changeset 2976:40014144f948

[gaim-migrate @ 2989] I think I'm a clone now committer: Tailor Script <tailor@pidgin.im>
author Rob Flynn <gaim@robflynn.com>
date Fri, 22 Feb 2002 23:48:23 +0000
parents 626729653436
children c4f218a8b78a
files po/de.po po/es.po po/fi.po po/fr.po po/ko.po po/ru.po po/sv.po po/zh_CN.po
diffstat 8 files changed, 10981 insertions(+), 7853 deletions(-) [+]
line wrap: on
line diff
--- a/po/de.po	Fri Feb 22 23:47:55 2002 +0000
+++ b/po/de.po	Fri Feb 22 23:48:23 2002 +0000
@@ -15,7 +15,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim 0.9.19\n"
-"POT-Creation-Date: 2002-01-30 18:58+0100\n"
+"POT-Creation-Date: 2002-02-17 12:41-0800\n"
 "PO-Revision-Date: 2002-01-30 22:42+0100\n"
 "Last-Translator: Karsten Weiss <knweiss@gmx.de>\n"
 "Language-Team: de <de@li.org>\n"
@@ -24,35 +24,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.5\n"
 
-#: src/protocols/gg/gg.c:71
-msgid "Available"
-msgstr "Erreichbar"
-
-#: src/protocols/gg/gg.c:72
-msgid "Available for friends only"
-msgstr "Nur für Freunde erreichbar"
-
-#: src/applet.c:293 src/buddy.c:487 src/buddy.c:2344 src/buddy.c:2480
-#: src/protocols/gg/gg.c:73
-msgid "Away"
-msgstr "Abwesend"
-
-#: src/protocols/gg/gg.c:74
-msgid "Away for friends only"
-msgstr "Nur für Freunde abwesend"
-
-#: src/protocols/gg/gg.c:75
-msgid "Invisible"
-msgstr "Unsichtbar"
-
-#: src/protocols/gg/gg.c:76
-msgid "Invisible for friends only"
-msgstr "Nur für Freunde unsichtbar"
-
-#: src/protocols/gg/gg.c:77
-msgid "Unavailable"
-msgstr "Unerreichbar"
-
 #: src/protocols/gg/gg.c:182
 msgid "Unable to resolve hostname."
 msgstr "Der Rechnername kann nicht aufgelöst werden."
@@ -304,8 +275,8 @@
 msgstr "Nachricht mittels Server senden"
 
 #: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1538
-#: src/protocols/jabber/jabber.c:1691 src/protocols/oscar/oscar.c:2858
-#: src/protocols/toc/toc.c:1202
+#: src/protocols/jabber/jabber.c:2021 src/protocols/oscar/oscar.c:2847
+#: src/protocols/toc/toc.c:1201
 msgid "Get Info"
 msgstr "Benutzer-Info"
 
@@ -358,24 +329,29 @@
 msgid "Channel:"
 msgstr "Kanal:"
 
-#: src/multi.c:506 src/protocols/irc/irc.c:1447
+#: src/multi.c:522 src/protocols/irc/irc.c:1447
 msgid "Password:"
 msgstr "Passwort:"
 
-#: src/protocols/jabber/jabber.c:1399
+#: src/protocols/jabber/jabber.c:1692
 msgid "Room:"
 msgstr "Raum:"
 
-#: src/protocols/jabber/jabber.c:1403
+#: src/protocols/jabber/jabber.c:1696
 msgid "Server:"
 msgstr "Server:"
 
-#: src/protocols/jabber/jabber.c:1408
+#: src/protocols/jabber/jabber.c:1701
 msgid "Handle:"
 msgstr "Kürzel:"
 
-#: src/protocols/msn/msn.c:653 src/protocols/msn/msn.c:1905
-#: src/protocols/msn/msn.c:1938
+#: src/buddy_chat.c:875 src/protocols/jabber/jabber.c:2026
+#: src/protocols/oscar/oscar.c:2854
+msgid "Get Away Msg"
+msgstr "Abwesenheits-Mitteilung holen"
+
+#: src/protocols/msn/msn.c:653 src/protocols/msn/msn.c:1909
+#: src/protocols/msn/msn.c:1942
 msgid "MSN Error"
 msgstr "MSN-Fehler"
 
@@ -389,12 +365,12 @@
 "Die Verbindung wurde getrennt. Sie haben sich von einem anderen Ort "
 "angemeldet."
 
-#: src/protocols/msn/msn.c:1905 src/protocols/msn/msn.c:1938
+#: src/protocols/msn/msn.c:1909 src/protocols/msn/msn.c:1942
 msgid "Invalid name"
 msgstr "Ungültiger Name"
 
-#: src/protocols/napster/napster.c:450 src/protocols/oscar/oscar.c:2547
-#: src/protocols/toc/toc.c:1089
+#: src/protocols/napster/napster.c:450 src/protocols/oscar/oscar.c:2536
+#: src/protocols/toc/toc.c:1088
 msgid "Join what group:"
 msgstr "An welcher Gruppe teilnehmen:"
 
@@ -412,12 +388,12 @@
 msgid "major connection error\n"
 msgstr "Schwerwiegender Verbindungsfehler!\n"
 
-#: src/protocols/oscar/oscar.c:353 src/protocols/toc/toc.c:510
-#: src/protocols/toc/toc.c:523 src/protocols/toc/toc.c:589
+#: src/protocols/oscar/oscar.c:353 src/protocols/toc/toc.c:509
+#: src/protocols/toc/toc.c:522 src/protocols/toc/toc.c:588
 msgid "Disconnected."
 msgstr "Verbindung unterbrochen"
 
-#: src/protocols/oscar/oscar.c:365 src/protocols/toc/toc.c:757
+#: src/protocols/oscar/oscar.c:365 src/protocols/toc/toc.c:756
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Die Verbindung zum Raum %s wurde unterbrochen"
@@ -468,7 +444,7 @@
 msgstr "Verbindung hergestellt. Cookie gesendet"
 
 #. Incorrect nick/password
-#: src/protocols/oscar/oscar.c:610 src/protocols/toc/toc.c:458
+#: src/protocols/oscar/oscar.c:610 src/protocols/toc/toc.c:457
 msgid "Incorrect nickname or password."
 msgstr "Ungültiger Benutzername oder Passwort."
 
@@ -482,14 +458,17 @@
 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 "Sie haben sich zu schnell an- und abgemeldet. Warten Sie 10 Minuten und versuchen Sie es noch einmal. Wenn Sie es weiterversuchen, müssen Sie sogar noch länger warten"
+msgstr ""
+"Sie haben sich zu schnell an- und abgemeldet. Warten Sie 10 Minuten und "
+"versuchen Sie es noch einmal. Wenn Sie es weiterversuchen, müssen Sie sogar "
+"noch länger warten"
 
 #. client too old
 #: src/protocols/oscar/oscar.c:624
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr "Ihre AIM-Software ist zu alt. Aktuelle Software finden Sie unter "
 
-#: src/protocols/oscar/oscar.c:628 src/protocols/toc/toc.c:541
+#: src/protocols/oscar/oscar.c:628 src/protocols/toc/toc.c:540
 msgid "Authentication Failed"
 msgstr "Legitimation fehlgeschlagen"
 
@@ -497,192 +476,185 @@
 msgid "Internal Error"
 msgstr "Interner Fehler"
 
-#: src/protocols/oscar/oscar.c:1204 src/protocols/oscar/oscar.c:2755
+#: src/protocols/oscar/oscar.c:1204 src/protocols/oscar/oscar.c:2744
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Direkte Verbindung mit %s hergestellt"
 
-#: src/protocols/oscar/oscar.c:1455
+#: src/protocols/oscar/oscar.c:1454
 #, c-format
 msgid "You missed %d message from %s because it was invalid."
 msgstr "Sie haben %d Nachricht von %s verpasst, da sie ungültig war."
 
-#: src/protocols/oscar/oscar.c:1456
+#: src/protocols/oscar/oscar.c:1455
 #, c-format
 msgid "You missed %d messages from %s because they were invalid."
 msgstr "Sie haben %d Nachrichten von %s verpasst, da sie ungültig waren."
 
-# Unübersetzbar. Der Originalstring muß abgeändert werden.
-#: src/protocols/oscar/oscar.c:1459
-#, c-format
-msgid "You missed %d message from %s because %s invalid."
-msgstr ""
-
-# Unübersetzbar. Der Originalstring muß abgeändert werden.
-#: src/protocols/oscar/oscar.c:1460
-#, c-format
-msgid "You missed %d messages from %s because %s invalid."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:1475
+#: src/protocols/oscar/oscar.c:1464
 #, c-format
 msgid "You missed %d message from %s because it was too large."
 msgstr "Sie haben %d Nachricht von %s verpasst, da sie zu groß war."
 
-#: src/protocols/oscar/oscar.c:1476
+#: src/protocols/oscar/oscar.c:1465
 #, c-format
 msgid "You missed %d messages from %s because they were too large."
 msgstr "Sie haben %d Nachrichten von %s verpasst, da sie zu groß waren."
 
-#: src/protocols/oscar/oscar.c:1485
+#: src/protocols/oscar/oscar.c:1474
 #, c-format
 msgid "You missed %d message from %s because the rate limit has been exceeded."
-msgstr "Sie haben %d Nachricht von %s verpasst, da die Senderate überschritten wurde."
-
-#: src/protocols/oscar/oscar.c:1486
+msgstr ""
+"Sie haben %d Nachricht von %s verpasst, da die Senderate überschritten wurde."
+
+#: src/protocols/oscar/oscar.c:1475
 #, c-format
 msgid ""
 "You missed %d messages from %s because the rate limit has been exceeded."
-msgstr "Sie haben %d Nachrichten von %s verpasst, da die Senderate überschritten wurde."
+msgstr ""
+"Sie haben %d Nachrichten von %s verpasst, da die Senderate überschritten "
+"wurde."
+
+#: src/protocols/oscar/oscar.c:1484
+#, fuzzy, c-format
+msgid "You missed %d message from %s because it was too evil."
+msgstr "Sie haben %d Nachricht von %s verpasst, da sie zu groß war."
 
 # ???
-#: src/protocols/oscar/oscar.c:1495
-#, c-format
-msgid "You missed %d message from %s because they are too evil."
-msgstr "Sie haben %d Nachricht von %s verpasst, da sie zu boshaft war."
-
-# ???
-#: src/protocols/oscar/oscar.c:1496
+#: src/protocols/oscar/oscar.c:1485
 #, c-format
 msgid "You missed %d messages from %s because they are too evil."
 msgstr "Sie haben %d Nachrichten von %s verpasst, da sie zu boshaft waren."
 
 # ???
-#: src/protocols/oscar/oscar.c:1505
+#: src/protocols/oscar/oscar.c:1494
 #, c-format
 msgid "You missed %d message from %s because you are too evil."
 msgstr "Sie haben %d Nachricht von %s verpasst, da Sie zu boshaft sind."
 
 # ???
-#: src/protocols/oscar/oscar.c:1506
+#: src/protocols/oscar/oscar.c:1495
 #, c-format
 msgid "You missed %d messages from %s because you are too evil."
 msgstr "Sie haben %d Nachrichten von %s verpasst, da Sie zu boshaft sind."
 
-#: src/protocols/oscar/oscar.c:1514
+#: src/protocols/oscar/oscar.c:1503
 #, c-format
 msgid "You missed %d message from %s for unknown reasons."
 msgstr "Sie haben %d Nachricht von %s aus unbekannten Gründen verpasst."
 
-#: src/protocols/oscar/oscar.c:1515
+#: src/protocols/oscar/oscar.c:1504
 #, c-format
 msgid "You missed %d messages from %s for unknown reasons."
 msgstr "Sie haben %d Nachricht von %s aus unbekannten Gründen verpasst."
 
-#: src/dialogs.c:2949 src/dialogs.c:2955 src/protocols/oscar/oscar.c:1520
-#: src/protocols/oscar/oscar.c:1558 src/protocols/oscar/oscar.c:1576
-#: src/protocols/oscar/oscar.c:2005 src/protocols/yahoo/yahoo.c:495
+#: src/dialogs.c:2949 src/dialogs.c:2955 src/protocols/oscar/oscar.c:1509
+#: src/protocols/oscar/oscar.c:1547 src/protocols/oscar/oscar.c:1565
+#: src/protocols/oscar/oscar.c:1994 src/protocols/yahoo/yahoo.c:501
 msgid "Gaim - Error"
 msgstr "Gaim - Fehler"
 
-#: src/protocols/oscar/oscar.c:1537
+#: src/protocols/oscar/oscar.c:1526
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC war den Fehler: %s\n"
 
-#: src/protocols/oscar/oscar.c:1539
+#: src/protocols/oscar/oscar.c:1528
 msgid "Gaim - Oscar SNAC Error"
 msgstr "Gaim - Oscar SNAC Fehler"
 
-#: src/protocols/oscar/oscar.c:1556
+#: src/protocols/oscar/oscar.c:1545
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr "Ihre Nachricht zu %s wurde nicht gesendet: %s"
 
-#: src/protocols/oscar/oscar.c:1557 src/protocols/oscar/oscar.c:1575
+#: src/protocols/oscar/oscar.c:1546 src/protocols/oscar/oscar.c:1564
 msgid "Reason unknown"
 msgstr "Grund unbekannt"
 
-#: src/protocols/oscar/oscar.c:1574
+#: src/protocols/oscar/oscar.c:1563
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr "Benutzerinformationen für %s sind nicht verfügbar: %s"
 
-#: src/buddy.c:1906 src/protocols/oscar/oscar.c:1602
+#: src/buddy.c:1906 src/protocols/oscar/oscar.c:1591
 msgid "Buddy Icon"
 msgstr "Buddy-Icon"
 
-#: src/buddy.c:1909 src/protocols/oscar/oscar.c:1605
+#: src/buddy.c:1909 src/protocols/oscar/oscar.c:1594
 msgid "Voice"
 msgstr "Stimme"
 
-#: src/buddy.c:1912 src/protocols/oscar/oscar.c:1608
+#: src/buddy.c:1912 src/protocols/oscar/oscar.c:1597
 msgid "IM Image"
 msgstr "IM Bild"
 
 #: src/buddy.c:488 src/buddy.c:1915 src/buddy.c:2343 src/prefs.c:2837
-#: src/protocols/oscar/oscar.c:1611
+#: src/protocols/oscar/oscar.c:1600
 msgid "Chat"
 msgstr "Chat"
 
-#: src/buddy.c:1918 src/protocols/oscar/oscar.c:1614
+#: src/buddy.c:1918 src/protocols/oscar/oscar.c:1603
 msgid "Get File"
 msgstr "Datei holen"
 
-#: src/buddy.c:1921 src/protocols/oscar/oscar.c:1617
+#: src/buddy.c:1921 src/protocols/oscar/oscar.c:1606
 msgid "Send File"
 msgstr "Datei versenden"
 
-#: src/buddy.c:1925 src/protocols/oscar/oscar.c:1621
+#: src/buddy.c:1925 src/protocols/oscar/oscar.c:1610
 msgid "Games"
 msgstr "Spiele"
 
-#: src/buddy.c:1928 src/protocols/oscar/oscar.c:1624
+#: src/buddy.c:1928 src/protocols/oscar/oscar.c:1613
 msgid "Stocks"
 msgstr "Bestände"
 
-#: src/buddy.c:1931 src/protocols/oscar/oscar.c:1627
+#: src/buddy.c:1931 src/protocols/oscar/oscar.c:1616
 msgid "Send Buddy List"
 msgstr "Buddy-Liste senden"
 
-#: src/buddy.c:1934 src/protocols/oscar/oscar.c:1630
+#: src/buddy.c:1934 src/protocols/oscar/oscar.c:1619
 msgid "EveryBuddy Bug"
 msgstr "EveryBuddy Bug"
 
-#: src/buddy.c:1937 src/protocols/oscar/oscar.c:1633
+#: src/buddy.c:1937 src/protocols/oscar/oscar.c:1622
 msgid "AP User"
 msgstr "AP Benutzer"
 
-#: src/buddy.c:1940 src/protocols/oscar/oscar.c:1636
+#: src/buddy.c:1940 src/protocols/oscar/oscar.c:1625
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/buddy.c:1943 src/protocols/oscar/oscar.c:1639
+#: src/buddy.c:1943 src/protocols/oscar/oscar.c:1628
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/buddy.c:1946 src/protocols/oscar/oscar.c:1642
+#: src/buddy.c:1946 src/protocols/oscar/oscar.c:1631
 msgid "ICQ Server Relay"
 msgstr "ICQ Server Relay"
 
-#: src/buddy.c:1949 src/protocols/oscar/oscar.c:1645
+#: src/buddy.c:1949 src/protocols/oscar/oscar.c:1634
 msgid "ICQ Unknown"
 msgstr "ICQ Unbekannt"
 
-#: src/buddy.c:1952 src/protocols/oscar/oscar.c:1648
+#: src/buddy.c:1952 src/protocols/oscar/oscar.c:1637
 msgid "Trillian Encryption"
 msgstr "Trillian Verschlüsselung"
 
-#: src/protocols/oscar/oscar.c:1685
+#: src/protocols/oscar/oscar.c:1674
 msgid ""
-"<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG SRC=\"free_icon.gif"
-"\"> : Normal AIM User<br><IMG SRC=\"aol_icon.gif\"> : AOL User <br><IMG SRC="
-"\"dt_icon.gif\"> : Trial AIM User <br><IMG SRC=\"admin_icon.gif\"> : "
-"Administrator"
-msgstr "<br><BODY BGCOLOR=WHITE><hr><I>Legende:</I><br><br><IMG SRC=\"free_icon.gif\"> : Normaler AIM-Benutzer<br><IMG SRC=\"aol_icon.gif\"> : AOL Benutzer <br><IMG SRC=\"dt_icon.gif\"> : Test-AIM Benutzer <br><IMG SRC=\"admin_icon.gif\"> : Administrator"
-
-#: src/protocols/oscar/oscar.c:1697
-#, c-format
+"<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG "
+"SRC=\"free_icon.gif\"> : Normal AIM User<br><IMG SRC=\"aol_icon.gif\"> : AOL "
+"User <br><IMG SRC=\"dt_icon.gif\"> : Trial AIM User <br><IMG "
+"SRC=\"admin_icon.gif\"> : Administrator"
+msgstr ""
+"<br><BODY BGCOLOR=WHITE><hr><I>Legende:</I><br><br><IMG "
+"SRC=\"free_icon.gif\"> : Normaler AIM-Benutzer<br><IMG SRC=\"aol_icon.gif\"> "
+": AOL Benutzer <br><IMG SRC=\"dt_icon.gif\"> : Test-AIM Benutzer <br><IMG "
+"SRC=\"admin_icon.gif\"> : Administrator"
+
+#: src/protocols/oscar/oscar.c:1686
 msgid ""
 "Username : <B>%s</B>  %s <BR>\n"
 "%sWarning Level : <B>%d %%</B><BR>\n"
@@ -698,217 +670,222 @@
 "<BR>\n"
 "<HR><BR>\n"
 
-#: src/protocols/oscar/oscar.c:1725
+#: src/protocols/oscar/oscar.c:1714
 msgid "<i>User has no away message</i>"
 msgstr "<i>Benutzer hat keine Abwesenheits-Mitteilung</i>"
 
-#: src/protocols/oscar/oscar.c:1737
+#: src/protocols/oscar/oscar.c:1726
 msgid "Client Capabilities: "
 msgstr "Client-Fähigkeiten: "
 
-#: src/protocols/oscar/oscar.c:1745
+#: src/protocols/oscar/oscar.c:1734
 msgid "<i>No Information Provided</i>"
 msgstr "<i>Keine Information bereitgestellt</i>"
 
-#: src/protocols/oscar/oscar.c:1768
+#: src/protocols/oscar/oscar.c:1757
 msgid "Your connection may be lost."
 msgstr "Die Verbindung wurde unterbrochen"
 
-#: src/protocols/oscar/oscar.c:1769
+#: src/protocols/oscar/oscar.c:1758
 msgid "AOL error"
 msgstr "AOL-Fehler"
 
-#: src/protocols/oscar/oscar.c:2004
+#: src/protocols/oscar/oscar.c:1993
 msgid ""
 "The last message was not sent because you are over the rate limit. Please "
 "wait 10 seconds and try again."
-msgstr "Die letzte Nachricht wurde nicht verschickt, da die Senderate überschritten wurde. Bitte warten Sie 10 Sekunden und versuchen Sie es erneut."
-
-#: src/dialogs.c:3482 src/protocols/oscar/oscar.c:2278
-#: src/protocols/oscar/oscar.c:2829 src/protocols/toc/toc.c:1547
-#: src/protocols/toc/toc.c:1564 src/protocols/toc/toc.c:1624
-#: src/protocols/toc/toc.c:1666 src/protocols/toc/toc.c:1785
-#: src/protocols/toc/toc.c:1815 src/protocols/toc/toc.c:1871
+msgstr ""
+"Die letzte Nachricht wurde nicht verschickt, da die Senderate überschritten "
+"wurde. Bitte warten Sie 10 Sekunden und versuchen Sie es erneut."
+
+#: src/dialogs.c:3482 src/protocols/oscar/oscar.c:2267
+#: src/protocols/oscar/oscar.c:2818 src/protocols/toc/toc.c:1546
+#: src/protocols/toc/toc.c:1563 src/protocols/toc/toc.c:1623
+#: src/protocols/toc/toc.c:1665 src/protocols/toc/toc.c:1784
+#: src/protocols/toc/toc.c:1814 src/protocols/toc/toc.c:1870
 msgid "Error"
 msgstr "Fehler"
 
 # Ich bin mir nicht sicher was "Exchange" hier genau bedeutet.
-#: src/protocols/oscar/oscar.c:2551 src/protocols/toc/toc.c:1093
+#: src/protocols/oscar/oscar.c:2540 src/protocols/toc/toc.c:1092
 msgid "Exchange:"
 msgstr "Austausch:"
 
 # "Direct IM"
-#: src/protocols/oscar/oscar.c:2829
+#: src/protocols/oscar/oscar.c:2818
 msgid "Unable to open Direct IM"
 msgstr "Direkte Verbindung nicht möglich"
 
 # Direct IM
-#: src/protocols/oscar/oscar.c:2839
+#: src/protocols/oscar/oscar.c:2828
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
 "let them see your IP address, and may be a security risk. Do you wish to "
 "continue?"
-msgstr "Sie möchten eine Direkte Verbindung mit %s herstellen. Wenn Sie dies tun, kann er Ihre ipadresse sehn und könnte ein sicherheitsrisiko darstellen. Möchten Sie weitermachen?"
-
-#: src/protocols/oscar/oscar.c:2865
-msgid "Get Away Msg"
-msgstr "Abwesenheits-Mitteilung holen"
-
-#: src/protocols/oscar/oscar.c:2872
+msgstr ""
+"Sie möchten eine Direkte Verbindung mit %s herstellen. Wenn Sie dies tun, "
+"kann er Ihre ipadresse sehn und könnte ein sicherheitsrisiko darstellen. "
+"Möchten Sie weitermachen?"
+
+#: src/protocols/oscar/oscar.c:2861
 msgid "Direct IM"
 msgstr "Direkte Nachricht"
 
-#: src/protocols/oscar/oscar.c:2880
+#: src/protocols/oscar/oscar.c:2869
 msgid "Get Capabilities"
 msgstr "Fähigkeiten holen"
 
-#: src/protocols/toc/toc.c:397
+#: src/protocols/toc/toc.c:396
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Datei %s konnte nicht geschrieben werden."
 
-#: src/protocols/toc/toc.c:400
+#: src/protocols/toc/toc.c:399
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Datei %s konnte nicht gelesen werden."
 
-#: src/protocols/toc/toc.c:403
+#: src/protocols/toc/toc.c:402
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Nachricht zu lange, letzten %s Bytes abgeschnitten."
 
-#: src/protocols/toc/toc.c:406
+#: src/protocols/toc/toc.c:405
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s ist zur Zeit nicht online."
 
-#: src/protocols/toc/toc.c:409
+#: src/protocols/toc/toc.c:408
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Verwarnung von %s nicht erlaubt."
 
-#: src/protocols/toc/toc.c:412
+#: src/protocols/toc/toc.c:411
 msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "Eine Nachricht ging verloren. Sie überschreiten die Geschwindigkeitsgrenze des Servers."
-
-#: src/protocols/toc/toc.c:415
+msgstr ""
+"Eine Nachricht ging verloren. Sie überschreiten die Geschwindigkeitsgrenze "
+"des Servers."
+
+#: src/protocols/toc/toc.c:414
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Chat in %s ist nicht möglich."
 
-#: src/protocols/toc/toc.c:418
+#: src/protocols/toc/toc.c:417
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Sie verschicken die Nachrichten an %s zu schnell."
 
-#: src/protocols/toc/toc.c:421
+#: src/protocols/toc/toc.c:420
 #, 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/protocols/toc/toc.c:424
+#: src/protocols/toc/toc.c:423
 #, 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/protocols/toc/toc.c:427
+#: src/protocols/toc/toc.c:426
 msgid "Failure."
 msgstr "Fehler."
 
-#: src/protocols/toc/toc.c:430
+#: src/protocols/toc/toc.c:429
 msgid "Too many matches."
 msgstr "Zu viele Übereinstimmungen."
 
-#: src/protocols/toc/toc.c:433
+#: src/protocols/toc/toc.c:432
 msgid "Need more qualifiers."
 msgstr "Benötige mehr Angaben."
 
-#: src/protocols/toc/toc.c:436
+#: src/protocols/toc/toc.c:435
 msgid "Dir service temporarily unavailable."
 msgstr "Verzeichnis-Dienst ist zur Zeit nicht verfügbar."
 
-#: src/protocols/toc/toc.c:439
+#: src/protocols/toc/toc.c:438
 msgid "Email lookup restricted."
 msgstr "eMail-Suche eingeschränkt."
 
-#: src/protocols/toc/toc.c:442
+#: src/protocols/toc/toc.c:441
 msgid "Keyword ignored."
 msgstr "Stichwort ignoriert."
 
-#: src/protocols/toc/toc.c:445
+#: src/protocols/toc/toc.c:444
 msgid "No keywords."
 msgstr "Keine Stichwörter."
 
-#: src/protocols/toc/toc.c:448
+#: src/protocols/toc/toc.c:447
 msgid "User has no directory information."
 msgstr "Der Benutzer hat kein Profil."
 
-#: src/protocols/toc/toc.c:452
+#: src/protocols/toc/toc.c:451
 msgid "Country not supported."
 msgstr "Land nicht unterstützt."
 
-#: src/protocols/toc/toc.c:455
+#: src/protocols/toc/toc.c:454
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Unbekannter Fehler: %s."
 
-#: src/protocols/toc/toc.c:461
+#: src/protocols/toc/toc.c:460
 msgid "The service is temporarily unavailable."
 msgstr "Der Dienst ist zur Zeit nicht erreichbar."
 
-#: src/protocols/toc/toc.c:464
+#: src/protocols/toc/toc.c:463
 msgid "Your warning level is currently too high to log in."
 msgstr "Ihre Warn-Stufe ist zur Zeit zu hoch, um sich anzumelden."
 
-#: src/protocols/toc/toc.c:467
+#: src/protocols/toc/toc.c:466
 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 "Sie haben Sich zu schnell an- und abgemeldet. Warten Sie 10 Minuten und versuchen Sie es erneut."
-
-#: src/protocols/toc/toc.c:470
+msgstr ""
+"Sie haben Sich zu schnell an- und abgemeldet. Warten Sie 10 Minuten und "
+"versuchen Sie es erneut."
+
+#: src/protocols/toc/toc.c:469
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Unbekannter Anmeldungsfehler: %s."
 
-#: src/protocols/toc/toc.c:473
+#: src/protocols/toc/toc.c:472
 #, c-format
 msgid "An unknown error, %d, has occured.  Info: %s"
 msgstr "Unbekannter Fehler: %d. Info: %s"
 
-#: src/protocols/toc/toc.c:490
+#: src/protocols/toc/toc.c:489
 msgid "Connection Closed"
 msgstr "Verbindung geschlossen"
 
-#: src/protocols/toc/toc.c:528
+#: src/protocols/toc/toc.c:527
 msgid "Waiting for reply..."
 msgstr "Auf die Antwort warten..."
 
-#: src/protocols/toc/toc.c:597
+#: src/protocols/toc/toc.c:596
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr ""
 "TOC ist von seiner Pause zurückgekehrt. Sie können wieder Nachrichten senden."
 
-#: src/protocols/toc/toc.c:598
+#: src/protocols/toc/toc.c:597
 msgid "TOC Resume"
 msgstr "TOC Fortsetzung"
 
-#: src/protocols/toc/toc.c:759
+#: src/protocols/toc/toc.c:758
 msgid "Chat Error"
 msgstr "Chat-Fehler"
 
-#: src/protocols/toc/toc.c:778
+#: src/protocols/toc/toc.c:777
 msgid "Password Change Successeful"
 msgstr "Password-Änderung erfolgreich"
 
-#: src/dialogs.c:1607 src/protocols/toc/toc.c:778
+#: src/dialogs.c:1607 src/protocols/toc/toc.c:777
 msgid "Gaim - Password Change"
 msgstr "Gaim - Password-Änderung"
 
-#: src/protocols/toc/toc.c:781
+#: src/protocols/toc/toc.c:780
 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 "
@@ -919,43 +896,43 @@
 "senden. Gaim verhindert jetzt, daß Nachrichten durchgehen. Dies ist nur "
 "temporär, bitte haben Sie Geduld."
 
-#: src/protocols/toc/toc.c:784
+#: src/protocols/toc/toc.c:783
 msgid "TOC Pause"
 msgstr "TOC Pause"
 
-#: src/protocols/toc/toc.c:1208
+#: src/protocols/toc/toc.c:1207
 msgid "Get Dir Info"
 msgstr "Verzeichnis Information holen"
 
-#: src/protocols/toc/toc.c:1624 src/protocols/toc/toc.c:1666
-#: src/protocols/toc/toc.c:1785 src/protocols/toc/toc.c:1871
+#: src/protocols/toc/toc.c:1623 src/protocols/toc/toc.c:1665
+#: src/protocols/toc/toc.c:1784 src/protocols/toc/toc.c:1870
 msgid "Could not connect for transfer!"
 msgstr "Übertragungsverbindung konnte nicht hergestellt werden!"
 
-#: src/protocols/toc/toc.c:1815
+#: src/protocols/toc/toc.c:1814
 msgid "Could not write file header!"
 msgstr "Dateikopf konnte nicht geschrieben werden!"
 
-#: src/protocols/toc/toc.c:1904
+#: src/protocols/toc/toc.c:1903
 msgid "Gaim - Save As..."
 msgstr "Gaim - Speichern unter..."
 
+#: src/protocols/toc/toc.c:1944
+#, c-format
+msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+msgstr "%s bittet %s %d Datei zu akzeptieren: %s (%.2f %s)%s%s "
+
 #: src/protocols/toc/toc.c:1945
 #, c-format
-msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-msgstr "%s bittet %s %d Datei zu akzeptieren: %s (%.2f %s)%s%s "
-
-#: src/protocols/toc/toc.c:1946
-#, c-format
 msgid "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr "%s bittet %s %d Dateien zu akzeptieren: %s (%.2f %s)%s%s "
 
-#: src/protocols/toc/toc.c:1951
+#: src/protocols/toc/toc.c:1950
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s bittet Sie eine Datei zu senden"
 
-#: src/protocols/yahoo/yahoo.c:495
+#: src/protocols/yahoo/yahoo.c:501
 msgid "Your message did not get sent."
 msgstr "Die Nachricht wurde nicht verschickt"
 
@@ -977,12 +954,12 @@
 msgstr "Empfänger:"
 
 # "Info" ist die offizielle GNOME Übersetzung
-#: src/about.c:92
+#: src/about.c:93
 #, c-format
 msgid "About Gaim v%s"
 msgstr "Info zu Gaim v%s"
 
-#: src/about.c:125
+#: src/about.c:126
 msgid ""
 "Gaim is a client that supports AOL's Instant Messenger protocol. It is "
 "written\n"
@@ -995,39 +972,28 @@
 "\n"
 "URL: "
 
-#: src/about.c:126
+#: src/about.c:137
 msgid ""
-"\n"
-"\n"
-"IRC: #gaim on irc.openprojects.net"
-msgstr ""
-"\n"
+"Active Developers\n"
+"====================\n"
+"Rob Flynn (maintainer) [ rob@marko.net ]\n"
+"Sean Egan (coder)      [ bj91704@binghamton.edu ]\n"
 "\n"
-"IRC: #gaim auf irc.openprojects.net"
-
-#: src/about.c:135
-msgid ""
-"Rob Flynn (maintainer)               rob@marko.net\n"
-"Eric Warmenhoven warmenhoven@yahoo.com\n"
-"\n"
+"Crazy Patch Writers\n"
+"===================\n"
 "Benjamin Miller\n"
 "Decklin Foster\n"
-"Sean Egan\n"
+"\n"
+"Retired Developers\n"
+"===================\n"
 "Jim Duchek\n"
-"Mark Spencer (original author)   markster@marko.net"
+"Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
+"Mark Spencer (original author)   [ markster@marko.net ]"
 msgstr ""
-"Rob Flynn (Maintainer)               rob@marko.net\n"
-"Eric Warmenhoven warmenhoven@yahoo.com\n"
-"\n"
-"Benjamin Miller\n"
-"Decklin Foster\n"
-"Sean Egan\n"
-"Jim Duchek\n"
-"Mark Spencer (Ursprünglicher Autor)   markster@marko.net"
-
-#: src/about.c:146 src/aim.c:296 src/buddy.c:2469 src/buddy_chat.c:1287
-#: src/buddy_chat.c:1384 src/buddy_chat.c:1414 src/conversation.c:2417
-#: src/dialogs.c:563 src/dialogs.c:3777 src/multi.c:1002 src/plugins.c:277
+
+#: src/about.c:155 src/aim.c:296 src/buddy.c:2469 src/buddy_chat.c:1311
+#: src/buddy_chat.c:1408 src/buddy_chat.c:1438 src/conversation.c:2417
+#: src/dialogs.c:563 src/dialogs.c:3777 src/multi.c:1026 src/plugins.c:277
 #: src/prefs.c:2496 src/prpl.c:438 src/prpl.c:679 src/server.c:991
 msgid "Close"
 msgstr "Schließen"
@@ -1035,7 +1001,7 @@
 #. this makes the sizes not work.
 #. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
 #. gtk_widget_grab_default(button);
-#: src/about.c:166
+#: src/about.c:175
 msgid "Web Site"
 msgstr "Webseite"
 
@@ -1047,7 +1013,7 @@
 msgid "Please enter your logon"
 msgstr "Bitte geben Sie einen Benutzernamen ein"
 
-#: src/aim.c:141 src/multi.c:1231 src/server.c:55
+#: src/aim.c:141 src/multi.c:1276 src/server.c:55
 msgid "Signon Error"
 msgstr "Anmeldefehler"
 
@@ -1071,7 +1037,7 @@
 msgid "Accounts"
 msgstr "Konten"
 
-#: src/aim.c:301 src/multi.c:854
+#: src/aim.c:301 src/multi.c:878
 msgid "Signon"
 msgstr "Anmelden"
 
@@ -1110,6 +1076,10 @@
 msgid "Away."
 msgstr "Abwesend."
 
+#: src/applet.c:293 src/buddy.c:487 src/buddy.c:2344 src/buddy.c:2480
+msgid "Away"
+msgstr "Abwesend"
+
 #: src/applet.c:296 src/away.c:389
 msgid "New Away Message"
 msgstr "Neue Abwesenheits-Mitteilung"
@@ -1144,9 +1114,9 @@
 msgstr "Alle auf Abwesend setzen"
 
 #. Put the buttons in the box
-#: src/buddy.c:482 src/buddy.c:2579 src/buddy_chat.c:1419
+#: src/buddy.c:482 src/buddy.c:2579 src/buddy_chat.c:1443
 #: src/conversation.c:2043 src/conversation.c:2432 src/dialogs.c:881
-#: src/dialogs.c:1065 src/dialogs.c:1968 src/multi.c:986 src/prefs.c:1990
+#: src/dialogs.c:1065 src/dialogs.c:1968 src/multi.c:1010 src/prefs.c:1990
 #: src/prefs.c:2332 src/prefs.c:2366
 msgid "Add"
 msgstr "Hinzufügen"
@@ -1155,19 +1125,19 @@
 msgid "Group"
 msgstr "Gruppe"
 
-#: src/buddy.c:484 src/buddy.c:2581 src/buddy_chat.c:1421
+#: src/buddy.c:484 src/buddy.c:2581 src/buddy_chat.c:1445
 #: src/conversation.c:2029 src/conversation.c:2429 src/prefs.c:2004
 #: src/prefs.c:2336 src/prefs.c:2370
 msgid "Remove"
 msgstr "Entfernen"
 
 #: src/buddy.c:489 src/buddy.c:627 src/buddy.c:774 src/buddy.c:2341
-#: src/buddy_chat.c:828 src/buddy_chat.c:1243
+#: src/buddy_chat.c:850 src/buddy_chat.c:1267
 msgid "IM"
 msgstr "Nachricht"
 
-#: src/buddy.c:490 src/buddy.c:2342 src/buddy_chat.c:844 src/buddy_chat.c:1251
-#: src/buddy_chat.c:1427 src/conversation.c:2450
+#: src/buddy.c:490 src/buddy.c:2342 src/buddy_chat.c:866 src/buddy_chat.c:1275
+#: src/buddy_chat.c:1451 src/conversation.c:2450
 msgid "Info"
 msgstr "Info"
 
@@ -1211,7 +1181,6 @@
 msgstr "Angemeldet: %s\n"
 
 #: src/buddy.c:2041
-#, c-format
 msgid "Warnings: %d%%\n"
 msgstr "Warnungen: %d%%\n"
 
@@ -1368,8 +1337,8 @@
 #: src/dialogs.c:1061 src/dialogs.c:1350 src/dialogs.c:1555 src/dialogs.c:1679
 #: src/dialogs.c:1739 src/dialogs.c:1957 src/dialogs.c:2139 src/dialogs.c:2314
 #: src/dialogs.c:2385 src/dialogs.c:3081 src/dialogs.c:3338 src/dialogs.c:3519
-#: src/dialogs.c:3890 src/dialogs.c:3996 src/multi.c:720 src/multi.c:850
-#: src/multi.c:1184 src/prpl.c:150 src/prpl.c:224
+#: src/dialogs.c:3890 src/dialogs.c:3996 src/dialogs.c:4642 src/multi.c:744
+#: src/multi.c:874 src/multi.c:1208 src/prpl.c:150 src/prpl.c:224
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -1377,8 +1346,8 @@
 msgid "Join"
 msgstr "Betreten"
 
-#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1293
-#: src/buddy_chat.c:1383
+#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1317
+#: src/buddy_chat.c:1407
 msgid "Invite"
 msgstr "Einladen"
 
@@ -1394,67 +1363,67 @@
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - Buddy in einen Chatraum einladen"
 
-#: src/buddy_chat.c:835
+#: src/buddy_chat.c:857
 msgid "Un-Ignore"
 msgstr "Beachten"
 
-#: src/buddy_chat.c:837 src/buddy_chat.c:1247
+#: src/buddy_chat.c:859 src/buddy_chat.c:1271
 msgid "Ignore"
 msgstr "Ignorieren"
 
 #. don't remove them from ignored in case they re-enter
-#: src/buddy_chat.c:881 src/buddy_chat.c:1001 src/buddy_chat.c:1473
-#: src/buddy_chat.c:1519
+#: src/buddy_chat.c:922 src/buddy_chat.c:1034 src/buddy_chat.c:1497
+#: src/buddy_chat.c:1530
 #, c-format
 msgid "%d %s in room"
 msgstr "%d %s im Raum"
 
-#: src/buddy_chat.c:889
+#: src/buddy_chat.c:930
 #, c-format
 msgid "%s entered the room."
 msgstr "%s hat den Raum betreten."
 
-#: src/buddy_chat.c:963
+#: src/buddy_chat.c:996
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s heißt jetzt %s"
 
-#: src/buddy_chat.c:1010
+#: src/buddy_chat.c:1043
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s hat den Raum verlassen (%s)."
 
-#: src/buddy_chat.c:1012
+#: src/buddy_chat.c:1045
 #, c-format
 msgid "%s left the room."
 msgstr "%s hat den Raum verlassen"
 
-#: src/buddy_chat.c:1120
+#: src/buddy_chat.c:1144
 msgid "Gaim - Group Chats"
 msgstr "Gaim - Gruppenchats"
 
-#: src/buddy_chat.c:1183
+#: src/buddy_chat.c:1207
 msgid "Topic:"
 msgstr "Thema:"
 
-#: src/buddy_chat.c:1224
+#: src/buddy_chat.c:1248
 msgid "0 people in room"
 msgstr "0 Leute im Raum"
 
-#: src/buddy_chat.c:1298 src/buddy_chat.c:1382
+#: src/buddy_chat.c:1322 src/buddy_chat.c:1406
 msgid "Whisper"
 msgstr "Flüstern"
 
-#: src/buddy_chat.c:1303 src/buddy_chat.c:1380 src/buddy_chat.c:1429
+#: src/buddy_chat.c:1327 src/buddy_chat.c:1404 src/buddy_chat.c:1453
 #: src/conversation.c:2461
 msgid "Send"
 msgstr "Abschicken"
 
-#: src/buddy_chat.c:1423 src/conversation.c:2438
+#: src/buddy_chat.c:1447 src/conversation.c:2438
 msgid "Block"
 msgstr "Sperren"
 
-#: src/buddy_chat.c:1425 src/conversation.c:2444 src/dialogs.c:419
+#: src/buddy_chat.c:1449 src/conversation.c:2444 src/dialogs.c:419
 #: src/dialogs.c:448
 msgid "Warn"
 msgstr "Warnen"
@@ -1590,7 +1559,7 @@
 msgstr "Unterhaltung speichern"
 
 #: src/conversation.c:1902 src/dialogs.c:1559 src/dialogs.c:1743
-#: src/dialogs.c:3093 src/dialogs.c:3786
+#: src/dialogs.c:3093 src/dialogs.c:3786 src/dialogs.c:4649
 msgid "Save"
 msgstr "Speichern"
 
@@ -1677,7 +1646,7 @@
 #. Build OK Button
 #: src/dialogs.c:632 src/dialogs.c:711 src/dialogs.c:769 src/dialogs.c:1354
 #: src/dialogs.c:1683 src/dialogs.c:1830 src/dialogs.c:2138 src/dialogs.c:2318
-#: src/dialogs.c:2384 src/dialogs.c:3895 src/dialogs.c:4001 src/multi.c:725
+#: src/dialogs.c:2384 src/dialogs.c:3895 src/dialogs.c:4001 src/multi.c:749
 msgid "OK"
 msgstr "OK"
 
@@ -2055,92 +2024,102 @@
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Fehler: Verbindung kann nicht hergestellt werden.\n"
 
-#: src/multi.c:411
+#: src/multi.c:427
 msgid "Gaim - Load Buddy Icon"
 msgstr "Gaim - Buddy-Icon laden"
 
-#: src/multi.c:454
+#: src/multi.c:470
 msgid "Buddy Icon File:"
 msgstr "Buddy-Icon Datei:"
 
-#: src/multi.c:465
+#: src/multi.c:481
 msgid "Browse"
 msgstr "Stöbern"
 
-#: src/multi.c:470 src/prefs.c:1512
+#: src/multi.c:486 src/prefs.c:1512
 msgid "Reset"
 msgstr "Zurücksetzen"
 
-#: src/multi.c:497
+#: src/multi.c:513
 msgid "Screenname:"
 msgstr "Benutzername:"
 
-#: src/multi.c:517
+#: src/multi.c:533
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: src/multi.c:522
+#: src/multi.c:538
 msgid "Remember Password"
 msgstr "Passwort speichern"
 
-#: src/multi.c:523
+#: src/multi.c:539
 msgid "Auto-Login"
 msgstr "Auto-Login"
 
-#: src/multi.c:563
+#: src/multi.c:579
 msgid "New Mail Notifications"
 msgstr "Neue Mail-Benachrichtigungen"
 
-#: src/multi.c:703
+#: src/multi.c:727
 msgid "Gaim - Modify Account"
 msgstr "Gaim - Konto bearbeiten"
 
-#: src/multi.c:822
+#: src/multi.c:846
 msgid "Enter Password"
 msgstr "Passwort eingeben"
 
-#: src/multi.c:911
+#: src/multi.c:935
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Wollen Sie %s wirklich löschen?"
 
-#: src/multi.c:948
+#: src/multi.c:972
 msgid "Gaim - Account Editor"
 msgstr "Gaim - Konten-Editor"
 
-#: src/multi.c:967
+#: src/multi.c:991
 msgid "Select All"
 msgstr "Alles auswählen"
 
-#: src/multi.c:972
+#: src/multi.c:996
 msgid "Select Autos"
 msgstr "\"Auto\" auswählen"
 
-#: src/multi.c:976
+#: src/multi.c:1000
 msgid "Select None"
 msgstr "Nichts auswählen"
 
-#: src/multi.c:990
+#: src/multi.c:1014
 msgid "Modify"
 msgstr "Bearbeiten"
 
-#: src/multi.c:994
+#: src/multi.c:1018
 msgid "Sign On/Off"
 msgstr "An-/Abmelden"
 
-#: src/multi.c:998
+#: src/multi.c:1022
 msgid "Delete"
 msgstr "Löschen"
 
-#: src/multi.c:1226
+#: src/multi.c:1256
 #, c-format
 msgid ""
 "%s\n"
-"%s was unable to sign on: %s"
+"%s: %s"
+msgstr ""
+
+#: src/multi.c:1275
+#, fuzzy, c-format
+msgid "%s was unable to sign on"
 msgstr ""
 "%s\n"
 "%s konnte sich nicht anmelden: %s"
 
+#: src/multi.c:1286
+#, fuzzy
+msgid "Notice"
+msgstr "Stimme"
+
 #: src/perl.c:856
 msgid "Perl Scripts"
 msgstr "Perl-skripte"
@@ -2814,7 +2793,11 @@
 "version of the source as this application was. Unfortunately, because it is "
 "not the same version I cannot safely tell you which one it was. Needless to "
 "say, it was not successfully loaded."
-msgstr "Sie haben versucht, ein Protokoll zu laden, welches nicht für die aktuelle Version kompiliert wurde. Da es nicht die gleiche Version ist, kann ich leider nicht sagen, um welches es sich handelt. Unnütz zu sagen, dass es nicht geladen werden konnte."
+msgstr ""
+"Sie haben versucht, ein Protokoll zu laden, welches nicht für die aktuelle "
+"Version kompiliert wurde. Da es nicht die gleiche Version ist, kann ich "
+"leider nicht sagen, um welches es sich handelt. Unnütz zu sagen, dass es "
+"nicht geladen werden konnte."
 
 #: src/prpl.c:74
 msgid "Protocol Error"
@@ -2890,8 +2873,8 @@
 "or the protocol does not have a login function."
 msgstr ""
 "Sie können sich mit diesem Konto nicht anmelden, da Sie das entsprechende "
-"Protokoll nicht geladen haben oder da dieses Protokoll keine Anmelde-"
-"Funktion besitzt."
+"Protokoll nicht geladen haben oder da dieses Protokoll keine "
+"Anmelde-Funktion besitzt."
 
 #: src/server.c:64
 msgid "Login Error"
@@ -2921,3 +2904,53 @@
 #: src/server.c:995
 msgid "More Info"
 msgstr "Mehr Informationen"
+
+#~ msgid "Available"
+#~ msgstr "Erreichbar"
+
+#~ msgid "Available for friends only"
+#~ msgstr "Nur für Freunde erreichbar"
+
+#~ msgid "Away for friends only"
+#~ msgstr "Nur für Freunde abwesend"
+
+#~ msgid "Invisible"
+#~ msgstr "Unsichtbar"
+
+#~ msgid "Invisible for friends only"
+#~ msgstr "Nur für Freunde unsichtbar"
+
+#~ msgid "Unavailable"
+#~ msgstr "Unerreichbar"
+
+# ???
+#~ msgid "You missed %d message from %s because they are too evil."
+#~ msgstr "Sie haben %d Nachricht von %s verpasst, da sie zu boshaft war."
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "IRC: #gaim on irc.openprojects.net"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "IRC: #gaim auf irc.openprojects.net"
+
+#~ msgid ""
+#~ "Rob Flynn (maintainer)               rob@marko.net\n"
+#~ "Eric Warmenhoven warmenhoven@yahoo.com\n"
+#~ "\n"
+#~ "Benjamin Miller\n"
+#~ "Decklin Foster\n"
+#~ "Sean Egan\n"
+#~ "Jim Duchek\n"
+#~ "Mark Spencer (original author)   markster@marko.net"
+#~ msgstr ""
+#~ "Rob Flynn (Maintainer)               rob@marko.net\n"
+#~ "Eric Warmenhoven warmenhoven@yahoo.com\n"
+#~ "\n"
+#~ "Benjamin Miller\n"
+#~ "Decklin Foster\n"
+#~ "Sean Egan\n"
+#~ "Jim Duchek\n"
+#~ "Mark Spencer (Ursprünglicher Autor)   markster@marko.net"
--- a/po/es.po	Fri Feb 22 23:47:55 2002 +0000
+++ b/po/es.po	Fri Feb 22 23:48:23 2002 +0000
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-06-17 23:52-0700\n"
+"POT-Creation-Date: 2002-02-17 12:41-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,280 +14,1191 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: plugins/icq/gaim_icq.c:442 src/oscar.c:2895 src/toc.c:1031
+#: src/protocols/gg/gg.c:182
+#, fuzzy
+msgid "Unable to resolve hostname."
+msgstr "No se pudo leer archivo %s."
+
+#: src/protocols/gg/gg.c:185
+#, fuzzy
+msgid "Unable to connect to server."
+msgstr "No se pudo conectar a AIM"
+
+#: src/protocols/gg/gg.c:188
+msgid "Invalid response from server."
+msgstr ""
+
+#: src/protocols/gg/gg.c:191
+#, fuzzy
+msgid "Error while reading from socket."
+msgstr "Error leyendo el archivo %s"
+
+#: src/protocols/gg/gg.c:194
+#, fuzzy
+msgid "Error while writting to socket."
+msgstr "Error creando el archivo %s"
+
+#: src/protocols/gg/gg.c:197
+#, fuzzy
+msgid "Authentification failed."
+msgstr "Autorización no optenida"
+
+#: src/protocols/gg/gg.c:200
+msgid "Unknown Error Code."
+msgstr ""
+
+#: src/protocols/gg/gg.c:302
+#, c-format
+msgid "Status: %s"
+msgstr ""
+
+#: src/protocols/gg/gg.c:317
+msgid "Nick:"
+msgstr ""
+
+#: src/protocols/gg/gg.c:318
+msgid "Gadu-Gadu User"
+msgstr ""
+
+#: src/protocols/gg/gg.c:337
+#, fuzzy
+msgid "Could not connect"
+msgstr "No se pudo conectar"
+
+#: src/protocols/gg/gg.c:344
+#, fuzzy
+msgid "Unable to read socket"
+msgstr "No se pudo leer archivo %s."
+
+#: src/protocols/gg/gg.c:455
+#, fuzzy
+msgid "Unable to connect."
+msgstr "No se pudo conectar a AIM"
+
+#: src/protocols/gg/gg.c:465
+#, fuzzy
+msgid "Reading data"
+msgstr "Recibiendo Data"
+
+#: src/protocols/gg/gg.c:468
+msgid "Balancer handshake"
+msgstr ""
+
+#: src/protocols/gg/gg.c:471
+msgid "Reading server key"
+msgstr ""
+
+#: src/protocols/gg/gg.c:474
+msgid "Exchanging key hash"
+msgstr ""
+
+#: src/protocols/gg/gg.c:482
+msgid "Critical error in GG library\n"
+msgstr ""
+
+#: src/protocols/gg/gg.c:521
+#, fuzzy
+msgid "Unable to ping server"
+msgstr "No se pudo conectar a AIM"
+
+#: src/protocols/gg/gg.c:533
+#, fuzzy
+msgid "Send as message"
+msgstr "Sonido cuando un mensaje es enviado"
+
+#: src/protocols/gg/gg.c:541
+#, fuzzy
+msgid "Looking up GG server"
+msgstr "Buscando %s"
+
+#: src/protocols/gg/gg.c:544
+msgid "Invalid Gadu-Gadu UIN specified"
+msgstr ""
+
+#: src/protocols/gg/gg.c:570
+#, fuzzy, c-format
+msgid "Connect to %s failed"
+msgstr "Connección"
+
+#: src/protocols/gg/gg.c:594
+msgid "You are trying to send message to invalid Gadu-Gadu UIN!"
+msgstr ""
+
+#: src/protocols/gg/gg.c:595 src/protocols/gg/gg.c:657
+#: src/protocols/gg/gg.c:762 src/protocols/gg/gg.c:768
+#: src/protocols/gg/gg.c:821 src/protocols/gg/gg.c:833
+#: src/protocols/gg/gg.c:845 src/protocols/gg/gg.c:956
+#: src/protocols/gg/gg.c:984 src/protocols/gg/gg.c:1043
+#: src/protocols/gg/gg.c:1066 src/protocols/gg/gg.c:1116
+#: src/protocols/gg/gg.c:1149 src/protocols/gg/gg.c:1214
+#, fuzzy
+msgid "Gadu-Gadu Error"
+msgstr "Gaim - Error %d"
+
+#: src/protocols/gg/gg.c:657
+msgid "Couldn't get search results"
+msgstr ""
+
+#: src/protocols/gg/gg.c:662
+msgid "Gadu-Gadu Search Engine"
+msgstr ""
+
+#: src/protocols/gg/gg.c:687
+msgid "Active"
+msgstr ""
+
+#: src/protocols/gg/gg.c:688
+msgid "yes"
+msgstr ""
+
+#: src/protocols/gg/gg.c:688
+#, fuzzy
+msgid "no"
+msgstr "Información"
+
+#: src/protocols/gg/gg.c:692
+msgid "UIN"
+msgstr ""
+
+#: src/protocols/gg/gg.c:696
+#, fuzzy
+msgid "First name"
+msgstr "Nombre"
+
+#: src/protocols/gg/gg.c:701
+#, fuzzy
+msgid "Second Name"
+msgstr "Nomre de Usuario:"
+
+#: src/protocols/gg/gg.c:705
+msgid "Nick"
+msgstr ""
+
+#: src/protocols/gg/gg.c:712 src/protocols/gg/gg.c:715
+msgid "Birth year"
+msgstr ""
+
+#: src/protocols/gg/gg.c:721 src/protocols/gg/gg.c:723
+#: src/protocols/gg/gg.c:725
+msgid "Sex"
+msgstr ""
+
+#. Line 5
+#: src/dialogs.c:1501 src/dialogs.c:2205 src/protocols/gg/gg.c:729
+msgid "City"
+msgstr "Ciudad"
+
+#: src/protocols/gg/gg.c:761
+msgid "There is no Buddy List stored on server. Sorry!"
+msgstr ""
+
+#: src/protocols/gg/gg.c:768
+msgid "Couldn't Import Buddies List from Server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:815
+msgid "Buddies List sucessfully transfered into Server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:816 src/protocols/gg/gg.c:828
+#: src/protocols/gg/gg.c:840
+msgid "Gadu-Gadu Information"
+msgstr ""
+
+#: src/protocols/gg/gg.c:821
+msgid "Couldn't transfer Buddies List into Server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:827
+msgid "Buddies List sucessfully deleted from Server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:833
+msgid "Couldn't delete Buddies List from Server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:839
+#, fuzzy
+msgid "Password changed sucessfully"
+msgstr "Gaim - Cambiar Contraseña"
+
+#: src/protocols/gg/gg.c:845
+msgid "Password couldn't be changed"
+msgstr ""
+
+#: src/protocols/gg/gg.c:956
+#, fuzzy
+msgid "Couldn't send http request"
+msgstr "no se pudo conectar al patrón\n"
+
+#: src/protocols/gg/gg.c:982
+#, c-format
+msgid "Buddies List import from Server failed (%s)"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1041
+#, c-format
+msgid "Buddies List export to Server failed (%s)"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1064
+#, c-format
+msgid "Deletion of Buddies List from Server failed (%s)"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1114 src/protocols/gg/gg.c:1212
+#, c-format
+msgid "Connect to search service failed (%s)"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1147
+#, fuzzy, c-format
+msgid "Changing Password failed (%s)"
+msgstr "Cambiar Contraseña"
+
+#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1175
+#, fuzzy
+msgid "Directory Search"
+msgstr "Información del Directorio"
+
+#: src/dialogs.c:1618 src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
+msgid "Change Password"
+msgstr "Cambiar Contraseña"
+
+#: src/protocols/gg/gg.c:1162 src/protocols/gg/gg.c:1179
+#, fuzzy
+msgid "Import Buddies List from Server"
+msgstr "Importar Lista de Amigos"
+
+#: src/protocols/gg/gg.c:1164 src/protocols/gg/gg.c:1180
+#, fuzzy
+msgid "Export Buddies List to Server"
+msgstr "Exportar Lista de Amigos"
+
+#: src/protocols/gg/gg.c:1166 src/protocols/gg/gg.c:1181
+msgid "Delete Buddies List from Server"
+msgstr ""
+
+#: src/protocols/icq/gaim_icq.c:308
+#, fuzzy
+msgid "Send message through server"
+msgstr "Sonido cuando un mensaje es enviado"
+
+#: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1538
+#: src/protocols/jabber/jabber.c:2021 src/protocols/oscar/oscar.c:2847
+#: src/protocols/toc/toc.c:1201
 #, fuzzy
 msgid "Get Info"
 msgstr "Información de Usuario"
 
-#: plugins/yay/yay.c:183
+#: src/protocols/irc/irc.c:429 src/protocols/irc/irc.c:962
+#, c-format
+msgid "<B>%s has changed the topic to: %s</B>"
+msgstr ""
+
+#: src/protocols/irc/irc.c:682
+msgid "No such nick/channel"
+msgstr ""
+
+#: src/protocols/irc/irc.c:682 src/protocols/irc/irc.c:685
+#: src/protocols/irc/irc.c:687 src/protocols/irc/irc.c:891
+#, fuzzy
+msgid "IRC Error"
+msgstr "Error"
+
+#: src/protocols/irc/irc.c:685
+msgid "No such server"
+msgstr ""
+
+#: src/protocols/irc/irc.c:687
+msgid "No nickname given"
+msgstr ""
+
+#: src/protocols/irc/irc.c:819
+#, fuzzy
+msgid "Unable to write"
+msgstr "No se pudo escribir archivo %s."
+
+#: src/protocols/irc/irc.c:889
+#, c-format
+msgid "You have been kicked from %s: %s"
+msgstr ""
+
+#: src/protocols/irc/irc.c:894
+#, c-format
+msgid "Kicked by %s: %s"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1357
+#, c-format
+msgid "You have left %s"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1358
+msgid "IRC Part"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1443
+#, fuzzy
+msgid "Channel:"
+msgstr "Cancelar"
+
+#: src/multi.c:522 src/protocols/irc/irc.c:1447
+#, fuzzy
+msgid "Password:"
+msgstr "Contraseña: "
+
+#: src/protocols/jabber/jabber.c:1692
+msgid "Room:"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1696
+msgid "Server:"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1701
+#, fuzzy
+msgid "Handle:"
+msgstr "Inactivo: "
+
+#: src/buddy_chat.c:875 src/protocols/jabber/jabber.c:2026
+#: src/protocols/oscar/oscar.c:2854
+#, fuzzy
+msgid "Get Away Msg"
+msgstr "Mensaje de ausencia"
+
+#: src/protocols/msn/msn.c:653 src/protocols/msn/msn.c:1909
+#: src/protocols/msn/msn.c:1942
+#, fuzzy
+msgid "MSN Error"
+msgstr "Error"
+
+#: src/protocols/msn/msn.c:653
+#, fuzzy
+msgid "Gaim was unable to send a message"
+msgstr "Gaim - Nuevo mensaje de ausencia"
+
+#: src/protocols/msn/msn.c:960
+msgid "You have been disconnected. You have signed on from another location."
+msgstr ""
+
+#: src/protocols/msn/msn.c:1909 src/protocols/msn/msn.c:1942
+#, fuzzy
+msgid "Invalid name"
+msgstr "Apellido Materno"
+
+#: src/protocols/napster/napster.c:450 src/protocols/oscar/oscar.c:2536
+#: src/protocols/toc/toc.c:1088
+msgid "Join what group:"
+msgstr "Unirse a que grupo:"
+
+#: src/protocols/oscar/oscar.c:305
+#, fuzzy, c-format
+msgid "Direct IM with %s closed"
+msgstr "<HR><B>%s connectado%s%s.</B><BR><HR>'"
+
+#: src/protocols/oscar/oscar.c:341
+#, fuzzy
+msgid "connection error (rend)\n"
+msgstr "error de conección!\n"
+
+#: src/protocols/oscar/oscar.c:352
+#, fuzzy
+msgid "major connection error\n"
+msgstr "error de conección!\n"
+
+#: src/protocols/oscar/oscar.c:353 src/protocols/toc/toc.c:509
+#: src/protocols/toc/toc.c:522 src/protocols/toc/toc.c:588
+msgid "Disconnected."
+msgstr "Desconectado."
+
+#: src/protocols/oscar/oscar.c:365 src/protocols/toc/toc.c:756
+#, c-format
+msgid "You have been disconnected from chat room %s."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:366
+#, fuzzy
+msgid "Chat Error!"
+msgstr "Error"
+
+#: src/protocols/oscar/oscar.c:378
+#, fuzzy
+msgid "Chat is currently unavailable"
+msgstr "Conversación en %s no esta disponible."
+
+#: src/protocols/oscar/oscar.c:379
 #, fuzzy
-msgid "Your message did not get sent."
-msgstr "Sonido cuando un mensaje es enviado"
-
-#: plugins/yay/yay.c:183 src/dialogs.c:3066 src/dialogs.c:3073
-#: src/oscar.c:1869 src/oscar.c:1874 src/oscar.c:1910 src/oscar.c:1929
+msgid "Gaim - Chat"
+msgstr "Gaim Conversaciones"
+
+#: src/protocols/oscar/oscar.c:438 src/protocols/oscar/oscar.c:498
+#, fuzzy
+msgid "Couldn't connect to host"
+msgstr "no se pudo conectar al patrón\n"
+
+#: src/protocols/oscar/oscar.c:446
+msgid "Password sent, waiting for response\n"
+msgstr "Contraseña mandada, esperando respuesta\n"
+
+#: src/protocols/oscar/oscar.c:479
+msgid "internal connection error\n"
+msgstr "error interno de conección\n"
+
+#: src/protocols/oscar/oscar.c:480
+msgid "Unable to login to AIM"
+msgstr "No se pudo conectar a AIM"
+
+#: src/protocols/oscar/oscar.c:485
+#, c-format
+msgid "Signon: %s"
+msgstr "Conectado: %s"
+
+#: src/protocols/oscar/oscar.c:557
+msgid "Signed off.\n"
+msgstr "Desconectado.\n"
+
+#: src/protocols/oscar/oscar.c:576 src/protocols/oscar/oscar.c:696
+msgid "Could Not Connect"
+msgstr "No se pudo conectar"
+
+#: src/protocols/oscar/oscar.c:584
+msgid "Connection established, cookie sent"
+msgstr "Conección establesida, cookie enviado"
+
+#. Incorrect nick/password
+#: src/protocols/oscar/oscar.c:610 src/protocols/toc/toc.c:457
+msgid "Incorrect nickname or password."
+msgstr "Nombre de cuenta o contraseña incorrecta."
+
+#. Suspended account
+#: src/protocols/oscar/oscar.c:615
+msgid "Your account is currently suspended."
+msgstr ""
+
+#. connecting too frequently
+#: src/protocols/oscar/oscar.c:619
+#, fuzzy
+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 ""
+"Usted se ha conectado y desconectado demasiadas veces.  Espere diezminutos e "
+"intente de nuveo.  Si sigue intentando, necesitara esperarmas tiempo."
+
+#. client too old
+#: src/protocols/oscar/oscar.c:624
+msgid "The client version you are using is too old. Please upgrade at "
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:628 src/protocols/toc/toc.c:540
+msgid "Authentication Failed"
+msgstr "Autorización no optenida"
+
+#: src/protocols/oscar/oscar.c:650
+msgid "Internal Error"
+msgstr "Error interno"
+
+#: src/protocols/oscar/oscar.c:1204 src/protocols/oscar/oscar.c:2744
+#, fuzzy, c-format
+msgid "Direct IM with %s established"
+msgstr "<HR><B>%s connectado%s%s.</B><BR><HR>'"
+
+#: src/protocols/oscar/oscar.c:1454
+#, fuzzy, c-format
+msgid "You missed %d message from %s because it was invalid."
+msgstr "Usted perdió un mensaje de %s porque fue demasiado largo."
+
+#: src/protocols/oscar/oscar.c:1455
+#, fuzzy, c-format
+msgid "You missed %d messages from %s because they were invalid."
+msgstr "Usted perdió un mensaje de %s porque fue demasiado largo."
+
+#: src/protocols/oscar/oscar.c:1464
+#, fuzzy, c-format
+msgid "You missed %d message from %s because it was too large."
+msgstr "Usted perdió un mensaje de %s porque fue demasiado largo."
+
+#: src/protocols/oscar/oscar.c:1465
+#, fuzzy, c-format
+msgid "You missed %d messages from %s because they were too large."
+msgstr "Usted perdió un mensaje de %s porque fue demasiado largo."
+
+#: src/protocols/oscar/oscar.c:1474
+#, fuzzy, c-format
+msgid "You missed %d message from %s because the rate limit has been exceeded."
+msgstr "Usted perdió un mensaje de %s porque fue demasiado largo."
+
+#: src/protocols/oscar/oscar.c:1475
+#, fuzzy, c-format
+msgid ""
+"You missed %d messages from %s because the rate limit has been exceeded."
+msgstr "Usted perdió un mensaje de %s porque fue demasiado largo."
+
+#: src/protocols/oscar/oscar.c:1484
+#, fuzzy, c-format
+msgid "You missed %d message from %s because it was too evil."
+msgstr "Usted perdió un mensaje de %s porque fue demasiado largo."
+
+#: src/protocols/oscar/oscar.c:1485
+#, fuzzy, c-format
+msgid "You missed %d messages from %s because they are too evil."
+msgstr "Usted perdió un mensaje de %s porque fue demasiado largo."
+
+#: src/protocols/oscar/oscar.c:1494
+#, fuzzy, c-format
+msgid "You missed %d message from %s because you are too evil."
+msgstr "Usted perdió un mensaje de %s porque fue demasiado largo."
+
+#: src/protocols/oscar/oscar.c:1495
+#, fuzzy, c-format
+msgid "You missed %d messages from %s because you are too evil."
+msgstr "Usted perdió un mensaje de %s porque fue demasiado largo."
+
+#: src/protocols/oscar/oscar.c:1503
+#, fuzzy, c-format
+msgid "You missed %d message from %s for unknown reasons."
+msgstr "Usted perdió un mensaje de %s porque fue demasiado largo."
+
+#: src/protocols/oscar/oscar.c:1504
+#, fuzzy, c-format
+msgid "You missed %d messages from %s for unknown reasons."
+msgstr "Usted perdió un mensaje de %s porque fue demasiado largo."
+
+#: src/dialogs.c:2949 src/dialogs.c:2955 src/protocols/oscar/oscar.c:1509
+#: src/protocols/oscar/oscar.c:1547 src/protocols/oscar/oscar.c:1565
+#: src/protocols/oscar/oscar.c:1994 src/protocols/yahoo/yahoo.c:501
 #, fuzzy
 msgid "Gaim - Error"
 msgstr "Gaim - Error %d"
 
-#: plugins/yay/yay.c:201
+#: src/protocols/oscar/oscar.c:1526
+#, c-format
+msgid "SNAC threw error: %s\n"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1528
+#, fuzzy
+msgid "Gaim - Oscar SNAC Error"
+msgstr "Gaim - Error %d"
+
+#: src/protocols/oscar/oscar.c:1545
+#, c-format
+msgid "Your message to %s did not get sent: %s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1546 src/protocols/oscar/oscar.c:1564
+msgid "Reason unknown"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1563
 #, c-format
-msgid "%s has made %s their buddy%s%s"
+msgid "User information for %s unavailable: %s"
+msgstr ""
+
+#: src/buddy.c:1906 src/protocols/oscar/oscar.c:1591
+#, fuzzy
+msgid "Buddy Icon"
+msgstr "Calada de Amigo"
+
+#: src/buddy.c:1909 src/protocols/oscar/oscar.c:1594
+msgid "Voice"
+msgstr ""
+
+#: src/buddy.c:1912 src/protocols/oscar/oscar.c:1597
+msgid "IM Image"
+msgstr ""
+
+#: src/buddy.c:488 src/buddy.c:1915 src/buddy.c:2343 src/prefs.c:2837
+#: src/protocols/oscar/oscar.c:1600
+msgid "Chat"
+msgstr "Hablar"
+
+#: src/buddy.c:1918 src/protocols/oscar/oscar.c:1603
+#, fuzzy
+msgid "Get File"
+msgstr "Archivo"
+
+#: src/buddy.c:1921 src/protocols/oscar/oscar.c:1606
+#, fuzzy
+msgid "Send File"
+msgstr "Archivo"
+
+#: src/buddy.c:1925 src/protocols/oscar/oscar.c:1610
+msgid "Games"
+msgstr ""
+
+#: src/buddy.c:1928 src/protocols/oscar/oscar.c:1613
+msgid "Stocks"
+msgstr ""
+
+#: src/buddy.c:1931 src/protocols/oscar/oscar.c:1616
+#, fuzzy
+msgid "Send Buddy List"
+msgstr "Lista de Amigos"
+
+#: src/buddy.c:1934 src/protocols/oscar/oscar.c:1619
+msgid "EveryBuddy Bug"
+msgstr ""
+
+#: src/buddy.c:1937 src/protocols/oscar/oscar.c:1622
+#, fuzzy
+msgid "AP User"
+msgstr "Gaim Usar"
+
+#: src/buddy.c:1940 src/protocols/oscar/oscar.c:1625
+msgid "ICQ RTF"
+msgstr ""
+
+#: src/buddy.c:1943 src/protocols/oscar/oscar.c:1628
+msgid "Nihilist"
+msgstr ""
+
+#: src/buddy.c:1946 src/protocols/oscar/oscar.c:1631
+msgid "ICQ Server Relay"
+msgstr ""
+
+#: src/buddy.c:1949 src/protocols/oscar/oscar.c:1634
+msgid "ICQ Unknown"
+msgstr ""
+
+#: src/buddy.c:1952 src/protocols/oscar/oscar.c:1637
+msgid "Trillian Encryption"
 msgstr ""
 
-#: plugins/yay/yay.c:203
+#: src/protocols/oscar/oscar.c:1674
+msgid ""
+"<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG "
+"SRC=\"free_icon.gif\"> : Normal AIM User<br><IMG SRC=\"aol_icon.gif\"> : AOL "
+"User <br><IMG SRC=\"dt_icon.gif\"> : Trial AIM User <br><IMG "
+"SRC=\"admin_icon.gif\"> : Administrator"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1686
+#, fuzzy
+msgid ""
+"Username : <B>%s</B>  %s <BR>\n"
+"%sWarning Level : <B>%d %%</B><BR>\n"
+"Online Since : <B>%s</B><BR>\n"
+"Idle Minutes : <B>%d</B>\n"
+"<BR>\n"
+"<HR><BR>\n"
+msgstr ""
+"Nombre de usuario: <B>%s</B>\n"
+"<BR>Warning Level : <B>%d %%</B>\n"
+"<BR>En línea desde : <B>%s</B><BR>Minutos Desocupados : <B>%d</B>\n"
+"<BR><HR><BR>%s\n"
+
+#: src/protocols/oscar/oscar.c:1714
+msgid "<i>User has no away message</i>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1726
+msgid "Client Capabilities: "
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1734
+msgid "<i>No Information Provided</i>"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1757
+msgid "Your connection may be lost."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1758
+msgid "AOL error"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1993
+msgid ""
+"The last message was not sent because you are over the rate limit. Please "
+"wait 10 seconds and try again."
+msgstr ""
+
+#: src/dialogs.c:3482 src/protocols/oscar/oscar.c:2267
+#: src/protocols/oscar/oscar.c:2818 src/protocols/toc/toc.c:1546
+#: src/protocols/toc/toc.c:1563 src/protocols/toc/toc.c:1623
+#: src/protocols/toc/toc.c:1665 src/protocols/toc/toc.c:1784
+#: src/protocols/toc/toc.c:1814 src/protocols/toc/toc.c:1870
+msgid "Error"
+msgstr "Error"
+
+#: src/protocols/oscar/oscar.c:2540 src/protocols/toc/toc.c:1092
+msgid "Exchange:"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2818
+#, fuzzy
+msgid "Unable to open Direct IM"
+msgstr "No se pudo conectar a AIM"
+
+#: src/protocols/oscar/oscar.c:2828
+#, c-format
+msgid ""
+"You have selected to open a Direct IM connection with %s. Doing this will "
+"let them see your IP address, and may be a security risk. Do you wish to "
+"continue?"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:2861
 #, fuzzy
-msgid "Gaim - Buddy"
-msgstr "Gaim - Agregar Amigo"
-
-#: plugins/yay/yay.c:250 src/about.c:179 src/aim.c:303 src/buddy.c:2607
-#: src/buddy_chat.c:971 src/buddy_chat.c:1125 src/buddy_chat.c:1152
-#: src/conversation.c:2135 src/dialogs.c:440 src/dialogs.c:3719
-#: src/multi.c:744 src/plugins.c:374 src/prefs.c:2429 src/prpl.c:359
-msgid "Close"
-msgstr "Cerrar"
-
-#: plugins/napster.c:1042
-msgid "Napster registration is currently under development"
+msgid "Direct IM"
+msgstr "Información del Directorio"
+
+#: src/protocols/oscar/oscar.c:2869
+msgid "Get Capabilities"
+msgstr ""
+
+#: src/protocols/toc/toc.c:396
+#, c-format
+msgid "Unable to write file %s."
+msgstr "No se pudo escribir archivo %s."
+
+#: src/protocols/toc/toc.c:399
+#, c-format
+msgid "Unable to read file %s."
+msgstr "No se pudo leer archivo %s."
+
+#: src/protocols/toc/toc.c:402
+#, c-format
+msgid "Message too long, last %s bytes truncated."
+msgstr "Mensaje demasiado largo, ultimos %s bytes fueron borrados."
+
+#: src/protocols/toc/toc.c:405
+#, c-format
+msgid "%s not currently logged in."
+msgstr "%s no esta en linea ahorita."
+
+#: src/protocols/toc/toc.c:408
+#, c-format
+msgid "Warning of %s not allowed."
+msgstr "Advertencias para %s estan prohibidas."
+
+#: src/protocols/toc/toc.c:411
+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/protocols/toc/toc.c:414
+#, c-format
+msgid "Chat in %s is not available."
+msgstr "Conversación en %s no esta disponible."
+
+#: src/protocols/toc/toc.c:417
+#, c-format
+msgid "You are sending messages too fast to %s."
+msgstr "Esta mandando los mensajes demasiado rapido a %s."
+
+#: src/protocols/toc/toc.c:420
+#, 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/protocols/toc/toc.c:423
+#, 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/protocols/toc/toc.c:426
+msgid "Failure."
+msgstr "Falla"
+
+#: src/protocols/toc/toc.c:429
+msgid "Too many matches."
+msgstr "Demasiados resultados"
+
+#: src/protocols/toc/toc.c:432
+msgid "Need more qualifiers."
+msgstr "Necesito mas calificadores"
+
+#: src/protocols/toc/toc.c:435
+msgid "Dir service temporarily unavailable."
+msgstr "Servicio de directorio no esta disponible ahorita."
+
+#: src/protocols/toc/toc.c:438
+msgid "Email lookup restricted."
+msgstr "Busqueda de correos electronicos es restringida."
+
+#: src/protocols/toc/toc.c:441
+msgid "Keyword ignored."
+msgstr "Palabra ignorada"
+
+#: src/protocols/toc/toc.c:444
+msgid "No keywords."
+msgstr "Sin palabras"
+
+#: src/protocols/toc/toc.c:447
+msgid "User has no directory information."
+msgstr "El usuario no tiene información en el directorio."
+
+#: src/protocols/toc/toc.c:451
+msgid "Country not supported."
+msgstr "País no apoyado"
+
+#: src/protocols/toc/toc.c:454
+#, c-format
+msgid "Failure unknown: %s."
+msgstr "Falla desconocida: %s."
+
+#: src/protocols/toc/toc.c:460
+msgid "The service is temporarily unavailable."
+msgstr "Este servicio no esta disponible en este momento."
+
+#: src/protocols/toc/toc.c:463
+msgid "Your warning level is currently too high to log in."
+msgstr "Su nivel de advertencias es demasiado alto para conectarse."
+
+#: src/protocols/toc/toc.c:466
+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/about.c:87
+"Usted se ha conectado y desconectado demasiadas veces.  Espere diezminutos e "
+"intente de nuveo.  Si sigue intentando, necesitara esperarmas tiempo."
+
+#: src/protocols/toc/toc.c:469
+#, c-format
+msgid "An unknown signon error has occurred: %s."
+msgstr "Un error al conectarse ha ocurrido: %s."
+
+#: src/protocols/toc/toc.c:472
+#, c-format
+msgid "An unknown error, %d, has occured.  Info: %s"
+msgstr "Un error desconocido, %d, ha ocurrido.  Informacion: %s"
+
+#: src/protocols/toc/toc.c:489
+#, fuzzy
+msgid "Connection Closed"
+msgstr "Connección"
+
+#: src/protocols/toc/toc.c:527
+msgid "Waiting for reply..."
+msgstr ""
+
+#: src/protocols/toc/toc.c:596
+msgid "TOC has come back from its pause. You may now send messages again."
+msgstr ""
+
+#: src/protocols/toc/toc.c:597
+msgid "TOC Resume"
+msgstr ""
+
+#: src/protocols/toc/toc.c:758
+#, fuzzy
+msgid "Chat Error"
+msgstr "Error"
+
+#: src/protocols/toc/toc.c:777
+#, fuzzy
+msgid "Password Change Successeful"
+msgstr "Gaim - Cambiar Contraseña"
+
+#: src/dialogs.c:1607 src/protocols/toc/toc.c:777
+msgid "Gaim - Password Change"
+msgstr "Gaim - Cambiar Contraseña"
+
+#: src/protocols/toc/toc.c:780
+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/protocols/toc/toc.c:783
+msgid "TOC Pause"
+msgstr ""
+
+#: src/protocols/toc/toc.c:1207
+#, fuzzy
+msgid "Get Dir Info"
+msgstr "Información del Directorio"
+
+#: src/protocols/toc/toc.c:1623 src/protocols/toc/toc.c:1665
+#: src/protocols/toc/toc.c:1784 src/protocols/toc/toc.c:1870
+#, fuzzy
+msgid "Could not connect for transfer!"
+msgstr "Error Connectando al encaje. \n"
+
+#: src/protocols/toc/toc.c:1814
+msgid "Could not write file header!"
+msgstr ""
+
+#: src/protocols/toc/toc.c:1903
+msgid "Gaim - Save As..."
+msgstr "Gaim - Guardar Como..."
+
+#: src/protocols/toc/toc.c:1944
+#, fuzzy, c-format
+msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+msgstr "%s le pide que acepte el archivo: %s (%d bytes)"
+
+#: src/protocols/toc/toc.c:1945
+#, fuzzy, c-format
+msgid "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+msgstr "%s le pide que acepte el archivo: %s (%d bytes)"
+
+#: src/protocols/toc/toc.c:1950
+#, c-format
+msgid "%s requests you to send them a file"
+msgstr "%s le pide que les mande un archivo"
+
+#: src/protocols/yahoo/yahoo.c:501
+#, fuzzy
+msgid "Your message did not get sent."
+msgstr "Sonido cuando un mensaje es enviado"
+
+#: src/protocols/zephyr/zephyr.c:802
+msgid "ZLocate"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:839
+msgid "Class:"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:843
+msgid "Instance:"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:847
+msgid "Recipient:"
+msgstr ""
+
+#: src/about.c:93
 #, c-format
 msgid "About Gaim v%s"
 msgstr "Sobre Gaim v%s"
 
-#: src/about.c:124
+#: src/about.c:126
 msgid ""
 "Gaim is a client that supports AOL's Instant Messenger protocol. It is "
-"written using Gtk+ and is licensed under the GPL.\n"
+"written\n"
+"using Gtk+ and is licensed under the GPL.\n"
+"\n"
 "URL: "
 msgstr ""
 
+#: src/about.c:137
+msgid ""
+"Active Developers\n"
+"====================\n"
+"Rob Flynn (maintainer) [ rob@marko.net ]\n"
+"Sean Egan (coder)      [ bj91704@binghamton.edu ]\n"
+"\n"
+"Crazy Patch Writers\n"
+"===================\n"
+"Benjamin Miller\n"
+"Decklin Foster\n"
+"\n"
+"Retired Developers\n"
+"===================\n"
+"Jim Duchek\n"
+"Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
+"Mark Spencer (original author)   [ markster@marko.net ]"
+msgstr ""
+
+#: src/about.c:155 src/aim.c:296 src/buddy.c:2469 src/buddy_chat.c:1311
+#: src/buddy_chat.c:1408 src/buddy_chat.c:1438 src/conversation.c:2417
+#: src/dialogs.c:563 src/dialogs.c:3777 src/multi.c:1026 src/plugins.c:277
+#: src/prefs.c:2496 src/prpl.c:438 src/prpl.c:679 src/server.c:991
+msgid "Close"
+msgstr "Cerrar"
+
 #. this makes the sizes not work.
 #. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
 #. gtk_widget_grab_default(button);
-#: src/about.c:199
+#: src/about.c:175
 msgid "Web Site"
 msgstr ""
 
-#: src/aim.c:137 src/buddy.c:2600
+#: src/aim.c:129 src/buddy.c:2462
 msgid "Signoff"
 msgstr "Desconectar"
 
-#: src/aim.c:149
+#: src/aim.c:141
 msgid "Please enter your logon"
 msgstr "Porfavor introduzca su nombre de cuenta"
 
-#: src/aim.c:149 src/aim.c:154 src/multi.c:917
+#: src/aim.c:141 src/multi.c:1276 src/server.c:55
 #, fuzzy
 msgid "Signon Error"
 msgstr "Conectar"
 
-#: src/aim.c:154
-#, fuzzy
-msgid "Please enter your password"
-msgstr "Porfavor introduzca su nombre de cuenta"
-
-#: src/aim.c:248
+#: src/aim.c:239
 msgid "Gaim - Login"
 msgstr "Conectación - Gaim"
 
-#: src/aim.c:266
+#: src/aim.c:257
 msgid "Screen Name: "
 msgstr "Nomre de Usuario:"
 
-#: src/aim.c:280
+#: src/aim.c:273
 msgid "Password: "
 msgstr "Contraseña: "
 
-#: src/aim.c:301 src/buddy.c:2604
+#: src/aim.c:294 src/buddy.c:2466
 msgid "Quit"
 msgstr "Salir"
 
-#: src/aim.c:306 src/aim.c:647 src/buddy.c:2662
+#: src/aim.c:299 src/aim.c:755 src/buddy.c:2492
 msgid "Accounts"
 msgstr ""
 
-#: src/aim.c:308 src/multi.c:597
+#: src/aim.c:301 src/multi.c:878
 msgid "Signon"
 msgstr "Conectar"
 
-#: src/aim.c:340 src/prpl.c:363
-msgid "Register"
-msgstr "Registrar"
-
-#: src/aim.c:341 src/prefs.c:1632 src/prefs.c:1839
+#: src/aim.c:333
+#, fuzzy
+msgid "About"
+msgstr "Sobre..."
+
+#: src/aim.c:334 src/prefs.c:1580 src/prefs.c:1854
 msgid "Options"
 msgstr "Opciones"
 
 #. Left side: frame with list of plugin file names
-#: src/aim.c:343 src/aim.c:650 src/buddy.c:2679 src/plugins.c:289
+#: src/aim.c:336 src/aim.c:758 src/buddy.c:2510 src/plugins.c:192
 msgid "Plugins"
 msgstr "Aditivos"
 
-#: src/aim.c:644 src/buddy.c:2671
+#: src/aim.c:752 src/buddy.c:2502
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: src/applet.c:88
-#, c-format
-msgid "file not found: %s\n"
-msgstr "archivo no encontrado: %s\n"
-
-#: src/applet.c:111
+#: src/applet.c:199
 msgid "Attempting to sign on...."
 msgstr "Tratando de conectarme...."
 
-#: src/applet.c:116
+#: src/applet.c:202
 #, fuzzy
 msgid "Offline. Click to bring up login box."
 msgstr "Desconectado.  Oprima para abrir ventana para conectarse."
 
-#: src/applet.c:169 src/buddy.c:445 src/buddy.c:2486 src/buddy.c:2618
+#: src/applet.c:218
+#, c-format
+msgid "Away: %d pending."
+msgstr ""
+
+#: src/applet.c:221
+#, fuzzy
+msgid "Away."
+msgstr "Ausente"
+
+#: src/applet.c:293 src/buddy.c:487 src/buddy.c:2344 src/buddy.c:2480
 msgid "Away"
 msgstr "Ausente"
 
-#: src/applet.c:172 src/away.c:333
+#: src/applet.c:296 src/away.c:389
 msgid "New Away Message"
 msgstr "Nuevo Mensaje de Ausencia"
 
-#: src/applet.c:309
+#: src/applet.c:443
 msgid "Can't create Gaim applet!"
 msgstr "No pudo crearse el programa Gaim"
 
-#: src/applet.c:352
+#: src/applet.c:464
 msgid "About..."
 msgstr "Sobre..."
 
-#: src/away.c:153
+#: src/away.c:203
 msgid "Gaim - Away!"
 msgstr "Gaim - Ausente!"
 
-#: src/away.c:196
+#: src/away.c:251
 msgid "I'm Back!"
 msgstr "Ya regrese"
 
-#: src/away.c:212 src/away.c:292 src/away.c:460
+#: src/away.c:267 src/away.c:347 src/away.c:521
 msgid "Back"
 msgstr "Retroceder"
 
-#: src/away.c:353
+#: src/away.c:409
 msgid "Remove Away Message"
 msgstr "Quitar Mensaje de Ausencia"
 
-#: src/away.c:529
+#: src/away.c:597
 msgid "Set All Away"
 msgstr ""
 
 #. Put the buttons in the box
-#: src/buddy.c:440 src/buddy.c:2747 src/buddy_chat.c:1157
-#: src/conversation.c:1799 src/conversation.c:2150 src/dialogs.c:883
-#: src/dialogs.c:1007 src/dialogs.c:1893 src/multi.c:728 src/prefs.c:1198
-#: src/prefs.c:1952 src/prefs.c:2269 src/prefs.c:2303
+#: src/buddy.c:482 src/buddy.c:2579 src/buddy_chat.c:1443
+#: src/conversation.c:2043 src/conversation.c:2432 src/dialogs.c:881
+#: src/dialogs.c:1065 src/dialogs.c:1968 src/multi.c:1010 src/prefs.c:1990
+#: src/prefs.c:2332 src/prefs.c:2366
 msgid "Add"
 msgstr "Agregar"
 
-#: src/buddy.c:441 src/buddy.c:2748 src/dialogs.c:893 src/dialogs.c:989
+#: src/buddy.c:483 src/buddy.c:2580 src/dialogs.c:891 src/dialogs.c:1038
 msgid "Group"
 msgstr "Grupo"
 
-#: src/buddy.c:442 src/buddy.c:2749 src/buddy_chat.c:1159
-#: src/conversation.c:1785 src/conversation.c:2147 src/prefs.c:1199
-#: src/prefs.c:1966 src/prefs.c:2273 src/prefs.c:2307
+#: src/buddy.c:484 src/buddy.c:2581 src/buddy_chat.c:1445
+#: src/conversation.c:2029 src/conversation.c:2429 src/prefs.c:2004
+#: src/prefs.c:2336 src/prefs.c:2370
 msgid "Remove"
 msgstr "Quitar"
 
-#: src/buddy.c:446 src/buddy.c:2130 src/buddy.c:2485
-msgid "Chat"
-msgstr "Hablar"
-
-#: src/buddy.c:447 src/buddy.c:648 src/buddy.c:761 src/buddy.c:2483
-#: src/buddy_chat.c:507 src/buddy_chat.c:927
+#: src/buddy.c:489 src/buddy.c:627 src/buddy.c:774 src/buddy.c:2341
+#: src/buddy_chat.c:850 src/buddy_chat.c:1267
 msgid "IM"
 msgstr "Mensaje"
 
-#: src/buddy.c:448 src/buddy.c:2484 src/buddy_chat.c:520 src/buddy_chat.c:935
-#: src/buddy_chat.c:1165 src/conversation.c:2168
+#: src/buddy.c:490 src/buddy.c:2342 src/buddy_chat.c:866 src/buddy_chat.c:1275
+#: src/buddy_chat.c:1451 src/conversation.c:2450
 msgid "Info"
 msgstr "Información"
 
 #. Put the buttons in the box
-#: src/buddy.c:654 src/buddy.c:767 src/dialogs.c:983 src/dialogs.c:3421
-#: src/dialogs.c:3436
+#: src/buddy.c:632 src/buddy.c:779 src/dialogs.c:1030 src/dialogs.c:3336
+#: src/dialogs.c:3351
 msgid "Alias"
 msgstr ""
 
-#: src/buddy.c:660 src/buddy.c:787
+#: src/buddy.c:637 src/buddy.c:798
 msgid "Add Buddy Pounce"
 msgstr "Agregar Calada de Amigo"
 
-#: src/buddy.c:666 src/buddy.c:793
+#: src/buddy.c:644 src/buddy.c:804
 msgid "View Log"
 msgstr ""
 
-#: src/buddy.c:749 src/buddy.c:781
+#: src/buddy.c:761 src/buddy.c:792
 #, fuzzy
 msgid "Rename"
 msgstr "Quitar"
 
-#: src/buddy.c:774
+#: src/buddy.c:786
 msgid "Un-Alias"
 msgstr ""
 
-#: src/buddy.c:1808
+#: src/buddy.c:1493 src/buddy.c:2485
+msgid "Buddy Pounce"
+msgstr "Calada de Amigo"
+
+#: src/buddy.c:1565
 msgid "New Buddy Pounce"
 msgstr "Nueva Calada de Amigo"
 
-#: src/buddy.c:1826
+#: src/buddy.c:1583
 msgid "Remove Buddy Pounce"
 msgstr "Quitar Calada de Amigo"
 
-#: src/buddy.c:2121
-#, fuzzy
-msgid "Buddy Icon"
-msgstr "Calada de Amigo"
-
-#: src/buddy.c:2124
-msgid "Voice"
-msgstr ""
-
-#: src/buddy.c:2127
-msgid "IM Image"
-msgstr ""
-
-#: src/buddy.c:2133
-#, fuzzy
-msgid "Get File"
-msgstr "Archivo"
-
-#: src/buddy.c:2136
-#, fuzzy
-msgid "Send File"
-msgstr "Archivo"
-
-#: src/buddy.c:2139
-msgid "Games"
-msgstr ""
-
-#: src/buddy.c:2142
-msgid "Stocks"
-msgstr ""
-
-#: src/buddy.c:2194
+#: src/buddy.c:2029
 #, fuzzy, c-format
 msgid "Logged in: %s\n"
 msgstr "Connectando %s\n"
 
-#: src/buddy.c:2205
+#: src/buddy.c:2041
 msgid "Warnings: %d%%\n"
 msgstr "Advertencias: %d%%\n"
 
-#: src/buddy.c:2217
+#: src/buddy.c:2053
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr ""
 
-#: src/buddy.c:2221
+#: src/buddy.c:2057
 #, fuzzy, c-format
 msgid ""
 "Alias: %s               \n"
@@ -298,1320 +1209,1062 @@
 "Connectado en: %s\n"
 "%s%s%s"
 
-#: src/buddy.c:2225
+#: src/buddy.c:2061
 msgid "Idle: "
 msgstr "Inactivo: "
 
-#: src/buddy.c:2294
+#: src/buddy.c:2132 src/buddy.c:2136
 #, fuzzy, c-format
 msgid "%s logged in."
 msgstr "<HR><B>%s connectado%s%s.</B><BR><HR>'"
 
-#: src/buddy.c:2346
+#: src/buddy.c:2195 src/buddy.c:2199
 #, fuzzy, c-format
 msgid "%s logged out."
 msgstr "<HR><B>%s desconectado%s%s.</B><BR><HR>"
 
-#: src/buddy.c:2515
+#: src/buddy.c:2376
 msgid "Information on selected Buddy"
 msgstr "Informacion sobre Amigo Escogido"
 
-#: src/buddy.c:2516 src/dialogs.c:678
+#: src/buddy.c:2377 src/dialogs.c:688
 msgid "Send Instant Message"
 msgstr "Mandar Mensaje Instantaneo"
 
-#: src/buddy.c:2517
+#: src/buddy.c:2378
 msgid "Start/join a Buddy Chat"
 msgstr "Empezar/Unirse a Conversación de Amigos"
 
-#: src/buddy.c:2518
+#: src/buddy.c:2379
 #, fuzzy
 msgid "Activate Away Message"
 msgstr "Nuevo Mensaje de Ausencia"
 
-#: src/buddy.c:2582
+#: src/buddy.c:2442
 msgid "File"
 msgstr "Archivo"
 
-#: src/buddy.c:2586
+#: src/buddy.c:2446
 msgid "Add A Buddy"
 msgstr "Agregar Amigo"
 
-#: src/buddy.c:2588
+#: src/buddy.c:2448
 #, fuzzy
 msgid "Join A Chat"
 msgstr "Unirse a conversación"
 
-#: src/buddy.c:2590
+#: src/buddy.c:2450
 #, fuzzy
 msgid "New Instant Message"
 msgstr "Mandar Mensaje Instantaneo"
 
-#: src/buddy.c:2595
+#: src/buddy.c:2452 src/dialogs.c:740
+#, fuzzy
+msgid "Get User Info"
+msgstr "Información de Usuario"
+
+#: src/buddy.c:2457
 msgid "Import Buddy List"
 msgstr "Importar Lista de Amigos"
 
-#: src/buddy.c:2613
+#: src/buddy.c:2475
 msgid "Tools"
 msgstr "Herramientas"
 
-#: src/buddy.c:2623
-msgid "Buddy Pounce"
-msgstr "Calada de Amigo"
-
-#: src/buddy.c:2632 src/dialogs.c:2074 src/dialogs.c:2241
-msgid "Search for Buddy"
-msgstr "Buscar un Amigo"
-
-#: src/buddy.c:2636
-msgid "by Email"
-msgstr "por Correo Electronico"
-
-#: src/buddy.c:2640
-msgid "by Dir Info"
-msgstr "por Información de Directorio"
-
-#: src/buddy.c:2647
-msgid "Settings"
-msgstr "Ajustes"
-
-#: src/buddy.c:2649
-msgid "User Info"
-msgstr "Información de Usuario"
-
-#: src/buddy.c:2653 src/dialogs.c:1367
-msgid "Directory Info"
-msgstr "Información del Directorio"
-
-#: src/buddy.c:2657 src/dialogs.c:1558
-msgid "Change Password"
-msgstr "Cambiar Contraseña"
-
-#: src/buddy.c:2666
+#: src/buddy.c:2498
 #, fuzzy
 msgid "Protocol Actions"
 msgstr "Opciones"
 
-#: src/buddy.c:2673
+#: src/buddy.c:2504
 msgid "View System Log"
 msgstr ""
 
-#: src/buddy.c:2684
+#: src/buddy.c:2516
 #, fuzzy
 msgid "Perl"
 msgstr "Permitir"
 
-#: src/buddy.c:2687
+#: src/buddy.c:2519
 msgid "Load Script"
 msgstr ""
 
-#: src/buddy.c:2691
+#: src/buddy.c:2523
 msgid "Unload All Scripts"
 msgstr ""
 
-#: src/buddy.c:2695
+#: src/buddy.c:2527
 msgid "List Scripts"
 msgstr ""
 
-#: src/buddy.c:2703
+#: src/buddy.c:2535
 msgid "Help"
 msgstr "Ayuda"
 
-#: src/buddy.c:2708
+#: src/buddy.c:2540
 #, fuzzy
 msgid "About Gaim"
 msgstr "Sobre"
 
-#: src/buddy.c:2727 src/prefs.c:2671
+#: src/buddy.c:2559 src/prefs.c:2816
 msgid "Buddy List"
 msgstr "Lista de Amigos"
 
-#: src/buddy.c:2781
+#: src/buddy.c:2612
 msgid "Add a new Buddy"
 msgstr "Agregar un nuevo Amigo"
 
-#: src/buddy.c:2782
+#: src/buddy.c:2613
 #, fuzzy
 msgid "Add a new Group"
 msgstr "Agregar un nuevo Amigo"
 
-#: src/buddy.c:2783
-msgid "Remove selected Buddy"
+#: src/buddy.c:2614
+#, fuzzy
+msgid "Remove selected Buddy/Group"
 msgstr "Quitar Amigo Escogido"
 
-#: src/buddy.c:2808
+#: src/buddy.c:2639
 msgid "Online"
 msgstr "En Linea"
 
-#: src/buddy.c:2810
+#: src/buddy.c:2641
 msgid "Edit Buddies"
 msgstr "Corregir Amigos["
 
-#: src/buddy.c:2847
+#: src/buddy.c:2681
 msgid "Gaim - Buddy List"
 msgstr "Gaim - Lista de Amigos"
 
-#: src/buddy_chat.c:104 src/oscar.c:2590 src/toc.c:1001
-msgid "Join what group:"
-msgstr "Unirse a que grupo:"
-
-#: src/buddy_chat.c:202
+#: src/buddy_chat.c:265
 msgid "Join Chat"
 msgstr "Unirse a conversación"
 
-#: src/buddy_chat.c:209 src/buddy_chat.c:1057 src/buddy_chat.c:1069
+#: src/buddy_chat.c:272
 msgid "Buddy Chat"
 msgstr "Conversación de Amigos"
 
-#: src/buddy_chat.c:220
+#: src/buddy_chat.c:283
 #, fuzzy
 msgid "Join Chat As:"
 msgstr "Unirse a conversación"
 
-#: src/buddy_chat.c:241 src/buddy_chat.c:286 src/dialogs.c:410
-#: src/dialogs.c:697 src/dialogs.c:757 src/dialogs.c:885 src/dialogs.c:1002
-#: src/dialogs.c:1281 src/dialogs.c:1491 src/dialogs.c:1619 src/dialogs.c:1684
-#: src/dialogs.c:1882 src/dialogs.c:2080 src/dialogs.c:2260 src/dialogs.c:2334
-#: src/dialogs.c:3199 src/dialogs.c:3423 src/dialogs.c:3619 src/dialogs.c:3852
-#: src/dialogs.c:3940 src/multi.c:479 src/multi.c:593 src/multi.c:893
-#: src/prpl.c:159 src/prpl.c:231
+#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:444
+#: src/dialogs.c:535 src/dialogs.c:706 src/dialogs.c:764 src/dialogs.c:883
+#: src/dialogs.c:1061 src/dialogs.c:1350 src/dialogs.c:1555 src/dialogs.c:1679
+#: src/dialogs.c:1739 src/dialogs.c:1957 src/dialogs.c:2139 src/dialogs.c:2314
+#: src/dialogs.c:2385 src/dialogs.c:3081 src/dialogs.c:3338 src/dialogs.c:3519
+#: src/dialogs.c:3890 src/dialogs.c:3996 src/dialogs.c:4642 src/multi.c:744
+#: src/multi.c:874 src/multi.c:1208 src/prpl.c:150 src/prpl.c:224
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/buddy_chat.c:246
+#: src/buddy_chat.c:309
 msgid "Join"
 msgstr "Unirse"
 
-#: src/buddy_chat.c:287 src/buddy_chat.c:977 src/buddy_chat.c:1124
+#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1317
+#: src/buddy_chat.c:1407
 msgid "Invite"
 msgstr "Invitar"
 
-#: src/buddy_chat.c:303
-msgid "Invite who?"
-msgstr "Invitar a quien?"
-
-#: src/buddy_chat.c:307
-msgid "With message:"
-msgstr "Con el mensaje:"
-
-#: src/buddy_chat.c:331
-msgid "Invite to Buddy Chat"
+#: src/buddy_chat.c:412 src/dialogs.c:1230 src/dialogs.c:3346
+msgid "Buddy"
+msgstr "Amigo"
+
+#: src/buddy_chat.c:417 src/prefs.c:1953
+#, fuzzy
+msgid "Message"
+msgstr "Crear Mensaje"
+
+#: src/buddy_chat.c:454
+#, fuzzy
+msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Invitar un Amigo a la conversación"
 
-#: src/buddy_chat.c:513 src/buddy_chat.c:931
+#: src/buddy_chat.c:857
+#, fuzzy
+msgid "Un-Ignore"
+msgstr "Ignorar"
+
+#: src/buddy_chat.c:859 src/buddy_chat.c:1271
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: src/buddy_chat.c:565 src/buddy_chat.c:671
+#. don't remove them from ignored in case they re-enter
+#: src/buddy_chat.c:922 src/buddy_chat.c:1034 src/buddy_chat.c:1497
+#: src/buddy_chat.c:1530
 #, c-format
 msgid "%d %s in room"
 msgstr ""
 
-#: src/buddy_chat.c:572
+#: src/buddy_chat.c:930
 #, c-format
 msgid "%s entered the room."
 msgstr ""
 
-#: src/buddy_chat.c:635
+#: src/buddy_chat.c:996
 #, c-format
 msgid "%s is now known as %s"
 msgstr ""
 
-#: src/buddy_chat.c:678
+#: src/buddy_chat.c:1043
+#, c-format
+msgid "%s left the room (%s)."
+msgstr ""
+
+#: src/buddy_chat.c:1045
 #, c-format
 msgid "%s left the room."
 msgstr ""
 
-#: src/buddy_chat.c:805
+#: src/buddy_chat.c:1144
 #, fuzzy
 msgid "Gaim - Group Chats"
 msgstr "Gaim Conversaciones"
 
-#: src/buddy_chat.c:866
+#: src/buddy_chat.c:1207
 msgid "Topic:"
 msgstr ""
 
-#: src/buddy_chat.c:908
+#: src/buddy_chat.c:1248
 msgid "0 people in room"
 msgstr ""
 
-#: src/buddy_chat.c:982 src/buddy_chat.c:1123
+#: src/buddy_chat.c:1322 src/buddy_chat.c:1406
 msgid "Whisper"
 msgstr "Susurrar"
 
-#: src/buddy_chat.c:987 src/buddy_chat.c:1121 src/buddy_chat.c:1167
-#: src/conversation.c:2179
+#: src/buddy_chat.c:1327 src/buddy_chat.c:1404 src/buddy_chat.c:1453
+#: src/conversation.c:2461
 msgid "Send"
 msgstr "Mandar"
 
-#: src/buddy_chat.c:1161 src/conversation.c:2156
+#: src/buddy_chat.c:1447 src/conversation.c:2438
 msgid "Block"
 msgstr "Bloquear"
 
-#: src/buddy_chat.c:1163 src/conversation.c:2162 src/dialogs.c:380
-#: src/dialogs.c:405
+#: src/buddy_chat.c:1449 src/conversation.c:2444 src/dialogs.c:419
+#: src/dialogs.c:448
 msgid "Warn"
 msgstr "Advertir"
 
-#: src/conversation.c:372
+#: src/conversation.c:392
 #, fuzzy
 msgid "Gaim - Save Conversation"
 msgstr "Gaim - Guardar Conversación"
 
-#: src/conversation.c:520
-#, c-format
-msgid "Removing '%s' from buddylist.\n"
-msgstr "Quitando '%s' de la lista.\n"
-
-#: src/conversation.c:1085
+#: src/conversation.c:1037
+msgid "Unable to send message: too large"
+msgstr ""
+
+#: src/conversation.c:1037 src/conversation.c:1039
+#, fuzzy
+msgid "Message Error"
+msgstr "Crear Mensaje"
+
+#: src/conversation.c:1039
+msgid "Unable to send message: Unknown reason"
+msgstr ""
+
+#: src/conversation.c:1258
 #, fuzzy, c-format
 msgid "Currently at %d, "
 msgstr "Presentemente en %d\n"
 
-#: src/conversation.c:1093
+#: src/conversation.c:1266
 #, c-format
 msgid "Setting position to %d\n"
 msgstr "Moviendo posición a %d\n"
 
-#: src/conversation.c:1619 src/prefs.c:1373
+#: src/conversation.c:1832 src/prefs.c:1274
 msgid "Bold Text"
 msgstr "Texto en Negritas"
 
-#: src/conversation.c:1619
+#: src/conversation.c:1832
 msgid "Bold"
 msgstr "Negritas"
 
-#: src/conversation.c:1623 src/prefs.c:1374
+#: src/conversation.c:1836
 msgid "Italics Text"
 msgstr "Texto Inclinado"
 
-#: src/conversation.c:1624
+#: src/conversation.c:1837
 msgid "Italics"
 msgstr "Inclinados"
 
-#: src/conversation.c:1627
+#: src/conversation.c:1840 src/prefs.c:1286
 msgid "Underline Text"
 msgstr "Subrayar Texto"
 
-#: src/conversation.c:1628
+#: src/conversation.c:1841
 msgid "Underline"
 msgstr "Subrayar"
 
-#: src/conversation.c:1632
+#: src/conversation.c:1845 src/prefs.c:1292
 msgid "Strike through Text"
 msgstr "Cruzar el Texto"
 
-#: src/conversation.c:1632
+#: src/conversation.c:1845
 msgid "Strike"
 msgstr "Cruzar"
 
-#: src/conversation.c:1638
+#: src/conversation.c:1851
 msgid "Decrease font size"
 msgstr "Hacer texto mas pequeño"
 
-#: src/conversation.c:1638
+#: src/conversation.c:1851
 msgid "Small"
 msgstr "Pequeño"
 
-#: src/conversation.c:1641
+#: src/conversation.c:1854
 msgid "Normal font size"
 msgstr "Texto normal"
 
-#: src/conversation.c:1641
+#: src/conversation.c:1854
 msgid "Normal"
 msgstr "Normal"
 
-#: src/conversation.c:1644
+#: src/conversation.c:1857
 msgid "Increase font size"
 msgstr "Hacer el texto mas grande "
 
-#: src/conversation.c:1644
+#: src/conversation.c:1857
 msgid "Big"
 msgstr "Grande"
 
-#: src/conversation.c:1651 src/dialogs.c:2686 src/dialogs.c:2702
+#: src/conversation.c:1864 src/dialogs.c:2756 src/dialogs.c:2780
 msgid "Select Font"
 msgstr "Seleccionar un Texto"
 
-#: src/conversation.c:1652
+#: src/conversation.c:1865
 msgid "Font"
 msgstr "Texto"
 
-#: src/conversation.c:1655 src/prefs.c:1404
+#: src/conversation.c:1868 src/prefs.c:1322
 msgid "Text Color"
 msgstr "Color del texto"
 
-#: src/conversation.c:1656 src/conversation.c:1660
+#: src/conversation.c:1869 src/conversation.c:1873
 msgid "Color"
 msgstr "Color"
 
-#: src/conversation.c:1660 src/prefs.c:1422
+#: src/conversation.c:1873 src/prefs.c:1340
 msgid "Background Color"
 msgstr ""
 
-#: src/conversation.c:1667 src/dialogs.c:2328
+#: src/conversation.c:1880 src/dialogs.c:2379
 msgid "Insert Link"
 msgstr "Insertar una Dirección"
 
-#: src/conversation.c:1668
+#: src/conversation.c:1881
 msgid "Link"
 msgstr "Dirección"
 
-#: src/conversation.c:1671
+#: src/conversation.c:1884
 msgid "Insert smiley face"
 msgstr ""
 
-#: src/conversation.c:1671
+#: src/conversation.c:1884
 #, fuzzy
 msgid "Smiley"
 msgstr "Archivo"
 
-#: src/conversation.c:1678
+#: src/conversation.c:1891
 msgid "Enable logging"
 msgstr "Usar Diario"
 
-#: src/conversation.c:1679 src/prefs.c:246
+#: src/conversation.c:1892 src/prefs.c:244
 msgid "Logging"
 msgstr "Diario"
 
-#: src/conversation.c:1688
+#: src/conversation.c:1901
 #, fuzzy
 msgid "Save Conversation"
 msgstr "Guarde todas las conversaciones"
 
-#: src/conversation.c:1689 src/dialogs.c:1496 src/dialogs.c:1689
-#: src/dialogs.c:3211 src/dialogs.c:3728
+#: src/conversation.c:1902 src/dialogs.c:1559 src/dialogs.c:1743
+#: src/dialogs.c:3093 src/dialogs.c:3786 src/dialogs.c:4649
 msgid "Save"
 msgstr "Guardar"
 
-#: src/conversation.c:1693
+#: src/conversation.c:1906
 msgid "Enable sounds"
 msgstr "Usar Sonidos"
 
-#: src/conversation.c:1694
+#: src/conversation.c:1907
 msgid "Sound"
 msgstr "Sonido"
 
-#: src/conversation.c:2008
+#: src/conversation.c:2290
 #, fuzzy
 msgid "Gaim - Conversations"
 msgstr "Gaim - Guardar Conversación"
 
-#: src/conversation.c:2095
+#: src/conversation.c:2377
 #, fuzzy
 msgid "Send message as: "
 msgstr "Sonido cuando un mensaje es enviado"
 
-#: src/dialogs.c:367
+#: src/conversation.c:2986
+#, fuzzy
+msgid "Gaim - Save Icon"
+msgstr "Gaim - Guardar Como..."
+
+#: src/conversation.c:3013
+msgid "Disable Animation"
+msgstr ""
+
+#: src/conversation.c:3018
+#, fuzzy
+msgid "Enable Animation"
+msgstr "Usar Sonidos"
+
+#: src/conversation.c:3024
+#, fuzzy
+msgid "Hide Icon"
+msgstr "Calada de Amigo"
+
+#: src/conversation.c:3030
+#, fuzzy
+msgid "Save Icon As..."
+msgstr "Gaim - Guardar Como..."
+
+#: src/dialogs.c:407
 msgid "Gaim - Warn user?"
 msgstr "Gaim - Advertir usuario?"
 
-#: src/dialogs.c:388
+#: src/dialogs.c:427
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "¿Deveras quiere advertirle a %s?"
 
-#: src/dialogs.c:393
+#: src/dialogs.c:432
 msgid "Warn anonymously?"
 msgstr "¿Advertirle anonimamente?"
 
-#: src/dialogs.c:397
+#: src/dialogs.c:436
 msgid "Anonymous warnings are less harsh."
 msgstr "Las advertencias anonimas son menos duras."
 
-#: src/dialogs.c:474
-#, c-format
-msgid "Unable to write file %s."
-msgstr "No se pudo escribir archivo %s."
-
-#: src/dialogs.c:477
-#, c-format
-msgid "Unable to read file %s."
-msgstr "No se pudo leer archivo %s."
-
-#: src/dialogs.c:480
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "Mensaje demasiado largo, ultimos %s bytes fueron borrados."
-
-#: src/dialogs.c:483
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s no esta en linea ahorita."
-
-#: src/dialogs.c:486
+#: src/dialogs.c:464
 #, c-format
-msgid "Warning of %s not allowed."
-msgstr "Advertencias para %s estan prohibidas."
-
-#: src/dialogs.c:489
-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:492
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "Conversación en %s no esta disponible."
-
-#: src/dialogs.c:495
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "Esta mandando los mensajes demasiado rapido a %s."
-
-#: src/dialogs.c:498
-#, 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:501
-#, 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:504
-msgid "Failure."
-msgstr "Falla"
-
-#: src/dialogs.c:507
-msgid "Too many matches."
-msgstr "Demasiados resultados"
-
-#: src/dialogs.c:510
-msgid "Need more qualifiers."
-msgstr "Necesito mas calificadores"
+msgid "Removing '%s' from buddylist.\n"
+msgstr "Quitando '%s' de la lista.\n"
+
+#: src/dialogs.c:490
+#, fuzzy, c-format
+msgid "Gaim - Remove %s?"
+msgstr "Gaim - Agregar Amigo"
+
+#: src/dialogs.c:503
+#, fuzzy
+msgid "Remove Buddy"
+msgstr "Gaim - Agregar Amigo"
 
 #: src/dialogs.c:513
-msgid "Dir service temporarily unavailable."
-msgstr "Servicio de directorio no esta disponible ahorita."
-
-#: src/dialogs.c:516
-msgid "Email lookup restricted."
-msgstr "Busqueda de correos electronicos es restringida."
-
-#: src/dialogs.c:519
-msgid "Keyword ignored."
-msgstr "Palabra ignorada"
-
-#: src/dialogs.c:522
-msgid "No keywords."
-msgstr "Sin palabras"
-
-#: src/dialogs.c:525
-msgid "User has no directory information."
-msgstr "El usuario no tiene información en el directorio."
-
-#: src/dialogs.c:529
-msgid "Country not supported."
-msgstr "País no apoyado"
-
-#: src/dialogs.c:532
 #, c-format
-msgid "Failure unknown: %s."
-msgstr "Falla desconocida: %s."
-
-#. Incorrect nick/password
-#: src/dialogs.c:535 src/oscar.c:627
-msgid "Incorrect nickname or password."
-msgstr "Nombre de cuenta o contraseña incorrecta."
-
-#: src/dialogs.c:538
-msgid "The service is temporarily unavailable."
-msgstr "Este servicio no esta disponible en este momento."
-
-#: src/dialogs.c:541
-msgid "Your warning level is currently too high to log in."
-msgstr "Su nivel de advertencias es demasiado alto para conectarse."
-
-#: src/dialogs.c:544
 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."
+"You are about to remove '%s' from\n"
+"your buddylist. Do you want to continue?"
 msgstr ""
-"Usted se ha conectado y desconectado demasiadas veces.  Espere diezminutos e "
-"intente de nuveo.  Si sigue intentando, necesitara esperarmas tiempo."
-
-#: src/dialogs.c:547
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "Un error al conectarse ha ocurrido: %s."
-
-#: src/dialogs.c:550
-#, c-format
-msgid "An unknown error, %d, has occured.  Info: %s"
-msgstr "Un error desconocido, %d, ha ocurrido.  Informacion: %s"
-
-#: src/dialogs.c:553
-#, c-format
-msgid "Gaim - Error %d"
-msgstr "Gaim - Error %d"
+
+#: src/dialogs.c:525 src/prpl.c:154 src/prpl.c:228
+msgid "Accept"
+msgstr "Aceptar"
 
 #. Build OK Button
-#: src/dialogs.c:612 src/dialogs.c:702 src/dialogs.c:762 src/dialogs.c:1286
-#: src/dialogs.c:1624 src/dialogs.c:1737 src/dialogs.c:2079 src/dialogs.c:2265
-#: src/dialogs.c:2333 src/dialogs.c:3857 src/dialogs.c:3945 src/multi.c:483
+#: src/dialogs.c:632 src/dialogs.c:711 src/dialogs.c:769 src/dialogs.c:1354
+#: src/dialogs.c:1683 src/dialogs.c:1830 src/dialogs.c:2138 src/dialogs.c:2318
+#: src/dialogs.c:2384 src/dialogs.c:3895 src/dialogs.c:4001 src/multi.c:749
 msgid "OK"
 msgstr "OK"
 
-#: src/dialogs.c:668
+#: src/dialogs.c:678
 msgid "Gaim - IM user"
 msgstr "Gaim - Usuario"
 
-#: src/dialogs.c:685
+#: src/dialogs.c:695
 #, fuzzy
 msgid "IM who:"
 msgstr "Quien: "
 
-#: src/dialogs.c:733
-#, fuzzy
-msgid "Get User Info"
-msgstr "Información de Usuario"
-
-#: src/dialogs.c:740
+#: src/dialogs.c:747
 msgid "User:"
 msgstr ""
 
 #. Finish up
-#: src/dialogs.c:768
+#: src/dialogs.c:774
 #, fuzzy
 msgid "Gaim - Get User Info"
 msgstr "Gaim - Crear Información del Usuario"
 
-#: src/dialogs.c:838
+#: src/dialogs.c:836
 msgid "Buddies"
 msgstr "Amigos"
 
-#: src/dialogs.c:891
+#: src/dialogs.c:889
 #, fuzzy
 msgid "Add Group"
 msgstr "Grupo"
 
-#: src/dialogs.c:921
+#: src/dialogs.c:914
 #, fuzzy
 msgid "Gaim - Add Group"
 msgstr "Gaim - Agregar Amigo"
 
-#: src/dialogs.c:948
+#: src/dialogs.c:998
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Agregar Amigo"
 
-#: src/dialogs.c:962
+#: src/dialogs.c:1010
 msgid "Add Buddy"
 msgstr "Agregar Amigo"
 
-#: src/dialogs.c:972 src/dialogs.c:3431
-msgid "Buddy"
-msgstr "Amigo"
-
-#: src/dialogs.c:1026
+#: src/dialogs.c:1020
+msgid "Contact"
+msgstr ""
+
+#. Set up stuff for the account box
+#: src/dialogs.c:1048
+#, fuzzy
+msgid "Add To"
+msgstr "Agregar"
+
+#: src/dialogs.c:1083
 #, fuzzy
 msgid "Please enter a buddy to pounce."
 msgstr "Porfavor introduzca su nombre de cuenta"
 
-#: src/dialogs.c:1026
+#: src/dialogs.c:1083
 #, fuzzy
 msgid "Buddy Pounce Error"
 msgstr "Calada de Amigo"
 
-#: src/dialogs.c:1095
-#, fuzzy
-msgid "Pounce buddy as:"
-msgstr "Sonido cuando un amgio se conecte"
-
-#: src/dialogs.c:1145
+#: src/dialogs.c:1199
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - Nuevo amigo a calar"
 
-#: src/dialogs.c:1162
+#. <pounce type="who">
+#: src/dialogs.c:1210
+msgid "Pounce Who"
+msgstr ""
+
+#: src/dialogs.c:1221
 #, fuzzy
-msgid "Buddy:"
-msgstr "Amigo"
-
-#: src/dialogs.c:1177
+msgid "Account"
+msgstr "Aceptar"
+
+#. </pounce type="who">
+#. <pounce type="when">
+#: src/dialogs.c:1245
+msgid "Pounce When"
+msgstr ""
+
+#: src/dialogs.c:1255
 msgid "Pounce on sign on"
 msgstr ""
 
-#: src/dialogs.c:1182
+#: src/dialogs.c:1260
 msgid "Pounce on return from away"
 msgstr ""
 
-#: src/dialogs.c:1186
+#: src/dialogs.c:1266
 msgid "Pounce on return from idle"
 msgstr ""
 
-#: src/dialogs.c:1194
+#. </pounce type="when">
+#. <pounce type="action">
+#: src/dialogs.c:1278
 #, fuzzy
-msgid "Open IM window on pounce"
-msgstr "Abrir Ventana de Mensage cuando se conecte este amigo"
-
-#: src/dialogs.c:1199
+msgid "Pounce Action"
+msgstr "Connección"
+
+#: src/dialogs.c:1289
 #, fuzzy
-msgid "Send IM on pounce"
-msgstr "Mandar un mensaje cuando se conecte este amigo"
-
-#: src/dialogs.c:1208
+msgid "Open IM Window"
+msgstr "Abrir Ventana de Mensage cuando se conecte este amigo"
+
+#: src/dialogs.c:1294
+msgid "Popup Notification"
+msgstr ""
+
+#: src/dialogs.c:1299
 #, fuzzy
-msgid "Message:"
-msgstr "Crear Mensaje"
-
-#: src/dialogs.c:1220
+msgid "Send Message"
+msgstr "Sonido cuando un mensaje es enviado"
+
+#: src/dialogs.c:1312
 #, fuzzy
 msgid "Execute command on pounce"
 msgstr "Mandar un mensaje cuando se conecte este amigo"
 
-#: src/dialogs.c:1229
-msgid "Command:"
-msgstr ""
-
-#: src/dialogs.c:1242
+#: src/dialogs.c:1325
 #, fuzzy
 msgid "Play sound on pounce"
 msgstr "Mandar un mensaje cuando se conecte este amigo"
 
-#: src/dialogs.c:1251
-#, fuzzy
-msgid "Sound:"
-msgstr "Sonido"
-
-#: src/dialogs.c:1268
+#. </pounce type="action">
+#: src/dialogs.c:1340
 msgid "Save this pounce after activation"
 msgstr ""
 
-#: src/dialogs.c:1357
+#: src/dialogs.c:1422
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - Crear Información del directorio"
 
-#: src/dialogs.c:1389
+#: src/dialogs.c:1431
+msgid "Directory Info"
+msgstr "Información del Directorio"
+
+#: src/dialogs.c:1453
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Dejar que busquedas en el Web encuentren su informacion"
 
 #. Line 1
-#: src/dialogs.c:1392 src/dialogs.c:2098
+#: src/dialogs.c:1456 src/dialogs.c:2157
 msgid "First Name"
 msgstr "Nombre"
 
 #. Line 2
-#: src/dialogs.c:1403 src/dialogs.c:2110
+#: src/dialogs.c:1467 src/dialogs.c:2169
 msgid "Middle Name"
 msgstr "Segundo Nombre"
 
 #. Line 3
-#: src/dialogs.c:1415 src/dialogs.c:2122
+#: src/dialogs.c:1479 src/dialogs.c:2181
 msgid "Last Name"
 msgstr "Apellido"
 
 #. Line 4
-#: src/dialogs.c:1426 src/dialogs.c:2134
+#: src/dialogs.c:1490 src/dialogs.c:2193
 msgid "Maiden Name"
 msgstr "Apellido Materno"
 
-#. Line 5
-#: src/dialogs.c:1437 src/dialogs.c:2146
-msgid "City"
-msgstr "Ciudad"
-
 #. Line 6
-#: src/dialogs.c:1448 src/dialogs.c:2157
+#: src/dialogs.c:1512 src/dialogs.c:2216
 msgid "State"
 msgstr "Estado"
 
 #. Line 7
-#: src/dialogs.c:1459 src/dialogs.c:2168
+#: src/dialogs.c:1523 src/dialogs.c:2227
 msgid "Country"
 msgstr "País"
 
-#: src/dialogs.c:1514
+#: src/dialogs.c:1577
 msgid "New Passwords Do Not Match"
 msgstr "Las contraseñas nuevas no son iguales"
 
-#: src/dialogs.c:1514 src/dialogs.c:1519
+#: src/dialogs.c:1577 src/dialogs.c:1582
 msgid "Gaim - Change Password Error"
 msgstr "Gaim - Error sobre el cambio de contraseña"
 
-#: src/dialogs.c:1519
+#: src/dialogs.c:1582
 msgid "Fill out all fields completely"
 msgstr "Llene todos los campos completamente"
 
-#: src/dialogs.c:1546 src/toc.c:606
-msgid "Gaim - Password Change"
-msgstr "Gaim - Cambiar Contraseña"
-
-#: src/dialogs.c:1577
+#: src/dialogs.c:1637
 msgid "Original Password"
 msgstr "Contraseña Original"
 
-#: src/dialogs.c:1591
+#: src/dialogs.c:1651
 msgid "New Password"
 msgstr "Contraseña Nueva"
 
-#: src/dialogs.c:1605
+#: src/dialogs.c:1665
 msgid "New Password (again)"
 msgstr "Contraseña Nueva (de nuevo)"
 
-#: src/dialogs.c:1650
+#: src/dialogs.c:1706
 msgid "Gaim - Set User Info"
 msgstr "Gaim - Crear Información del Usuario"
 
-#: src/dialogs.c:1748
+#: src/dialogs.c:1814
 msgid "Below are the results of your search: "
 msgstr "Siguientemente estan los resultados de su búsqueda: "
 
-#: src/dialogs.c:1872 src/dialogs.c:1879
+#: src/dialogs.c:1947 src/dialogs.c:1954
 msgid "Permit"
 msgstr "Permitir"
 
-#: src/dialogs.c:1874 src/dialogs.c:1881
+#: src/dialogs.c:1949 src/dialogs.c:1956
 msgid "Deny"
 msgstr "Negar"
 
-#: src/dialogs.c:1922
+#: src/dialogs.c:1993
 #, fuzzy
 msgid "Gaim - Add Permit"
 msgstr "Gaim - Agregar Autorizar/Negar"
 
-#: src/dialogs.c:1924
+#: src/dialogs.c:1995
 #, fuzzy
 msgid "Gaim - Add Deny"
 msgstr "Gaim - Agregar Autorizar/Negar"
 
-#: src/dialogs.c:1995
+#: src/dialogs.c:2055
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - Guardar Conversación"
 
-#: src/dialogs.c:2205
+#: src/dialogs.c:2133 src/dialogs.c:2296
+msgid "Search for Buddy"
+msgstr "Buscar un Amigo"
+
+#: src/dialogs.c:2261
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - Encontrar amgio por información"
 
-#: src/dialogs.c:2235
+#: src/dialogs.c:2290
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - Encontrar amigo por correo electrónico"
 
-#: src/dialogs.c:2248
+#: src/dialogs.c:2303
 msgid "Email"
 msgstr "Correo Electrónico"
 
-#: src/dialogs.c:2347
+#: src/dialogs.c:2398
 msgid "URL"
 msgstr "Dirección"
 
 #. Right side: frame with description and the filepath of plugin
-#: src/dialogs.c:2355 src/plugins.c:308
+#: src/dialogs.c:2406 src/plugins.c:211
 msgid "Description"
 msgstr "Descripción"
 
-#: src/dialogs.c:2381
+#: src/dialogs.c:2430
 msgid "Gaim - Add URL"
 msgstr "Gaim - Agregar dirección"
 
-#: src/dialogs.c:2524 src/dialogs.c:2537 src/dialogs.c:2574
+#: src/dialogs.c:2581 src/dialogs.c:2602 src/dialogs.c:2656
 msgid "Select Text Color"
 msgstr "Seleccionar color de texto"
 
-#: src/dialogs.c:2561
+#: src/dialogs.c:2635
 #, fuzzy
 msgid "Select Background Color"
 msgstr "Seleccionar color de texto"
 
-#: src/dialogs.c:2925
-#, c-format
-msgid "Error reading file %s"
-msgstr "Error leyendo el archivo %s"
-
-#: src/dialogs.c:2926 src/dialogs.c:3580 src/oscar.c:2365 src/oscar.c:2875
-#: src/toc.c:1422 src/toc.c:1439 src/toc.c:1499 src/toc.c:1541 src/toc.c:1675
-#: src/toc.c:1705 src/toc.c:1761
-msgid "Error"
-msgstr "Error"
-
-#: src/dialogs.c:3003
+#: src/dialogs.c:2857
+msgid "Import to:"
+msgstr ""
+
+#: src/dialogs.c:2881
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Importar lista de amigos"
 
 #. We shouldn't allow a blank title
-#: src/dialogs.c:3066
+#: src/dialogs.c:2948
 msgid "You cannot create an away message with a blank title"
 msgstr ""
 
 #. We shouldn't allow a blank message
-#: src/dialogs.c:3073
+#: src/dialogs.c:2955
 msgid "You cannot create an empty away message"
 msgstr ""
 
-#: src/dialogs.c:3140
+#: src/dialogs.c:3023
 msgid "Gaim - New away message"
 msgstr "Gaim - Nuevo mensaje de ausencia"
 
-#: src/dialogs.c:3150
+#: src/dialogs.c:3033
 #, fuzzy
 msgid "New away message"
 msgstr "Nuevo Mensaje de Ausencia"
 
-#: src/dialogs.c:3163
+#: src/dialogs.c:3046
 msgid "Away title: "
 msgstr "Titulo del mensaje: "
 
-#: src/dialogs.c:3203
+#: src/dialogs.c:3085
 #, fuzzy
 msgid "Use"
 msgstr "Gaim Usar"
 
-#: src/dialogs.c:3207
+#: src/dialogs.c:3089
 msgid "Save & Use"
 msgstr ""
 
 #. show everything
-#: src/dialogs.c:3376
+#: src/dialogs.c:3292
 #, fuzzy
 msgid "Smile!"
 msgstr "Archivo"
 
-#: src/dialogs.c:3429
+#: src/dialogs.c:3344
 #, fuzzy
 msgid "Alias Buddy"
 msgstr "Agregar Amigo"
 
-#: src/dialogs.c:3466
+#: src/dialogs.c:3377
 #, fuzzy
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - Agregar Amigo"
 
-#: src/dialogs.c:3543
+#: src/dialogs.c:3449
 #, fuzzy
 msgid "Gaim - Save Log File"
 msgstr "Gaim - Guardar Como..."
 
-#: src/dialogs.c:3578
+#: src/dialogs.c:3481
 #, fuzzy, c-format
 msgid "Unable to remove file %s - %s"
 msgstr "No se pudo leer archivo %s."
 
-#: src/dialogs.c:3609
+#: src/dialogs.c:3509
 msgid "Really clear log?"
 msgstr ""
 
-#: src/dialogs.c:3627
+#: src/dialogs.c:3524
 #, fuzzy
 msgid "Okay"
 msgstr "OK"
 
-#: src/dialogs.c:3723
+#: src/dialogs.c:3695
+#, fuzzy
+msgid "Date"
+msgstr "Estado"
+
+#: src/dialogs.c:3758
+#, fuzzy
+msgid "Conversation"
+msgstr "Guarde todas las conversaciones"
+
+#: src/dialogs.c:3781
 #, fuzzy
 msgid "Clear"
 msgstr "Cerrar"
 
-#: src/dialogs.c:3821
+#: src/dialogs.c:3859
 #, fuzzy
 msgid "Gaim - Rename Group"
 msgstr "Gaim - Agregar Amigo"
 
-#: src/dialogs.c:3831
+#: src/dialogs.c:3869
 msgid "Rename Group"
 msgstr ""
 
-#: src/dialogs.c:3838 src/dialogs.c:3926
+#: src/dialogs.c:3876 src/dialogs.c:3982
 #, fuzzy
 msgid "New name:"
 msgstr "Nomre de Usuario:"
 
-#: src/dialogs.c:3909
+#: src/dialogs.c:3965
 #, fuzzy
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - Agregar Amigo"
 
-#: src/dialogs.c:3919
+#: src/dialogs.c:3975
 #, fuzzy
 msgid "Rename Buddy"
 msgstr "Gaim - Agregar Amigo"
 
-#: src/gaimrc.c:980
+#. Below is basically stolen from plugins.c
+#: src/dialogs.c:4059
+#, fuzzy
+msgid "Gaim - Select Perl Script"
+msgstr "Gaim - Crear Información del Usuario"
+
+#: src/gaimrc.c:1113
 #, c-format
 msgid "Could not open config file %s."
 msgstr ""
 
-#: src/gaimrc.c:981
+#: src/gaimrc.c:1114
 #, fuzzy
 msgid "Preferences Error"
 msgstr "Preferencias"
 
-#: src/html.c:167
-#, c-format
-msgid "Getting %d bytes from %s"
-msgstr "Recibiendo %d bytes de %s"
-
-#: src/html.c:181
-msgid "Getting Data"
-msgstr "Recibiendo Data"
-
-#: src/html.c:213
+#: src/html.c:183
 #, c-format
 msgid "Receieved: '%s'\n"
 msgstr "Recibido: '%s'\n"
 
-#: src/html.c:238
+#: src/html.c:221
 msgid "g003: Error opening connection.\n"
 msgstr "Error abriendo enlaze. \n"
 
-#: src/multi.c:361 src/prefs.c:189
+#: src/multi.c:427
+#, fuzzy
+msgid "Gaim - Load Buddy Icon"
+msgstr "Gaim - Agregar Amigo"
+
+#: src/multi.c:470
 #, fuzzy
-msgid "General Options"
-msgstr "Opciones"
-
-#: src/multi.c:366
+msgid "Buddy Icon File:"
+msgstr "Calada de Amigo"
+
+#: src/multi.c:481
+#, fuzzy
+msgid "Browse"
+msgstr "Navegador"
+
+#: src/multi.c:486 src/prefs.c:1512
+#, fuzzy
+msgid "Reset"
+msgstr "Registrar"
+
+#: src/multi.c:513
 #, fuzzy
 msgid "Screenname:"
 msgstr "Nomre de Usuario:"
 
-#: src/multi.c:375
-#, fuzzy
-msgid "Password:"
-msgstr "Contraseña: "
-
-#: src/multi.c:386
+#: src/multi.c:533
 msgid "Protocol:"
 msgstr ""
 
-#: src/multi.c:391
+#: src/multi.c:538
 msgid "Remember Password"
 msgstr "Acordarse de la Constraseña"
 
-#: src/multi.c:392
+#: src/multi.c:539
 #, fuzzy
 msgid "Auto-Login"
 msgstr "Auto-conectar"
 
-#: src/multi.c:458
+#: src/multi.c:579
+msgid "New Mail Notifications"
+msgstr ""
+
+#: src/multi.c:727
 #, fuzzy
 msgid "Gaim - Modify Account"
 msgstr "Conectación - Gaim"
 
-#: src/multi.c:565
+#: src/multi.c:846
 #, fuzzy
 msgid "Enter Password"
 msgstr "Contraseña Nueva"
 
-#: src/multi.c:653
+#: src/multi.c:935
 #, fuzzy, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "¿Deveras quiere advertirle a %s?"
 
-#: src/multi.c:690
+#: src/multi.c:972
 #, fuzzy
 msgid "Gaim - Account Editor"
 msgstr "Gaim - Lista de aditivos"
 
-#: src/multi.c:709
+#: src/multi.c:991
 #, fuzzy
 msgid "Select All"
 msgstr "Seleccionar un Texto"
 
-#: src/multi.c:714
+#: src/multi.c:996
 #, fuzzy
 msgid "Select Autos"
 msgstr "Seleccionar un Texto"
 
-#: src/multi.c:718
+#: src/multi.c:1000
 #, fuzzy
 msgid "Select None"
 msgstr "Seleccionar un Texto"
 
-#: src/multi.c:732
+#: src/multi.c:1014
 msgid "Modify"
 msgstr ""
 
-#: src/multi.c:736
+#: src/multi.c:1018
 #, fuzzy
 msgid "Sign On/Off"
 msgstr "Desconectar"
 
-#: src/multi.c:740
+#: src/multi.c:1022
 #, fuzzy
 msgid "Delete"
 msgstr "Seleccionar un Texto"
 
-#: src/multi.c:914
+#: src/multi.c:1256
 #, c-format
 msgid ""
 "%s\n"
-"%s was unable to sign on: %s"
-msgstr ""
-
-#: src/oscar.c:341 src/oscar.c:358 src/toc.c:351 src/toc.c:361 src/toc.c:422
-msgid "Disconnected."
-msgstr "Desconectado."
-
-#: src/oscar.c:349
-#, fuzzy
-msgid "connection error (rend)\n"
-msgstr "error de conección!\n"
-
-#: src/oscar.c:357
-#, fuzzy
-msgid "major connection error\n"
-msgstr "error de conección!\n"
-
-#: src/oscar.c:370 src/toc.c:585
-#, c-format
-msgid "You have been disconnected from chat room %s."
+"%s: %s"
 msgstr ""
 
-#: src/oscar.c:371
-#, fuzzy
-msgid "Chat Error!"
-msgstr "Error"
-
-#: src/oscar.c:381
-#, fuzzy
-msgid "Chat is currently unavailable"
-msgstr "Conversación en %s no esta disponible."
-
-#: src/oscar.c:382
-#, fuzzy
-msgid "Gaim - Chat"
-msgstr "Gaim Conversaciones"
-
-#: src/oscar.c:437 src/oscar.c:490
-#, fuzzy
-msgid "Couldn't connect to host"
-msgstr "no se pudo conectar al patrón\n"
-
-#: src/oscar.c:445
-msgid "Password sent, waiting for response\n"
-msgstr "Contraseña mandada, esperando respuesta\n"
-
-#: src/oscar.c:456
+#: src/multi.c:1275
 #, c-format
-msgid "Logging in %s\n"
-msgstr "Connectando %s\n"
-
-#: src/oscar.c:471
-msgid "internal connection error\n"
-msgstr "error interno de conección\n"
-
-#: src/oscar.c:472
-msgid "Unable to login to AIM"
-msgstr "No se pudo conectar a AIM"
-
-#: src/oscar.c:477
-#, c-format
-msgid "Signon: %s"
-msgstr "Conectado: %s"
-
-#: src/oscar.c:546
-msgid "Signed off.\n"
-msgstr "Desconectado.\n"
-
-#: src/oscar.c:565 src/oscar.c:708
-msgid "Could Not Connect"
-msgstr "No se pudo conectar"
-
-#: src/oscar.c:573
-msgid "Connection established, cookie sent"
-msgstr "Conección establesida, cookie enviado"
-
-#. connecting too frequently
-#: src/oscar.c:622
-#, fuzzy
-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 ""
-"Usted se ha conectado y desconectado demasiadas veces.  Espere diezminutos e "
-"intente de nuveo.  Si sigue intentando, necesitara esperarmas tiempo."
-
-#. client too old
-#: src/oscar.c:632
-msgid "The client version you are using is too old. Please upgrade at "
+msgid "%s was unable to sign on"
 msgstr ""
 
-#: src/oscar.c:636 src/toc.c:375
-msgid "Authentication Failed"
-msgstr "Autorización no optenida"
-
-#: src/oscar.c:665
-msgid "Internal Error"
-msgstr "Error interno"
-
-#: src/oscar.c:1248 src/oscar.c:2759
-#, fuzzy, c-format
-msgid "Direct IM with %s established"
-msgstr "<HR><B>%s connectado%s%s.</B><BR><HR>'"
-
-#. message too large
-#: src/oscar.c:1868
-#, 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:1873
-#, c-format
-msgid "You missed a message from %s for unknown reasons."
-msgstr ""
-
-#: src/oscar.c:1908
-#, c-format
-msgid "Your message to %s did not get sent: %s"
-msgstr ""
-
-#: src/oscar.c:1909 src/oscar.c:1928
-msgid "Reason unknown"
-msgstr ""
-
-#: src/oscar.c:1927
-#, c-format
-msgid "User information for %s unavailable: %s"
-msgstr ""
-
-#: src/oscar.c:1968
-msgid ""
-"Username : <B>%s</B>  %s <BR>\n"
-"%sWarning Level : <B>%d %%</B><BR>\n"
-"Online Since : <B>%s</B><BR>\n"
-"Idle Minutes : <B>%d</B>\n"
-"<BR>\n"
-"<HR><BR>\n"
-"%s<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG "
-"SRC=\"free_icon.gif\"> : Normal AIM User<br><IMG SRC=\"aol_icon.gif\"> : AOL "
-"User <br><IMG SRC=\"dt_icon.gif\"> : Trial AIM User <br><IMG "
-"SRC=\"admin_icon.gif\"> : Administrator"
-msgstr ""
-
-#: src/oscar.c:1990
-msgid "<i>No Information Provided</i>"
+#: src/multi.c:1286
+msgid "Notice"
 msgstr ""
 
-#: src/oscar.c:1991
-msgid "<i>User has no away message</i>"
-msgstr ""
-
-#: src/oscar.c:2017
-msgid "Your connection may be lost."
-msgstr ""
-
-#: src/oscar.c:2018
-msgid "AOL error"
-msgstr ""
-
-#: src/oscar.c:2605
-msgid "Exchange:"
-msgstr ""
-
-#: src/oscar.c:2816
-#, fuzzy, c-format
-msgid "Direct IM with %s closed"
-msgstr "<HR><B>%s connectado%s%s.</B><BR><HR>'"
-
-#: src/oscar.c:2875
-#, fuzzy
-msgid "Unable to open Direct IM"
-msgstr "No se pudo conectar a AIM"
-
-#: src/oscar.c:2885
-#, c-format
-msgid ""
-"You have selected to open a Direct IM connection with %s. Doing this will "
-"let them see your IP address, and may be a security risk. Do you wish to "
-"continue?"
-msgstr ""
-
-#: src/oscar.c:2902
-#, fuzzy
-msgid "Get Away Msg"
-msgstr "Mensaje de ausencia"
-
-#: src/oscar.c:2910
-#, fuzzy
-msgid "Direct IM"
-msgstr "Información del Directorio"
-
-#: src/oscar.c:3050
-msgid ""
-"Unfortunately, currently Oscar only allows new user registration by going to "
-"http://aim.aol.com/aimnew/Aim/register.adp?promo=106723&pageset=Aim&client=no"
-". Clicking the Register button will open the URL for you."
-msgstr ""
-
-#. Below is basically stolen from plugins.c
-#: src/perl.c:656
-#, fuzzy
-msgid "Gaim - Select Perl Script"
-msgstr "Gaim - Crear Información del Usuario"
-
-#: src/perl.c:704
+#: src/perl.c:856
 msgid "Perl Scripts"
 msgstr ""
 
-#: src/plugins.c:129
+#: src/plugins.c:113
 msgid "Gaim - Plugin List"
 msgstr "Gaim - Lista de aditivos"
 
-#: src/plugins.c:206 src/plugins.c:212 src/plugins.c:222
-msgid "Plugin Error"
-msgstr "Error de aditivo"
-
-#: src/plugins.c:275
+#: src/plugins.c:178
 msgid "Gaim - Plugins"
 msgstr "Gaim - Aditivos"
 
-#: src/plugins.c:335
+#: src/plugins.c:238
 #, fuzzy
 msgid "Filepath:"
 msgstr "Archivo"
 
-#: src/plugins.c:353
+#: src/plugins.c:256
 msgid "Load"
 msgstr ""
 
-#: src/plugins.c:356
+#: src/plugins.c:259
 msgid "Load a plugin from a file"
 msgstr ""
 
-#: src/plugins.c:358
+#: src/plugins.c:261
 #, fuzzy
 msgid "Configure"
 msgstr "Configurar Aditivo"
 
-#: src/plugins.c:361
+#: src/plugins.c:264
 msgid "Configure settings of the selected plugin"
 msgstr ""
 
-#: src/plugins.c:363
+#: src/plugins.c:266
 msgid "Reload"
 msgstr ""
 
-#: src/plugins.c:367
+#: src/plugins.c:270
 #, fuzzy
 msgid "Reload the selected plugin"
 msgstr "Quitar Amigo Escogido"
 
-#: src/plugins.c:369
+#: src/plugins.c:272
 #, fuzzy
 msgid "Unload"
 msgstr "Desocupar Aditivo"
 
-#: src/plugins.c:372
+#: src/plugins.c:275
 #, fuzzy
 msgid "Unload the selected plugin"
 msgstr "Desocupar Aditivo"
 
-#: src/plugins.c:377
+#: src/plugins.c:280
 #, fuzzy
 msgid "Close this window"
 msgstr ""
 "Demostrar cuando los amigos se conectan/desconectan en lasventanas de las "
 "conversaciones"
 
-#: src/prefs.c:197 src/prefs.c:362 src/prefs.c:503 src/prefs.c:602
-#: src/prefs.c:835 src/prefs.c:1366 src/prefs.c:1628 src/prefs.c:1835
-#: src/prefs.c:2220
+#: src/prefs.c:190
+#, fuzzy
+msgid "General Options"
+msgstr "Opciones"
+
+#: src/prefs.c:198 src/prefs.c:373 src/prefs.c:539 src/prefs.c:640
+#: src/prefs.c:893 src/prefs.c:1037 src/prefs.c:1262 src/prefs.c:1576
+#: src/prefs.c:1850 src/prefs.c:2283
 msgid "All options take effect immediately unless otherwise noted."
 msgstr ""
 
-#: src/prefs.c:209
+#: src/prefs.c:210
 msgid "Miscellaneous"
 msgstr ""
 
-#: src/prefs.c:217
+#: src/prefs.c:218
 msgid "Use borderless buttons"
 msgstr ""
 
@@ -1620,43 +2273,43 @@
 msgid "Show Buddy Ticker"
 msgstr "Demostrar dibujos de los tipos de amigos"
 
-#: src/prefs.c:228
+#: src/prefs.c:227
 msgid "Show Debug Window"
 msgstr ""
 
-#: src/prefs.c:232
+#: src/prefs.c:230
 #, fuzzy
 msgid "Report Idle Times"
 msgstr "Demostrar el tiempo de inactividad de los amigos"
 
-#: src/prefs.c:240
+#: src/prefs.c:238
 msgid "None"
 msgstr ""
 
+#: src/prefs.c:239
+msgid "Gaim Use"
+msgstr "Gaim Usar"
+
 #: src/prefs.c:241
-msgid "Gaim Use"
-msgstr "Gaim Usar"
-
-#: src/prefs.c:243
 #, fuzzy
 msgid "X Use"
 msgstr "Gaim Usar"
 
-#: src/prefs.c:254
+#: src/prefs.c:252
 #, fuzzy
 msgid "Log all conversations"
 msgstr "Guarde todas las conversaciones"
 
-#: src/prefs.c:255
+#: src/prefs.c:253
 #, fuzzy
 msgid "Strip HTML from logs"
 msgstr "Quitar HTML de todas las conversaciones guardadas"
 
-#: src/prefs.c:261
+#: src/prefs.c:259
 msgid "Log when buddies sign on/sign off"
 msgstr ""
 
-#: src/prefs.c:262
+#: src/prefs.c:261
 msgid "Log when buddies become idle/un-idle"
 msgstr ""
 
@@ -1668,546 +2321,627 @@
 msgid "Log your own signons/idleness/awayness"
 msgstr ""
 
-#: src/prefs.c:265
+#: src/prefs.c:266
 msgid "Individual log file for each buddy's signons"
 msgstr ""
 
-#: src/prefs.c:267
+#: src/prefs.c:269
 msgid "Browser"
 msgstr "Navegador"
 
-#: src/prefs.c:279
+#: src/prefs.c:281
 msgid "KFM"
 msgstr ""
 
-#: src/prefs.c:280
+#: src/prefs.c:282
+msgid "Opera"
+msgstr ""
+
+#: src/prefs.c:283
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/prefs.c:283
+#: src/prefs.c:286
 msgid "Pop up new window by default"
 msgstr "Crear una nueva ventana por omisión"
 
-#: src/prefs.c:290
+#: src/prefs.c:293
 msgid "GNOME URL Handler"
 msgstr ""
 
-#: src/prefs.c:292
+#: src/prefs.c:295
+msgid "Galeon"
+msgstr ""
+
+#: src/prefs.c:296
 msgid "Manual"
 msgstr "Manual"
 
-#: src/prefs.c:354
+#: src/prefs.c:365
 #, fuzzy
 msgid "Proxy Options"
 msgstr "Opciones"
 
-#: src/prefs.c:366
+#: src/prefs.c:377
 msgid ""
 "Not all protocols can use these proxy options. Please see the README file "
 "for details."
 msgstr ""
 
-#: src/prefs.c:495
+#: src/prefs.c:382
+#, fuzzy
+msgid "Proxy Type"
+msgstr "No Proxy"
+
+#: src/prefs.c:394
+msgid "Proxy Server"
+msgstr ""
+
+#: src/prefs.c:397
+#, fuzzy
+msgid "No Proxy"
+msgstr "No Proxy"
+
+#: src/prefs.c:409
+#, fuzzy
+msgid "SOCKS 4"
+msgstr "Proxy SOCKS v4"
+
+#: src/prefs.c:419
+msgid "SOCKS 5"
+msgstr ""
+
+#: src/prefs.c:428
+msgid "HTTP"
+msgstr ""
+
+#: src/prefs.c:452
+#, fuzzy
+msgid "Host"
+msgstr "Patrón TOC: "
+
+#: src/prefs.c:468
+#, fuzzy
+msgid "Port"
+msgstr "Puerto:"
+
+#: src/prefs.c:485
+#, fuzzy
+msgid "User"
+msgstr "Gaim Usar"
+
+#: src/prefs.c:501
+#, fuzzy
+msgid "Password"
+msgstr "Contraseña: "
+
+#: src/prefs.c:531
 #, fuzzy
 msgid "Buddy List Options"
 msgstr "Lista de Amigos"
 
-#: src/prefs.c:507
+#: src/prefs.c:543
 #, fuzzy
 msgid "Buddy List Window"
 msgstr "Lista de Amigos"
 
-#: src/prefs.c:519
+#: src/prefs.c:555
 msgid "Hide IM/Info/Chat buttons"
 msgstr ""
 
-#: src/prefs.c:521
+#: src/prefs.c:557
 #, fuzzy
 msgid "Automatically show buddy list on sign on"
 msgstr "Automaticamente demuestre la lista de amigos"
 
-#: src/prefs.c:524
+#: src/prefs.c:560
 #, fuzzy
 msgid "Save Window Size/Position"
 msgstr "Guardar algunas configuraciones de tamaño/posicion de ventanas"
 
-#: src/prefs.c:530
+#: src/prefs.c:567
 msgid "Show pictures on buttons"
 msgstr ""
 
-#: src/prefs.c:535
+#: src/prefs.c:572
 #, fuzzy
 msgid "Display Buddy List near applet"
 msgstr "Lista de amigos se demuestra cerca del applet"
 
-#: src/prefs.c:538
+#: src/prefs.c:575
 msgid "Group Displays"
 msgstr ""
 
-#: src/prefs.c:550
+#: src/prefs.c:587
 msgid "Hide groups with no online buddies"
 msgstr ""
 
-#: src/prefs.c:556
+#: src/prefs.c:593
 msgid "Show numbers in groups"
 msgstr "Demostrar los numeros en grupos"
 
-#: src/prefs.c:558
+#: src/prefs.c:595
 #, fuzzy
 msgid "Buddy Displays"
 msgstr "Lista de Amigos"
 
-#: src/prefs.c:570
+#: src/prefs.c:607
 #, fuzzy
 msgid "Show buddy type icons"
 msgstr "Demostrar dibujos de los tipos de amigos"
 
-#: src/prefs.c:571
+#: src/prefs.c:608
 msgid "Show warning levels"
 msgstr ""
 
-#: src/prefs.c:577
+#: src/prefs.c:614
 msgid "Show idle times"
 msgstr "Demostrar el tiempo de inactividad de los amigos"
 
-#: src/prefs.c:594
+#: src/prefs.c:615
+msgid "Grey idle buddies"
+msgstr ""
+
+#: src/prefs.c:632
 #, fuzzy
 msgid "Conversation Options"
 msgstr "Guarde todas las conversaciones"
 
-#: src/prefs.c:606
+#: src/prefs.c:644
 #, fuzzy
 msgid "Keyboard Options"
 msgstr "Opciones"
 
-#: src/prefs.c:618
+#: src/prefs.c:656
 msgid "Enter sends message"
 msgstr "Enter manda el mensaje"
 
-#: src/prefs.c:619
+#: src/prefs.c:657
 #, fuzzy
 msgid "Control-Enter sends message"
 msgstr "Enter manda el mensaje"
 
-#: src/prefs.c:620
+#: src/prefs.c:658
 msgid "Escape closes window"
 msgstr ""
 
-#: src/prefs.c:626
+#: src/prefs.c:664
 msgid "Control-{B/I/U/S} inserts HTML tags"
 msgstr ""
 
-#: src/prefs.c:627
+#: src/prefs.c:665
 msgid "Control-(number) inserts smileys"
 msgstr ""
 
-#: src/prefs.c:628
+#: src/prefs.c:666
 msgid "F2 toggles timestamp display"
 msgstr ""
 
-#: src/prefs.c:630
+#: src/prefs.c:668
 #, fuzzy
 msgid "Display and General Options"
 msgstr "Opciones"
 
-#: src/prefs.c:642
+#: src/prefs.c:680
 #, fuzzy
 msgid "Show graphical smileys"
 msgstr "Demostrar caritas gráficas (experimental)"
 
-#: src/prefs.c:643
+#: src/prefs.c:681
 #, fuzzy
 msgid "Show timestamp on messages"
 msgstr "Demostrar la hora de los mensajes"
 
-#: src/prefs.c:644
+#: src/prefs.c:682
 #, fuzzy
 msgid "Show URLs as links"
 msgstr "Mandar direcciones como enlaze"
 
-#: src/prefs.c:645
+#: src/prefs.c:683
 #, fuzzy
 msgid "Highlight misspelled words"
 msgstr "Automagicamente destaque las faltas de ortografía"
 
-#: src/prefs.c:646 src/prefs.c:1857
+#: src/prefs.c:684 src/prefs.c:1872
 msgid "Sending messages removes away status"
 msgstr "Mandando un mensaje quita el estado de ausente"
 
-#: src/prefs.c:647 src/prefs.c:1864
+#: src/prefs.c:685 src/prefs.c:1885
 #, fuzzy
 msgid "Queue new messages when away"
 msgstr "Ignorar nuevas conversaciones mientras este ausente"
 
-#: src/prefs.c:653
+#: src/prefs.c:691
 #, fuzzy
 msgid "Ignore colors"
 msgstr "Ignorar los colores de los amigos"
 
-#: src/prefs.c:654
+#: src/prefs.c:692
 #, fuzzy
 msgid "Ignore font faces"
 msgstr "Hacer el texto mas grande "
 
-#: src/prefs.c:655
+#: src/prefs.c:693
 #, fuzzy
 msgid "Ignore font sizes"
 msgstr "Hacer el texto mas grande "
 
-#: src/prefs.c:656
+#: src/prefs.c:694
 #, fuzzy
 msgid "Ignore TiK Automated Messages"
 msgstr "Crear Mensaje"
 
-#: src/prefs.c:657 src/prefs.c:1855
+#: src/prefs.c:695 src/prefs.c:1870
 msgid "Ignore new conversations when away"
 msgstr "Ignorar nuevas conversaciones mientras este ausente"
 
-#: src/prefs.c:827
+#: src/prefs.c:884
 #, fuzzy
 msgid "IM Options"
 msgstr "Opciones"
 
-#: src/prefs.c:839
+#: src/prefs.c:897 src/prefs.c:2832
 msgid "IM Window"
 msgstr ""
 
-#: src/prefs.c:855 src/prefs.c:899
+#: src/prefs.c:913 src/prefs.c:1057
 #, fuzzy
 msgid "Show buttons as: "
 msgstr "Demostrar los dibujos en los botonoes"
 
-#: src/prefs.c:859 src/prefs.c:903
+#: src/prefs.c:917 src/prefs.c:1062
 msgid "Pictures And Text"
 msgstr ""
 
-#: src/prefs.c:860 src/prefs.c:904
+#: src/prefs.c:918 src/prefs.c:1064
 msgid "Pictures"
 msgstr ""
 
-#: src/prefs.c:861 src/prefs.c:905
+#: src/prefs.c:919 src/prefs.c:1065
 #, fuzzy
 msgid "Text"
 msgstr "Texto en Negritas"
 
-#: src/prefs.c:871
+#: src/prefs.c:930
 #, fuzzy
 msgid "Show all conversations in one tabbed window"
 msgstr ""
 "Demostrar cuando los amigos se conectan/desconectan en lasventanas de las "
 "conversaciones"
 
-#: src/prefs.c:872 src/prefs.c:916
+#: src/prefs.c:932
+#, fuzzy
+msgid "Show chats in the same tabbed window"
+msgstr ""
+"Demostrar cuando los amigos se conectan/desconectan en lasventanas de las "
+"conversaciones"
+
+#: src/prefs.c:939 src/prefs.c:1085
 #, fuzzy
 msgid "Raise windows on events"
 msgstr "Alzar ventanas cuando un mensaje sea recibido"
 
-#: src/prefs.c:873
+#: src/prefs.c:940
 #, fuzzy
 msgid "Show logins in window"
 msgstr ""
 "Demostrar cuando los amigos se conectan/desconectan en lasventanas de las "
 "conversaciones"
 
-#: src/prefs.c:879 src/prefs.c:923
+#: src/prefs.c:941
+msgid "Show aliases in tabs/titles"
+msgstr ""
+
+#: src/prefs.c:942
+#, fuzzy
+msgid "Hide window on send"
+msgstr "Alzar ventanas cuando un mensaje sea recibido"
+
+#: src/prefs.c:944 src/prefs.c:1088
+#, fuzzy
+msgid "Window Sizes"
+msgstr "Guardar algunas configuraciones de tamaño/posicion de ventanas"
+
+#: src/prefs.c:952 src/prefs.c:1096
 msgid "New window width:"
 msgstr ""
 
-#: src/prefs.c:880 src/prefs.c:924
+#: src/prefs.c:953 src/prefs.c:1097
 msgid "New window height:"
 msgstr ""
 
-#: src/prefs.c:881 src/prefs.c:925
+#: src/prefs.c:954 src/prefs.c:1098
 msgid "Entry widget height:"
 msgstr ""
 
-#: src/prefs.c:883
+#: src/prefs.c:956 src/prefs.c:1100
+msgid "Tab Placement"
+msgstr ""
+
+#: src/prefs.c:976 src/prefs.c:1120
+msgid "Top"
+msgstr ""
+
+#: src/prefs.c:978 src/prefs.c:1122
+msgid "Bottom"
+msgstr ""
+
+#: src/prefs.c:985 src/prefs.c:1129
+msgid "Left"
+msgstr ""
+
+#: src/prefs.c:987 src/prefs.c:1131
+msgid "Right"
+msgstr ""
+
+#: src/prefs.c:991
+#, fuzzy
+msgid "Buddy Icons"
+msgstr "Calada de Amigo"
+
+#: src/prefs.c:1003
+#, fuzzy
+msgid "Hide Buddy Icons"
+msgstr "Calada de Amigo"
+
+#: src/prefs.c:1029
+#, fuzzy
+msgid "Chat Options"
+msgstr "Opciones"
+
+#: src/prefs.c:1041
 msgid "Group Chat Window"
 msgstr ""
 
-#: src/prefs.c:915
+#: src/prefs.c:1076
 #, fuzzy
 msgid "Show all chats in one tabbed window"
 msgstr ""
 "Demostrar cuando los amigos se conectan/desconectan en lasventanas de las "
 "conversaciones"
 
-#: src/prefs.c:917
+#: src/prefs.c:1078
+#, fuzzy
+msgid "Show conversations in the same tabbed window"
+msgstr ""
+"Demostrar cuando los amigos se conectan/desconectan en lasventanas de las "
+"conversaciones"
+
+#: src/prefs.c:1086
 msgid "Show people joining/leaving in window"
 msgstr ""
 
-#: src/prefs.c:927
-#, fuzzy
-msgid "Tabbed Window Options"
-msgstr "Guardar algunas configuraciones de tamaño/posicion de ventanas"
-
-#: src/prefs.c:939
-msgid "IM Tab Placement:"
-msgstr ""
-
-#: src/prefs.c:951 src/prefs.c:985
-msgid "Top"
+#: src/prefs.c:1134
+msgid "Tab Completion"
 msgstr ""
 
-#: src/prefs.c:953 src/prefs.c:987
-msgid "Bottom"
-msgstr ""
-
-#: src/prefs.c:960 src/prefs.c:994
-msgid "Left"
-msgstr ""
-
-#: src/prefs.c:962 src/prefs.c:996
-msgid "Right"
+#: src/prefs.c:1146
+msgid "Tab-Complete Nicks"
 msgstr ""
 
-#: src/prefs.c:973
-msgid "Chat Tab Placement:"
-msgstr ""
-
-#: src/prefs.c:1031 src/prefs.c:1033 src/prefs.c:1241 src/prefs.c:1243
-msgid "Gaim Chat"
-msgstr "Gaim Conversaciones"
-
-#: src/prefs.c:1179 src/prefs.c:2697
-msgid "Chat Rooms"
+#: src/prefs.c:1152
+msgid "Old-Style Tab Completion"
 msgstr ""
 
-#: src/prefs.c:1197
-msgid "Refresh"
-msgstr "Refrescar"
-
-#: src/prefs.c:1222
-msgid "List of available chats"
-msgstr "Lista de conversaciones disponibles"
-
-#: src/prefs.c:1232
-msgid "List of subscribed chats"
-msgstr "Lista de conversaciones subscritas"
-
-#: src/prefs.c:1358 src/prefs.c:2692
+#: src/prefs.c:1254 src/prefs.c:2842
 #, fuzzy
 msgid "Font Options"
 msgstr "Opciones"
 
-#: src/prefs.c:1375
-msgid "Underlined Text"
-msgstr "Texto Subrayado"
-
-#: src/prefs.c:1376
-msgid "Strike Text"
-msgstr "Texto cruzado por una linea"
-
-#: src/prefs.c:1406 src/prefs.c:1424 src/prefs.c:1446
+#: src/prefs.c:1280
+#, fuzzy
+msgid "Italic Text"
+msgstr "Texto Inclinado"
+
+#: src/prefs.c:1324 src/prefs.c:1342 src/prefs.c:1364
 #, fuzzy
 msgid "Select"
 msgstr "Seleccionar un Texto"
 
-#: src/prefs.c:1444
+#: src/prefs.c:1362
 msgid "Font Face for Text"
 msgstr "Tipo de texto"
 
-#: src/prefs.c:1459
+#: src/prefs.c:1377
 #, fuzzy
 msgid "Font Size for Text"
 msgstr "Tipo de texto"
 
-#: src/prefs.c:1541
+#: src/prefs.c:1472
 #, fuzzy
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim - Guardar Conversación"
 
-#: src/prefs.c:1576
-#, fuzzy
-msgid "Reset"
-msgstr "Registrar"
-
-#: src/prefs.c:1581
+#: src/prefs.c:1507
+msgid "Play"
+msgstr ""
+
+#: src/prefs.c:1517
 #, fuzzy
 msgid "Choose..."
 msgstr "Cerrar"
 
-#: src/prefs.c:1620
+#: src/prefs.c:1568
 #, fuzzy
 msgid "Sound Options"
 msgstr "Opciones"
 
-#: src/prefs.c:1648
+#: src/prefs.c:1596
 #, fuzzy
 msgid "No sounds when you log in"
 msgstr "Sonido cuando un amgio se conecte"
 
-#: src/prefs.c:1649 src/prefs.c:1856
+#: src/prefs.c:1602 src/prefs.c:1871
 msgid "Sounds while away"
 msgstr ""
 
-#: src/prefs.c:1655
-msgid "Beep instead of playing sound"
-msgstr ""
-
-#: src/prefs.c:1665
+#: src/prefs.c:1612
+#, fuzzy
+msgid "Sound Player:"
+msgstr "Sonido"
+
+#: src/prefs.c:1681
 #, c-format
 msgid ""
 "Command to play sound files\n"
 "(%s for filename; internal if empty)"
 msgstr ""
 
-#: src/prefs.c:1676
+#: src/prefs.c:1692
 msgid "Events"
 msgstr ""
 
-#: src/prefs.c:1684
+#: src/prefs.c:1700
 msgid "Sound when buddy logs in"
 msgstr "Sonido cuando un amgio se conecte"
 
-#: src/prefs.c:1685
+#: src/prefs.c:1701
 msgid "Sound when buddy logs out"
 msgstr "Sonido cuando un amigo se desconecte"
 
-#: src/prefs.c:1691
+#: src/prefs.c:1707
 #, fuzzy
 msgid "Sound when received message begins conversation"
 msgstr "Sonido cuando un mensaje es enviado"
 
-#: src/prefs.c:1692
+#: src/prefs.c:1709
 msgid "Sound when message is received"
 msgstr "Sonido cuando un mensaje es recibido"
 
-#: src/prefs.c:1693
+#: src/prefs.c:1710
 msgid "Sound when message is sent"
 msgstr "Sonido cuando un mensaje es enviado"
 
-#: src/prefs.c:1699
+#: src/prefs.c:1716
 #, fuzzy
 msgid "Sound in chat rooms when people enter"
 msgstr "Sonidos en conversaciones cuando gente entra o sale"
 
-#: src/prefs.c:1700
+#: src/prefs.c:1717
 #, fuzzy
 msgid "Sound in chat rooms when people leave"
 msgstr "Sonidos en conversaciones cuando gente entra o sale"
 
-#: src/prefs.c:1701
+#: src/prefs.c:1718
 #, fuzzy
 msgid "Sound in chat rooms when you talk"
 msgstr "Sonidos en conversaciones cuando getne habla"
 
-#: src/prefs.c:1702
+#: src/prefs.c:1719
 #, fuzzy
 msgid "Sound in chat rooms when others talk"
 msgstr "Sonidos en conversaciones cuando getne habla"
 
-#: src/prefs.c:1827 src/prefs.c:2719
+#: src/prefs.c:1842 src/prefs.c:2864
 #, fuzzy
 msgid "Away Messages"
 msgstr "Nuevo Mensaje de Ausencia"
 
-#: src/prefs.c:1863
+#: src/prefs.c:1879
 msgid "Don't send auto-response"
 msgstr ""
 
-#: src/prefs.c:1874
+#: src/prefs.c:1880
+msgid "Only send auto-response when idle"
+msgstr ""
+
+#: src/prefs.c:1895
+msgid "Time between sending auto-responses (in seconds):"
+msgstr ""
+
+#: src/prefs.c:1910
 msgid "Auto Away after"
 msgstr ""
 
-#: src/prefs.c:1888
+#: src/prefs.c:1924
 msgid "minutes using"
 msgstr ""
 
-#: src/prefs.c:1901
+#: src/prefs.c:1937
 #, fuzzy
 msgid "Messages"
 msgstr "Crear Mensaje"
 
-#: src/prefs.c:1913
+#: src/prefs.c:1949
 #, fuzzy
 msgid "Title"
 msgstr "Archivo"
 
-#: src/prefs.c:1917
-#, fuzzy
-msgid "Message"
-msgstr "Crear Mensaje"
-
-#: src/prefs.c:1956
+#: src/prefs.c:1994
 msgid "Edit"
 msgstr ""
 
-#: src/prefs.c:1960
+#: src/prefs.c:1998
 #, fuzzy
 msgid "Make Away"
 msgstr "Hacerme ausente ahora"
 
-#: src/prefs.c:2212
+#: src/prefs.c:2275
 #, fuzzy
 msgid "Privacy Options"
 msgstr "Opciones"
 
-#: src/prefs.c:2228
+#: src/prefs.c:2291
 msgid "Set privacy for:"
 msgstr ""
 
-#: src/prefs.c:2247
+#: src/prefs.c:2310
 msgid "Allow all users to contact me"
 msgstr ""
 
-#: src/prefs.c:2248
+#: src/prefs.c:2311
 msgid "Allow only the users below"
 msgstr ""
 
-#: src/prefs.c:2250
+#: src/prefs.c:2313
 msgid "Allow List"
 msgstr ""
 
-#: src/prefs.c:2281
+#: src/prefs.c:2344
 #, fuzzy
 msgid "Deny all users"
 msgstr "Negar algunos"
 
-#: src/prefs.c:2282
+#: src/prefs.c:2345
 msgid "Block the users below"
 msgstr ""
 
-#: src/prefs.c:2284
+#: src/prefs.c:2347
 #, fuzzy
 msgid "Block List"
 msgstr "Bloquear"
 
-#: src/prefs.c:2379
+#: src/prefs.c:2442
 msgid "Gaim - Preferences"
 msgstr "Gaim - Preferencias"
 
-#: src/prefs.c:2459
+#: src/prefs.c:2525
 msgid "Gaim debug output window"
 msgstr "Gaim ventana de respuestas del programa"
 
-#: src/prefs.c:2653
+#: src/prefs.c:2798
 msgid "General"
 msgstr "General"
 
-#: src/prefs.c:2658
+#: src/prefs.c:2803
 #, fuzzy
 msgid "Proxy"
 msgstr "No Proxy"
 
-#: src/prefs.c:2682
+#: src/prefs.c:2827
 #, fuzzy
 msgid "Conversations"
 msgstr "Guarde todas las conversaciones"
 
-#: src/prefs.c:2687
-msgid "Windows"
-msgstr ""
-
-#: src/prefs.c:2708
+#: src/prefs.c:2853
 msgid "Sounds"
 msgstr "Sonidos"
 
-#: src/prefs.c:2730
+#: src/prefs.c:2875
 msgid "Privacy"
 msgstr ""
 
-#: src/prpl.c:76
+#: src/prpl.c:70
 msgid ""
 "You have attempted to load a protocol which was not compiled from the same "
 "version of the source as this application was. Unfortunately, because it is "
@@ -2215,164 +2949,197 @@
 "say, it was not successfully loaded."
 msgstr ""
 
-#: src/prpl.c:80
+#: src/prpl.c:74
 #, fuzzy
 msgid "Protocol Error"
 msgstr "Error de aditivo"
 
-#: src/prpl.c:100
+#: src/prpl.c:93
 #, c-format
 msgid "%s was using %s, which got removed. %s is now offline."
 msgstr ""
 
-#: src/prpl.c:103
+#: src/prpl.c:96
 #, fuzzy
 msgid "Disconnect"
 msgstr "Desconectado."
 
-#: src/prpl.c:143
+#: src/prpl.c:133
 #, fuzzy
 msgid "Accept?"
 msgstr "Aceptar"
 
-#: src/prpl.c:163 src/prpl.c:235
-msgid "Accept"
-msgstr "Aceptar"
-
-#: src/prpl.c:208
+#: src/prpl.c:199
 #, fuzzy
 msgid "Gaim - Prompt"
 msgstr "Gaim - Agregar Autorizar/Negar"
 
-#: src/prpl.c:303
+#: src/prpl.c:419
 #, fuzzy
-msgid "Gaim - New User Registration"
-msgstr "Gaim - Guardar Conversación"
-
-#: src/prpl.c:312
-msgid "New User Registration"
+msgid "Gaim - New Mail"
+msgstr "Gaim - Guardar Como..."
+
+#: src/prpl.c:445
+msgid "Open Mail"
 msgstr ""
 
-#: src/prpl.c:324
-msgid "Register new user for"
+#: src/prpl.c:564
+#, c-format
+msgid "%s%s%s%s has made %s their buddy%s%s%s"
+msgstr ""
+
+#: src/prpl.c:572
+msgid ""
+"\n"
+"\n"
+"Do you wish to add them to your buddy list?"
 msgstr ""
 
-#: src/prpl.c:552
+#: src/prpl.c:615
+msgid ""
+"You do not currently have any protocols available that are able to register "
+"new accounts."
+msgstr ""
+
+#: src/prpl.c:652
 #, fuzzy
-msgid "Gaim - Select File"
-msgstr "Gaim - Guardar Como..."
-
-#: src/prpl.c:554
+msgid "Gaim - Registration"
+msgstr "Gaim - Guardar Conversación"
+
+#: src/prpl.c:667
+msgid "Registration Information"
+msgstr ""
+
+#: src/prpl.c:684
+msgid "Register"
+msgstr "Registrar"
+
+#: src/server.c:55
 #, fuzzy
-msgid "Gaim - Send File"
-msgstr "Gaim - Guardar Como..."
-
-#: src/server.c:56
+msgid "Please enter your password"
+msgstr "Porfavor introduzca su nombre de cuenta"
+
+#: src/server.c:62
 msgid ""
 "You cannot log this account in; you do not have the protocol it uses loaded, "
 "or the protocol does not have a login function."
 msgstr ""
 
-#: src/server.c:58
+#: src/server.c:64
 #, fuzzy
 msgid "Login Error"
 msgstr "Error de aditivo"
 
-#: src/server.c:487
+#: src/server.c:550
 #, fuzzy, c-format
 msgid "(%d messages)"
 msgstr "Sonido cuando un mensaje es enviado"
 
-#: src/server.c:493
+#: src/server.c:556
 #, fuzzy
 msgid "(1 message)"
 msgstr "Con el mensaje:"
 
-#: src/server.c:781
+#: src/server.c:747
+#, fuzzy
+msgid "Warned"
+msgstr "Advertir"
+
+#: src/server.c:818
 msgid "Yes"
 msgstr ""
 
-#: src/server.c:782
+#: src/server.c:819
 msgid "No"
 msgstr ""
 
-#: src/toc.c:324 src/toc.c:331
+#: src/server.c:995
+#, fuzzy
+msgid "More Info"
+msgstr "Información de Usuario"
+
 #, fuzzy
-msgid "Connection Closed"
-msgstr "Connección"
-
-#: src/toc.c:366
-msgid "Waiting for reply..."
-msgstr ""
-
-#: src/toc.c:429
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr ""
-
-#: src/toc.c:430
-msgid "TOC Resume"
-msgstr ""
-
-#: src/toc.c:587
+#~ msgid "Gaim - Buddy"
+#~ msgstr "Gaim - Agregar Amigo"
+
+#~ msgid "file not found: %s\n"
+#~ msgstr "archivo no encontrado: %s\n"
+
+#~ msgid "by Email"
+#~ msgstr "por Correo Electronico"
+
+#~ msgid "by Dir Info"
+#~ msgstr "por Información de Directorio"
+
+#~ msgid "Settings"
+#~ msgstr "Ajustes"
+
+#~ msgid "User Info"
+#~ msgstr "Información de Usuario"
+
+#~ msgid "Invite who?"
+#~ msgstr "Invitar a quien?"
+
+#~ msgid "With message:"
+#~ msgstr "Con el mensaje:"
+
+#~ msgid "Gaim - Error %d"
+#~ msgstr "Gaim - Error %d"
+
 #, fuzzy
-msgid "Chat Error"
-msgstr "Error"
-
-#: src/toc.c:606
+#~ msgid "Pounce buddy as:"
+#~ msgstr "Sonido cuando un amgio se conecte"
+
+#, fuzzy
+#~ msgid "Buddy:"
+#~ msgstr "Amigo"
+
 #, fuzzy
-msgid "Password Change Successeful"
-msgstr "Gaim - Cambiar Contraseña"
-
-#: src/toc.c:609
-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:612
-msgid "TOC Pause"
-msgstr ""
-
-#: src/toc.c:1016
+#~ msgid "Send IM on pounce"
+#~ msgstr "Mandar un mensaje cuando se conecte este amigo"
+
 #, fuzzy
-msgid "Community:"
-msgstr "País"
-
-#: src/toc.c:1037
+#~ msgid "Message:"
+#~ msgstr "Crear Mensaje"
+
+#~ msgid "Getting %d bytes from %s"
+#~ msgstr "Recibiendo %d bytes de %s"
+
+#~ msgid "Logging in %s\n"
+#~ msgstr "Connectando %s\n"
+
+#~ msgid "Plugin Error"
+#~ msgstr "Error de aditivo"
+
 #, fuzzy
-msgid "Get Dir Info"
-msgstr "Información del Directorio"
-
-#: src/toc.c:1215
-msgid ""
-"Unfortunately, currently TOC only allows new user registration by going to "
-"http://aim.aol.com/aimnew/Aim/register.adp?promo=106723&pageset=Aim&client=no"
-". Clicking the Register button will open the URL for you."
-msgstr ""
-
-#: src/toc.c:1499 src/toc.c:1541 src/toc.c:1675 src/toc.c:1761
+#~ msgid "Tabbed Window Options"
+#~ msgstr "Guardar algunas configuraciones de tamaño/posicion de ventanas"
+
+#~ msgid "Gaim Chat"
+#~ msgstr "Gaim Conversaciones"
+
+#~ msgid "Refresh"
+#~ msgstr "Refrescar"
+
+#~ msgid "List of available chats"
+#~ msgstr "Lista de conversaciones disponibles"
+
+#~ msgid "List of subscribed chats"
+#~ msgstr "Lista de conversaciones subscritas"
+
+#~ msgid "Underlined Text"
+#~ msgstr "Texto Subrayado"
+
+#~ msgid "Strike Text"
+#~ msgstr "Texto cruzado por una linea"
+
 #, fuzzy
-msgid "Could not connect for transfer!"
-msgstr "Error Connectando al encaje. \n"
-
-#: src/toc.c:1705
-msgid "Could not write file header!"
-msgstr ""
-
-#: src/toc.c:1794
-msgid "Gaim - Save As..."
-msgstr "Gaim - Guardar Como..."
-
-#: src/toc.c:1833
-#, fuzzy, c-format
-msgid "%s requests %s to accept %d file%s: %s (%.2f %s)%s%s"
-msgstr "%s le pide que acepte el archivo: %s (%d bytes)"
-
-#: src/toc.c:1838
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s le pide que les mande un archivo"
+#~ msgid "Gaim - Select File"
+#~ msgstr "Gaim - Guardar Como..."
+
+#, fuzzy
+#~ msgid "Community:"
+#~ msgstr "País"
 
 #, fuzzy
 #~ msgid "Gaim - Change MSN Name"
@@ -2382,12 +3149,6 @@
 #~ msgid "Ok"
 #~ msgstr "OK"
 
-#~ msgid "Export Buddy List"
-#~ msgstr "Exportar Lista de Amigos"
-
-#~ msgid "Error writing file %s"
-#~ msgstr "Error creando el archivo %s"
-
 #~ msgid "Gaim - Export Buddy List"
 #~ msgstr "Gaim - Exportar lista de amigos"
 
@@ -2411,10 +3172,6 @@
 #~ msgstr "Color del texto"
 
 #, fuzzy
-#~ msgid "Chat Options"
-#~ msgstr "Opciones"
-
-#, fuzzy
 #~ msgid "Sound Events"
 #~ msgstr "Sonidos"
 
@@ -2469,17 +3226,6 @@
 #~ msgid "GetFile Error"
 #~ msgstr "Gaim - Error %d"
 
-#~ msgid ""
-#~ "Username : <B>%s</B>\n"
-#~ "<BR>Warning Level : <B>%d %%</B>\n"
-#~ "<BR>Online Since : <B>%s</B><BR>Idle Minutes : <B>%d</B>\n"
-#~ "<BR><HR><BR>%s\n"
-#~ msgstr ""
-#~ "Nombre de usuario: <B>%s</B>\n"
-#~ "<BR>Warning Level : <B>%d %%</B>\n"
-#~ "<BR>En línea desde : <B>%s</B><BR>Minutos Desocupados : <B>%d</B>\n"
-#~ "<BR><HR><BR>%s\n"
-
 #~ msgid "Receiving %s from %s"
 #~ msgstr "Recibiendo %s de %s"
 
@@ -2518,9 +3264,6 @@
 #~ 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"
@@ -2529,12 +3272,6 @@
 #~ 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"
 
@@ -2571,9 +3308,6 @@
 #~ 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"
 
@@ -2605,9 +3339,6 @@
 #~ msgid "No Idle"
 #~ msgstr "No desocupado"
 
-#~ msgid "SOCKS v4 Proxy"
-#~ msgstr "Proxy SOCKS v4"
-
 #~ msgid "SOCKS v5 Proxy (DOES NOT WORK!)"
 #~ msgstr "Proxy SOCKS v5 (NO SIRVE!)"
 
--- a/po/fi.po	Fri Feb 22 23:47:55 2002 +0000
+++ b/po/fi.po	Fri Feb 22 23:48:23 2002 +0000
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim 0.50\n"
-"POT-Creation-Date: 2002-01-03 19:26+0200\n"
+"POT-Creation-Date: 2002-02-17 12:41-0800\n"
 "PO-Revision-Date: 2002-01-03 22:17+0200\n"
 "Last-Translator: Tero Kuusela <teroajk@yahoo.com>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -13,364 +13,443 @@
 "Content-Type: text/plain; charset=iso-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/protocols/gg/gg.c:68
-msgid "Available"
-msgstr "Käytettävissä"
-
-#: src/protocols/gg/gg.c:69
-msgid "Available for friends only"
-msgstr "Käytettävissä vain ystäville"
-
-#: src/applet.c:291 src/buddy.c:478 src/buddy.c:2283 src/buddy.c:2419
-#: src/protocols/gg/gg.c:70
-msgid "Away"
-msgstr "Poissa"
-
-#: src/protocols/gg/gg.c:71
-msgid "Away for friends only"
-msgstr "Poissa vain ystäville"
-
-#: src/protocols/gg/gg.c:72
-msgid "Invisible"
-msgstr "Näkymätön"
-
-#: src/protocols/gg/gg.c:73
-msgid "Invisible for friends only"
-msgstr "Näkymätön vain ystäville"
-
-#: src/protocols/gg/gg.c:74
-msgid "Unavailable"
-msgstr "Ei käytettävissä"
-
-#: src/protocols/gg/gg.c:168
+#: src/protocols/gg/gg.c:182
 msgid "Unable to resolve hostname."
 msgstr "Ei kyetty ratkaisemaan verkkoaseman nimeä."
 
-#: src/protocols/gg/gg.c:171
+#: src/protocols/gg/gg.c:185
 msgid "Unable to connect to server."
 msgstr "Palvelimeen ei kyetty muodostamaan yhteyttä."
 
-#: src/protocols/gg/gg.c:174
+#: src/protocols/gg/gg.c:188
 msgid "Invalid response from server."
 msgstr "Kelvoton vastaus palvelimelta."
 
-#: src/protocols/gg/gg.c:177
+#: src/protocols/gg/gg.c:191
 msgid "Error while reading from socket."
 msgstr "Virhe luettaessa socketista."
 
-#: src/protocols/gg/gg.c:180
+#: src/protocols/gg/gg.c:194
 msgid "Error while writting to socket."
 msgstr "Virhe kirjoitettaessa socketiin."
 
-#: src/protocols/gg/gg.c:183
+#: src/protocols/gg/gg.c:197
 msgid "Authentification failed."
 msgstr "Tunnistus epäonnistui."
 
-#: src/protocols/gg/gg.c:186
+#: src/protocols/gg/gg.c:200
 msgid "Unknown Error Code."
 msgstr "Tuntematon virhekoodi."
 
-#: src/protocols/gg/gg.c:191 src/protocols/gg/gg.c:599
-#: src/protocols/gg/gg.c:698 src/protocols/gg/gg.c:840
-#: src/protocols/gg/gg.c:877 src/protocols/gg/gg.c:921
-msgid "Gadu-Gadu Error"
-msgstr "Gadu-Gadu-virhe"
-
-#: src/protocols/gg/gg.c:311
+#: src/protocols/gg/gg.c:302
 #, c-format
 msgid "Status: %s"
 msgstr "Tila: %s"
 
-#: src/protocols/gg/gg.c:326
+#: src/protocols/gg/gg.c:317
 msgid "Nick:"
 msgstr "Lempinimi:"
 
-#: src/protocols/gg/gg.c:327
+#: src/protocols/gg/gg.c:318
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu-käyttäjä"
 
-#: src/protocols/gg/gg.c:462
+#: src/protocols/gg/gg.c:337
+#, fuzzy
+msgid "Could not connect"
+msgstr "Yhteyttä ei kyetty muodostamaan"
+
+#: src/protocols/gg/gg.c:344
+#, fuzzy
+msgid "Unable to read socket"
+msgstr "Ei kyetty lukemaan tiedostoa %s."
+
+#: src/protocols/gg/gg.c:455
 msgid "Unable to connect."
 msgstr "Yhteyden muodostaminen epäonnistui."
 
-#: src/protocols/gg/gg.c:473
-msgid "Handshake"
-msgstr "Kättely"
-
-#: src/protocols/gg/gg.c:475
-msgid "Connecting to GG server"
-msgstr "Yhdistetään GG-palvelimeen"
-
-#: src/protocols/gg/gg.c:478
-msgid "Waiting for server key"
+#: src/protocols/gg/gg.c:465
+msgid "Reading data"
+msgstr ""
+
+#: src/protocols/gg/gg.c:468
+msgid "Balancer handshake"
+msgstr ""
+
+#: src/protocols/gg/gg.c:471
+#, fuzzy
+msgid "Reading server key"
 msgstr "Odotetaan palvelinavainta"
 
-#: src/protocols/gg/gg.c:480
-msgid "Sending key"
-msgstr "Lähetetään avainta"
-
-#: src/protocols/gg/gg.c:537
+#: src/protocols/gg/gg.c:474
+msgid "Exchanging key hash"
+msgstr ""
+
+#: src/protocols/gg/gg.c:482
+msgid "Critical error in GG library\n"
+msgstr ""
+
+#: src/protocols/gg/gg.c:521
+#, fuzzy
+msgid "Unable to ping server"
+msgstr "Palvelimeen ei kyetty muodostamaan yhteyttä."
+
+#: src/protocols/gg/gg.c:533
 msgid "Send as message"
 msgstr "Lähetä viestinä"
 
-#: src/protocols/gg/gg.c:545
+#: src/protocols/gg/gg.c:541
 msgid "Looking up GG server"
 msgstr "Etsitään GG-palvelinta"
 
-#: src/protocols/gg/gg.c:548
+#: src/protocols/gg/gg.c:544
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "Epäkelpo Gadu-Gadu-UIN ilmoitettu"
 
-#: src/protocols/gg/gg.c:575
+#: src/protocols/gg/gg.c:570
 #, c-format
 msgid "Connect to %s failed"
 msgstr "%s: yhdistäminen epäonnistui"
 
-#: src/protocols/gg/gg.c:598
+#: src/protocols/gg/gg.c:594
 msgid "You are trying to send message to invalid Gadu-Gadu UIN!"
 msgstr "Yrität lähettää viestiä epäkelvolle Gadu-Gadu-UIN:lle!"
 
+#: src/protocols/gg/gg.c:595 src/protocols/gg/gg.c:657
+#: src/protocols/gg/gg.c:762 src/protocols/gg/gg.c:768
+#: src/protocols/gg/gg.c:821 src/protocols/gg/gg.c:833
+#: src/protocols/gg/gg.c:845 src/protocols/gg/gg.c:956
+#: src/protocols/gg/gg.c:984 src/protocols/gg/gg.c:1043
+#: src/protocols/gg/gg.c:1066 src/protocols/gg/gg.c:1116
+#: src/protocols/gg/gg.c:1149 src/protocols/gg/gg.c:1214
+msgid "Gadu-Gadu Error"
+msgstr "Gadu-Gadu-virhe"
+
 # src/message.c:76
-#: src/protocols/gg/gg.c:698
+#: src/protocols/gg/gg.c:657
 msgid "Couldn't get search results"
 msgstr "Ei kyetty noutamaan hakutuloksia"
 
-#: src/protocols/gg/gg.c:703
+#: src/protocols/gg/gg.c:662
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu-hakumoottori"
 
-#: src/protocols/gg/gg.c:730
+#: src/protocols/gg/gg.c:687
 msgid "Active"
 msgstr "Aktiivinen"
 
-#: src/protocols/gg/gg.c:731
+#: src/protocols/gg/gg.c:688
 msgid "yes"
 msgstr "kyllä"
 
-#: src/protocols/gg/gg.c:731
+#: src/protocols/gg/gg.c:688
 msgid "no"
 msgstr "ei"
 
-#: src/protocols/gg/gg.c:735
+#: src/protocols/gg/gg.c:692
 msgid "UIN"
 msgstr "UIN"
 
-#: src/protocols/gg/gg.c:739
+#: src/protocols/gg/gg.c:696
 msgid "First name"
 msgstr "Etunimi"
 
-#: src/protocols/gg/gg.c:744
+#: src/protocols/gg/gg.c:701
 msgid "Second Name"
 msgstr "Sukunimi"
 
-#: src/protocols/gg/gg.c:748
+#: src/protocols/gg/gg.c:705
 msgid "Nick"
 msgstr "Lempinimi"
 
-#: src/protocols/gg/gg.c:755 src/protocols/gg/gg.c:758
+#: src/protocols/gg/gg.c:712 src/protocols/gg/gg.c:715
 msgid "Birth year"
 msgstr "Syntymävuosi"
 
-#: src/protocols/gg/gg.c:764 src/protocols/gg/gg.c:766
-#: src/protocols/gg/gg.c:768
+#: src/protocols/gg/gg.c:721 src/protocols/gg/gg.c:723
+#: src/protocols/gg/gg.c:725
 msgid "Sex"
 msgstr "Sukupuoli"
 
 #. Line 5
-#: src/dialogs.c:1385 src/dialogs.c:2068 src/protocols/gg/gg.c:772
+#: src/dialogs.c:1501 src/dialogs.c:2205 src/protocols/gg/gg.c:729
 msgid "City"
 msgstr "Kunta"
 
+#: src/protocols/gg/gg.c:761
+msgid "There is no Buddy List stored on server. Sorry!"
+msgstr ""
+
+#: src/protocols/gg/gg.c:768
+msgid "Couldn't Import Buddies List from Server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:815
+msgid "Buddies List sucessfully transfered into Server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:816 src/protocols/gg/gg.c:828
 #: src/protocols/gg/gg.c:840
-msgid "Couldn't send search request"
+#, fuzzy
+msgid "Gadu-Gadu Information"
+msgstr "Gadu-Gadu-virhe"
+
+#: src/protocols/gg/gg.c:821
+msgid "Couldn't transfer Buddies List into Server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:827
+msgid "Buddies List sucessfully deleted from Server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:833
+msgid "Couldn't delete Buddies List from Server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:839
+#, fuzzy
+msgid "Password changed sucessfully"
+msgstr "Salasanan vaihto onnistui"
+
+#: src/protocols/gg/gg.c:845
+msgid "Password couldn't be changed"
+msgstr ""
+
+#: src/protocols/gg/gg.c:956
+#, fuzzy
+msgid "Couldn't send http request"
 msgstr "Hakupyyntöä ei voitu lähettää"
 
-#: src/protocols/gg/gg.c:876 src/protocols/gg/gg.c:920
+#: src/protocols/gg/gg.c:982
+#, c-format
+msgid "Buddies List import from Server failed (%s)"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1041
+#, c-format
+msgid "Buddies List export to Server failed (%s)"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1064
+#, c-format
+msgid "Deletion of Buddies List from Server failed (%s)"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1114 src/protocols/gg/gg.c:1212
 #, c-format
 msgid "Connect to search service failed (%s)"
 msgstr "Yhteys hakupalveluun epäonnistui (%s)"
 
-#: src/protocols/gg/gg.c:886 src/protocols/gg/gg.c:895
+#: src/protocols/gg/gg.c:1147
+#, fuzzy, c-format
+msgid "Changing Password failed (%s)"
+msgstr "Vaihda salasanaa"
+
+#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1175
 msgid "Directory Search"
 msgstr "Haku hakemistosta"
 
-#: src/protocols/icq/gaim_icq.c:305
+#: src/dialogs.c:1618 src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
+msgid "Change Password"
+msgstr "Vaihda salasanaa"
+
+#: src/protocols/gg/gg.c:1162 src/protocols/gg/gg.c:1179
+#, fuzzy
+msgid "Import Buddies List from Server"
+msgstr "Tuo tuttavalista"
+
+#: src/protocols/gg/gg.c:1164 src/protocols/gg/gg.c:1180
+#, fuzzy
+msgid "Export Buddies List to Server"
+msgstr "Tuo tuttavalista"
+
+#: src/protocols/gg/gg.c:1166 src/protocols/gg/gg.c:1181
+msgid "Delete Buddies List from Server"
+msgstr ""
+
+#: src/protocols/icq/gaim_icq.c:308
 msgid "Send message through server"
 msgstr "Lähetä viesti palvelimen kautta"
 
-#: src/protocols/icq/gaim_icq.c:466 src/protocols/irc/irc.c:1493
-#: src/protocols/jabber/jabber.c:1644 src/protocols/oscar/oscar.c:2621
-#: src/protocols/toc/toc.c:1200
+#: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1538
+#: src/protocols/jabber/jabber.c:2021 src/protocols/oscar/oscar.c:2847
+#: src/protocols/toc/toc.c:1201
 msgid "Get Info"
 msgstr "Hae tiedot"
 
-#: src/protocols/irc/irc.c:428 src/protocols/irc/irc.c:920
+#: src/protocols/irc/irc.c:429 src/protocols/irc/irc.c:962
 #, c-format
 msgid "<B>%s has changed the topic to: %s</B>"
 msgstr "<B>%s on vaihtanut aiheeksi: %s</B>"
 
-#: src/protocols/irc/irc.c:662
+#: src/protocols/irc/irc.c:682
 msgid "No such nick/channel"
 msgstr "Ei sellaista lempinimeä/kanavaa"
 
-#: src/protocols/irc/irc.c:662 src/protocols/irc/irc.c:665
-#: src/protocols/irc/irc.c:667 src/protocols/irc/irc.c:856
+#: src/protocols/irc/irc.c:682 src/protocols/irc/irc.c:685
+#: src/protocols/irc/irc.c:687 src/protocols/irc/irc.c:891
 msgid "IRC Error"
 msgstr "IRC-virhe"
 
-#: src/protocols/irc/irc.c:665
+#: src/protocols/irc/irc.c:685
 msgid "No such server"
 msgstr "Ei sellaista palvelinta"
 
-#: src/protocols/irc/irc.c:667
+#: src/protocols/irc/irc.c:687
 msgid "No nickname given"
 msgstr "Lempinimeä ei annettu"
 
-#: src/protocols/irc/irc.c:799
+#: src/protocols/irc/irc.c:819
 msgid "Unable to write"
 msgstr "Ei kyetty kirjoittamaan"
 
-#: src/protocols/irc/irc.c:854
+#: src/protocols/irc/irc.c:889
 #, c-format
 msgid "You have been kicked from %s: %s"
 msgstr "%s: Sinut on potkaistu pois: %s"
 
-#: src/protocols/irc/irc.c:1324
+#: src/protocols/irc/irc.c:894
+#, c-format
+msgid "Kicked by %s: %s"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1357
 #, c-format
 msgid "You have left %s"
 msgstr "%s: Olet poistunut"
 
-#: src/protocols/irc/irc.c:1325
+#: src/protocols/irc/irc.c:1358
 msgid "IRC Part"
 msgstr "IRC-lähtö"
 
-#: src/protocols/irc/irc.c:1398
+#: src/protocols/irc/irc.c:1443
 msgid "Channel:"
 msgstr "Kanava:"
 
-#: src/multi.c:506 src/protocols/irc/irc.c:1402
+#: src/multi.c:522 src/protocols/irc/irc.c:1447
 msgid "Password:"
 msgstr "Salasana:"
 
-#: src/protocols/jabber/jabber.c:1352
+#: src/protocols/jabber/jabber.c:1692
 msgid "Room:"
 msgstr "Huone:"
 
-#: src/protocols/jabber/jabber.c:1356
+#: src/protocols/jabber/jabber.c:1696
 msgid "Server:"
 msgstr "Palvelin:"
 
-#: src/protocols/jabber/jabber.c:1361
+#: src/protocols/jabber/jabber.c:1701
 msgid "Handle:"
 msgstr "Kädensija (handle):"
 
-#: src/protocols/msn/msn.c:566 src/protocols/msn/msn.c:1689
-#: src/protocols/msn/msn.c:1722
+#: src/buddy_chat.c:875 src/protocols/jabber/jabber.c:2026
+#: src/protocols/oscar/oscar.c:2854
+msgid "Get Away Msg"
+msgstr "Hae poissaoloviesti"
+
+#: src/protocols/msn/msn.c:653 src/protocols/msn/msn.c:1909
+#: src/protocols/msn/msn.c:1942
 msgid "MSN Error"
 msgstr "MSN-virhe"
 
-#: src/protocols/msn/msn.c:566
+#: src/protocols/msn/msn.c:653
 msgid "Gaim was unable to send a message"
 msgstr "Gaim ei kyennyt lähettämään viestiä"
 
-#: src/protocols/msn/msn.c:1689 src/protocols/msn/msn.c:1722
+#: src/protocols/msn/msn.c:960
+#, fuzzy
+msgid "You have been disconnected. You have signed on from another location."
+msgstr "Yhteytesi juttuhuoneeseen %s on katkennut."
+
+#: src/protocols/msn/msn.c:1909 src/protocols/msn/msn.c:1942
 msgid "Invalid name"
 msgstr "Epäkelpo nimi"
 
-#: src/protocols/napster/napster.c:450 src/protocols/oscar/oscar.c:2319
-#: src/protocols/toc/toc.c:1087
+#: src/protocols/napster/napster.c:450 src/protocols/oscar/oscar.c:2536
+#: src/protocols/toc/toc.c:1088
 msgid "Join what group:"
 msgstr "Mihin ryhmään liitytään:"
 
-#: src/protocols/oscar/oscar.c:295
+#: src/protocols/oscar/oscar.c:305
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Suora pikaviesti %s:n kanssa suljettu"
 
-#: src/protocols/oscar/oscar.c:331
+#: src/protocols/oscar/oscar.c:341
 msgid "connection error (rend)\n"
 msgstr "yhteysvirhe (rend)\n"
 
-#: src/protocols/oscar/oscar.c:342
+#: src/protocols/oscar/oscar.c:352
 msgid "major connection error\n"
 msgstr "merkittävä yhteysvirhe\n"
 
-#: src/protocols/oscar/oscar.c:343 src/protocols/toc/toc.c:511
-#: src/protocols/toc/toc.c:521 src/protocols/toc/toc.c:587
+#: src/protocols/oscar/oscar.c:353 src/protocols/toc/toc.c:509
+#: src/protocols/toc/toc.c:522 src/protocols/toc/toc.c:588
 msgid "Disconnected."
 msgstr "Yhteys katkennut."
 
-#: src/protocols/oscar/oscar.c:355 src/protocols/toc/toc.c:755
+#: src/protocols/oscar/oscar.c:365 src/protocols/toc/toc.c:756
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Yhteytesi juttuhuoneeseen %s on katkennut."
 
-#: src/protocols/oscar/oscar.c:356
+#: src/protocols/oscar/oscar.c:366
 msgid "Chat Error!"
 msgstr "Chat-virhe!"
 
-#: src/protocols/oscar/oscar.c:366
+#: src/protocols/oscar/oscar.c:378
 msgid "Chat is currently unavailable"
 msgstr "Chatti ei ole parhaillaan käytettävissä"
 
-#: src/protocols/oscar/oscar.c:367
+#: src/protocols/oscar/oscar.c:379
 msgid "Gaim - Chat"
 msgstr "Gaim - Chatti"
 
-#: src/protocols/oscar/oscar.c:426 src/protocols/oscar/oscar.c:488
+#: src/protocols/oscar/oscar.c:438 src/protocols/oscar/oscar.c:498
 msgid "Couldn't connect to host"
 msgstr "Yhteyttä verkkoasemaan ei voitu muodostaa"
 
-#: src/protocols/oscar/oscar.c:434
+#: src/protocols/oscar/oscar.c:446
 msgid "Password sent, waiting for response\n"
 msgstr "Salasana lähetetty, odotetaan vastausta\n"
 
-#: src/protocols/oscar/oscar.c:445
-#, c-format
-msgid "Logging in %s\n"
-msgstr "Kirjaudutaan sisään %s\n"
-
-#: src/protocols/oscar/oscar.c:450
-msgid "Send offline message"
-msgstr "Lähetä offline-viesti"
-
-#: src/protocols/oscar/oscar.c:469
+#: src/protocols/oscar/oscar.c:479
 msgid "internal connection error\n"
 msgstr "sisäinen yhteysvirhe\n"
 
-#: src/protocols/oscar/oscar.c:470
+#: src/protocols/oscar/oscar.c:480
 msgid "Unable to login to AIM"
 msgstr "Ei kyetty kirjautumaan sisään AIM:iin"
 
-#: src/protocols/oscar/oscar.c:475
+#: src/protocols/oscar/oscar.c:485
 #, c-format
 msgid "Signon: %s"
 msgstr "Sisäänkirjaus: %s"
 
-#: src/protocols/oscar/oscar.c:531
+#: src/protocols/oscar/oscar.c:557
 msgid "Signed off.\n"
 msgstr "Kirjauduttu ulos.\n"
 
-#: src/protocols/oscar/oscar.c:550 src/protocols/oscar/oscar.c:668
+#: src/protocols/oscar/oscar.c:576 src/protocols/oscar/oscar.c:696
 msgid "Could Not Connect"
 msgstr "Yhteyttä ei kyetty muodostamaan"
 
-#: src/protocols/oscar/oscar.c:558
+#: src/protocols/oscar/oscar.c:584
 msgid "Connection established, cookie sent"
 msgstr "Yhteys muodostettu, eväste lähetetty"
 
 #. Incorrect nick/password
-#: src/protocols/oscar/oscar.c:584 src/protocols/toc/toc.c:459
+#: src/protocols/oscar/oscar.c:610 src/protocols/toc/toc.c:457
 msgid "Incorrect nickname or password."
 msgstr "Virheellinen lempinimi tai salasana."
 
 #. Suspended account
-#: src/protocols/oscar/oscar.c:589
+#: src/protocols/oscar/oscar.c:615
 msgid "Your account is currently suspended."
 msgstr "Tilisi palvelu on parhaillaan keskeytetty."
 
 #. connecting too frequently
-#: src/protocols/oscar/oscar.c:593
+#: src/protocols/oscar/oscar.c:619
 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."
@@ -380,77 +459,196 @@
 "pidempään."
 
 #. client too old
-#: src/protocols/oscar/oscar.c:598
+#: src/protocols/oscar/oscar.c:624
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr "Asiakasohjelmasi versio on liian vanha. Päivitä "
 
-#: src/protocols/oscar/oscar.c:602 src/protocols/toc/toc.c:539
+#: src/protocols/oscar/oscar.c:628 src/protocols/toc/toc.c:540
 msgid "Authentication Failed"
 msgstr "Aidonnus epäonnistui"
 
-#: src/protocols/oscar/oscar.c:624
+#: src/protocols/oscar/oscar.c:650
 msgid "Internal Error"
 msgstr "Sisäinen virhe"
 
-#: src/protocols/oscar/oscar.c:1184 src/protocols/oscar/oscar.c:2525
+#: src/protocols/oscar/oscar.c:1204 src/protocols/oscar/oscar.c:2744
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Suora pikaviesti %s:n kanssa muodostettu"
 
 # Detta är felrapporterat
-#: src/protocols/oscar/oscar.c:1423
-#, c-format
-msgid "You missed %d message%s from %s because %s invalid."
+#: src/protocols/oscar/oscar.c:1454
+#, fuzzy, c-format
+msgid "You missed %d message from %s because it was invalid."
+msgstr "Et saanut %d viesti%s %s:lta koska %s on epäkelpo."
+
+# Detta är felrapporterat
+#: src/protocols/oscar/oscar.c:1455
+#, fuzzy, c-format
+msgid "You missed %d messages from %s because they were invalid."
 msgstr "Et saanut %d viesti%s %s:lta koska %s on epäkelpo."
 
-#: src/protocols/oscar/oscar.c:1433
-#, c-format
-msgid "You missed %d message%s from %s because %s too large."
+#: src/protocols/oscar/oscar.c:1464
+#, fuzzy, c-format
+msgid "You missed %d message from %s because it was too large."
 msgstr "Et saanut %d viesti%s %s:lta koska %s on liian suuri."
 
-#: src/protocols/oscar/oscar.c:1443
-#, c-format
+#: src/protocols/oscar/oscar.c:1465
+#, fuzzy, c-format
+msgid "You missed %d messages from %s because they were too large."
+msgstr "Et saanut %d viesti%s %s:lta koska ne ovat liian hirveitä."
+
+#: src/protocols/oscar/oscar.c:1474
+#, fuzzy, c-format
+msgid "You missed %d message from %s because the rate limit has been exceeded."
+msgstr "Et saanut %d viesti%s %s:lta koska taajuusraja ylittyi."
+
+#: src/protocols/oscar/oscar.c:1475
+#, fuzzy, c-format
 msgid ""
-"You missed %d message%s from %s because the rate limit has been exceeded."
+"You missed %d messages from %s because the rate limit has been exceeded."
 msgstr "Et saanut %d viesti%s %s:lta koska taajuusraja ylittyi."
 
-#: src/protocols/oscar/oscar.c:1452
-#, c-format
-msgid "You missed %d message%s from %s because they are too evil."
+#: src/protocols/oscar/oscar.c:1484
+#, fuzzy, c-format
+msgid "You missed %d message from %s because it was too evil."
 msgstr "Et saanut %d viesti%s %s:lta koska ne ovat liian hirveitä."
 
-#: src/protocols/oscar/oscar.c:1461
-#, c-format
-msgid "You missed %d message%s from %s because you are too evil."
+#: src/protocols/oscar/oscar.c:1485
+#, fuzzy, c-format
+msgid "You missed %d messages from %s because they are too evil."
+msgstr "Et saanut %d viesti%s %s:lta koska ne ovat liian hirveitä."
+
+#: src/protocols/oscar/oscar.c:1494
+#, fuzzy, c-format
+msgid "You missed %d message from %s because you are too evil."
 msgstr "Et saanut %d viesti%s %s:lta koska olet liian hirveä."
 
-#: src/protocols/oscar/oscar.c:1469
-#, c-format
-msgid "You missed %d message%s from %s for unknown reasons."
+#: src/protocols/oscar/oscar.c:1495
+#, fuzzy, c-format
+msgid "You missed %d messages from %s because you are too evil."
+msgstr "Et saanut %d viesti%s %s:lta koska olet liian hirveä."
+
+#: src/protocols/oscar/oscar.c:1503
+#, fuzzy, c-format
+msgid "You missed %d message from %s for unknown reasons."
 msgstr "Et saanut %d viesti%s %s:lta tuntemattomista syistä."
 
-#: src/dialogs.c:2808 src/dialogs.c:2814 src/protocols/oscar/oscar.c:1475
-#: src/protocols/oscar/oscar.c:1507 src/protocols/oscar/oscar.c:1525
-#: src/protocols/yahoo/yahoo.c:500
+#: src/protocols/oscar/oscar.c:1504
+#, fuzzy, c-format
+msgid "You missed %d messages from %s for unknown reasons."
+msgstr "Et saanut %d viesti%s %s:lta tuntemattomista syistä."
+
+#: src/dialogs.c:2949 src/dialogs.c:2955 src/protocols/oscar/oscar.c:1509
+#: src/protocols/oscar/oscar.c:1547 src/protocols/oscar/oscar.c:1565
+#: src/protocols/oscar/oscar.c:1994 src/protocols/yahoo/yahoo.c:501
 msgid "Gaim - Error"
 msgstr "Gaim - Virhe"
 
-#: src/protocols/oscar/oscar.c:1505
+#: src/protocols/oscar/oscar.c:1526
+#, c-format
+msgid "SNAC threw error: %s\n"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1528
+#, fuzzy
+msgid "Gaim - Oscar SNAC Error"
+msgstr "Gaim - Virhe"
+
+#: src/protocols/oscar/oscar.c:1545
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr "Viestiäsi %s:lle ei lähetetty: %s"
 
-#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:1524
+#: src/protocols/oscar/oscar.c:1546 src/protocols/oscar/oscar.c:1564
 msgid "Reason unknown"
 msgstr "Tuntematon syy"
 
-#: src/protocols/oscar/oscar.c:1523
+#: src/protocols/oscar/oscar.c:1563
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr "%s:n käyttäjätiedot eivät ole saatavilla: %s"
 
-#: src/protocols/oscar/oscar.c:1565
-#, c-format
+#: src/buddy.c:1906 src/protocols/oscar/oscar.c:1591
+msgid "Buddy Icon"
+msgstr "Tuttavakuvake"
+
+#: src/buddy.c:1909 src/protocols/oscar/oscar.c:1594
+msgid "Voice"
+msgstr "Ääni"
+
+#: src/buddy.c:1912 src/protocols/oscar/oscar.c:1597
+msgid "IM Image"
+msgstr "Pikaviestikuva"
+
+#: src/buddy.c:488 src/buddy.c:1915 src/buddy.c:2343 src/prefs.c:2837
+#: src/protocols/oscar/oscar.c:1600
+msgid "Chat"
+msgstr "Chatti"
+
+#: src/buddy.c:1918 src/protocols/oscar/oscar.c:1603
+msgid "Get File"
+msgstr "Vastaanota tiedosto"
+
+#: src/buddy.c:1921 src/protocols/oscar/oscar.c:1606
+msgid "Send File"
+msgstr "Lähetä tiedosto"
+
+#: src/buddy.c:1925 src/protocols/oscar/oscar.c:1610
+msgid "Games"
+msgstr "Pelit"
+
+#: src/buddy.c:1928 src/protocols/oscar/oscar.c:1613
+msgid "Stocks"
+msgstr "Osakkeet"
+
+#: src/buddy.c:1931 src/protocols/oscar/oscar.c:1616
+#, fuzzy
+msgid "Send Buddy List"
+msgstr "Tuttavalista"
+
+#: src/buddy.c:1934 src/protocols/oscar/oscar.c:1619
+msgid "EveryBuddy Bug"
+msgstr "EveryBuddy-virhe"
+
+#: src/buddy.c:1937 src/protocols/oscar/oscar.c:1622
+#, fuzzy
+msgid "AP User"
+msgstr "Käyttäjä"
+
+#: src/buddy.c:1940 src/protocols/oscar/oscar.c:1625
+msgid "ICQ RTF"
+msgstr ""
+
+#: src/buddy.c:1943 src/protocols/oscar/oscar.c:1628
+msgid "Nihilist"
+msgstr ""
+
+#: src/buddy.c:1946 src/protocols/oscar/oscar.c:1631
+msgid "ICQ Server Relay"
+msgstr ""
+
+#: src/buddy.c:1949 src/protocols/oscar/oscar.c:1634
+msgid "ICQ Unknown"
+msgstr ""
+
+#: src/buddy.c:1952 src/protocols/oscar/oscar.c:1637
+msgid "Trillian Encryption"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1674
+msgid ""
+"<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG "
+"SRC=\"free_icon.gif\"> : Normal AIM User<br><IMG SRC=\"aol_icon.gif\"> : AOL "
+"User <br><IMG SRC=\"dt_icon.gif\"> : Trial AIM User <br><IMG "
+"SRC=\"admin_icon.gif\"> : Administrator"
+msgstr ""
+"<br><BODY BGCOLOR=WHITE><hr><I>Selite:</I><br><br><IMG "
+"SRC=\"free_icon.gif\"> : Tavallinen AIM-käyttäjä<br><IMG "
+"SRC=\"aol_icon.gif\"> : AOL-käyttäjä <br><IMG SRC=\"dt_icon.gif\"> : "
+"AIM-koekäyttäjä <br><IMG SRC=\"admin_icon.gif\"> : Pääkäyttäjä"
+
+#: src/protocols/oscar/oscar.c:1686
 msgid ""
 "Username : <B>%s</B>  %s <BR>\n"
 "%sWarning Level : <B>%d %%</B><BR>\n"
@@ -466,168 +664,168 @@
 "<BR>\n"
 "<HR><BR>\n"
 
-#: src/protocols/oscar/oscar.c:1576
-msgid ""
-"<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG SRC=\"free_icon.gif\"> "
-": Normal AIM User<br><IMG SRC=\"aol_icon.gif\"> : AOL User <br><IMG "
-"SRC=\"dt_icon.gif\"> : Trial AIM User <br><IMG SRC=\"admin_icon.gif\"> : "
-"Administrator"
-msgstr ""
-"<br><BODY BGCOLOR=WHITE><hr><I>Selite:</I><br><br><IMG SRC=\"free_icon.gif\"> "
-": Tavallinen AIM-käyttäjä<br><IMG SRC=\"aol_icon.gif\"> : AOL-käyttäjä "
-"<br><IMG SRC=\"dt_icon.gif\"> : AIM-koekäyttäjä <br><IMG "
-"SRC=\"admin_icon.gif\"> : Pääkäyttäjä"
-
-#: src/protocols/oscar/oscar.c:1586
+#: src/protocols/oscar/oscar.c:1714
+msgid "<i>User has no away message</i>"
+msgstr "<i>Käyttäjällä ei ole poissaoloviestiä</i>"
+
+#: src/protocols/oscar/oscar.c:1726
+#, fuzzy
+msgid "Client Capabilities: "
+msgstr "Kykeneväisyydet: %s\n"
+
+#: src/protocols/oscar/oscar.c:1734
 msgid "<i>No Information Provided</i>"
 msgstr "<i>Ei tietoja annettuna</i>"
 
-#: src/protocols/oscar/oscar.c:1587
-msgid "<i>User has no away message</i>"
-msgstr "<i>Käyttäjällä ei ole poissaoloviestiä</i>"
-
-#: src/protocols/oscar/oscar.c:1612
+#: src/protocols/oscar/oscar.c:1757
 msgid "Your connection may be lost."
 msgstr "Yhteytesi voi olla kadonnut."
 
-#: src/protocols/oscar/oscar.c:1613
+#: src/protocols/oscar/oscar.c:1758
 msgid "AOL error"
 msgstr "AOL-virhe"
 
-#: src/dialogs.c:3341 src/protocols/oscar/oscar.c:2062
-#: src/protocols/oscar/oscar.c:2599 src/protocols/toc/toc.c:1545
-#: src/protocols/toc/toc.c:1562 src/protocols/toc/toc.c:1622
-#: src/protocols/toc/toc.c:1664 src/protocols/toc/toc.c:1783
-#: src/protocols/toc/toc.c:1813 src/protocols/toc/toc.c:1869
+#: src/protocols/oscar/oscar.c:1993
+msgid ""
+"The last message was not sent because you are over the rate limit. Please "
+"wait 10 seconds and try again."
+msgstr ""
+
+#: src/dialogs.c:3482 src/protocols/oscar/oscar.c:2267
+#: src/protocols/oscar/oscar.c:2818 src/protocols/toc/toc.c:1546
+#: src/protocols/toc/toc.c:1563 src/protocols/toc/toc.c:1623
+#: src/protocols/toc/toc.c:1665 src/protocols/toc/toc.c:1784
+#: src/protocols/toc/toc.c:1814 src/protocols/toc/toc.c:1870
 msgid "Error"
 msgstr "Virhe"
 
-#: src/protocols/oscar/oscar.c:2323 src/protocols/toc/toc.c:1091
+#: src/protocols/oscar/oscar.c:2540 src/protocols/toc/toc.c:1092
 msgid "Exchange:"
 msgstr "Vaihto:"
 
-#: src/protocols/oscar/oscar.c:2599
+#: src/protocols/oscar/oscar.c:2818
 msgid "Unable to open Direct IM"
 msgstr "Ei kyetty avaamaan suoraa pikaviestintää"
 
-#: src/protocols/oscar/oscar.c:2609
+#: src/protocols/oscar/oscar.c:2828
 #, c-format
 msgid ""
-"You have selected to open a Direct IM connection with %s. Doing this will let "
-"them see your IP address, and may be a security risk. Do you wish to "
+"You have selected to open a Direct IM connection with %s. Doing this will "
+"let them see your IP address, and may be a security risk. Do you wish to "
 "continue?"
 msgstr ""
 "Olet valinnut suoran pikaviestinnän avaamisen %s:n kanssa. Tämän tekeminen "
-"antaa vastapuolen nähdä IP-osoitteesi ja voi olla turvallisuusriski. Haluatko "
-"jatkaa?"
-
-#: src/protocols/oscar/oscar.c:2627
-msgid "Get Away Msg"
-msgstr "Hae poissaoloviesti"
-
-#: src/protocols/oscar/oscar.c:2634
+"antaa vastapuolen nähdä IP-osoitteesi ja voi olla turvallisuusriski. "
+"Haluatko jatkaa?"
+
+#: src/protocols/oscar/oscar.c:2861
 msgid "Direct IM"
 msgstr "Suora pikaviesti"
 
-#: src/protocols/toc/toc.c:398
+#: src/protocols/oscar/oscar.c:2869
+#, fuzzy
+msgid "Get Capabilities"
+msgstr "Kykeneväisyydet: %s\n"
+
+#: src/protocols/toc/toc.c:396
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Ei kyetty kirjoittamaan tiedostoa %s."
 
-#: src/protocols/toc/toc.c:401
+#: src/protocols/toc/toc.c:399
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Ei kyetty lukemaan tiedostoa %s."
 
-#: src/protocols/toc/toc.c:404
+#: src/protocols/toc/toc.c:402
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Viesti on liian pitkä, viimeiset %s tavua leikattu."
 
-#: src/protocols/toc/toc.c:407
+#: src/protocols/toc/toc.c:405
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s ei ole parhaillaan kirjautuneena sisään."
 
-#: src/protocols/toc/toc.c:410
+#: src/protocols/toc/toc.c:408
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "%s:n varoittaminen ei ole sallittua."
 
-#: src/protocols/toc/toc.c:413
+#: src/protocols/toc/toc.c:411
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "Viesti on hylätty, ylität palvelimen nopeusrajan."
 
-#: src/protocols/toc/toc.c:416
+#: src/protocols/toc/toc.c:414
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "%s: Chatti ei ole käytettävissä."
 
-#: src/protocols/toc/toc.c:419
+#: src/protocols/toc/toc.c:417
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Lähetät viestejä %s:lle liian nopeasti."
 
-#: src/protocols/toc/toc.c:422
+#: src/protocols/toc/toc.c:420
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "Et saanut %s:n pikaviestiä koska se oli liian suuri."
 
-#: src/protocols/toc/toc.c:425
+#: src/protocols/toc/toc.c:423
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "Et saanut %s:n pikaviestiä koska se lähetettiin liian nopeasti."
 
-#: src/protocols/toc/toc.c:428
+#: src/protocols/toc/toc.c:426
 msgid "Failure."
 msgstr "Epäonnistuminen."
 
-#: src/protocols/toc/toc.c:431
+#: src/protocols/toc/toc.c:429
 msgid "Too many matches."
 msgstr "Liian monta täsmäävyyttä."
 
-#: src/protocols/toc/toc.c:434
+#: src/protocols/toc/toc.c:432
 msgid "Need more qualifiers."
 msgstr "Tarvitaan lisää määritteitä."
 
-#: src/protocols/toc/toc.c:437
+#: src/protocols/toc/toc.c:435
 msgid "Dir service temporarily unavailable."
 msgstr "Hakemistopalvelu ei tilapäisesti ole käytettävissä."
 
-#: src/protocols/toc/toc.c:440
+#: src/protocols/toc/toc.c:438
 msgid "Email lookup restricted."
 msgstr "Sähköpostin katsominen rajoitettu."
 
-#: src/protocols/toc/toc.c:443
+#: src/protocols/toc/toc.c:441
 msgid "Keyword ignored."
 msgstr "Avainsanasta ei välitetty."
 
-#: src/protocols/toc/toc.c:446
+#: src/protocols/toc/toc.c:444
 msgid "No keywords."
 msgstr "Ei avainsanoja."
 
-#: src/protocols/toc/toc.c:449
+#: src/protocols/toc/toc.c:447
 msgid "User has no directory information."
 msgstr "Käyttäjällä ei ole hakemistotietoja."
 
-#: src/protocols/toc/toc.c:453
+#: src/protocols/toc/toc.c:451
 msgid "Country not supported."
 msgstr "Maata ei tuettu."
 
-#: src/protocols/toc/toc.c:456
+#: src/protocols/toc/toc.c:454
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Tunnistamaton epäonnistuminen: %s."
 
-#: src/protocols/toc/toc.c:462
+#: src/protocols/toc/toc.c:460
 msgid "The service is temporarily unavailable."
 msgstr "Palvelu ei tilapäisesti ole käytössä."
 
-#: src/protocols/toc/toc.c:465
+#: src/protocols/toc/toc.c:463
 msgid "Your warning level is currently too high to log in."
 msgstr "Varoitustasosi on parhaillaan liian korkea kirjautuaksesi sisään."
 
-#: src/protocols/toc/toc.c:468
+#: src/protocols/toc/toc.c:466
 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."
@@ -636,111 +834,117 @@
 "ja yritä uudestaan. Jos jatkat yrittämistä, joudut odottamaan vielä "
 "pidempään."
 
-#: src/protocols/toc/toc.c:471
+#: src/protocols/toc/toc.c:469
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Tuntematon sisäänkirjautumisvirhe esiintyi: %s."
 
-#: src/protocols/toc/toc.c:474
+#: src/protocols/toc/toc.c:472
 #, c-format
 msgid "An unknown error, %d, has occured.  Info: %s"
 msgstr "Tuntematon virhe, %d, esiintyi. Tiedot: %s"
 
-#: src/protocols/toc/toc.c:491
+#: src/protocols/toc/toc.c:489
 msgid "Connection Closed"
 msgstr "Yhteys suljettu"
 
-#: src/protocols/toc/toc.c:526
+#: src/protocols/toc/toc.c:527
 msgid "Waiting for reply..."
 msgstr "Odotetaan vastausta..."
 
-#: src/protocols/toc/toc.c:595
+#: src/protocols/toc/toc.c:596
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC on palannut tauoltaan. Voit nyt lähettää viestejä jälleen."
 
-#: src/protocols/toc/toc.c:596
+#: src/protocols/toc/toc.c:597
 msgid "TOC Resume"
 msgstr "TOC jatka"
 
-#: src/protocols/toc/toc.c:757
+#: src/protocols/toc/toc.c:758
 msgid "Chat Error"
 msgstr "Chat-virhe"
 
-#: src/protocols/toc/toc.c:776
+#: src/protocols/toc/toc.c:777
 msgid "Password Change Successeful"
 msgstr "Salasanan vaihto onnistui"
 
-#: src/dialogs.c:1491 src/protocols/toc/toc.c:776
+#: src/dialogs.c:1607 src/protocols/toc/toc.c:777
 msgid "Gaim - Password Change"
 msgstr "Gaim - Salasanan vaihto"
 
-#: src/protocols/toc/toc.c:779
+#: src/protocols/toc/toc.c:780
 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 ""
 "TOC on lähettänyt PAUSE-komennon. Kun tämä tapahtuu, TOC ei välitä mistään "
-"sille lähetetyistä virheistä ja voi potkaista sinut ulos jos lähetät viestin. "
-"Gaim estää kaiken läpimenon. Tämä on vain väliaikaista, ole kärsivällinen."
-
-#: src/protocols/toc/toc.c:782
+"sille lähetetyistä virheistä ja voi potkaista sinut ulos jos lähetät "
+"viestin. Gaim estää kaiken läpimenon. Tämä on vain väliaikaista, ole "
+"kärsivällinen."
+
+#: src/protocols/toc/toc.c:783
 msgid "TOC Pause"
 msgstr "TOC-tauko"
 
-#: src/protocols/toc/toc.c:1206
+#: src/protocols/toc/toc.c:1207
 msgid "Get Dir Info"
 msgstr "Hae hakemistotiedot"
 
-#: src/protocols/toc/toc.c:1622 src/protocols/toc/toc.c:1664
-#: src/protocols/toc/toc.c:1783 src/protocols/toc/toc.c:1869
+#: src/protocols/toc/toc.c:1623 src/protocols/toc/toc.c:1665
+#: src/protocols/toc/toc.c:1784 src/protocols/toc/toc.c:1870
 msgid "Could not connect for transfer!"
 msgstr "Yhteyttä siirtoa varten ei voitu muodostaa!"
 
-#: src/protocols/toc/toc.c:1813
+#: src/protocols/toc/toc.c:1814
 msgid "Could not write file header!"
 msgstr "Ei voitu kirjoittaa tiedoston otsikkoa!"
 
-#: src/protocols/toc/toc.c:1902
+#: src/protocols/toc/toc.c:1903
 msgid "Gaim - Save As..."
 msgstr "Gaim - Tallenna nimellä..."
 
-#: src/protocols/toc/toc.c:1941
-#, c-format
-msgid "%s requests %s to accept %d file%s: %s (%.2f %s)%s%s"
+#: src/protocols/toc/toc.c:1944
+#, fuzzy, c-format
+msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgstr "%s pyytää %s hyväksymään %d tiedoston%s: %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:1946
+#: src/protocols/toc/toc.c:1945
+#, fuzzy, c-format
+msgid "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+msgstr "%s pyytää %s hyväksymään %d tiedoston%s: %s (%.2f %s)%s%s"
+
+#: src/protocols/toc/toc.c:1950
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s pyytää sinua lähettämään hänelle tiedoston"
 
-#: src/protocols/yahoo/yahoo.c:500
+#: src/protocols/yahoo/yahoo.c:501
 msgid "Your message did not get sent."
 msgstr "Viestiäsi ei lähetetty."
 
-#: src/protocols/zephyr/zephyr.c:778
+#: src/protocols/zephyr/zephyr.c:802
 msgid "ZLocate"
 msgstr "ZLocate"
 
-#: src/protocols/zephyr/zephyr.c:815
+#: src/protocols/zephyr/zephyr.c:839
 msgid "Class:"
 msgstr "Luokka:"
 
-#: src/protocols/zephyr/zephyr.c:819
+#: src/protocols/zephyr/zephyr.c:843
 msgid "Instance:"
 msgstr "Ilmentymä:"
 
-#: src/protocols/zephyr/zephyr.c:823
+#: src/protocols/zephyr/zephyr.c:847
 msgid "Recipient:"
 msgstr "Vastaanottaja:"
 
-#: src/about.c:94
+#: src/about.c:93
 #, c-format
 msgid "About Gaim v%s"
 msgstr "Tietoja Gaim:ista v%s"
 
-#: src/about.c:127
+#: src/about.c:126
 msgid ""
 "Gaim is a client that supports AOL's Instant Messenger protocol. It is "
 "written\n"
@@ -753,159 +957,124 @@
 "\n"
 "URL: "
 
-#: src/about.c:128
-msgid ""
-"\n"
-"\n"
-"IRC: #gaim on irc.openprojects.net"
-msgstr ""
-"\n"
-"\n"
-"IRC: #gaim irc.openprojects.net:issä"
-
 #: src/about.c:137
 msgid ""
-"Rob Flynn (maintainer)               rob@marko.net\n"
-"Eric Warmenhoven (lead coder)  warmenhoven@yahoo.com\n"
+"Active Developers\n"
+"====================\n"
+"Rob Flynn (maintainer) [ rob@marko.net ]\n"
+"Sean Egan (coder)      [ bj91704@binghamton.edu ]\n"
 "\n"
+"Crazy Patch Writers\n"
+"===================\n"
 "Benjamin Miller\n"
 "Decklin Foster\n"
-"Sean Egan\n"
+"\n"
+"Retired Developers\n"
+"===================\n"
 "Jim Duchek\n"
-"Mark Spencer (original author)   markster@marko.net"
+"Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
+"Mark Spencer (original author)   [ markster@marko.net ]"
 msgstr ""
-"Rob Flynn (ylläpitäjä)                  rob@marko.net\n"
-"Eric Warmenhoven (pääohjelmoija)  warmenhoven@yahoo.com\n"
-"\n"
-"Benjamin Miller\n"
-"Decklin Foster\n"
-"Sean Egan\n"
-"Jim Duchek\n"
-"Mark Spencer (alkuperäinen tekijä) markster@marko.net"
-
-#: src/about.c:148 src/about.c:213 src/aim.c:295 src/buddy.c:2408
-#: src/buddy_chat.c:1301 src/buddy_chat.c:1398 src/buddy_chat.c:1428
-#: src/conversation.c:2293 src/dialogs.c:447 src/dialogs.c:3634
-#: src/multi.c:1002 src/plugins.c:277 src/prefs.c:2416 src/prpl.c:438
+
+#: src/about.c:155 src/aim.c:296 src/buddy.c:2469 src/buddy_chat.c:1311
+#: src/buddy_chat.c:1408 src/buddy_chat.c:1438 src/conversation.c:2417
+#: src/dialogs.c:563 src/dialogs.c:3777 src/multi.c:1026 src/plugins.c:277
+#: src/prefs.c:2496 src/prpl.c:438 src/prpl.c:679 src/server.c:991
 msgid "Close"
 msgstr "Sulje"
 
 #. this makes the sizes not work.
 #. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
 #. gtk_widget_grab_default(button);
-#: src/about.c:168
+#: src/about.c:175
 msgid "Web Site"
 msgstr "Web-sivusto"
 
-#: src/about.c:223
-msgid ""
-"Relax, help is just around the corner. The first thing you'll need to do is "
-"get an AIM account; you can get one from http://aim.aol.com/. Just click the "
-"button that says \"New Users\" and you can create an account that way. Once "
-"you have your account, enter the username and password into the login window "
-"that comes up when you start Gaim, and click the Signon button. Once you're "
-"online, you can talk to one of the Gaim developers for more assistance; their "
-"contact information is in the AUTHORS file in the Gaim source, or at "
-msgstr ""
-"Rauhoitu, apu on heti nurkan takana. Ensimmäinen asia, joka sinun täytyy "
-"tehdä, on AIM-tilin hankkiminen. Voit tehdä sen sivustolla "
-"http://aim.aol.com/. Napsauta vain nappia jossa lukee \"New Users\" ja voit "
-"luoda tilin sitä kautta. Kun sinulla on tili, kirjoita käyttäjänimesi ja "
-"salasanasi sisäänkirjautumisikkunaan, joka ilmestyy kun käynnistät Gaim:in, "
-"ja napsauta sisäänkirjautumisnappia. Kun olet kirjautunut sisään, voit "
-"keskustella yhdelle Gaim:in kehittäjistä lisäavun saamiseksi - heidän "
-"yhteystietonsa löytyvät AUTHORS-tiedostosta Gaim:in lähdekoodissa tai sivulta "
-""
-
-#: src/about.c:234
-msgid ""
-"contactinfo.php. If you can't get online and still need more assistance, feel "
-"free to email us at gaim@marko.net. Thanks for using Gaim!"
-msgstr ""
-"contactinfo.php. Jos et pääse kirjautumaan sisään ja kaipaat yhä lisäapua, "
-"voit vapaasti lähettää meille sähköpostia osoitteeseen gaim@marko.net. Kiitos "
-"että käytät Gaim:ia!"
-
-#: src/aim.c:128 src/buddy.c:2401
+#: src/aim.c:129 src/buddy.c:2462
 msgid "Signoff"
 msgstr "Kirjaudu ulos"
 
-#: src/aim.c:140
+#: src/aim.c:141
 msgid "Please enter your logon"
 msgstr "Anna sisäänkirjautumistietosi"
 
-#: src/aim.c:140 src/multi.c:1231 src/server.c:53
+#: src/aim.c:141 src/multi.c:1276 src/server.c:55
 msgid "Signon Error"
 msgstr "Sisäänkirjautumisvirhe"
 
-#: src/aim.c:238
+#: src/aim.c:239
 msgid "Gaim - Login"
 msgstr "Gaim - Sisäänkirjautuminen"
 
-#: src/aim.c:256
+#: src/aim.c:257
 msgid "Screen Name: "
 msgstr "Näyttönimi: "
 
-#: src/aim.c:272
+#: src/aim.c:273
 msgid "Password: "
 msgstr "Salasana: "
 
-#: src/aim.c:293 src/buddy.c:2405
+#: src/aim.c:294 src/buddy.c:2466
 msgid "Quit"
 msgstr "Lopeta"
 
-#: src/aim.c:298 src/aim.c:745 src/buddy.c:2431
+#: src/aim.c:299 src/aim.c:755 src/buddy.c:2492
 msgid "Accounts"
 msgstr "Tilit"
 
-#: src/aim.c:300 src/multi.c:854
+#: src/aim.c:301 src/multi.c:878
 msgid "Signon"
 msgstr "Kirjaudu sisään"
 
-#: src/aim.c:332
-msgid "Help!"
-msgstr "Apua!"
+#: src/aim.c:333
+#, fuzzy
+msgid "About"
+msgstr "Tietoja..."
 
 # src/menus.c:311
-#: src/aim.c:333 src/prefs.c:1525 src/prefs.c:1800
+#: src/aim.c:334 src/prefs.c:1580 src/prefs.c:1854
 msgid "Options"
 msgstr "Asetukset"
 
 #. Left side: frame with list of plugin file names
-#: src/aim.c:335 src/aim.c:748 src/buddy.c:2449 src/plugins.c:192
+#: src/aim.c:336 src/aim.c:758 src/buddy.c:2510 src/plugins.c:192
 msgid "Plugins"
 msgstr "Lisäohjelmat"
 
-#: src/aim.c:742 src/buddy.c:2441
+#: src/aim.c:752 src/buddy.c:2502
 msgid "Preferences"
 msgstr "Asetukset"
 
-#: src/applet.c:197
+#: src/applet.c:199
 msgid "Attempting to sign on...."
 msgstr "Yritetään kirjautua sisään..."
 
-#: src/applet.c:200
+#: src/applet.c:202
 msgid "Offline. Click to bring up login box."
 msgstr "Ei sisäänkirjautuneena. Napsauta avataksesi sisäänkirjautumisruudun."
 
-#: src/applet.c:216
+#: src/applet.c:218
 #, c-format
 msgid "Away: %d pending."
 msgstr "Poissa: %d keskeneräisiä."
 
-#: src/applet.c:219
+#: src/applet.c:221
 msgid "Away."
 msgstr "Poissa."
 
-#: src/applet.c:294 src/away.c:387
+#: src/applet.c:293 src/buddy.c:487 src/buddy.c:2344 src/buddy.c:2480
+msgid "Away"
+msgstr "Poissa"
+
+#: src/applet.c:296 src/away.c:389
 msgid "New Away Message"
 msgstr "Uusi poissaoloviesti"
 
-#: src/applet.c:441
+#: src/applet.c:443
 msgid "Can't create Gaim applet!"
 msgstr "Ei voitu luoda Gaim-sovelmaa!"
 
-#: src/applet.c:462
+#: src/applet.c:464
 msgid "About..."
 msgstr "Tietoja..."
 
@@ -913,137 +1082,100 @@
 msgid "Gaim - Away!"
 msgstr "Gaim - Poissa!"
 
-#: src/away.c:249
+#: src/away.c:251
 msgid "I'm Back!"
 msgstr "Olen palannut!"
 
 # src/menus.c:327
-#: src/away.c:265 src/away.c:345 src/away.c:519
+#: src/away.c:267 src/away.c:347 src/away.c:521
 msgid "Back"
 msgstr "Palaa"
 
-#: src/away.c:407
+#: src/away.c:409
 msgid "Remove Away Message"
 msgstr "Poista poissaoloviesti"
 
-#: src/away.c:595
+#: src/away.c:597
 msgid "Set All Away"
 msgstr "Aseta kaikki poissaoleviksi"
 
 #. Put the buttons in the box
-#: src/buddy.c:473 src/buddy.c:2518 src/buddy_chat.c:1433
-#: src/conversation.c:1934 src/conversation.c:2308 src/dialogs.c:765
-#: src/dialogs.c:949 src/dialogs.c:1831 src/multi.c:986 src/prefs.c:1914
-#: src/prefs.c:2256 src/prefs.c:2290
+#: src/buddy.c:482 src/buddy.c:2579 src/buddy_chat.c:1443
+#: src/conversation.c:2043 src/conversation.c:2432 src/dialogs.c:881
+#: src/dialogs.c:1065 src/dialogs.c:1968 src/multi.c:1010 src/prefs.c:1990
+#: src/prefs.c:2332 src/prefs.c:2366
 msgid "Add"
 msgstr "Lisää"
 
-#: src/buddy.c:474 src/buddy.c:2519 src/dialogs.c:775 src/dialogs.c:922
+#: src/buddy.c:483 src/buddy.c:2580 src/dialogs.c:891 src/dialogs.c:1038
 msgid "Group"
 msgstr "Ryhmä"
 
-#: src/buddy.c:475 src/buddy.c:2520 src/buddy_chat.c:1435
-#: src/conversation.c:1920 src/conversation.c:2305 src/prefs.c:1928
-#: src/prefs.c:2260 src/prefs.c:2294
+#: src/buddy.c:484 src/buddy.c:2581 src/buddy_chat.c:1445
+#: src/conversation.c:2029 src/conversation.c:2429 src/prefs.c:2004
+#: src/prefs.c:2336 src/prefs.c:2370
 msgid "Remove"
 msgstr "Poista"
 
-#: src/buddy.c:479 src/buddy.c:1898 src/buddy.c:2282 src/prefs.c:2741
-msgid "Chat"
-msgstr "Chatti"
-
-#: src/buddy.c:480 src/buddy.c:616 src/buddy.c:759 src/buddy.c:2280
-#: src/buddy_chat.c:820 src/buddy_chat.c:1257
+#: src/buddy.c:489 src/buddy.c:627 src/buddy.c:774 src/buddy.c:2341
+#: src/buddy_chat.c:850 src/buddy_chat.c:1267
 msgid "IM"
 msgstr "Pikaviesti"
 
-#: src/buddy.c:481 src/buddy.c:2281 src/buddy_chat.c:836 src/buddy_chat.c:1265
-#: src/buddy_chat.c:1441 src/conversation.c:2326
+#: src/buddy.c:490 src/buddy.c:2342 src/buddy_chat.c:866 src/buddy_chat.c:1275
+#: src/buddy_chat.c:1451 src/conversation.c:2450
 msgid "Info"
 msgstr "Tietoja"
 
 #. Put the buttons in the box
-#: src/buddy.c:621 src/buddy.c:764 src/dialogs.c:914 src/dialogs.c:3195
-#: src/dialogs.c:3210
+#: src/buddy.c:632 src/buddy.c:779 src/dialogs.c:1030 src/dialogs.c:3336
+#: src/dialogs.c:3351
 msgid "Alias"
 msgstr "Alias"
 
-#: src/buddy.c:626 src/buddy.c:783
+#: src/buddy.c:637 src/buddy.c:798
 msgid "Add Buddy Pounce"
 msgstr "Lisää tuttavailmoitin"
 
-#: src/buddy.c:633 src/buddy.c:789
+#: src/buddy.c:644 src/buddy.c:804
 msgid "View Log"
 msgstr "Näytä loki"
 
-#: src/buddy.c:748 src/buddy.c:777
+#: src/buddy.c:761 src/buddy.c:792
 msgid "Rename"
 msgstr "Vaihda nimi"
 
-#: src/buddy.c:771
+#: src/buddy.c:786
 msgid "Un-Alias"
 msgstr "Poista alias"
 
-#: src/buddy.c:1476 src/buddy.c:2424
+#: src/buddy.c:1493 src/buddy.c:2485
 msgid "Buddy Pounce"
 msgstr "Tuttavailmoitin"
 
-#: src/buddy.c:1548
+#: src/buddy.c:1565
 msgid "New Buddy Pounce"
 msgstr "Uusi tuttavailmoitin"
 
-#: src/buddy.c:1566
+#: src/buddy.c:1583
 msgid "Remove Buddy Pounce"
 msgstr "Poista tuttavailmoitin"
 
-#: src/buddy.c:1889
-msgid "Buddy Icon"
-msgstr "Tuttavakuvake"
-
-#: src/buddy.c:1892
-msgid "Voice"
-msgstr "Ääni"
-
-#: src/buddy.c:1895
-msgid "IM Image"
-msgstr "Pikaviestikuva"
-
-#: src/buddy.c:1901
-msgid "Get File"
-msgstr "Vastaanota tiedosto"
-
-#: src/buddy.c:1904
-msgid "Send File"
-msgstr "Lähetä tiedosto"
-
-#: src/buddy.c:1908
-msgid "Games"
-msgstr "Pelit"
-
-#: src/buddy.c:1911
-msgid "Stocks"
-msgstr "Osakkeet"
-
-#: src/buddy.c:1914
-msgid "EveryBuddy Bug"
-msgstr "EveryBuddy-virhe"
-
-#: src/buddy.c:1985
+#: src/buddy.c:2029
 #, c-format
 msgid "Logged in: %s\n"
 msgstr "%s kirjautuneena sisään\n"
 
-#: src/buddy.c:1997
-#, c-format
+#: src/buddy.c:2041
 msgid "Warnings: %d%%\n"
 msgstr "Varoitukset: %d%%\n"
 
-#: src/buddy.c:2009
+#: src/buddy.c:2053
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr "Kykeneväisyydet: %s\n"
 
-#: src/buddy.c:2013
+#: src/buddy.c:2057
 #, c-format
 msgid ""
 "Alias: %s               \n"
@@ -1054,121 +1186,121 @@
 "Näyttönimi: %s\n"
 "%s%s%s%s%s%s"
 
-#: src/buddy.c:2017
+#: src/buddy.c:2061
 msgid "Idle: "
 msgstr "Jouten: "
 
-#: src/buddy.c:2087
+#: src/buddy.c:2132 src/buddy.c:2136
 #, c-format
 msgid "%s logged in."
 msgstr "%s kirjautui sisään."
 
-#: src/buddy.c:2142
+#: src/buddy.c:2195 src/buddy.c:2199
 #, c-format
 msgid "%s logged out."
 msgstr "%s kirjautui ulos."
 
-#: src/buddy.c:2315
+#: src/buddy.c:2376
 msgid "Information on selected Buddy"
 msgstr "Tietoja valitusta tuttavasta"
 
-#: src/buddy.c:2316 src/dialogs.c:572
+#: src/buddy.c:2377 src/dialogs.c:688
 msgid "Send Instant Message"
 msgstr "Lähetä pikaviesti"
 
-#: src/buddy.c:2317
+#: src/buddy.c:2378
 msgid "Start/join a Buddy Chat"
 msgstr "Aloita/liity tuttavachattiin"
 
-#: src/buddy.c:2318
+#: src/buddy.c:2379
 msgid "Activate Away Message"
 msgstr "Aktivoi poissaoloviesti"
 
-#: src/buddy.c:2381
+#: src/buddy.c:2442
 msgid "File"
 msgstr "Tiedosto"
 
-#: src/buddy.c:2385
+#: src/buddy.c:2446
 msgid "Add A Buddy"
 msgstr "Lisää tuttava"
 
-#: src/buddy.c:2387
+#: src/buddy.c:2448
 msgid "Join A Chat"
 msgstr "Liity chattiin"
 
-#: src/buddy.c:2389
+#: src/buddy.c:2450
 msgid "New Instant Message"
 msgstr "Uusi pikaviesti"
 
-#: src/buddy.c:2391 src/dialogs.c:624
+#: src/buddy.c:2452 src/dialogs.c:740
 msgid "Get User Info"
 msgstr "Hae käyttäjätiedot"
 
-#: src/buddy.c:2396
+#: src/buddy.c:2457
 msgid "Import Buddy List"
 msgstr "Tuo tuttavalista"
 
-#: src/buddy.c:2414
+#: src/buddy.c:2475
 msgid "Tools"
 msgstr "Työkalut"
 
-#: src/buddy.c:2437
+#: src/buddy.c:2498
 msgid "Protocol Actions"
 msgstr "Protokollatoiminnot"
 
-#: src/buddy.c:2443
+#: src/buddy.c:2504
 msgid "View System Log"
 msgstr "Näytä järjestelmän loki"
 
-#: src/buddy.c:2455
+#: src/buddy.c:2516
 msgid "Perl"
 msgstr "Perl"
 
-#: src/buddy.c:2458
+#: src/buddy.c:2519
 msgid "Load Script"
 msgstr "Lataa skripti"
 
-#: src/buddy.c:2462
+#: src/buddy.c:2523
 msgid "Unload All Scripts"
 msgstr "Poista kaikki skriptit"
 
-#: src/buddy.c:2466
+#: src/buddy.c:2527
 msgid "List Scripts"
 msgstr "Listaa skriptit"
 
-#: src/buddy.c:2474
+#: src/buddy.c:2535
 msgid "Help"
 msgstr "Apua"
 
-#: src/buddy.c:2479
+#: src/buddy.c:2540
 msgid "About Gaim"
 msgstr "Gaim:ista"
 
-#: src/buddy.c:2498 src/prefs.c:2720
+#: src/buddy.c:2559 src/prefs.c:2816
 msgid "Buddy List"
 msgstr "Tuttavalista"
 
-#: src/buddy.c:2551
+#: src/buddy.c:2612
 msgid "Add a new Buddy"
 msgstr "Lisää uusi tuttava"
 
-#: src/buddy.c:2552
+#: src/buddy.c:2613
 msgid "Add a new Group"
 msgstr "Lisää uusi ryhmä"
 
-#: src/buddy.c:2553
+#: src/buddy.c:2614
 msgid "Remove selected Buddy/Group"
 msgstr "Poista valittu tuttava/ryhmä"
 
-#: src/buddy.c:2578
+#: src/buddy.c:2639
 msgid "Online"
 msgstr "Kirjautuneena sisään"
 
-#: src/buddy.c:2580
+#: src/buddy.c:2641
 msgid "Edit Buddies"
 msgstr "Muokkaa tuttavia"
 
-#: src/buddy.c:2620
+#: src/buddy.c:2681
 msgid "Gaim - Buddy List"
 msgstr "Gaim - Tuttavalista"
 
@@ -1184,13 +1316,13 @@
 msgid "Join Chat As:"
 msgstr "Liity chattiin nimellä:"
 
-#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:420
-#: src/dialogs.c:590 src/dialogs.c:648 src/dialogs.c:767 src/dialogs.c:945
-#: src/dialogs.c:1234 src/dialogs.c:1439 src/dialogs.c:1563 src/dialogs.c:1623
-#: src/dialogs.c:1820 src/dialogs.c:2002 src/dialogs.c:2177 src/dialogs.c:2248
-#: src/dialogs.c:2940 src/dialogs.c:3197 src/dialogs.c:3378 src/dialogs.c:3747
-#: src/dialogs.c:3852 src/multi.c:720 src/multi.c:850 src/multi.c:1184
-#: src/prpl.c:150 src/prpl.c:224
+#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:444
+#: src/dialogs.c:535 src/dialogs.c:706 src/dialogs.c:764 src/dialogs.c:883
+#: src/dialogs.c:1061 src/dialogs.c:1350 src/dialogs.c:1555 src/dialogs.c:1679
+#: src/dialogs.c:1739 src/dialogs.c:1957 src/dialogs.c:2139 src/dialogs.c:2314
+#: src/dialogs.c:2385 src/dialogs.c:3081 src/dialogs.c:3338 src/dialogs.c:3519
+#: src/dialogs.c:3890 src/dialogs.c:3996 src/dialogs.c:4642 src/multi.c:744
+#: src/multi.c:874 src/multi.c:1208 src/prpl.c:150 src/prpl.c:224
 msgid "Cancel"
 msgstr "Peruuta"
 
@@ -1198,17 +1330,17 @@
 msgid "Join"
 msgstr "Liity"
 
-#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1307
-#: src/buddy_chat.c:1397
+#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1317
+#: src/buddy_chat.c:1407
 msgid "Invite"
 msgstr "Kutsu"
 
-#: src/buddy_chat.c:412 src/dialogs.c:1114 src/dialogs.c:3205
+#: src/buddy_chat.c:412 src/dialogs.c:1230 src/dialogs.c:3346
 msgid "Buddy"
 msgstr "Tuttava"
 
 # src/sidebar.c:103
-#: src/buddy_chat.c:417 src/prefs.c:1879
+#: src/buddy_chat.c:417 src/prefs.c:1953
 msgid "Message"
 msgstr "Viesti"
 
@@ -1216,628 +1348,651 @@
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - Kutsu tuttava chattihuoneeseen"
 
-#: src/buddy_chat.c:827
+#: src/buddy_chat.c:857
 msgid "Un-Ignore"
 msgstr "Välitä"
 
-#: src/buddy_chat.c:829 src/buddy_chat.c:1261
+#: src/buddy_chat.c:859 src/buddy_chat.c:1271
 msgid "Ignore"
 msgstr "Älä välitä"
 
 #. don't remove them from ignored in case they re-enter
-#: src/buddy_chat.c:873 src/buddy_chat.c:993
+#: src/buddy_chat.c:922 src/buddy_chat.c:1034 src/buddy_chat.c:1497
+#: src/buddy_chat.c:1530
 #, c-format
 msgid "%d %s in room"
 msgstr "%d %s huoneessa"
 
-#: src/buddy_chat.c:881
+#: src/buddy_chat.c:930
 #, c-format
 msgid "%s entered the room."
 msgstr "%s saapui huoneeseen."
 
-#: src/buddy_chat.c:955
+#: src/buddy_chat.c:996
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s on nyt nimeltään %s"
 
-#: src/buddy_chat.c:1001
+#: src/buddy_chat.c:1043
+#, fuzzy, c-format
+msgid "%s left the room (%s)."
+msgstr "%s poistui huoneesta."
+
+#: src/buddy_chat.c:1045
 #, c-format
 msgid "%s left the room."
 msgstr "%s poistui huoneesta."
 
-#: src/buddy_chat.c:1136
+#: src/buddy_chat.c:1144
 msgid "Gaim - Group Chats"
 msgstr "Gaim - Ryhmächatit"
 
-#: src/buddy_chat.c:1197
+#: src/buddy_chat.c:1207
 msgid "Topic:"
 msgstr "Aihe:"
 
-#: src/buddy_chat.c:1238
+#: src/buddy_chat.c:1248
 msgid "0 people in room"
 msgstr "0 ihmistä huoneessa"
 
-#: src/buddy_chat.c:1312 src/buddy_chat.c:1396
+#: src/buddy_chat.c:1322 src/buddy_chat.c:1406
 msgid "Whisper"
 msgstr "Kuiskaa"
 
-#: src/buddy_chat.c:1317 src/buddy_chat.c:1394 src/buddy_chat.c:1443
-#: src/conversation.c:2337
+#: src/buddy_chat.c:1327 src/buddy_chat.c:1404 src/buddy_chat.c:1453
+#: src/conversation.c:2461
 msgid "Send"
 msgstr "Lähetä"
 
-#: src/buddy_chat.c:1437 src/conversation.c:2314
+#: src/buddy_chat.c:1447 src/conversation.c:2438
 msgid "Block"
 msgstr "Estä"
 
-#: src/buddy_chat.c:1439 src/conversation.c:2320 src/dialogs.c:391
-#: src/dialogs.c:416
+#: src/buddy_chat.c:1449 src/conversation.c:2444 src/dialogs.c:419
+#: src/dialogs.c:448
 msgid "Warn"
 msgstr "Varoita"
 
-#: src/conversation.c:387
+#: src/conversation.c:392
 msgid "Gaim - Save Conversation"
 msgstr "Gaim - Tallenna keskustelu"
 
-#: src/conversation.c:544
-#, c-format
-msgid "Removing '%s' from buddylist.\n"
-msgstr "Poistetaan \"%s\" tuttavalistalta.\n"
-
-#: src/conversation.c:925
+#: src/conversation.c:1037
 msgid "Unable to send message: too large"
 msgstr "Viestiä ei voitu lähettää: liian suuri"
 
-#: src/conversation.c:925 src/conversation.c:927
+#: src/conversation.c:1037 src/conversation.c:1039
 msgid "Message Error"
 msgstr "Viestivirhe"
 
-#: src/conversation.c:927
+#: src/conversation.c:1039
 msgid "Unable to send message: Unknown reason"
 msgstr "Viestiä ei voitu lähettää: Tuntematon syy"
 
-#: src/conversation.c:1146
+#: src/conversation.c:1258
 #, c-format
 msgid "Currently at %d, "
 msgstr "Parhaillaan %d:ssa, "
 
-#: src/conversation.c:1154
+#: src/conversation.c:1266
 #, c-format
 msgid "Setting position to %d\n"
 msgstr "Asetetaan sijainniksi %d\n"
 
-#: src/conversation.c:1725 src/prefs.c:1233
+#: src/conversation.c:1832 src/prefs.c:1274
 msgid "Bold Text"
 msgstr "Lihavoi teksti"
 
-#: src/conversation.c:1725
+#: src/conversation.c:1832
 msgid "Bold"
 msgstr "Lihavoi"
 
-#: src/conversation.c:1729
+#: src/conversation.c:1836
 msgid "Italics Text"
 msgstr "Kursivoi teksti"
 
-#: src/conversation.c:1730
+#: src/conversation.c:1837
 msgid "Italics"
 msgstr "Kursivoi"
 
-#: src/conversation.c:1733 src/prefs.c:1245
+#: src/conversation.c:1840 src/prefs.c:1286
 msgid "Underline Text"
 msgstr "Alleviivaa teksti"
 
-#: src/conversation.c:1734
+#: src/conversation.c:1841
 msgid "Underline"
 msgstr "Alleviivaa"
 
-#: src/conversation.c:1738 src/prefs.c:1251
+#: src/conversation.c:1845 src/prefs.c:1292
 msgid "Strike through Text"
 msgstr "Yliviivaa teksti"
 
-#: src/conversation.c:1738
+#: src/conversation.c:1845
 msgid "Strike"
 msgstr "Yliviivaa"
 
-#: src/conversation.c:1744
+#: src/conversation.c:1851
 msgid "Decrease font size"
 msgstr "Pienennä fonttikokoa"
 
-#: src/conversation.c:1744
+#: src/conversation.c:1851
 msgid "Small"
 msgstr "Pieni"
 
-#: src/conversation.c:1747
+#: src/conversation.c:1854
 msgid "Normal font size"
 msgstr "Normaali fonttikoko"
 
-#: src/conversation.c:1747
+#: src/conversation.c:1854
 msgid "Normal"
 msgstr "Normaali"
 
-#: src/conversation.c:1750
+#: src/conversation.c:1857
 msgid "Increase font size"
 msgstr "Suurenna fonttikokoa"
 
-#: src/conversation.c:1750
+#: src/conversation.c:1857
 msgid "Big"
 msgstr "Suuri"
 
-#: src/conversation.c:1757 src/dialogs.c:2628 src/dialogs.c:2647
+#: src/conversation.c:1864 src/dialogs.c:2756 src/dialogs.c:2780
 msgid "Select Font"
 msgstr "Valitse fontti"
 
-#: src/conversation.c:1758
+#: src/conversation.c:1865
 msgid "Font"
 msgstr "Fontti"
 
-#: src/conversation.c:1761 src/prefs.c:1281
+#: src/conversation.c:1868 src/prefs.c:1322
 msgid "Text Color"
 msgstr "Tekstin väri"
 
-#: src/conversation.c:1762 src/conversation.c:1766
+#: src/conversation.c:1869 src/conversation.c:1873
 msgid "Color"
 msgstr "Väri"
 
-#: src/conversation.c:1766 src/prefs.c:1299
+#: src/conversation.c:1873 src/prefs.c:1340
 msgid "Background Color"
 msgstr "Taustaväri"
 
-#: src/conversation.c:1773 src/dialogs.c:2242
+#: src/conversation.c:1880 src/dialogs.c:2379
 msgid "Insert Link"
 msgstr "Lisää linkki"
 
-#: src/conversation.c:1774
+#: src/conversation.c:1881
 msgid "Link"
 msgstr "Linkki"
 
-#: src/conversation.c:1777
+#: src/conversation.c:1884
 msgid "Insert smiley face"
 msgstr "Lisää hymiö"
 
-#: src/conversation.c:1777
+#: src/conversation.c:1884
 msgid "Smiley"
 msgstr "Hymiö"
 
-#: src/conversation.c:1784
+#: src/conversation.c:1891
 msgid "Enable logging"
 msgstr "Ota käyttöön kirjaaminen lokiin"
 
-#: src/conversation.c:1785 src/prefs.c:244
+#: src/conversation.c:1892 src/prefs.c:244
 msgid "Logging"
 msgstr "Kirjataan lokiin"
 
-#: src/conversation.c:1794
+#: src/conversation.c:1901
 msgid "Save Conversation"
 msgstr "Tallenna keskustelu"
 
 # src/menus.c:280
-#: src/conversation.c:1795 src/dialogs.c:1443 src/dialogs.c:1627
-#: src/dialogs.c:2952 src/dialogs.c:3643
+#: src/conversation.c:1902 src/dialogs.c:1559 src/dialogs.c:1743
+#: src/dialogs.c:3093 src/dialogs.c:3786 src/dialogs.c:4649
 msgid "Save"
 msgstr "Tallenna"
 
-#: src/conversation.c:1799
+#: src/conversation.c:1906
 msgid "Enable sounds"
 msgstr "Ota äänet käyttöön"
 
-#: src/conversation.c:1800
+#: src/conversation.c:1907
 msgid "Sound"
 msgstr "Ääni"
 
-#: src/conversation.c:2166
+#: src/conversation.c:2290
 msgid "Gaim - Conversations"
 msgstr "Gaim - Keskustelut"
 
-#: src/conversation.c:2253
+#: src/conversation.c:2377
 msgid "Send message as: "
 msgstr "Lähetä viesti nimellä: "
 
-#: src/conversation.c:2742
+#: src/conversation.c:2986
 msgid "Gaim - Save Icon"
 msgstr "Gaim - Tallenna kuvake"
 
-#: src/conversation.c:2769
+#: src/conversation.c:3013
 msgid "Disable Animation"
 msgstr "Poista animaatio käytöstä"
 
-#: src/conversation.c:2774
+#: src/conversation.c:3018
 msgid "Enable Animation"
 msgstr "Ota animaatio käyttöön"
 
-#: src/conversation.c:2780
+#: src/conversation.c:3024
 msgid "Hide Icon"
 msgstr "Piilota kuvake"
 
-#: src/conversation.c:2786
+#: src/conversation.c:3030
 msgid "Save Icon As..."
 msgstr "Tallenna kuvake nimellä..."
 
-#: src/dialogs.c:379
+#: src/dialogs.c:407
 msgid "Gaim - Warn user?"
 msgstr "Gaim - Varoita käyttäjää?"
 
-#: src/dialogs.c:399
+#: src/dialogs.c:427
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "Haluatko todella varoittaa käyttäjää %s?"
 
-#: src/dialogs.c:404
+#: src/dialogs.c:432
 msgid "Warn anonymously?"
 msgstr "Varoita nimettömänä?"
 
-#: src/dialogs.c:408
+#: src/dialogs.c:436
 msgid "Anonymous warnings are less harsh."
 msgstr "Nimettömät varoitukset ovat vähemmän ankaria."
 
+#: src/dialogs.c:464
+#, c-format
+msgid "Removing '%s' from buddylist.\n"
+msgstr "Poistetaan \"%s\" tuttavalistalta.\n"
+
+#: src/dialogs.c:490
+#, fuzzy, c-format
+msgid "Gaim - Remove %s?"
+msgstr "Gaim - Vaihda ryhmän nimeä"
+
+#: src/dialogs.c:503
+#, fuzzy
+msgid "Remove Buddy"
+msgstr "Vaihda tuttavan nimeä"
+
+#: src/dialogs.c:513
+#, c-format
+msgid ""
+"You are about to remove '%s' from\n"
+"your buddylist. Do you want to continue?"
+msgstr ""
+
+#: src/dialogs.c:525 src/prpl.c:154 src/prpl.c:228
+msgid "Accept"
+msgstr "Hyväksy"
+
 #. Build OK Button
-#: src/dialogs.c:516 src/dialogs.c:595 src/dialogs.c:653 src/dialogs.c:1238
-#: src/dialogs.c:1567 src/dialogs.c:1680 src/dialogs.c:2001 src/dialogs.c:2181
-#: src/dialogs.c:2247 src/dialogs.c:3752 src/dialogs.c:3857 src/multi.c:725
+#: src/dialogs.c:632 src/dialogs.c:711 src/dialogs.c:769 src/dialogs.c:1354
+#: src/dialogs.c:1683 src/dialogs.c:1830 src/dialogs.c:2138 src/dialogs.c:2318
+#: src/dialogs.c:2384 src/dialogs.c:3895 src/dialogs.c:4001 src/multi.c:749
 msgid "OK"
 msgstr "OK"
 
-#: src/dialogs.c:562
+#: src/dialogs.c:678
 msgid "Gaim - IM user"
 msgstr "Gaim - Pikaviestimen käyttäjä"
 
-#: src/dialogs.c:579
+#: src/dialogs.c:695
 msgid "IM who:"
 msgstr "Pikaviesti kenelle:"
 
-#: src/dialogs.c:631
+#: src/dialogs.c:747
 msgid "User:"
 msgstr "Käyttäjä:"
 
 #. Finish up
-#: src/dialogs.c:658
+#: src/dialogs.c:774
 msgid "Gaim - Get User Info"
 msgstr "Gaim - Hae käyttäjätiedot"
 
-#: src/dialogs.c:720
+#: src/dialogs.c:836
 msgid "Buddies"
 msgstr "Tuttavat"
 
-#: src/dialogs.c:773
+#: src/dialogs.c:889
 msgid "Add Group"
 msgstr "Lisää ryhmä"
 
-#: src/dialogs.c:798
+#: src/dialogs.c:914
 msgid "Gaim - Add Group"
 msgstr "Gaim - Lisää ryhmä"
 
-#: src/dialogs.c:882
+#: src/dialogs.c:998
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Lisää tuttava"
 
-#: src/dialogs.c:894
+#: src/dialogs.c:1010
 msgid "Add Buddy"
 msgstr "Lisää tuttava"
 
-#: src/dialogs.c:904
+#: src/dialogs.c:1020
 msgid "Contact"
 msgstr "Kontakti"
 
 #. Set up stuff for the account box
-#: src/dialogs.c:932
+#: src/dialogs.c:1048
 msgid "Add To"
 msgstr "Lisää"
 
-#: src/dialogs.c:967
+#: src/dialogs.c:1083
 msgid "Please enter a buddy to pounce."
 msgstr "Syötä ilmoitettava tuttava."
 
-#: src/dialogs.c:967
+#: src/dialogs.c:1083
 msgid "Buddy Pounce Error"
 msgstr "Tuttavailmoitinvirhe"
 
-#: src/dialogs.c:1083
+#: src/dialogs.c:1199
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - Uusi tuttavailmoitin"
 
 #. <pounce type="who">
-#: src/dialogs.c:1094
+#: src/dialogs.c:1210
 msgid "Pounce Who"
 msgstr "Kenestä ilmoitetaan"
 
-#: src/dialogs.c:1105
+#: src/dialogs.c:1221
 msgid "Account"
 msgstr "Tili"
 
 #. </pounce type="who">
 #. <pounce type="when">
-#: src/dialogs.c:1129
+#: src/dialogs.c:1245
 msgid "Pounce When"
 msgstr "Milloin ilmoitetaan"
 
-#: src/dialogs.c:1139
+#: src/dialogs.c:1255
 msgid "Pounce on sign on"
 msgstr "Ilmoita sisäänkirjautuessa"
 
-#: src/dialogs.c:1144
+#: src/dialogs.c:1260
 msgid "Pounce on return from away"
 msgstr "Ilmoita palatessa oltuaan poissa"
 
-#: src/dialogs.c:1150
+#: src/dialogs.c:1266
 msgid "Pounce on return from idle"
 msgstr "Ilmoita palatessa oltuaan jouten"
 
 #. </pounce type="when">
 #. <pounce type="action">
-#: src/dialogs.c:1162
+#: src/dialogs.c:1278
 msgid "Pounce Action"
 msgstr "Ilmoitustoiminto"
 
-#: src/dialogs.c:1173
+#: src/dialogs.c:1289
 msgid "Open IM Window"
 msgstr "Avaa pikaviesti-ikkuna"
 
-#: src/dialogs.c:1178
+#: src/dialogs.c:1294
 msgid "Popup Notification"
 msgstr "Näytä ilmoitus"
 
-#: src/dialogs.c:1183
+#: src/dialogs.c:1299
 msgid "Send Message"
 msgstr "Lähetä viesti"
 
-#: src/dialogs.c:1196
+#: src/dialogs.c:1312
 msgid "Execute command on pounce"
 msgstr "Aja komento ilmoitettaessa"
 
-#: src/dialogs.c:1209
+#: src/dialogs.c:1325
 msgid "Play sound on pounce"
 msgstr "Soita ääni ilmoitettaessa"
 
 #. </pounce type="action">
-#: src/dialogs.c:1224
+#: src/dialogs.c:1340
 msgid "Save this pounce after activation"
 msgstr "Tallenna tämä ilmoitin aktivoinnin jälkeen"
 
-#: src/dialogs.c:1306
+#: src/dialogs.c:1422
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - Aseta hakemistotiedot"
 
-#: src/dialogs.c:1315
+#: src/dialogs.c:1431
 msgid "Directory Info"
 msgstr "Hakemistotiedot"
 
-#: src/dialogs.c:1337
+#: src/dialogs.c:1453
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Salli verkkohaut tietojesi löytämiseksi"
 
 #. Line 1
-#: src/dialogs.c:1340 src/dialogs.c:2020
+#: src/dialogs.c:1456 src/dialogs.c:2157
 msgid "First Name"
 msgstr "Etunimi"
 
 #. Line 2
-#: src/dialogs.c:1351 src/dialogs.c:2032
+#: src/dialogs.c:1467 src/dialogs.c:2169
 msgid "Middle Name"
 msgstr "Muut etunimet"
 
 #. Line 3
-#: src/dialogs.c:1363 src/dialogs.c:2044
+#: src/dialogs.c:1479 src/dialogs.c:2181
 msgid "Last Name"
 msgstr "Sukunimi"
 
 #. Line 4
-#: src/dialogs.c:1374 src/dialogs.c:2056
+#: src/dialogs.c:1490 src/dialogs.c:2193
 msgid "Maiden Name"
 msgstr "Entinen nimi"
 
 #. Line 6
-#: src/dialogs.c:1396 src/dialogs.c:2079
+#: src/dialogs.c:1512 src/dialogs.c:2216
 msgid "State"
 msgstr "Lääni"
 
 #. Line 7
-#: src/dialogs.c:1407 src/dialogs.c:2090
+#: src/dialogs.c:1523 src/dialogs.c:2227
 msgid "Country"
 msgstr "Valtio"
 
-#: src/dialogs.c:1461
+#: src/dialogs.c:1577
 msgid "New Passwords Do Not Match"
 msgstr "Uudet salasanat eivät täsmää"
 
-#: src/dialogs.c:1461 src/dialogs.c:1466
+#: src/dialogs.c:1577 src/dialogs.c:1582
 msgid "Gaim - Change Password Error"
 msgstr "Gaim - Salasanan muuttamisvirhe"
 
-#: src/dialogs.c:1466
+#: src/dialogs.c:1582
 msgid "Fill out all fields completely"
 msgstr "Täytä kaikki kentät kokonaan"
 
-#: src/dialogs.c:1502
-msgid "Change Password"
-msgstr "Vaihda salasanaa"
-
-#: src/dialogs.c:1521
+#: src/dialogs.c:1637
 msgid "Original Password"
 msgstr "Vanha salasana"
 
-#: src/dialogs.c:1535
+#: src/dialogs.c:1651
 msgid "New Password"
 msgstr "Uusi salasana"
 
-#: src/dialogs.c:1549
+#: src/dialogs.c:1665
 msgid "New Password (again)"
 msgstr "Uusi salasana (uudelleen)"
 
-#: src/dialogs.c:1590
+#: src/dialogs.c:1706
 msgid "Gaim - Set User Info"
 msgstr "Gaim - Aseta käyttäjätiedot"
 
-#: src/dialogs.c:1685
+#: src/dialogs.c:1814
 msgid "Below are the results of your search: "
 msgstr "Alla ovat hakusi tulokset: "
 
-#: src/dialogs.c:1810 src/dialogs.c:1817
+#: src/dialogs.c:1947 src/dialogs.c:1954
 msgid "Permit"
 msgstr "Salli"
 
-#: src/dialogs.c:1812 src/dialogs.c:1819
+#: src/dialogs.c:1949 src/dialogs.c:1956
 msgid "Deny"
 msgstr "Kiellä"
 
-#: src/dialogs.c:1856
+#: src/dialogs.c:1993
 msgid "Gaim - Add Permit"
 msgstr "Gaim - Salli lisää"
 
-#: src/dialogs.c:1858
+#: src/dialogs.c:1995
 msgid "Gaim - Add Deny"
 msgstr "Gaim - Kiellä lisää"
 
-#: src/dialogs.c:1918
+#: src/dialogs.c:2055
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - Kirjaa keskustelu lokiin"
 
-#: src/dialogs.c:1996 src/dialogs.c:2159
+#: src/dialogs.c:2133 src/dialogs.c:2296
 msgid "Search for Buddy"
 msgstr "Etsi tuttavaa"
 
-#: src/dialogs.c:2124
+#: src/dialogs.c:2261
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - Etsi tuttava tietojen perusteella"
 
-#: src/dialogs.c:2153
+#: src/dialogs.c:2290
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - Etsi tuttava sähköpostin perusteella"
 
-#: src/dialogs.c:2166
+#: src/dialogs.c:2303
 msgid "Email"
 msgstr "Sähköposti"
 
-#: src/dialogs.c:2261
+#: src/dialogs.c:2398
 msgid "URL"
 msgstr "URL"
 
 #. Right side: frame with description and the filepath of plugin
-#: src/dialogs.c:2269 src/plugins.c:211
+#: src/dialogs.c:2406 src/plugins.c:211
 msgid "Description"
 msgstr "Kuvaus"
 
-#: src/dialogs.c:2293
+#: src/dialogs.c:2430
 msgid "Gaim - Add URL"
 msgstr "Gaim - Lisää URL"
 
-#: src/dialogs.c:2444 src/dialogs.c:2465 src/dialogs.c:2519
+#: src/dialogs.c:2581 src/dialogs.c:2602 src/dialogs.c:2656
 msgid "Select Text Color"
 msgstr "Valitse tekstin väri"
 
-#: src/dialogs.c:2498
+#: src/dialogs.c:2635
 msgid "Select Background Color"
 msgstr "Valitse taustaväri"
 
-#: src/dialogs.c:2722
+#: src/dialogs.c:2857
 msgid "Import to:"
 msgstr "Tuo:"
 
-#: src/dialogs.c:2746
+#: src/dialogs.c:2881
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Tuo tuttavalista"
 
 #. We shouldn't allow a blank title
-#: src/dialogs.c:2807
+#: src/dialogs.c:2948
 msgid "You cannot create an away message with a blank title"
 msgstr "Et voi luoda poissaoloviestiä tyhjällä otsikolla"
 
 #. We shouldn't allow a blank message
-#: src/dialogs.c:2814
+#: src/dialogs.c:2955
 msgid "You cannot create an empty away message"
 msgstr "Et voi luoda tyhjää poissaoloviestiä"
 
-#: src/dialogs.c:2882
+#: src/dialogs.c:3023
 msgid "Gaim - New away message"
 msgstr "Gaim - Uusi poissaoloviesti"
 
-#: src/dialogs.c:2892
+#: src/dialogs.c:3033
 msgid "New away message"
 msgstr "Uusi poissaoloviesti"
 
-#: src/dialogs.c:2905
+#: src/dialogs.c:3046
 msgid "Away title: "
 msgstr "Poissaolon otsikko: "
 
-#: src/dialogs.c:2944
+#: src/dialogs.c:3085
 msgid "Use"
 msgstr "Käytä"
 
-#: src/dialogs.c:2948
+#: src/dialogs.c:3089
 msgid "Save & Use"
 msgstr "Tallenna ja käytä"
 
 #. show everything
-#: src/dialogs.c:3151
+#: src/dialogs.c:3292
 msgid "Smile!"
 msgstr "Hymyile!"
 
-#: src/dialogs.c:3203
+#: src/dialogs.c:3344
 msgid "Alias Buddy"
 msgstr "Anna tuttavalle alias"
 
-#: src/dialogs.c:3236
+#: src/dialogs.c:3377
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - Anna tuttavalle alias"
 
-#: src/dialogs.c:3308
+#: src/dialogs.c:3449
 msgid "Gaim - Save Log File"
 msgstr "Gaim - Tallenna lokitiedosto"
 
-#: src/dialogs.c:3340
+#: src/dialogs.c:3481
 #, c-format
 msgid "Unable to remove file %s - %s"
 msgstr "Ei kyetty poistamaan tiedostoa %s - %s"
 
-#: src/dialogs.c:3368
+#: src/dialogs.c:3509
 msgid "Really clear log?"
 msgstr "Tyhjennä loki?"
 
-#: src/dialogs.c:3383
+#: src/dialogs.c:3524
 msgid "Okay"
 msgstr "Selvä"
 
-#: src/dialogs.c:3554
+#: src/dialogs.c:3695
 msgid "Date"
 msgstr "Pvm"
 
-#: src/dialogs.c:3617
+#: src/dialogs.c:3758
 msgid "Conversation"
 msgstr "Keskustelu"
 
-#: src/dialogs.c:3638
+#: src/dialogs.c:3781
 msgid "Clear"
 msgstr "Tyhjennä"
 
-#: src/dialogs.c:3716
+#: src/dialogs.c:3859
 msgid "Gaim - Rename Group"
 msgstr "Gaim - Vaihda ryhmän nimeä"
 
-#: src/dialogs.c:3726
+#: src/dialogs.c:3869
 msgid "Rename Group"
 msgstr "Vaihda ryhmän nimeä"
 
-#: src/dialogs.c:3733 src/dialogs.c:3838
+#: src/dialogs.c:3876 src/dialogs.c:3982
 msgid "New name:"
 msgstr "Uusi nimi:"
 
-#: src/dialogs.c:3821
+#: src/dialogs.c:3965
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - Vaihda tuttavan nimeä"
 
-#: src/dialogs.c:3831
+#: src/dialogs.c:3975
 msgid "Rename Buddy"
 msgstr "Vaihda tuttavan nimeä"
 
 #. Below is basically stolen from plugins.c
-#: src/dialogs.c:3915
+#: src/dialogs.c:4059
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - Valitse Perlskripti"
 
-#: src/gaimrc.c:1107
+#: src/gaimrc.c:1113
 #, c-format
 msgid "Could not open config file %s."
 msgstr "Ei kyetty avaamaan asetustiedostoa %s."
 
-#: src/gaimrc.c:1108
+#: src/gaimrc.c:1114
 msgid "Preferences Error"
 msgstr "Asetusvirhe"
 
@@ -1850,92 +2005,102 @@
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Virhe avattaessa yhteyttä.\n"
 
-#: src/multi.c:411
+#: src/multi.c:427
 msgid "Gaim - Load Buddy Icon"
 msgstr "Gaim - Lataa tuttavakuvake"
 
-#: src/multi.c:454
+#: src/multi.c:470
 msgid "Buddy Icon File:"
 msgstr "Tuttavakuvaketiedosto:"
 
-#: src/multi.c:465
+#: src/multi.c:481
 msgid "Browse"
 msgstr "Selaa"
 
-#: src/multi.c:470 src/prefs.c:1457
+#: src/multi.c:486 src/prefs.c:1512
 msgid "Reset"
 msgstr "Nollaa"
 
-#: src/multi.c:497
+#: src/multi.c:513
 msgid "Screenname:"
 msgstr "Näyttönimi:"
 
-#: src/multi.c:517
+#: src/multi.c:533
 msgid "Protocol:"
 msgstr "Protokolla:"
 
-#: src/multi.c:522
+#: src/multi.c:538
 msgid "Remember Password"
 msgstr "Muista salasana"
 
-#: src/multi.c:523
+#: src/multi.c:539
 msgid "Auto-Login"
 msgstr "Kirjaudu sisään automaattisesti"
 
-#: src/multi.c:563
+#: src/multi.c:579
 msgid "New Mail Notifications"
 msgstr "Tiedota uusista sähköposteista"
 
-#: src/multi.c:703
+#: src/multi.c:727
 msgid "Gaim - Modify Account"
 msgstr "Gaim - Muokkaa tiliä"
 
-#: src/multi.c:822
+#: src/multi.c:846
 msgid "Enter Password"
 msgstr "Anna salasana"
 
-#: src/multi.c:911
+#: src/multi.c:935
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Haluatko varmasti poistaa %s:n?"
 
-#: src/multi.c:948
+#: src/multi.c:972
 msgid "Gaim - Account Editor"
 msgstr "Gaim - Tilin muokkaus"
 
-#: src/multi.c:967
+#: src/multi.c:991
 msgid "Select All"
 msgstr "Valitse kaikki"
 
-#: src/multi.c:972
+#: src/multi.c:996
 msgid "Select Autos"
 msgstr "Valitse automaattiset"
 
-#: src/multi.c:976
+#: src/multi.c:1000
 msgid "Select None"
 msgstr "Poista valinnat"
 
-#: src/multi.c:990
+#: src/multi.c:1014
 msgid "Modify"
 msgstr "Muokkaa"
 
-#: src/multi.c:994
+#: src/multi.c:1018
 msgid "Sign On/Off"
 msgstr "Kirjaa sisään/ulos"
 
-#: src/multi.c:998
+#: src/multi.c:1022
 msgid "Delete"
 msgstr "Poista"
 
-#: src/multi.c:1226
+#: src/multi.c:1256
 #, c-format
 msgid ""
 "%s\n"
-"%s was unable to sign on: %s"
+"%s: %s"
+msgstr ""
+
+#: src/multi.c:1275
+#, fuzzy, c-format
+msgid "%s was unable to sign on"
 msgstr ""
 "%s\n"
 "%s ei kyennyt kirjautumaan sisään: %s"
 
+#: src/multi.c:1286
+#, fuzzy
+msgid "Notice"
+msgstr "Ääni"
+
 #: src/perl.c:856
 msgid "Perl Scripts"
 msgstr "Perlskripti"
@@ -1992,9 +2157,9 @@
 msgid "General Options"
 msgstr "Yleiset asetukset"
 
-#: src/prefs.c:198 src/prefs.c:372 src/prefs.c:538 src/prefs.c:639
-#: src/prefs.c:868 src/prefs.c:1003 src/prefs.c:1221 src/prefs.c:1521
-#: src/prefs.c:1796 src/prefs.c:2207
+#: src/prefs.c:198 src/prefs.c:373 src/prefs.c:539 src/prefs.c:640
+#: src/prefs.c:893 src/prefs.c:1037 src/prefs.c:1262 src/prefs.c:1576
+#: src/prefs.c:1850 src/prefs.c:2283
 msgid "All options take effect immediately unless otherwise noted."
 msgstr "Kaikki muutokset tapahtuvat välittömästi ellei muuta ole mainittu."
 
@@ -2084,354 +2249,381 @@
 msgstr "GNOME:n URL-käsittelijä"
 
 #: src/prefs.c:295
+msgid "Galeon"
+msgstr ""
+
+#: src/prefs.c:296
 msgid "Manual"
 msgstr "Manuaalinen"
 
-#: src/prefs.c:364
+#: src/prefs.c:365
 msgid "Proxy Options"
 msgstr "Välipalvelimen asetukset"
 
-#: src/prefs.c:376
+#: src/prefs.c:377
 msgid ""
-"Not all protocols can use these proxy options. Please see the README file for "
-"details."
+"Not all protocols can use these proxy options. Please see the README file "
+"for details."
 msgstr ""
 "Kaikki protokollat eivät voi käyttää näitä välipalvelimen asetuksia. Lue "
 "README-tiedostosta yksityiskohdat."
 
-#: src/prefs.c:381
+#: src/prefs.c:382
 msgid "Proxy Type"
 msgstr "Välipalvelimen tyyppi"
 
-#: src/prefs.c:393
+#: src/prefs.c:394
+msgid "Proxy Server"
+msgstr "Välipalvelin"
+
+#: src/prefs.c:397
 msgid "No Proxy"
 msgstr "Ei välipalvelinta"
 
-#: src/prefs.c:405
+#: src/prefs.c:409
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: src/prefs.c:415
+#: src/prefs.c:419
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: src/prefs.c:424
+#: src/prefs.c:428
 msgid "HTTP"
 msgstr "HTTP"
 
-#: src/prefs.c:433
-msgid "Proxy Server"
-msgstr "Välipalvelin"
-
-#: src/prefs.c:451
+#: src/prefs.c:452
 msgid "Host"
 msgstr "Verkkoasema (host)"
 
-#: src/prefs.c:467
+#: src/prefs.c:468
 msgid "Port"
 msgstr "Portti"
 
-#: src/prefs.c:484
+#: src/prefs.c:485
 msgid "User"
 msgstr "Käyttäjä"
 
-#: src/prefs.c:500
+#: src/prefs.c:501
 msgid "Password"
 msgstr "Salasana"
 
-#: src/prefs.c:530
+#: src/prefs.c:531
 msgid "Buddy List Options"
 msgstr "Tuttavalistan asetukset"
 
-#: src/prefs.c:542
+#: src/prefs.c:543
 msgid "Buddy List Window"
 msgstr "Tuttavalistaikkuna"
 
-#: src/prefs.c:554
+#: src/prefs.c:555
 msgid "Hide IM/Info/Chat buttons"
 msgstr "Piilota pikaviesti-/tiedot- ja verkkojuttelunapit"
 
-#: src/prefs.c:556
+#: src/prefs.c:557
 msgid "Automatically show buddy list on sign on"
 msgstr "Näytä automaattisesti tuttavalista kirjauduttaessa sisään"
 
-#: src/prefs.c:559
+#: src/prefs.c:560
 msgid "Save Window Size/Position"
 msgstr "Tallenna ikkunan koko/sijainti"
 
-#: src/prefs.c:566
+#: src/prefs.c:567
 msgid "Show pictures on buttons"
 msgstr "Näytä kuvat napeissa"
 
-#: src/prefs.c:571
+#: src/prefs.c:572
 msgid "Display Buddy List near applet"
 msgstr "Näytä tuttavalista lähellä sovelmaa"
 
-#: src/prefs.c:574
+#: src/prefs.c:575
 msgid "Group Displays"
 msgstr "Ryhmänäytöt"
 
-#: src/prefs.c:586
+#: src/prefs.c:587
 msgid "Hide groups with no online buddies"
 msgstr "Piilota ryhmät joissa ei ole sisäänkirjautuneita tuttavia"
 
-#: src/prefs.c:592
+#: src/prefs.c:593
 msgid "Show numbers in groups"
 msgstr "Näytä numerot ryhmissä"
 
-#: src/prefs.c:594
+#: src/prefs.c:595
 msgid "Buddy Displays"
 msgstr "Tuttavanäytöt"
 
-#: src/prefs.c:606
+#: src/prefs.c:607
 msgid "Show buddy type icons"
 msgstr "Näytä tuttavatyyppien kuvakkeet"
 
-#: src/prefs.c:607
+#: src/prefs.c:608
 msgid "Show warning levels"
 msgstr "Näytä varoitustasot"
 
-#: src/prefs.c:613
+#: src/prefs.c:614
 msgid "Show idle times"
 msgstr "Näytä joutenoloajat"
 
-#: src/prefs.c:614
+#: src/prefs.c:615
 msgid "Grey idle buddies"
 msgstr "Näytä jouten olevat tuttavat harmaina"
 
-#: src/prefs.c:631
+#: src/prefs.c:632
 msgid "Conversation Options"
 msgstr "Keskusteluasetukset"
 
-#: src/prefs.c:643
+#: src/prefs.c:644
 msgid "Keyboard Options"
 msgstr "Näppäimistöasetukset"
 
-#: src/prefs.c:655
-msgid "Enter sends message"
-msgstr "\"Enter\" lähettää viestin"
-
 #: src/prefs.c:656
-msgid "Control-Enter sends message"
-msgstr "\"Control-Enter\" lähettää viestin"
+msgid "Enter sends message"
+msgstr "\"Enter\" lähettää viestin"
 
 #: src/prefs.c:657
+msgid "Control-Enter sends message"
+msgstr "\"Control-Enter\" lähettää viestin"
+
+#: src/prefs.c:658
 msgid "Escape closes window"
 msgstr "\"Escape\" sulkee ikkunan"
 
-#: src/prefs.c:663
-msgid "Control-{B/I/U/S} inserts HTML tags"
-msgstr "\"Control-{B/I/U/S}\" lisää HTML-lipun"
-
 #: src/prefs.c:664
+msgid "Control-{B/I/U/S} inserts HTML tags"
+msgstr "\"Control-{B/I/U/S}\" lisää HTML-lipun"
+
+#: src/prefs.c:665
 msgid "Control-(number) inserts smileys"
 msgstr "\"Control-(numero)\" lisää hymiön"
 
-#: src/prefs.c:665
+#: src/prefs.c:666
 msgid "F2 toggles timestamp display"
 msgstr "F2 asettaa aikaleiman päälle/pois"
 
-#: src/prefs.c:667
+#: src/prefs.c:668
 msgid "Display and General Options"
 msgstr "Näyttö- ja yleiset asetukset"
 
-#: src/prefs.c:679
+#: src/prefs.c:680
 msgid "Show graphical smileys"
 msgstr "Näytä graafiset hymiöt"
 
-#: src/prefs.c:680
-msgid "Show timestamp on messages"
-msgstr "Näytä aikaleimat viesteissä"
-
 #: src/prefs.c:681
-msgid "Show URLs as links"
-msgstr "Näytä URL:t linkkeinä"
+msgid "Show timestamp on messages"
+msgstr "Näytä aikaleimat viesteissä"
 
 #: src/prefs.c:682
+msgid "Show URLs as links"
+msgstr "Näytä URL:t linkkeinä"
+
+#: src/prefs.c:683
 msgid "Highlight misspelled words"
 msgstr "Korosta väärinkirjoitetut sanat"
 
-#: src/prefs.c:683 src/prefs.c:1818
+#: src/prefs.c:684 src/prefs.c:1872
 msgid "Sending messages removes away status"
 msgstr "Viestien lähettäminen poistaa poissaolotilan"
 
-#: src/prefs.c:684 src/prefs.c:1826
+#: src/prefs.c:685 src/prefs.c:1885
 msgid "Queue new messages when away"
 msgstr "Laita uudet viestit jonoon poissaollessa"
 
-#: src/prefs.c:690
+#: src/prefs.c:691
 msgid "Ignore colors"
 msgstr "Älä välitä väreistä"
 
-#: src/prefs.c:691
+#: src/prefs.c:692
 msgid "Ignore font faces"
 msgstr "Älä välitä fonttien tyypistä"
 
-#: src/prefs.c:692
+#: src/prefs.c:693
 msgid "Ignore font sizes"
 msgstr "Älä välitä fonttien koosta"
 
-#: src/prefs.c:693
+#: src/prefs.c:694
 msgid "Ignore TiK Automated Messages"
 msgstr "Älä välitä automatisoiduista TiK-viesteistä"
 
-#: src/prefs.c:694 src/prefs.c:1816
+#: src/prefs.c:695 src/prefs.c:1870
 msgid "Ignore new conversations when away"
 msgstr "Älä välitä uusista keskusteluista poissaollessa"
 
-#: src/prefs.c:860
+#: src/prefs.c:884
 msgid "IM Options"
 msgstr "Pikaviestiasetukset"
 
-#: src/prefs.c:872 src/prefs.c:2736
+#: src/prefs.c:897 src/prefs.c:2832
 msgid "IM Window"
 msgstr "Pikaviesti-ikkuna"
 
-#: src/prefs.c:888 src/prefs.c:1023
+#: src/prefs.c:913 src/prefs.c:1057
 msgid "Show buttons as: "
 msgstr "Näytä napeissa: "
 
-#: src/prefs.c:892 src/prefs.c:1028
+#: src/prefs.c:917 src/prefs.c:1062
 msgid "Pictures And Text"
 msgstr "Kuvat ja teksti"
 
-#: src/prefs.c:893 src/prefs.c:1030
+#: src/prefs.c:918 src/prefs.c:1064
 msgid "Pictures"
 msgstr "Kuvat"
 
-#: src/prefs.c:894 src/prefs.c:1031
+#: src/prefs.c:919 src/prefs.c:1065
 msgid "Text"
 msgstr "Teksti"
 
-#: src/prefs.c:905
+#: src/prefs.c:930
 msgid "Show all conversations in one tabbed window"
 msgstr "Näytä kaikki keskustelut yhdessä, jaetussa ikkunassa"
 
-#: src/prefs.c:907 src/prefs.c:1044
+#: src/prefs.c:932
+#, fuzzy
+msgid "Show chats in the same tabbed window"
+msgstr "Näytä kaikki chatit yhdessä, jaetussa ikkunassa"
+
+#: src/prefs.c:939 src/prefs.c:1085
 msgid "Raise windows on events"
 msgstr "Nosta ikkuna tapahtumahetkinä"
 
-#: src/prefs.c:908
+#: src/prefs.c:940
 msgid "Show logins in window"
 msgstr "Näytä sisäänkirjautumiset ikkunassa"
 
-#: src/prefs.c:910 src/prefs.c:1047
+#: src/prefs.c:941
+msgid "Show aliases in tabs/titles"
+msgstr ""
+
+#: src/prefs.c:942
+#, fuzzy
+msgid "Hide window on send"
+msgstr "Nosta ikkuna tapahtumahetkinä"
+
+#: src/prefs.c:944 src/prefs.c:1088
 msgid "Window Sizes"
 msgstr "Ikkunakoot"
 
-#: src/prefs.c:918 src/prefs.c:1055
+#: src/prefs.c:952 src/prefs.c:1096
 msgid "New window width:"
 msgstr "Uuden ikkunan leveys:"
 
-#: src/prefs.c:919 src/prefs.c:1056
+#: src/prefs.c:953 src/prefs.c:1097
 msgid "New window height:"
 msgstr "Uuden ikkunan korkeus:"
 
-#: src/prefs.c:920 src/prefs.c:1057
+#: src/prefs.c:954 src/prefs.c:1098
 msgid "Entry widget height:"
 msgstr "Kirjoitusalueen korkeus:"
 
-#: src/prefs.c:922 src/prefs.c:1059
+#: src/prefs.c:956 src/prefs.c:1100
 msgid "Tab Placement"
 msgstr "Reunamerkkien sijoitus"
 
-#: src/prefs.c:942 src/prefs.c:1079
+#: src/prefs.c:976 src/prefs.c:1120
 msgid "Top"
 msgstr "Ylhäällä"
 
-#: src/prefs.c:944 src/prefs.c:1081
+#: src/prefs.c:978 src/prefs.c:1122
 msgid "Bottom"
 msgstr "Alhaalla"
 
-#: src/prefs.c:951 src/prefs.c:1088
+#: src/prefs.c:985 src/prefs.c:1129
 msgid "Left"
 msgstr "Vasemmalla"
 
-#: src/prefs.c:953 src/prefs.c:1090
+#: src/prefs.c:987 src/prefs.c:1131
 msgid "Right"
 msgstr "Oikealla"
 
-#: src/prefs.c:957
+#: src/prefs.c:991
 msgid "Buddy Icons"
 msgstr "Tuttavakuvakkeet"
 
-#: src/prefs.c:969
+#: src/prefs.c:1003
 msgid "Hide Buddy Icons"
 msgstr "Piilota tuttavakuvakkeet"
 
-#: src/prefs.c:995
+#: src/prefs.c:1029
 msgid "Chat Options"
 msgstr "Chattiasetukset"
 
-#: src/prefs.c:1007
+#: src/prefs.c:1041
 msgid "Group Chat Window"
 msgstr "Ryhmächatti-ikkuna"
 
-#: src/prefs.c:1042
+#: src/prefs.c:1076
 msgid "Show all chats in one tabbed window"
 msgstr "Näytä kaikki chatit yhdessä, jaetussa ikkunassa"
 
-#: src/prefs.c:1045
+#: src/prefs.c:1078
+#, fuzzy
+msgid "Show conversations in the same tabbed window"
+msgstr "Näytä kaikki keskustelut yhdessä, jaetussa ikkunassa"
+
+#: src/prefs.c:1086
 msgid "Show people joining/leaving in window"
 msgstr "Näytä ihmisten saapuminen/poistuminen ikkunassa"
 
-#: src/prefs.c:1093
+#: src/prefs.c:1134
 msgid "Tab Completion"
 msgstr "\"Tab\"-täydennys"
 
-#: src/prefs.c:1105
+#: src/prefs.c:1146
 msgid "Tab-Complete Nicks"
 msgstr "\"Tab\"-täydennä lempinimet"
 
-#: src/prefs.c:1111
+#: src/prefs.c:1152
 msgid "Old-Style Tab Completion"
 msgstr "Vanhanmallinen \"Tab\"-täydennys"
 
-#: src/prefs.c:1213 src/prefs.c:2746
+#: src/prefs.c:1254 src/prefs.c:2842
 msgid "Font Options"
 msgstr "Fonttiasetukset"
 
-#: src/prefs.c:1239
+#: src/prefs.c:1280
 msgid "Italic Text"
 msgstr "Kursivoitu teksti"
 
-#: src/prefs.c:1283 src/prefs.c:1301 src/prefs.c:1323
+#: src/prefs.c:1324 src/prefs.c:1342 src/prefs.c:1364
 msgid "Select"
 msgstr "Valitse"
 
-#: src/prefs.c:1321
+#: src/prefs.c:1362
 msgid "Font Face for Text"
 msgstr "Tekstin fontin tyyppi"
 
-#: src/prefs.c:1336
+#: src/prefs.c:1377
 msgid "Font Size for Text"
 msgstr "Tekstin fonttikoko"
 
-#: src/prefs.c:1422
+#: src/prefs.c:1472
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim - Ääniasetukset"
 
-#: src/prefs.c:1462
+#: src/prefs.c:1507
+msgid "Play"
+msgstr ""
+
+#: src/prefs.c:1517
 msgid "Choose..."
 msgstr "Valitse..."
 
-#: src/prefs.c:1513
+#: src/prefs.c:1568
 msgid "Sound Options"
 msgstr "Ääniasetukset"
 
-#: src/prefs.c:1541
+#: src/prefs.c:1596
 msgid "No sounds when you log in"
 msgstr "Ei ääniä kun kirjaudut sisään"
 
-#: src/prefs.c:1547 src/prefs.c:1817
+#: src/prefs.c:1602 src/prefs.c:1871
 msgid "Sounds while away"
 msgstr "Äänet poissaollessasi"
 
-#: src/prefs.c:1557
+#: src/prefs.c:1612
 msgid "Sound Player:"
 msgstr "Äänisoitin:"
 
-#: src/prefs.c:1626
+#: src/prefs.c:1681
 #, c-format
 msgid ""
 "Command to play sound files\n"
@@ -2440,135 +2632,144 @@
 "Komento äänitiedostojen soittamiseen\n"
 "(%s tiedostonimeksi; sisäinen jos tyhjä)"
 
-#: src/prefs.c:1637
+#: src/prefs.c:1692
 msgid "Events"
 msgstr "Tapahtumat"
 
-#: src/prefs.c:1645
+#: src/prefs.c:1700
 msgid "Sound when buddy logs in"
 msgstr "Ääni kun tuttava kirjautuu sisään"
 
-#: src/prefs.c:1646
+#: src/prefs.c:1701
 msgid "Sound when buddy logs out"
 msgstr "Ääni kun tuttava kirjautuu ulos"
 
-#: src/prefs.c:1652
+#: src/prefs.c:1707
 msgid "Sound when received message begins conversation"
 msgstr "Ääni kun vastaanotettu viesti aloittaa keskustelun"
 
-#: src/prefs.c:1654
+#: src/prefs.c:1709
 msgid "Sound when message is received"
 msgstr "Ääni kun viesti vastaanotetaan"
 
-#: src/prefs.c:1655
+#: src/prefs.c:1710
 msgid "Sound when message is sent"
 msgstr "Ääni kun viesti lähetetään"
 
-#: src/prefs.c:1661
+#: src/prefs.c:1716
 msgid "Sound in chat rooms when people enter"
 msgstr "Ääni chattihuoneissa ihmisten saapuessa"
 
-#: src/prefs.c:1662
+#: src/prefs.c:1717
 msgid "Sound in chat rooms when people leave"
 msgstr "Ääni chattihuoneissa ihmisten poistuessa"
 
-#: src/prefs.c:1663
+#: src/prefs.c:1718
 msgid "Sound in chat rooms when you talk"
 msgstr "Ääni chattihuoneissa viestittäessäsi"
 
-#: src/prefs.c:1664
+#: src/prefs.c:1719
 msgid "Sound in chat rooms when others talk"
 msgstr "Ääni chattihuoneissa muiden viestittäessä"
 
-#: src/prefs.c:1788 src/prefs.c:2768
+#: src/prefs.c:1842 src/prefs.c:2864
 msgid "Away Messages"
 msgstr "Poissaoloviestit"
 
-#: src/prefs.c:1825
+#: src/prefs.c:1879
 msgid "Don't send auto-response"
 msgstr "Älä lähetä automaattista vastausta"
 
-#: src/prefs.c:1836
+#: src/prefs.c:1880
+#, fuzzy
+msgid "Only send auto-response when idle"
+msgstr "Älä lähetä automaattista vastausta"
+
+#: src/prefs.c:1895
+msgid "Time between sending auto-responses (in seconds):"
+msgstr ""
+
+#: src/prefs.c:1910
 msgid "Auto Away after"
 msgstr "Merkitse poissaolevaksi"
 
-#: src/prefs.c:1850
+#: src/prefs.c:1924
 msgid "minutes using"
 msgstr "minuutin jälkeen viestillä"
 
-#: src/prefs.c:1863
+#: src/prefs.c:1937
 msgid "Messages"
 msgstr "Viestit"
 
-#: src/prefs.c:1875
+#: src/prefs.c:1949
 msgid "Title"
 msgstr "Otsikko"
 
-#: src/prefs.c:1918
+#: src/prefs.c:1994
 msgid "Edit"
 msgstr "Muokkaa"
 
-#: src/prefs.c:1922
+#: src/prefs.c:1998
 msgid "Make Away"
 msgstr "Luo poissaolo"
 
-#: src/prefs.c:2199
+#: src/prefs.c:2275
 msgid "Privacy Options"
 msgstr "Yksityisyysasetukset"
 
-#: src/prefs.c:2215
+#: src/prefs.c:2291
 msgid "Set privacy for:"
 msgstr "Yksityisyysasetukset tilille:"
 
-#: src/prefs.c:2234
+#: src/prefs.c:2310
 msgid "Allow all users to contact me"
 msgstr "Salli kaikkien käyttäjien ottaa minuun yhteyttä"
 
-#: src/prefs.c:2235
+#: src/prefs.c:2311
 msgid "Allow only the users below"
 msgstr "Salli vain allaolevat käyttäjät"
 
-#: src/prefs.c:2237
+#: src/prefs.c:2313
 msgid "Allow List"
 msgstr "Sallittujen lista"
 
-#: src/prefs.c:2268
+#: src/prefs.c:2344
 msgid "Deny all users"
 msgstr "Kiellä kaikki käyttäjät"
 
-#: src/prefs.c:2269
+#: src/prefs.c:2345
 msgid "Block the users below"
 msgstr "Kiellä allaolevia käyttäjiä"
 
-#: src/prefs.c:2271
+#: src/prefs.c:2347
 msgid "Block List"
 msgstr "Kiellettyjen lista"
 
-#: src/prefs.c:2366
+#: src/prefs.c:2442
 msgid "Gaim - Preferences"
 msgstr "Gaim - Asetukset"
 
-#: src/prefs.c:2445
+#: src/prefs.c:2525
 msgid "Gaim debug output window"
 msgstr "Gaim-virheidenetsinnän tulostusikkuna"
 
-#: src/prefs.c:2702
+#: src/prefs.c:2798
 msgid "General"
 msgstr "Yleistä"
 
-#: src/prefs.c:2707
+#: src/prefs.c:2803
 msgid "Proxy"
 msgstr "Välipalvelin"
 
-#: src/prefs.c:2731
+#: src/prefs.c:2827
 msgid "Conversations"
 msgstr "Keskustelut"
 
-#: src/prefs.c:2757
+#: src/prefs.c:2853
 msgid "Sounds"
 msgstr "Äänet"
 
-#: src/prefs.c:2779
+#: src/prefs.c:2875
 msgid "Privacy"
 msgstr "Yksityisyys"
 
@@ -2601,10 +2802,6 @@
 msgid "Accept?"
 msgstr "Hyväksy?"
 
-#: src/prpl.c:154 src/prpl.c:228
-msgid "Accept"
-msgstr "Hyväksy"
-
 #: src/prpl.c:199
 msgid "Gaim - Prompt"
 msgstr "Gaim - Kehote"
@@ -2632,11 +2829,31 @@
 "\n"
 "Haluatko lisätä hänet tuttavalistallesi?"
 
-#: src/server.c:53
+#: src/prpl.c:615
+msgid ""
+"You do not currently have any protocols available that are able to register "
+"new accounts."
+msgstr ""
+
+#: src/prpl.c:652
+#, fuzzy
+msgid "Gaim - Registration"
+msgstr "Gaim - Keskustelut"
+
+#: src/prpl.c:667
+msgid "Registration Information"
+msgstr ""
+
+#: src/prpl.c:684
+#, fuzzy
+msgid "Register"
+msgstr "Nollaa"
+
+#: src/server.c:55
 msgid "Please enter your password"
 msgstr "Anna salasanasi"
 
-#: src/server.c:60
+#: src/server.c:62
 msgid ""
 "You cannot log this account in; you do not have the protocol it uses loaded, "
 "or the protocol does not have a login function."
@@ -2644,28 +2861,123 @@
 "Et voi kirjata tätä tiliä sisään.Et ole ladannut protokollaa, jota se "
 "käyttää, tai protokollassa ei ole sisäänkirjautumisfunktiota."
 
-#: src/server.c:62
+#: src/server.c:64
 msgid "Login Error"
 msgstr "Sisäänkirjautumisvirhe"
 
-#: src/server.c:535
+#: src/server.c:550
 #, c-format
 msgid "(%d messages)"
 msgstr "(%d viestiä)"
 
-#: src/server.c:541
+#: src/server.c:556
 msgid "(1 message)"
 msgstr "(1 viesti)"
 
-#: src/server.c:756
+#: src/server.c:747
 msgid "Warned"
 msgstr "Varoitettu"
 
-#: src/server.c:827
+#: src/server.c:818
 msgid "Yes"
 msgstr "Kyllä"
 
-#: src/server.c:828
+#: src/server.c:819
 msgid "No"
 msgstr "Ei"
 
+#: src/server.c:995
+#, fuzzy
+msgid "More Info"
+msgstr "Hae tiedot"
+
+#~ msgid "Available"
+#~ msgstr "Käytettävissä"
+
+#~ msgid "Available for friends only"
+#~ msgstr "Käytettävissä vain ystäville"
+
+#~ msgid "Away for friends only"
+#~ msgstr "Poissa vain ystäville"
+
+#~ msgid "Invisible"
+#~ msgstr "Näkymätön"
+
+#~ msgid "Invisible for friends only"
+#~ msgstr "Näkymätön vain ystäville"
+
+#~ msgid "Unavailable"
+#~ msgstr "Ei käytettävissä"
+
+#~ msgid "Handshake"
+#~ msgstr "Kättely"
+
+#~ msgid "Connecting to GG server"
+#~ msgstr "Yhdistetään GG-palvelimeen"
+
+#~ msgid "Sending key"
+#~ msgstr "Lähetetään avainta"
+
+#~ msgid "Logging in %s\n"
+#~ msgstr "Kirjaudutaan sisään %s\n"
+
+#~ msgid "Send offline message"
+#~ msgstr "Lähetä offline-viesti"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "IRC: #gaim on irc.openprojects.net"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "IRC: #gaim irc.openprojects.net:issä"
+
+#~ msgid ""
+#~ "Rob Flynn (maintainer)               rob@marko.net\n"
+#~ "Eric Warmenhoven (lead coder)  warmenhoven@yahoo.com\n"
+#~ "\n"
+#~ "Benjamin Miller\n"
+#~ "Decklin Foster\n"
+#~ "Sean Egan\n"
+#~ "Jim Duchek\n"
+#~ "Mark Spencer (original author)   markster@marko.net"
+#~ msgstr ""
+#~ "Rob Flynn (ylläpitäjä)                  rob@marko.net\n"
+#~ "Eric Warmenhoven (pääohjelmoija)  warmenhoven@yahoo.com\n"
+#~ "\n"
+#~ "Benjamin Miller\n"
+#~ "Decklin Foster\n"
+#~ "Sean Egan\n"
+#~ "Jim Duchek\n"
+#~ "Mark Spencer (alkuperäinen tekijä) markster@marko.net"
+
+#~ msgid ""
+#~ "Relax, help is just around the corner. The first thing you'll need to do is "
+#~ "get an AIM account; you can get one from http://aim.aol.com/. Just click the "
+#~ "button that says \"New Users\" and you can create an account that way. Once "
+#~ "you have your account, enter the username and password into the login window "
+#~ "that comes up when you start Gaim, and click the Signon button. Once you're "
+#~ "online, you can talk to one of the Gaim developers for more assistance; "
+#~ "their contact information is in the AUTHORS file in the Gaim source, or at "
+#~ msgstr ""
+#~ "Rauhoitu, apu on heti nurkan takana. Ensimmäinen asia, joka sinun täytyy "
+#~ "tehdä, on AIM-tilin hankkiminen. Voit tehdä sen sivustolla "
+#~ "http://aim.aol.com/. Napsauta vain nappia jossa lukee \"New Users\" ja voit "
+#~ "luoda tilin sitä kautta. Kun sinulla on tili, kirjoita käyttäjänimesi ja "
+#~ "salasanasi sisäänkirjautumisikkunaan, joka ilmestyy kun käynnistät Gaim:in, "
+#~ "ja napsauta sisäänkirjautumisnappia. Kun olet kirjautunut sisään, voit "
+#~ "keskustella yhdelle Gaim:in kehittäjistä lisäavun saamiseksi - heidän "
+#~ "yhteystietonsa löytyvät AUTHORS-tiedostosta Gaim:in lähdekoodissa tai "
+#~ "sivulta "
+
+#~ msgid ""
+#~ "contactinfo.php. If you can't get online and still need more assistance, "
+#~ "feel free to email us at gaim@marko.net. Thanks for using Gaim!"
+#~ msgstr ""
+#~ "contactinfo.php. Jos et pääse kirjautumaan sisään ja kaipaat yhä lisäapua, "
+#~ "voit vapaasti lähettää meille sähköpostia osoitteeseen gaim@marko.net. "
+#~ "Kiitos että käytät Gaim:ia!"
+
+#~ msgid "Help!"
+#~ msgstr "Apua!"
--- a/po/fr.po	Fri Feb 22 23:47:55 2002 +0000
+++ b/po/fr.po	Fri Feb 22 23:48:23 2002 +0000
@@ -7,291 +7,1243 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Gaim 0.9.20\n"
-"POT-Creation-Date: 2001-06-17 23:41-0700\n"
+"POT-Creation-Date: 2002-02-17 12:41-0800\n"
 "PO-Revision-Date: 2001-12-27 22:26-0700\n"
 "Last-Translator: Sebfrance\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: plugins/icq/gaim_icq.c:442 src/oscar.c:2895 src/toc.c:1031
+#: src/protocols/gg/gg.c:182
+#, fuzzy
+msgid "Unable to resolve hostname."
+msgstr "Impossible de lire le fichier %s."
+
+#: src/protocols/gg/gg.c:185
+#, fuzzy
+msgid "Unable to connect to server."
+msgstr "Impossible de se connecter à AIM"
+
+#: src/protocols/gg/gg.c:188
+msgid "Invalid response from server."
+msgstr ""
+
+#: src/protocols/gg/gg.c:191
+#, fuzzy
+msgid "Error while reading from socket."
+msgstr "Erreur à la lecture du fichier %s"
+
+#: src/protocols/gg/gg.c:194
+#, fuzzy
+msgid "Error while writting to socket."
+msgstr "Erreur à l'écriture du fichier %s"
+
+#: src/protocols/gg/gg.c:197
+#, fuzzy
+msgid "Authentification failed."
+msgstr "Echec de Vérification."
+
+#: src/protocols/gg/gg.c:200
+msgid "Unknown Error Code."
+msgstr ""
+
+#: src/protocols/gg/gg.c:302
+#, c-format
+msgid "Status: %s"
+msgstr ""
+
+#: src/protocols/gg/gg.c:317
+msgid "Nick:"
+msgstr ""
+
+#: src/protocols/gg/gg.c:318
+msgid "Gadu-Gadu User"
+msgstr ""
+
+#: src/protocols/gg/gg.c:337
+#, fuzzy
+msgid "Could not connect"
+msgstr "Impossible de se Connecter"
+
+#: src/protocols/gg/gg.c:344
+#, fuzzy
+msgid "Unable to read socket"
+msgstr "Impossible de lire le fichier %s."
+
+#: src/protocols/gg/gg.c:455
+#, fuzzy
+msgid "Unable to connect."
+msgstr "Impossible de faire une connection directe"
+
+#: src/protocols/gg/gg.c:465
+#, fuzzy
+msgid "Reading data"
+msgstr "Recuperation de donnée"
+
+#: src/protocols/gg/gg.c:468
+msgid "Balancer handshake"
+msgstr ""
+
+#: src/protocols/gg/gg.c:471
+msgid "Reading server key"
+msgstr ""
+
+#: src/protocols/gg/gg.c:474
+msgid "Exchanging key hash"
+msgstr ""
+
+#: src/protocols/gg/gg.c:482
+msgid "Critical error in GG library\n"
+msgstr ""
+
+#: src/protocols/gg/gg.c:521
+#, fuzzy
+msgid "Unable to ping server"
+msgstr "Impossible de faire une connection directe"
+
+#: src/protocols/gg/gg.c:533
+#, fuzzy
+msgid "Send as message"
+msgstr "Envoyer le message sous le pseudo: "
+
+#: src/protocols/gg/gg.c:541
+#, fuzzy
+msgid "Looking up GG server"
+msgstr "Résolution de %s"
+
+#: src/protocols/gg/gg.c:544
+msgid "Invalid Gadu-Gadu UIN specified"
+msgstr ""
+
+#: src/protocols/gg/gg.c:570
+#, fuzzy, c-format
+msgid "Connect to %s failed"
+msgstr "Connection Terminée"
+
+#: src/protocols/gg/gg.c:594
+msgid "You are trying to send message to invalid Gadu-Gadu UIN!"
+msgstr ""
+
+#: src/protocols/gg/gg.c:595 src/protocols/gg/gg.c:657
+#: src/protocols/gg/gg.c:762 src/protocols/gg/gg.c:768
+#: src/protocols/gg/gg.c:821 src/protocols/gg/gg.c:833
+#: src/protocols/gg/gg.c:845 src/protocols/gg/gg.c:956
+#: src/protocols/gg/gg.c:984 src/protocols/gg/gg.c:1043
+#: src/protocols/gg/gg.c:1066 src/protocols/gg/gg.c:1116
+#: src/protocols/gg/gg.c:1149 src/protocols/gg/gg.c:1214
+#, fuzzy
+msgid "Gadu-Gadu Error"
+msgstr "Gaim - Erreur"
+
+#: src/protocols/gg/gg.c:657
+msgid "Couldn't get search results"
+msgstr ""
+
+#: src/protocols/gg/gg.c:662
+msgid "Gadu-Gadu Search Engine"
+msgstr ""
+
+#: src/protocols/gg/gg.c:687
+msgid "Active"
+msgstr ""
+
+#: src/protocols/gg/gg.c:688
+#, fuzzy
+msgid "yes"
+msgstr "Oui"
+
+#: src/protocols/gg/gg.c:688
+#, fuzzy
+msgid "no"
+msgstr "Info"
+
+#: src/protocols/gg/gg.c:692
+msgid "UIN"
+msgstr ""
+
+#: src/protocols/gg/gg.c:696
+#, fuzzy
+msgid "First name"
+msgstr "Prénom"
+
+#: src/protocols/gg/gg.c:701
+#, fuzzy
+msgid "Second Name"
+msgstr "Pseudonyme: "
+
+#: src/protocols/gg/gg.c:705
+msgid "Nick"
+msgstr ""
+
+#: src/protocols/gg/gg.c:712 src/protocols/gg/gg.c:715
+msgid "Birth year"
+msgstr ""
+
+#: src/protocols/gg/gg.c:721 src/protocols/gg/gg.c:723
+#: src/protocols/gg/gg.c:725
+msgid "Sex"
+msgstr ""
+
+#. Line 5
+#: src/dialogs.c:1501 src/dialogs.c:2205 src/protocols/gg/gg.c:729
+msgid "City"
+msgstr "Ville"
+
+#: src/protocols/gg/gg.c:761
+msgid "There is no Buddy List stored on server. Sorry!"
+msgstr ""
+
+#: src/protocols/gg/gg.c:768
+msgid "Couldn't Import Buddies List from Server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:815
+msgid "Buddies List sucessfully transfered into Server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:816 src/protocols/gg/gg.c:828
+#: src/protocols/gg/gg.c:840
+msgid "Gadu-Gadu Information"
+msgstr ""
+
+#: src/protocols/gg/gg.c:821
+msgid "Couldn't transfer Buddies List into Server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:827
+msgid "Buddies List sucessfully deleted from Server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:833
+msgid "Couldn't delete Buddies List from Server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:839
+#, fuzzy
+msgid "Password changed sucessfully"
+msgstr "Changement de mot de passe effectué"
+
+#: src/protocols/gg/gg.c:845
+msgid "Password couldn't be changed"
+msgstr ""
+
+#: src/protocols/gg/gg.c:956
+#, fuzzy
+msgid "Couldn't send http request"
+msgstr "incapable de se connecter au serveur\n"
+
+#: src/protocols/gg/gg.c:982
+#, c-format
+msgid "Buddies List import from Server failed (%s)"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1041
+#, c-format
+msgid "Buddies List export to Server failed (%s)"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1064
+#, c-format
+msgid "Deletion of Buddies List from Server failed (%s)"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1114 src/protocols/gg/gg.c:1212
+#, c-format
+msgid "Connect to search service failed (%s)"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1147
+#, fuzzy, c-format
+msgid "Changing Password failed (%s)"
+msgstr "Changer de Mot de Passe"
+
+#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1175
+#, fuzzy
+msgid "Directory Search"
+msgstr "Information de l'annuaire"
+
+#: src/dialogs.c:1618 src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
+msgid "Change Password"
+msgstr "Changer de Mot de Passe"
+
+#: src/protocols/gg/gg.c:1162 src/protocols/gg/gg.c:1179
+#, fuzzy
+msgid "Import Buddies List from Server"
+msgstr "Importer une Liste de Potes"
+
+#: src/protocols/gg/gg.c:1164 src/protocols/gg/gg.c:1180
+#, fuzzy
+msgid "Export Buddies List to Server"
+msgstr "Exporter une Liste de Potes"
+
+#: src/protocols/gg/gg.c:1166 src/protocols/gg/gg.c:1181
+msgid "Delete Buddies List from Server"
+msgstr ""
+
+#: src/protocols/icq/gaim_icq.c:308
+#, fuzzy
+msgid "Send message through server"
+msgstr "Envoyer le message sous le pseudo: "
+
+#: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1538
+#: src/protocols/jabber/jabber.c:2021 src/protocols/oscar/oscar.c:2847
+#: src/protocols/toc/toc.c:1201
 #, fuzzy
 msgid "Get Info"
 msgstr "Obtenir des informations"
 
-#: plugins/yay/yay.c:183
+#: src/protocols/irc/irc.c:429 src/protocols/irc/irc.c:962
+#, c-format
+msgid "<B>%s has changed the topic to: %s</B>"
+msgstr ""
+
+#: src/protocols/irc/irc.c:682
+msgid "No such nick/channel"
+msgstr ""
+
+#: src/protocols/irc/irc.c:682 src/protocols/irc/irc.c:685
+#: src/protocols/irc/irc.c:687 src/protocols/irc/irc.c:891
+#, fuzzy
+msgid "IRC Error"
+msgstr "Erreur de Salon"
+
+#: src/protocols/irc/irc.c:685
+msgid "No such server"
+msgstr ""
+
+#: src/protocols/irc/irc.c:687
+msgid "No nickname given"
+msgstr ""
+
+#: src/protocols/irc/irc.c:819
+#, fuzzy
+msgid "Unable to write"
+msgstr "Impossible d'ecrire dans le fichier %s."
+
+#: src/protocols/irc/irc.c:889
+#, fuzzy, c-format
+msgid "You have been kicked from %s: %s"
+msgstr "Vous avez été déconnecté du salon %s."
+
+#: src/protocols/irc/irc.c:894
+#, c-format
+msgid "Kicked by %s: %s"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1357
+#, c-format
+msgid "You have left %s"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1358
+msgid "IRC Part"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1443
+#, fuzzy
+msgid "Channel:"
+msgstr "Annuler"
+
+#: src/multi.c:522 src/protocols/irc/irc.c:1447
+#, fuzzy
+msgid "Password:"
+msgstr "Mot de Passe:"
+
+#: src/protocols/jabber/jabber.c:1692
+msgid "Room:"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1696
+msgid "Server:"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1701
+#, fuzzy
+msgid "Handle:"
+msgstr "Inactif: "
+
+#: src/buddy_chat.c:875 src/protocols/jabber/jabber.c:2026
+#: src/protocols/oscar/oscar.c:2854
+#, fuzzy
+msgid "Get Away Msg"
+msgstr "Obtenir le Message d'absence"
+
+#: src/protocols/msn/msn.c:653 src/protocols/msn/msn.c:1909
+#: src/protocols/msn/msn.c:1942
+#, fuzzy
+msgid "MSN Error"
+msgstr "Erreur"
+
+#: src/protocols/msn/msn.c:653
+#, fuzzy
+msgid "Gaim was unable to send a message"
+msgstr ""
+"%s\n"
+"%s n'a pas pu se connecter: %s"
+
+#: src/protocols/msn/msn.c:960
+#, fuzzy
+msgid "You have been disconnected. You have signed on from another location."
+msgstr "Vous avez été déconnecté du salon %s."
+
+#: src/protocols/msn/msn.c:1909 src/protocols/msn/msn.c:1942
+#, fuzzy
+msgid "Invalid name"
+msgstr "Nom de jeune-fille"
+
+#: src/protocols/napster/napster.c:450 src/protocols/oscar/oscar.c:2536
+#: src/protocols/toc/toc.c:1088
+msgid "Join what group:"
+msgstr "Joindre le groupe: "
+
+#: src/protocols/oscar/oscar.c:305
+#, fuzzy, c-format
+msgid "Direct IM with %s closed"
+msgstr "Connection directe avec %s fermée"
+
+#: src/protocols/oscar/oscar.c:341
+#, fuzzy
+msgid "connection error (rend)\n"
+msgstr "erreur à la connection!\n"
+
+#: src/protocols/oscar/oscar.c:352
+#, fuzzy
+msgid "major connection error\n"
+msgstr "erreur majeure à la connection!\n"
+
+#: src/protocols/oscar/oscar.c:353 src/protocols/toc/toc.c:509
+#: src/protocols/toc/toc.c:522 src/protocols/toc/toc.c:588
+msgid "Disconnected."
+msgstr "Déconnecté."
+
+#: src/protocols/oscar/oscar.c:365 src/protocols/toc/toc.c:756
+#, c-format
+msgid "You have been disconnected from chat room %s."
+msgstr "Vous avez été déconnecté du salon %s."
+
+#: src/protocols/oscar/oscar.c:366
+#, fuzzy
+msgid "Chat Error!"
+msgstr "Erreur de salon!"
+
+#: src/protocols/oscar/oscar.c:378
+#, fuzzy
+msgid "Chat is currently unavailable"
+msgstr "Le salon est inaccessible."
+
+#: src/protocols/oscar/oscar.c:379
+#, fuzzy
+msgid "Gaim - Chat"
+msgstr "Gaim - Salon"
+
+#: src/protocols/oscar/oscar.c:438 src/protocols/oscar/oscar.c:498
 #, fuzzy
-msgid "Your message did not get sent."
-msgstr "Votre message n'a pas été envoyé."
-
-#: plugins/yay/yay.c:183 src/dialogs.c:3066 src/dialogs.c:3073
-#: src/oscar.c:1869 src/oscar.c:1874 src/oscar.c:1910 src/oscar.c:1929
+msgid "Couldn't connect to host"
+msgstr "incapable de se connecter au serveur\n"
+
+#: src/protocols/oscar/oscar.c:446
+msgid "Password sent, waiting for response\n"
+msgstr "Mot de passe envoyé, en attente de réponse\n"
+
+#: src/protocols/oscar/oscar.c:479
+msgid "internal connection error\n"
+msgstr "erreur interne de connection\n"
+
+#: src/protocols/oscar/oscar.c:480
+msgid "Unable to login to AIM"
+msgstr "Impossible de se connecter à AIM"
+
+#: src/protocols/oscar/oscar.c:485
+#, c-format
+msgid "Signon: %s"
+msgstr "Connection: %s"
+
+#: src/protocols/oscar/oscar.c:557
+msgid "Signed off.\n"
+msgstr "Hors Ligne.\n"
+
+#: src/protocols/oscar/oscar.c:576 src/protocols/oscar/oscar.c:696
+msgid "Could Not Connect"
+msgstr "Impossible de se Connecter"
+
+#: src/protocols/oscar/oscar.c:584
+msgid "Connection established, cookie sent"
+msgstr "Connection établie, cookie envoyé"
+
+#. Incorrect nick/password
+#: src/protocols/oscar/oscar.c:610 src/protocols/toc/toc.c:457
+msgid "Incorrect nickname or password."
+msgstr "Pseudonyme ou Mot de Passe incorrect."
+
+#. Suspended account
+#: src/protocols/oscar/oscar.c:615
+msgid "Your account is currently suspended."
+msgstr ""
+
+#. connecting too frequently
+#: src/protocols/oscar/oscar.c:619
+#, fuzzy
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"Vous vous êtes connecté/déconnecté trop fréquemment. Attendez 10 minutes et "
+"Réessayez. Si vous continuez d'essayer, il vous faudra attendre encore plus "
+"longtemps."
+
+#. client too old
+#: src/protocols/oscar/oscar.c:624
+msgid "The client version you are using is too old. Please upgrade at "
+msgstr ""
+"La version du client que vous utilisez est trop ancienne. Veillez la mettre "
+"à jour à"
+
+#: src/protocols/oscar/oscar.c:628 src/protocols/toc/toc.c:540
+msgid "Authentication Failed"
+msgstr "Echec de Vérification."
+
+#: src/protocols/oscar/oscar.c:650
+msgid "Internal Error"
+msgstr "Erreur Interne"
+
+#: src/protocols/oscar/oscar.c:1204 src/protocols/oscar/oscar.c:2744
+#, fuzzy, c-format
+msgid "Direct IM with %s established"
+msgstr "Connection directe avec %s établie"
+
+#: src/protocols/oscar/oscar.c:1454
+#, fuzzy, c-format
+msgid "You missed %d message from %s because it was invalid."
+msgstr ""
+"Vous avez raté un message de %s parce qu'il était trop gros (le message :))."
+
+#: src/protocols/oscar/oscar.c:1455
+#, fuzzy, c-format
+msgid "You missed %d messages from %s because they were invalid."
+msgstr ""
+"Vous avez raté un message de %s parce qu'il était trop gros (le message :))."
+
+#: src/protocols/oscar/oscar.c:1464
+#, fuzzy, c-format
+msgid "You missed %d 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/protocols/oscar/oscar.c:1465
+#, fuzzy, c-format
+msgid "You missed %d messages from %s because they were too large."
+msgstr ""
+"Vous avez raté un message de %s parce qu'il était trop gros (le message :))."
+
+#: src/protocols/oscar/oscar.c:1474
+#, fuzzy, c-format
+msgid "You missed %d message from %s because the rate limit has been exceeded."
+msgstr ""
+"Vous avez raté un message de %s parce qu'il était trop gros (le message :))."
+
+#: src/protocols/oscar/oscar.c:1475
+#, fuzzy, c-format
+msgid ""
+"You missed %d messages from %s because the rate limit has been exceeded."
+msgstr ""
+"Vous avez raté un message de %s parce qu'il était trop gros (le message :))."
+
+#: src/protocols/oscar/oscar.c:1484
+#, fuzzy, c-format
+msgid "You missed %d message from %s because it was too evil."
+msgstr ""
+"Vous avez raté un message de %s parce qu'il était trop gros (le message :))."
+
+#: src/protocols/oscar/oscar.c:1485
+#, fuzzy, c-format
+msgid "You missed %d messages from %s because they are too evil."
+msgstr ""
+"Vous avez raté un message de %s parce qu'il était trop gros (le message :))."
+
+#: src/protocols/oscar/oscar.c:1494
+#, fuzzy, c-format
+msgid "You missed %d message from %s because you are too evil."
+msgstr ""
+"Vous avez raté un message de %s parce qu'il était trop gros (le message :))."
+
+#: src/protocols/oscar/oscar.c:1495
+#, fuzzy, c-format
+msgid "You missed %d messages from %s because you are too evil."
+msgstr ""
+"Vous avez raté un message de %s parce qu'il était trop gros (le message :))."
+
+#: src/protocols/oscar/oscar.c:1503
+#, fuzzy, c-format
+msgid "You missed %d message from %s for unknown reasons."
+msgstr "Vous avez raté un message de %s pour des raisons inconnues."
+
+#: src/protocols/oscar/oscar.c:1504
+#, fuzzy, c-format
+msgid "You missed %d messages from %s for unknown reasons."
+msgstr "Vous avez raté un message de %s pour des raisons inconnues."
+
+#: src/dialogs.c:2949 src/dialogs.c:2955 src/protocols/oscar/oscar.c:1509
+#: src/protocols/oscar/oscar.c:1547 src/protocols/oscar/oscar.c:1565
+#: src/protocols/oscar/oscar.c:1994 src/protocols/yahoo/yahoo.c:501
 #, fuzzy
 msgid "Gaim - Error"
 msgstr "Gaim - Erreur"
 
-#: plugins/yay/yay.c:201
+#: src/protocols/oscar/oscar.c:1526
+#, c-format
+msgid "SNAC threw error: %s\n"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1528
+#, fuzzy
+msgid "Gaim - Oscar SNAC Error"
+msgstr "Gaim - Erreur"
+
+#: src/protocols/oscar/oscar.c:1545
+#, c-format
+msgid "Your message to %s did not get sent: %s"
+msgstr "Votre message vers %s n'a pas été envoyé: %s"
+
+#: src/protocols/oscar/oscar.c:1546 src/protocols/oscar/oscar.c:1564
+msgid "Reason unknown"
+msgstr "Raison inconnue"
+
+#: src/protocols/oscar/oscar.c:1563
 #, c-format
-msgid "%s has made %s their buddy%s%s"
-msgstr "%s a ajouté %s dans sa liste"
-
-#: plugins/yay/yay.c:203
+msgid "User information for %s unavailable: %s"
+msgstr "Les Informations sur l'utilisateur %s ne sont pas disponibles: %s"
+
+#: src/buddy.c:1906 src/protocols/oscar/oscar.c:1591
+#, fuzzy
+msgid "Buddy Icon"
+msgstr "Icon du pote"
+
+#: src/buddy.c:1909 src/protocols/oscar/oscar.c:1594
+msgid "Voice"
+msgstr "Voix"
+
+#: src/buddy.c:1912 src/protocols/oscar/oscar.c:1597
+msgid "IM Image"
+msgstr "Transfer d'image"
+
+#: src/buddy.c:488 src/buddy.c:1915 src/buddy.c:2343 src/prefs.c:2837
+#: src/protocols/oscar/oscar.c:1600
+msgid "Chat"
+msgstr "Salon"
+
+#: src/buddy.c:1918 src/protocols/oscar/oscar.c:1603
+#, fuzzy
+msgid "Get File"
+msgstr "Recevoir un Fichier"
+
+#: src/buddy.c:1921 src/protocols/oscar/oscar.c:1606
+#, fuzzy
+msgid "Send File"
+msgstr "Envoyer un Fichier"
+
+#: src/buddy.c:1925 src/protocols/oscar/oscar.c:1610
+msgid "Games"
+msgstr "Jeux"
+
+#: src/buddy.c:1928 src/protocols/oscar/oscar.c:1613
+msgid "Stocks"
+msgstr "Bourse"
+
+#: src/buddy.c:1931 src/protocols/oscar/oscar.c:1616
+#, fuzzy
+msgid "Send Buddy List"
+msgstr "Liste de Potes"
+
+#: src/buddy.c:1934 src/protocols/oscar/oscar.c:1619
+msgid "EveryBuddy Bug"
+msgstr ""
+
+#: src/buddy.c:1937 src/protocols/oscar/oscar.c:1622
+#, fuzzy
+msgid "AP User"
+msgstr "Utilisateur:"
+
+#: src/buddy.c:1940 src/protocols/oscar/oscar.c:1625
+msgid "ICQ RTF"
+msgstr ""
+
+#: src/buddy.c:1943 src/protocols/oscar/oscar.c:1628
+msgid "Nihilist"
+msgstr ""
+
+#: src/buddy.c:1946 src/protocols/oscar/oscar.c:1631
+msgid "ICQ Server Relay"
+msgstr ""
+
+#: src/buddy.c:1949 src/protocols/oscar/oscar.c:1634
+msgid "ICQ Unknown"
+msgstr ""
+
+#: src/buddy.c:1952 src/protocols/oscar/oscar.c:1637
+msgid "Trillian Encryption"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1674
+#, fuzzy
+msgid ""
+"<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG "
+"SRC=\"free_icon.gif\"> : Normal AIM User<br><IMG SRC=\"aol_icon.gif\"> : AOL "
+"User <br><IMG SRC=\"dt_icon.gif\"> : Trial AIM User <br><IMG "
+"SRC=\"admin_icon.gif\"> : Administrator"
+msgstr ""
+"Nom d'utilisateur : <B>%s</B>  %s <BR>\n"
+"%sNiveau de Blame : <B>%d %%</B><BR>\n"
+"En ligne depuis : <B>%s</B><BR>\n"
+"Temps d'inactivité : <B>%d</B>\n"
+"<BR>\n"
+"<HR><BR>\n"
+"%s<br><BODY BGCOLOR=WHITE><hr><I>Légende:</I><br><br><IMG "
+"SRC=\"free_icon.gif\"> : Utilisateur d'aim normal<br><IMG "
+"SRC=\"aol_icon.gif\"> : Utilisateur d'AOL <br><IMG SRC=\"dt_icon.gif\"> : "
+"Utilisateur d'aim avec client non officiel<br><IMG SRC=\"admin_icon.gif\"> : "
+"Administrateur"
+
+#: src/protocols/oscar/oscar.c:1686
+#, fuzzy
+msgid ""
+"Username : <B>%s</B>  %s <BR>\n"
+"%sWarning Level : <B>%d %%</B><BR>\n"
+"Online Since : <B>%s</B><BR>\n"
+"Idle Minutes : <B>%d</B>\n"
+"<BR>\n"
+"<HR><BR>\n"
+msgstr ""
+"Pseudonyme : <B>%s</B>\n"
+"<BR>Niveau d'avertissement : <B>%d %%</B>\n"
+"<BR>En Ligne depuis : <B>%s</B><BR>Minutes d'inactivité : <B>%d</B>\n"
+"<BR><HR><BR>%s\n"
+
+#: src/protocols/oscar/oscar.c:1714
+msgid "<i>User has no away message</i>"
+msgstr "<i>L'utilisateur n'a pas de message d'absence</i>"
+
+#: src/protocols/oscar/oscar.c:1726
+#, fuzzy
+msgid "Client Capabilities: "
+msgstr "Capacités: %s\n"
+
+#: src/protocols/oscar/oscar.c:1734
+msgid "<i>No Information Provided</i>"
+msgstr "<i>Pas d'information</i>"
+
+#: src/protocols/oscar/oscar.c:1757
+msgid "Your connection may be lost."
+msgstr "Votre connection risque d'etre coupée"
+
+#: src/protocols/oscar/oscar.c:1758
+msgid "AOL error"
+msgstr "erreur d'AOL"
+
+#: src/protocols/oscar/oscar.c:1993
+msgid ""
+"The last message was not sent because you are over the rate limit. Please "
+"wait 10 seconds and try again."
+msgstr ""
+
+#: src/dialogs.c:3482 src/protocols/oscar/oscar.c:2267
+#: src/protocols/oscar/oscar.c:2818 src/protocols/toc/toc.c:1546
+#: src/protocols/toc/toc.c:1563 src/protocols/toc/toc.c:1623
+#: src/protocols/toc/toc.c:1665 src/protocols/toc/toc.c:1784
+#: src/protocols/toc/toc.c:1814 src/protocols/toc/toc.c:1870
+msgid "Error"
+msgstr "Erreur"
+
+#: src/protocols/oscar/oscar.c:2540 src/protocols/toc/toc.c:1092
+msgid "Exchange:"
+msgstr "Echange:"
+
+#: src/protocols/oscar/oscar.c:2818
+#, fuzzy
+msgid "Unable to open Direct IM"
+msgstr "Impossible de faire une connection directe"
+
+#: src/protocols/oscar/oscar.c:2828
+#, c-format
+msgid ""
+"You have selected to open a Direct IM connection with %s. Doing this will "
+"let them see your IP address, and may be a security risk. Do you wish to "
+"continue?"
+msgstr ""
+"Vous voulez ouvrir une connection directe avec %s. Faire ceci peutleur "
+"permettre de voir votre ip, et résulter en un risque de sécurité.voulez vous "
+"continuer?"
+
+#: src/protocols/oscar/oscar.c:2861
+#, fuzzy
+msgid "Direct IM"
+msgstr "Connection directe"
+
+#: src/protocols/oscar/oscar.c:2869
 #, fuzzy
-msgid "Gaim - Buddy"
-msgstr "Gaim - Pote"
-
-#: plugins/yay/yay.c:250 src/about.c:179 src/aim.c:303 src/buddy.c:2607
-#: src/buddy_chat.c:971 src/buddy_chat.c:1125 src/buddy_chat.c:1152
-#: src/conversation.c:2135 src/dialogs.c:440 src/dialogs.c:3719
-#: src/multi.c:744 src/plugins.c:374 src/prefs.c:2429 src/prpl.c:359
-msgid "Close"
-msgstr "Fermer"
-
-#: plugins/napster.c:1042
-msgid "Napster registration is currently under development"
-msgstr "Enregistrement à Napster est encore en développement"
-
-#: src/about.c:87
+msgid "Get Capabilities"
+msgstr "Capacités: %s\n"
+
+#: src/protocols/toc/toc.c:396
+#, c-format
+msgid "Unable to write file %s."
+msgstr "Impossible d'ecrire dans le fichier %s."
+
+#: src/protocols/toc/toc.c:399
+#, c-format
+msgid "Unable to read file %s."
+msgstr "Impossible de lire le fichier %s."
+
+#: src/protocols/toc/toc.c:402
+#, c-format
+msgid "Message too long, last %s bytes truncated."
+msgstr "Message trop long, perte des %s derniers octets."
+
+#: src/protocols/toc/toc.c:405
+#, c-format
+msgid "%s not currently logged in."
+msgstr "%s n'est pas en ligne."
+
+#: src/protocols/toc/toc.c:408
+#, c-format
+msgid "Warning of %s not allowed."
+msgstr "Les Avertissements à %s ne sont pas permis."
+
+#: src/protocols/toc/toc.c:411
+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/protocols/toc/toc.c:414
+#, c-format
+msgid "Chat in %s is not available."
+msgstr "Le Salon %s est inaccessible."
+
+#: src/protocols/toc/toc.c:417
+#, c-format
+msgid "You are sending messages too fast to %s."
+msgstr "Vous envoyez vos messages trop vite à %s."
+
+#: src/protocols/toc/toc.c:420
+#, 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/protocols/toc/toc.c:423
+#, 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/protocols/toc/toc.c:426
+msgid "Failure."
+msgstr "Echec"
+
+#: src/protocols/toc/toc.c:429
+msgid "Too many matches."
+msgstr "Trop de réponses"
+
+#: src/protocols/toc/toc.c:432
+msgid "Need more qualifiers."
+msgstr "Besoin de plus de critères."
+
+#: src/protocols/toc/toc.c:435
+msgid "Dir service temporarily unavailable."
+msgstr "Le repertoire est temporairement indisponible."
+
+#: src/protocols/toc/toc.c:438
+msgid "Email lookup restricted."
+msgstr "La recherche par Email est restreinte."
+
+#: src/protocols/toc/toc.c:441
+msgid "Keyword ignored."
+msgstr "Mot clé ignoré."
+
+#: src/protocols/toc/toc.c:444
+msgid "No keywords."
+msgstr "Pas de mot-clé."
+
+#: src/protocols/toc/toc.c:447
+msgid "User has no directory information."
+msgstr "L'utilisateur n'a pas d'information personnelle."
+
+#: src/protocols/toc/toc.c:451
+msgid "Country not supported."
+msgstr "Pays non supporté."
+
+#: src/protocols/toc/toc.c:454
+#, c-format
+msgid "Failure unknown: %s."
+msgstr "Echec inconnu: %s."
+
+#: src/protocols/toc/toc.c:460
+msgid "The service is temporarily unavailable."
+msgstr "Le service est termporairement indisponible."
+
+#: src/protocols/toc/toc.c:463
+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/protocols/toc/toc.c:466
+msgid ""
+"You have been connecting and disconnecting too frequently.  Wait ten minutes "
+"and try again.  If you continue to try, you will need to wait even longer."
+msgstr ""
+"Vous vous êtes connecté/déconnecté trop fréquemment. Attendez 10 minutes et "
+"Réessayez. Si vous continuez d'essayer, il vous faudra attendre encore plus "
+"longtemps."
+
+#: src/protocols/toc/toc.c:469
+#, c-format
+msgid "An unknown signon error has occurred: %s."
+msgstr "Une erreur inconnue est survenue à la connection: %s."
+
+#: src/protocols/toc/toc.c:472
+#, c-format
+msgid "An unknown error, %d, has occured.  Info: %s"
+msgstr "Une erreur inconnue, %d, s'est produite. Info: %s"
+
+#: src/protocols/toc/toc.c:489
+#, fuzzy
+msgid "Connection Closed"
+msgstr "Connection Terminée"
+
+#: src/protocols/toc/toc.c:527
+msgid "Waiting for reply..."
+msgstr "En attente d'une réponse..."
+
+#: src/protocols/toc/toc.c:596
+msgid "TOC has come back from its pause. You may now send messages again."
+msgstr ""
+"TOC est revenu de sa pause. Vous pouvez désormais renvoyer des messages à "
+"nouveau."
+
+#: src/protocols/toc/toc.c:597
+msgid "TOC Resume"
+msgstr "TOC retour"
+
+#: src/protocols/toc/toc.c:758
+#, fuzzy
+msgid "Chat Error"
+msgstr "Erreur de Salon"
+
+#: src/protocols/toc/toc.c:777
+#, fuzzy
+msgid "Password Change Successeful"
+msgstr "Changement de mot de passe effectué"
+
+#: src/dialogs.c:1607 src/protocols/toc/toc.c:777
+msgid "Gaim - Password Change"
+msgstr "Gaim - Changement de mot de passe"
+
+#: src/protocols/toc/toc.c:780
+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 ""
+"TOC a envoyé la commande PAUSE. Lorsque ceci arrive TOC ignore tous les "
+"messages envoyés et peux vous déconnecter si vous en envoyer un. Gaim "
+"empèchera ceci. Ce n'est que temporaire, soyez patient."
+
+#: src/protocols/toc/toc.c:783
+msgid "TOC Pause"
+msgstr "TOC en Pause"
+
+#: src/protocols/toc/toc.c:1207
+#, fuzzy
+msgid "Get Dir Info"
+msgstr "Info Personnelle"
+
+#: src/protocols/toc/toc.c:1623 src/protocols/toc/toc.c:1665
+#: src/protocols/toc/toc.c:1784 src/protocols/toc/toc.c:1870
+#, fuzzy
+msgid "Could not connect for transfer!"
+msgstr "N'a pu se connecter pour le transfert!"
+
+#: src/protocols/toc/toc.c:1814
+msgid "Could not write file header!"
+msgstr "N'a pu écrire l'en tête du fichier"
+
+#: src/protocols/toc/toc.c:1903
+msgid "Gaim - Save As..."
+msgstr "Gaim - Enregistrer sous..."
+
+#: src/protocols/toc/toc.c:1944
+#, fuzzy, c-format
+msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+msgstr "%s demande à %s d'accepter %d fichier%s: %s (%.2f %s)%s%s"
+
+#: src/protocols/toc/toc.c:1945
+#, fuzzy, c-format
+msgid "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+msgstr "%s demande à %s d'accepter %d fichier%s: %s (%.2f %s)%s%s"
+
+#: src/protocols/toc/toc.c:1950
+#, c-format
+msgid "%s requests you to send them a file"
+msgstr "%s vous demande de leur envoyer un fichier"
+
+#: src/protocols/yahoo/yahoo.c:501
+#, fuzzy
+msgid "Your message did not get sent."
+msgstr "Votre message n'a pas été envoyé."
+
+#: src/protocols/zephyr/zephyr.c:802
+msgid "ZLocate"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:839
+msgid "Class:"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:843
+msgid "Instance:"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:847
+msgid "Recipient:"
+msgstr ""
+
+#: src/about.c:93
 #, c-format
 msgid "About Gaim v%s"
 msgstr "À propos de Gaim v%s"
 
-#: src/about.c:124
+#: src/about.c:126
+#, fuzzy
 msgid ""
 "Gaim is a client that supports AOL's Instant Messenger protocol. It is "
-"written using Gtk+ and is licensed under the GPL.\n"
+"written\n"
+"using Gtk+ and is licensed under the GPL.\n"
+"\n"
 "URL: "
 msgstr ""
-"Gaim est un client supportant le protocol d'AIM. Il est écrit en Gtk+"
-"et est sous la GPL.\n"
+"Gaim est un client supportant le protocol d'AIM. Il est écrit en Gtk+et est "
+"sous la GPL.\n"
 "URL: "
 
+#: src/about.c:137
+msgid ""
+"Active Developers\n"
+"====================\n"
+"Rob Flynn (maintainer) [ rob@marko.net ]\n"
+"Sean Egan (coder)      [ bj91704@binghamton.edu ]\n"
+"\n"
+"Crazy Patch Writers\n"
+"===================\n"
+"Benjamin Miller\n"
+"Decklin Foster\n"
+"\n"
+"Retired Developers\n"
+"===================\n"
+"Jim Duchek\n"
+"Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
+"Mark Spencer (original author)   [ markster@marko.net ]"
+msgstr ""
+
+#: src/about.c:155 src/aim.c:296 src/buddy.c:2469 src/buddy_chat.c:1311
+#: src/buddy_chat.c:1408 src/buddy_chat.c:1438 src/conversation.c:2417
+#: src/dialogs.c:563 src/dialogs.c:3777 src/multi.c:1026 src/plugins.c:277
+#: src/prefs.c:2496 src/prpl.c:438 src/prpl.c:679 src/server.c:991
+msgid "Close"
+msgstr "Fermer"
+
 #. this makes the sizes not work.
 #. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
 #. gtk_widget_grab_default(button);
-#: src/about.c:199
+#: src/about.c:175
 msgid "Web Site"
 msgstr "Site Web"
 
-#: src/aim.c:137 src/buddy.c:2600
+#: src/aim.c:129 src/buddy.c:2462
 msgid "Signoff"
 msgstr "Deconnection"
 
-#: src/aim.c:149
+#: src/aim.c:141
 msgid "Please enter your logon"
 msgstr "Entrez votre login"
 
-#: src/aim.c:149 src/aim.c:154 src/multi.c:917
+#: src/aim.c:141 src/multi.c:1276 src/server.c:55
 #, fuzzy
 msgid "Signon Error"
 msgstr "Erreur de connection"
 
-#: src/aim.c:154
-#, fuzzy
-msgid "Please enter your password"
-msgstr "Entrez votre mot de passe"
-
-#: src/aim.c:248
+#: src/aim.c:239
 msgid "Gaim - Login"
 msgstr "Gaim - Connection"
 
-#: src/aim.c:266
+#: src/aim.c:257
 msgid "Screen Name: "
 msgstr "Pseudonyme: "
 
-#: src/aim.c:280
+#: src/aim.c:273
 msgid "Password: "
 msgstr "Mot de Passe: "
 
-#: src/aim.c:301 src/buddy.c:2604
+#: src/aim.c:294 src/buddy.c:2466
 msgid "Quit"
 msgstr "Quitter"
 
-#: src/aim.c:306 src/aim.c:647 src/buddy.c:2662
+#: src/aim.c:299 src/aim.c:755 src/buddy.c:2492
 msgid "Accounts"
 msgstr "Comptes"
 
-#: src/aim.c:308 src/multi.c:597
+#: src/aim.c:301 src/multi.c:878
 msgid "Signon"
 msgstr "Connection"
 
-#: src/aim.c:340 src/prpl.c:363
-msgid "Register"
-msgstr "S'enregistrer"
-
-#: src/aim.c:341 src/prefs.c:1632 src/prefs.c:1839
+#: src/aim.c:333
+#, fuzzy
+msgid "About"
+msgstr "À Propos..."
+
+#: src/aim.c:334 src/prefs.c:1580 src/prefs.c:1854
 msgid "Options"
 msgstr "Options"
 
 #. Left side: frame with list of plugin file names
-#: src/aim.c:343 src/aim.c:650 src/buddy.c:2679 src/plugins.c:289
+#: src/aim.c:336 src/aim.c:758 src/buddy.c:2510 src/plugins.c:192
 msgid "Plugins"
 msgstr "Plugins"
 
-#: src/aim.c:644 src/buddy.c:2671
+#: src/aim.c:752 src/buddy.c:2502
 msgid "Preferences"
 msgstr "Préférences"
 
-#: src/applet.c:88
-#, c-format
-msgid "file not found: %s\n"
-msgstr "Fichier non trouvé: %s\n"
-
-#: src/applet.c:111
+#: src/applet.c:199
 msgid "Attempting to sign on...."
 msgstr "Tentative de connection"
 
-#: src/applet.c:116
+#: src/applet.c:202
 #, fuzzy
 msgid "Offline. Click to bring up login box."
 msgstr "Déconnecté. Cliquer pour obtenir la fenêtre de connection."
 
-#: src/applet.c:169 src/buddy.c:445 src/buddy.c:2486 src/buddy.c:2618
+#: src/applet.c:218
+#, c-format
+msgid "Away: %d pending."
+msgstr ""
+
+#: src/applet.c:221
+#, fuzzy
+msgid "Away."
+msgstr "Absent"
+
+#: src/applet.c:293 src/buddy.c:487 src/buddy.c:2344 src/buddy.c:2480
 msgid "Away"
 msgstr "Absent"
 
-#: src/applet.c:172 src/away.c:333
+#: src/applet.c:296 src/away.c:389
 msgid "New Away Message"
 msgstr "Nouveau Message d'absence"
 
-#: src/applet.c:309
+#: src/applet.c:443
 msgid "Can't create Gaim applet!"
 msgstr "Impossible de créer l'applet Gaim"
 
-#: src/applet.c:352
+#: src/applet.c:464
 msgid "About..."
 msgstr "À Propos..."
 
-#: src/away.c:153
+#: src/away.c:203
 msgid "Gaim - Away!"
 msgstr "Gaim - Absent!"
 
-#: src/away.c:196
+#: src/away.c:251
 msgid "I'm Back!"
 msgstr "Je suis de Retour!!"
 
-#: src/away.c:212 src/away.c:292 src/away.c:460
+#: src/away.c:267 src/away.c:347 src/away.c:521
 msgid "Back"
 msgstr "De retour"
 
-#: src/away.c:353
+#: src/away.c:409
 msgid "Remove Away Message"
 msgstr "Enlever le message d'absence"
 
-#: src/away.c:529
+#: src/away.c:597
 msgid "Set All Away"
 msgstr "Mettre le message d'absence sur tous les comptes"
 
 #. Put the buttons in the box
-#: src/buddy.c:440 src/buddy.c:2747 src/buddy_chat.c:1157
-#: src/conversation.c:1799 src/conversation.c:2150 src/dialogs.c:883
-#: src/dialogs.c:1007 src/dialogs.c:1893 src/multi.c:728 src/prefs.c:1198
-#: src/prefs.c:1952 src/prefs.c:2269 src/prefs.c:2303
+#: src/buddy.c:482 src/buddy.c:2579 src/buddy_chat.c:1443
+#: src/conversation.c:2043 src/conversation.c:2432 src/dialogs.c:881
+#: src/dialogs.c:1065 src/dialogs.c:1968 src/multi.c:1010 src/prefs.c:1990
+#: src/prefs.c:2332 src/prefs.c:2366
 msgid "Add"
 msgstr "Ajouter"
 
-#: src/buddy.c:441 src/buddy.c:2748 src/dialogs.c:893 src/dialogs.c:989
+#: src/buddy.c:483 src/buddy.c:2580 src/dialogs.c:891 src/dialogs.c:1038
 msgid "Group"
 msgstr "Groupe"
 
-#: src/buddy.c:442 src/buddy.c:2749 src/buddy_chat.c:1159
-#: src/conversation.c:1785 src/conversation.c:2147 src/prefs.c:1199
-#: src/prefs.c:1966 src/prefs.c:2273 src/prefs.c:2307
+#: src/buddy.c:484 src/buddy.c:2581 src/buddy_chat.c:1445
+#: src/conversation.c:2029 src/conversation.c:2429 src/prefs.c:2004
+#: src/prefs.c:2336 src/prefs.c:2370
 msgid "Remove"
 msgstr "Enlever"
 
-#: src/buddy.c:446 src/buddy.c:2130 src/buddy.c:2485
-msgid "Chat"
-msgstr "Salon"
-
-#: src/buddy.c:447 src/buddy.c:648 src/buddy.c:761 src/buddy.c:2483
-#: src/buddy_chat.c:507 src/buddy_chat.c:927
+#: src/buddy.c:489 src/buddy.c:627 src/buddy.c:774 src/buddy.c:2341
+#: src/buddy_chat.c:850 src/buddy_chat.c:1267
 msgid "IM"
 msgstr "IM"
 
-#: src/buddy.c:448 src/buddy.c:2484 src/buddy_chat.c:520 src/buddy_chat.c:935
-#: src/buddy_chat.c:1165 src/conversation.c:2168
+#: src/buddy.c:490 src/buddy.c:2342 src/buddy_chat.c:866 src/buddy_chat.c:1275
+#: src/buddy_chat.c:1451 src/conversation.c:2450
 msgid "Info"
 msgstr "Info"
 
 #. Put the buttons in the box
-#: src/buddy.c:654 src/buddy.c:767 src/dialogs.c:983 src/dialogs.c:3421
-#: src/dialogs.c:3436
+#: src/buddy.c:632 src/buddy.c:779 src/dialogs.c:1030 src/dialogs.c:3336
+#: src/dialogs.c:3351
 msgid "Alias"
 msgstr "Alias"
 
-#: src/buddy.c:660 src/buddy.c:787
+#: src/buddy.c:637 src/buddy.c:798
 msgid "Add Buddy Pounce"
 msgstr "Ajouter une Alerte"
 
-#: src/buddy.c:666 src/buddy.c:793
+#: src/buddy.c:644 src/buddy.c:804
 msgid "View Log"
 msgstr "Voir les Logs"
 
-#: src/buddy.c:749 src/buddy.c:781
+#: src/buddy.c:761 src/buddy.c:792
 #, fuzzy
 msgid "Rename"
 msgstr "Renommer"
 
-#: src/buddy.c:774
+#: src/buddy.c:786
 msgid "Un-Alias"
 msgstr "Retirer l'alias"
 
-#: src/buddy.c:1808
+#: src/buddy.c:1493 src/buddy.c:2485
+msgid "Buddy Pounce"
+msgstr "Alerte"
+
+#: src/buddy.c:1565
 msgid "New Buddy Pounce"
 msgstr "Nouvelle Alerte"
 
-#: src/buddy.c:1826
+#: src/buddy.c:1583
 msgid "Remove Buddy Pounce"
 msgstr "Enlever une Alerte"
 
-#: src/buddy.c:2121
-#, fuzzy
-msgid "Buddy Icon"
-msgstr "Icon du pote"
-
-#: src/buddy.c:2124
-msgid "Voice"
-msgstr "Voix"
-
-#: src/buddy.c:2127
-msgid "IM Image"
-msgstr "Transfer d'image"
-
-#: src/buddy.c:2133
-#, fuzzy
-msgid "Get File"
-msgstr "Recevoir un Fichier"
-
-#: src/buddy.c:2136
-#, fuzzy
-msgid "Send File"
-msgstr "Envoyer un Fichier"
-
-#: src/buddy.c:2139
-msgid "Games"
-msgstr "Jeux"
-
-#: src/buddy.c:2142
-msgid "Stocks"
-msgstr "Bourse"
-
-#: src/buddy.c:2194
+#: src/buddy.c:2029
 #, fuzzy, c-format
 msgid "Logged in: %s\n"
 msgstr "Connection de %s\n"
 
-#: src/buddy.c:2205
-#, c-format
+#: src/buddy.c:2041
 msgid "Warnings: %d%%\n"
 msgstr "Attention: %d%%\n"
 
-#: src/buddy.c:2217
+#: src/buddy.c:2053
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr "Capacités: %s\n"
 
-#: src/buddy.c:2221
+#: src/buddy.c:2057
 #, fuzzy, c-format
 msgid ""
 "Alias: %s               \n"
@@ -302,1334 +1254,1066 @@
 "Pseudonyme: %s\n"
 "%s%s%s%s%s%s"
 
-#: src/buddy.c:2225
+#: src/buddy.c:2061
 msgid "Idle: "
 msgstr "Inactif: "
 
-#: src/buddy.c:2294
+#: src/buddy.c:2132 src/buddy.c:2136
 #, fuzzy, c-format
 msgid "%s logged in."
 msgstr "%s s'est connecté."
 
-#: src/buddy.c:2346
+#: src/buddy.c:2195 src/buddy.c:2199
 #, fuzzy, c-format
 msgid "%s logged out."
 msgstr "%s s'est déconnecté."
 
-#: src/buddy.c:2515
+#: src/buddy.c:2376
 msgid "Information on selected Buddy"
 msgstr "Information sur le pote sélectionné"
 
-#: src/buddy.c:2516 src/dialogs.c:678
+#: src/buddy.c:2377 src/dialogs.c:688
 msgid "Send Instant Message"
 msgstr "Envoyer un message"
 
-#: src/buddy.c:2517
+#: src/buddy.c:2378
 msgid "Start/join a Buddy Chat"
 msgstr "Ouvrir/Rallier un Salon"
 
-#: src/buddy.c:2518
+#: src/buddy.c:2379
 #, fuzzy
 msgid "Activate Away Message"
 msgstr "Activer le message d'absence"
 
-#: src/buddy.c:2582
+#: src/buddy.c:2442
 msgid "File"
 msgstr "Fichier"
 
-#: src/buddy.c:2586
+#: src/buddy.c:2446
 msgid "Add A Buddy"
 msgstr "Ajouter un Pote"
 
-#: src/buddy.c:2588
+#: src/buddy.c:2448
 #, fuzzy
 msgid "Join A Chat"
 msgstr "Rallier le salon"
 
-#: src/buddy.c:2590
+#: src/buddy.c:2450
 #, fuzzy
 msgid "New Instant Message"
 msgstr "Nouveau message"
 
-#: src/buddy.c:2595
+#: src/buddy.c:2452 src/dialogs.c:740
+#, fuzzy
+msgid "Get User Info"
+msgstr "Message d'Information"
+
+#: src/buddy.c:2457
 msgid "Import Buddy List"
 msgstr "Importer une Liste de Potes"
 
-#: src/buddy.c:2613
+#: src/buddy.c:2475
 msgid "Tools"
 msgstr "Outils"
 
-#: src/buddy.c:2623
-msgid "Buddy Pounce"
-msgstr "Alerte"
-
-#: src/buddy.c:2632 src/dialogs.c:2074 src/dialogs.c:2241
-msgid "Search for Buddy"
-msgstr "Rechercher un Pote"
-
-#: src/buddy.c:2636
-msgid "by Email"
-msgstr "Par son Email"
-
-#: src/buddy.c:2640
-msgid "by Dir Info"
-msgstr "Par ses Informations Personnelles"
-
-#: src/buddy.c:2647
-msgid "Settings"
-msgstr "Préférences"
-
-#: src/buddy.c:2649
-msgid "User Info"
-msgstr "Information sur l'utilisateur"
-
-#: src/buddy.c:2653 src/dialogs.c:1367
-msgid "Directory Info"
-msgstr "Information de l'annuaire"
-
-#: src/buddy.c:2657 src/dialogs.c:1558
-msgid "Change Password"
-msgstr "Changer de Mot de Passe"
-
-#: src/buddy.c:2666
+#: src/buddy.c:2498
 #, fuzzy
 msgid "Protocol Actions"
 msgstr "Options du protocol"
 
-#: src/buddy.c:2673
+#: src/buddy.c:2504
 msgid "View System Log"
 msgstr "Voir les Logs du système"
 
-#: src/buddy.c:2684
+#: src/buddy.c:2516
 #, fuzzy
 msgid "Perl"
 msgstr "Perl"
 
-#: src/buddy.c:2687
+#: src/buddy.c:2519
 msgid "Load Script"
 msgstr "Charger un script"
 
-#: src/buddy.c:2691
+#: src/buddy.c:2523
 msgid "Unload All Scripts"
 msgstr "Décharger tous les scripts"
 
-#: src/buddy.c:2695
+#: src/buddy.c:2527
 msgid "List Scripts"
 msgstr "Lister les scripts"
 
-#: src/buddy.c:2703
+#: src/buddy.c:2535
 msgid "Help"
 msgstr "Aide"
 
-#: src/buddy.c:2708
+#: src/buddy.c:2540
 #, fuzzy
 msgid "About Gaim"
 msgstr "À propos..."
 
-#: src/buddy.c:2727 src/prefs.c:2671
+#: src/buddy.c:2559 src/prefs.c:2816
 msgid "Buddy List"
 msgstr "Liste de Potes"
 
-#: src/buddy.c:2781
+#: src/buddy.c:2612
 msgid "Add a new Buddy"
 msgstr "Ajouter un Nouveau Pote"
 
-#: src/buddy.c:2782
+#: src/buddy.c:2613
 #, fuzzy
 msgid "Add a new Group"
 msgstr "Ajouter un Nouveau Groupe"
 
-#: src/buddy.c:2783
-msgid "Remove selected Buddy"
+#: src/buddy.c:2614
+#, fuzzy
+msgid "Remove selected Buddy/Group"
 msgstr "Supprimer le Pote sélectionné"
 
-#: src/buddy.c:2808
+#: src/buddy.c:2639
 msgid "Online"
 msgstr "En Ligne"
 
-#: src/buddy.c:2810
+#: src/buddy.c:2641
 msgid "Edit Buddies"
 msgstr "Editer sa liste de potes"
 
-#: src/buddy.c:2847
+#: src/buddy.c:2681
 msgid "Gaim - Buddy List"
 msgstr "Gaim - Liste de Potes"
 
-#: src/buddy_chat.c:104 src/oscar.c:2590 src/toc.c:1001
-msgid "Join what group:"
-msgstr "Joindre le groupe: "
-
-#: src/buddy_chat.c:202
+#: src/buddy_chat.c:265
 msgid "Join Chat"
 msgstr "Rallier le salon"
 
-#: src/buddy_chat.c:209 src/buddy_chat.c:1057 src/buddy_chat.c:1069
+#: src/buddy_chat.c:272
 msgid "Buddy Chat"
 msgstr "Salon"
 
-#: src/buddy_chat.c:220
+#: src/buddy_chat.c:283
 #, fuzzy
 msgid "Join Chat As:"
 msgstr "Rallier le salon en tant que:"
 
-#: src/buddy_chat.c:241 src/buddy_chat.c:286 src/dialogs.c:410
-#: src/dialogs.c:697 src/dialogs.c:757 src/dialogs.c:885 src/dialogs.c:1002
-#: src/dialogs.c:1281 src/dialogs.c:1491 src/dialogs.c:1619 src/dialogs.c:1684
-#: src/dialogs.c:1882 src/dialogs.c:2080 src/dialogs.c:2260 src/dialogs.c:2334
-#: src/dialogs.c:3199 src/dialogs.c:3423 src/dialogs.c:3619 src/dialogs.c:3852
-#: src/dialogs.c:3940 src/multi.c:479 src/multi.c:593 src/multi.c:893
-#: src/prpl.c:159 src/prpl.c:231
+#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:444
+#: src/dialogs.c:535 src/dialogs.c:706 src/dialogs.c:764 src/dialogs.c:883
+#: src/dialogs.c:1061 src/dialogs.c:1350 src/dialogs.c:1555 src/dialogs.c:1679
+#: src/dialogs.c:1739 src/dialogs.c:1957 src/dialogs.c:2139 src/dialogs.c:2314
+#: src/dialogs.c:2385 src/dialogs.c:3081 src/dialogs.c:3338 src/dialogs.c:3519
+#: src/dialogs.c:3890 src/dialogs.c:3996 src/dialogs.c:4642 src/multi.c:744
+#: src/multi.c:874 src/multi.c:1208 src/prpl.c:150 src/prpl.c:224
 msgid "Cancel"
 msgstr "Annuler"
 
-#: src/buddy_chat.c:246
+#: src/buddy_chat.c:309
 msgid "Join"
 msgstr "Joindre"
 
-#: src/buddy_chat.c:287 src/buddy_chat.c:977 src/buddy_chat.c:1124
+#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1317
+#: src/buddy_chat.c:1407
 msgid "Invite"
 msgstr "Inviter"
 
-#: src/buddy_chat.c:303
-msgid "Invite who?"
-msgstr "Inviter qui ?"
-
-#: src/buddy_chat.c:307
-msgid "With message:"
-msgstr "En utilisant le message:"
-
-#: src/buddy_chat.c:331
-msgid "Invite to Buddy Chat"
+#: src/buddy_chat.c:412 src/dialogs.c:1230 src/dialogs.c:3346
+msgid "Buddy"
+msgstr "Pote"
+
+#: src/buddy_chat.c:417 src/prefs.c:1953
+#, fuzzy
+msgid "Message"
+msgstr "Message"
+
+#: src/buddy_chat.c:454
+#, fuzzy
+msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Inviter à un Salon"
 
-#: src/buddy_chat.c:513 src/buddy_chat.c:931
+#: src/buddy_chat.c:857
+#, fuzzy
+msgid "Un-Ignore"
+msgstr "Ignorer"
+
+#: src/buddy_chat.c:859 src/buddy_chat.c:1271
 msgid "Ignore"
 msgstr "Ignorer"
 
-#: src/buddy_chat.c:565 src/buddy_chat.c:671
+#. don't remove them from ignored in case they re-enter
+#: src/buddy_chat.c:922 src/buddy_chat.c:1034 src/buddy_chat.c:1497
+#: src/buddy_chat.c:1530
 #, c-format
 msgid "%d %s in room"
 msgstr "%d %s dans le salon"
 
-#: src/buddy_chat.c:572
+#: src/buddy_chat.c:930
 #, c-format
 msgid "%s entered the room."
 msgstr "%s est entré dans le salon."
 
-#: src/buddy_chat.c:635
+#: src/buddy_chat.c:996
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s est désormais connu sous le nom de %s"
 
-#: src/buddy_chat.c:678
+#: src/buddy_chat.c:1043
+#, fuzzy, c-format
+msgid "%s left the room (%s)."
+msgstr "%s a quitté le salon."
+
+#: src/buddy_chat.c:1045
 #, c-format
 msgid "%s left the room."
 msgstr "%s a quitté le salon."
 
-#: src/buddy_chat.c:805
+#: src/buddy_chat.c:1144
 #, fuzzy
 msgid "Gaim - Group Chats"
 msgstr "Salon Gaim"
 
-#: src/buddy_chat.c:866
+#: src/buddy_chat.c:1207
 msgid "Topic:"
 msgstr "Sujet: "
 
-#: src/buddy_chat.c:908
+#: src/buddy_chat.c:1248
 msgid "0 people in room"
 msgstr "Personne dans ce Salon"
 
-#: src/buddy_chat.c:982 src/buddy_chat.c:1123
+#: src/buddy_chat.c:1322 src/buddy_chat.c:1406
 msgid "Whisper"
 msgstr "Murmurer"
 
-#: src/buddy_chat.c:987 src/buddy_chat.c:1121 src/buddy_chat.c:1167
-#: src/conversation.c:2179
+#: src/buddy_chat.c:1327 src/buddy_chat.c:1404 src/buddy_chat.c:1453
+#: src/conversation.c:2461
 msgid "Send"
 msgstr "Envoyer"
 
-#: src/buddy_chat.c:1161 src/conversation.c:2156
+#: src/buddy_chat.c:1447 src/conversation.c:2438
 msgid "Block"
 msgstr "Bloquer"
 
-#: src/buddy_chat.c:1163 src/conversation.c:2162 src/dialogs.c:380
-#: src/dialogs.c:405
+#: src/buddy_chat.c:1449 src/conversation.c:2444 src/dialogs.c:419
+#: src/dialogs.c:448
 msgid "Warn"
 msgstr "Donner un Avertissement"
 
-#: src/conversation.c:372
+#: src/conversation.c:392
 #, fuzzy
 msgid "Gaim - Save Conversation"
 msgstr "Gaim - Tracer la Conversation"
 
-#: src/conversation.c:520
-#, c-format
-msgid "Removing '%s' from buddylist.\n"
-msgstr "Suppression de '%s' de la Liste\n"
-
-#: src/conversation.c:1085
+#: src/conversation.c:1037
+msgid "Unable to send message: too large"
+msgstr ""
+
+#: src/conversation.c:1037 src/conversation.c:1039
+#, fuzzy
+msgid "Message Error"
+msgstr "Message"
+
+#: src/conversation.c:1039
+#, fuzzy
+msgid "Unable to send message: Unknown reason"
+msgstr "Vous avez raté un message de %s pour des raisons inconnues."
+
+#: src/conversation.c:1258
 #, fuzzy, c-format
 msgid "Currently at %d, "
 msgstr "Actuellement à %d, "
 
-#: src/conversation.c:1093
+#: src/conversation.c:1266
 #, c-format
 msgid "Setting position to %d\n"
 msgstr "Positionné à %d\n"
 
-#: src/conversation.c:1619 src/prefs.c:1373
+#: src/conversation.c:1832 src/prefs.c:1274
 msgid "Bold Text"
 msgstr "Texte en Gras"
 
-#: src/conversation.c:1619
+#: src/conversation.c:1832
 msgid "Bold"
 msgstr "Gras"
 
-#: src/conversation.c:1623 src/prefs.c:1374
+#: src/conversation.c:1836
 msgid "Italics Text"
 msgstr "Texte en Italique"
 
-#: src/conversation.c:1624
+#: src/conversation.c:1837
 msgid "Italics"
 msgstr "Italique"
 
-#: src/conversation.c:1627
+#: src/conversation.c:1840 src/prefs.c:1286
 msgid "Underline Text"
 msgstr "Texte Souligné"
 
-#: src/conversation.c:1628
+#: src/conversation.c:1841
 msgid "Underline"
 msgstr "Souligné"
 
-#: src/conversation.c:1632
+#: src/conversation.c:1845 src/prefs.c:1292
 msgid "Strike through Text"
 msgstr "Texte Barré"
 
-#: src/conversation.c:1632
+#: src/conversation.c:1845
 msgid "Strike"
 msgstr "Barré"
 
-#: src/conversation.c:1638
+#: src/conversation.c:1851
 msgid "Decrease font size"
 msgstr "Police plus Petite"
 
-#: src/conversation.c:1638
+#: src/conversation.c:1851
 msgid "Small"
 msgstr "Petit"
 
-#: src/conversation.c:1641
+#: src/conversation.c:1854
 msgid "Normal font size"
 msgstr "Police Normale"
 
-#: src/conversation.c:1641
+#: src/conversation.c:1854
 msgid "Normal"
 msgstr "Normal"
 
-#: src/conversation.c:1644
+#: src/conversation.c:1857
 msgid "Increase font size"
 msgstr "Police plus Grande"
 
-#: src/conversation.c:1644
+#: src/conversation.c:1857
 msgid "Big"
 msgstr "Grand"
 
-#: src/conversation.c:1651 src/dialogs.c:2686 src/dialogs.c:2702
+#: src/conversation.c:1864 src/dialogs.c:2756 src/dialogs.c:2780
 msgid "Select Font"
 msgstr "Sectionner une police"
 
-#: src/conversation.c:1652
+#: src/conversation.c:1865
 msgid "Font"
 msgstr "Police"
 
-#: src/conversation.c:1655 src/prefs.c:1404
+#: src/conversation.c:1868 src/prefs.c:1322
 msgid "Text Color"
 msgstr "Couleur de texte"
 
-#: src/conversation.c:1656 src/conversation.c:1660
+#: src/conversation.c:1869 src/conversation.c:1873
 msgid "Color"
 msgstr "Couleur"
 
-#: src/conversation.c:1660 src/prefs.c:1422
+#: src/conversation.c:1873 src/prefs.c:1340
 msgid "Background Color"
 msgstr "Couleur de fond"
 
-#: src/conversation.c:1667 src/dialogs.c:2328
+#: src/conversation.c:1880 src/dialogs.c:2379
 msgid "Insert Link"
 msgstr "Insérer un Lien"
 
-#: src/conversation.c:1668
+#: src/conversation.c:1881
 msgid "Link"
 msgstr "Lien"
 
-#: src/conversation.c:1671
+#: src/conversation.c:1884
 msgid "Insert smiley face"
 msgstr "Insérer un smiley"
 
-#: src/conversation.c:1671
+#: src/conversation.c:1884
 #, fuzzy
 msgid "Smiley"
 msgstr "Smiley"
 
-#: src/conversation.c:1678
+#: src/conversation.c:1891
 msgid "Enable logging"
 msgstr "Activer la Connection"
 
-#: src/conversation.c:1679 src/prefs.c:246
+#: src/conversation.c:1892 src/prefs.c:244
 msgid "Logging"
 msgstr "Connection"
 
-#: src/conversation.c:1688
+#: src/conversation.c:1901
 #, fuzzy
 msgid "Save Conversation"
 msgstr "Tracer toutes les conversations"
 
-#: src/conversation.c:1689 src/dialogs.c:1496 src/dialogs.c:1689
-#: src/dialogs.c:3211 src/dialogs.c:3728
+#: src/conversation.c:1902 src/dialogs.c:1559 src/dialogs.c:1743
+#: src/dialogs.c:3093 src/dialogs.c:3786 src/dialogs.c:4649
 msgid "Save"
 msgstr "Enregistrer"
 
-#: src/conversation.c:1693
+#: src/conversation.c:1906
 msgid "Enable sounds"
 msgstr "Activer le son"
 
-#: src/conversation.c:1694
+#: src/conversation.c:1907
 msgid "Sound"
 msgstr "Son"
 
-#: src/conversation.c:2008
+#: src/conversation.c:2290
 #, fuzzy
 msgid "Gaim - Conversations"
 msgstr "Gaim - Tracer la Conversation"
 
-#: src/conversation.c:2095
+#: src/conversation.c:2377
 #, fuzzy
 msgid "Send message as: "
 msgstr "Envoyer le message sous le pseudo: "
 
-#: src/dialogs.c:367
+#: src/conversation.c:2986
+#, fuzzy
+msgid "Gaim - Save Icon"
+msgstr "Gaim - Enregistrer sous..."
+
+#: src/conversation.c:3013
+msgid "Disable Animation"
+msgstr ""
+
+#: src/conversation.c:3018
+#, fuzzy
+msgid "Enable Animation"
+msgstr "Activer le son"
+
+#: src/conversation.c:3024
+#, fuzzy
+msgid "Hide Icon"
+msgstr "Icon du pote"
+
+#: src/conversation.c:3030
+#, fuzzy
+msgid "Save Icon As..."
+msgstr "Gaim - Enregistrer sous..."
+
+#: src/dialogs.c:407
 msgid "Gaim - Warn user?"
 msgstr "Gaim - Donner un Avertissement?"
 
-#: src/dialogs.c:388
+#: src/dialogs.c:427
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "Voulez-vous réellement donner un avertissement à %s?"
 
-#: src/dialogs.c:393
+#: src/dialogs.c:432
 msgid "Warn anonymously?"
 msgstr "Donner un avertissement anonyme?"
 
-#: src/dialogs.c:397
+#: src/dialogs.c:436
 msgid "Anonymous warnings are less harsh."
 msgstr "Les avertissements anonymes sont moins durs."
 
-#: src/dialogs.c:474
-#, c-format
-msgid "Unable to write file %s."
-msgstr "Impossible d'ecrire dans le fichier %s."
-
-#: src/dialogs.c:477
-#, c-format
-msgid "Unable to read file %s."
-msgstr "Impossible de lire le fichier %s."
-
-#: src/dialogs.c:480
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "Message trop long, perte des %s derniers octets."
-
-#: src/dialogs.c:483
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s n'est pas en ligne."
-
-#: src/dialogs.c:486
+#: src/dialogs.c:464
 #, c-format
-msgid "Warning of %s not allowed."
-msgstr "Les Avertissements à %s ne sont pas permis."
-
-#: src/dialogs.c:489
-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:492
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "Le Salon %s est inaccessible."
-
-#: src/dialogs.c:495
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "Vous envoyez vos messages trop vite à %s."
-
-#: src/dialogs.c:498
-#, 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:501
-#, 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:504
-msgid "Failure."
-msgstr "Echec"
-
-#: src/dialogs.c:507
-msgid "Too many matches."
-msgstr "Trop de réponses"
-
-#: src/dialogs.c:510
-msgid "Need more qualifiers."
-msgstr "Besoin de plus de critères."
+msgid "Removing '%s' from buddylist.\n"
+msgstr "Suppression de '%s' de la Liste\n"
+
+#: src/dialogs.c:490
+#, fuzzy, c-format
+msgid "Gaim - Remove %s?"
+msgstr "Gaim - Renommer un groupe"
+
+#: src/dialogs.c:503
+#, fuzzy
+msgid "Remove Buddy"
+msgstr "Gaim - Renommer un Pote"
 
 #: src/dialogs.c:513
-msgid "Dir service temporarily unavailable."
-msgstr "Le repertoire est temporairement indisponible."
-
-#: src/dialogs.c:516
-msgid "Email lookup restricted."
-msgstr "La recherche par Email est restreinte."
-
-#: src/dialogs.c:519
-msgid "Keyword ignored."
-msgstr "Mot clé ignoré."
-
-#: src/dialogs.c:522
-msgid "No keywords."
-msgstr "Pas de mot-clé."
-
-#: src/dialogs.c:525
-msgid "User has no directory information."
-msgstr "L'utilisateur n'a pas d'information personnelle."
-
-#: src/dialogs.c:529
-msgid "Country not supported."
-msgstr "Pays non supporté."
-
-#: src/dialogs.c:532
 #, c-format
-msgid "Failure unknown: %s."
-msgstr "Echec inconnu: %s."
-
-#. Incorrect nick/password
-#: src/dialogs.c:535 src/oscar.c:627
-msgid "Incorrect nickname or password."
-msgstr "Pseudonyme ou Mot de Passe incorrect."
-
-#: src/dialogs.c:538
-msgid "The service is temporarily unavailable."
-msgstr "Le service est termporairement indisponible."
-
-#: src/dialogs.c:541
-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:544
 msgid ""
-"You have been connecting and disconnecting too frequently.  Wait ten minutes "
-"and try again.  If you continue to try, you will need to wait even longer."
-msgstr "Vous vous êtes connecté/déconnecté trop fréquemment. Attendez 10 minutes et Réessayez. Si vous continuez d'essayer, il vous faudra attendre encore plus longtemps."
-
-#: src/dialogs.c:547
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "Une erreur inconnue est survenue à la connection: %s."
-
-#: src/dialogs.c:550
-#, c-format
-msgid "An unknown error, %d, has occured.  Info: %s"
-msgstr "Une erreur inconnue, %d, s'est produite. Info: %s"
-
-#: src/dialogs.c:553
-#, c-format
-msgid "Gaim - Error %d"
-msgstr "Gaim - Erreur %d"
+"You are about to remove '%s' from\n"
+"your buddylist. Do you want to continue?"
+msgstr ""
+
+#: src/dialogs.c:525 src/prpl.c:154 src/prpl.c:228
+msgid "Accept"
+msgstr "Accepter"
 
 #. Build OK Button
-#: src/dialogs.c:612 src/dialogs.c:702 src/dialogs.c:762 src/dialogs.c:1286
-#: src/dialogs.c:1624 src/dialogs.c:1737 src/dialogs.c:2079 src/dialogs.c:2265
-#: src/dialogs.c:2333 src/dialogs.c:3857 src/dialogs.c:3945 src/multi.c:483
+#: src/dialogs.c:632 src/dialogs.c:711 src/dialogs.c:769 src/dialogs.c:1354
+#: src/dialogs.c:1683 src/dialogs.c:1830 src/dialogs.c:2138 src/dialogs.c:2318
+#: src/dialogs.c:2384 src/dialogs.c:3895 src/dialogs.c:4001 src/multi.c:749
 msgid "OK"
 msgstr "OK"
 
-#: src/dialogs.c:668
+#: src/dialogs.c:678
 msgid "Gaim - IM user"
 msgstr "Gaim - IM Utilisateur"
 
-#: src/dialogs.c:685
+#: src/dialogs.c:695
 #, fuzzy
 msgid "IM who:"
 msgstr "Envoyer un message à qui:"
 
-#: src/dialogs.c:733
-#, fuzzy
-msgid "Get User Info"
-msgstr "Message d'Information"
-
-#: src/dialogs.c:740
+#: src/dialogs.c:747
 msgid "User:"
 msgstr "Utilisateur:"
 
 #. Finish up
-#: src/dialogs.c:768
+#: src/dialogs.c:774
 #, fuzzy
 msgid "Gaim - Get User Info"
 msgstr "Gaim - Message d'information"
 
-#: src/dialogs.c:838
+#: src/dialogs.c:836
 msgid "Buddies"
 msgstr "Potes"
 
-#: src/dialogs.c:891
+#: src/dialogs.c:889
 #, fuzzy
 msgid "Add Group"
 msgstr "Ajouter un Groupe"
 
-#: src/dialogs.c:921
+#: src/dialogs.c:914
 #, fuzzy
 msgid "Gaim - Add Group"
 msgstr "Gaim - Ajouter un Pote"
 
-#: src/dialogs.c:948
+#: src/dialogs.c:998
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Ajouter un Pote"
 
-#: src/dialogs.c:962
+#: src/dialogs.c:1010
 msgid "Add Buddy"
 msgstr "Ajouter un Pote"
 
-#: src/dialogs.c:972 src/dialogs.c:3431
-msgid "Buddy"
-msgstr "Pote"
-
-#: src/dialogs.c:1026
+#: src/dialogs.c:1020
+msgid "Contact"
+msgstr ""
+
+#. Set up stuff for the account box
+#: src/dialogs.c:1048
+#, fuzzy
+msgid "Add To"
+msgstr "Ajouter"
+
+#: src/dialogs.c:1083
 #, fuzzy
 msgid "Please enter a buddy to pounce."
 msgstr "Entrez un pote pour la création d'une alerte"
 
-#: src/dialogs.c:1026
+#: src/dialogs.c:1083
 #, fuzzy
 msgid "Buddy Pounce Error"
 msgstr "Erreur d'Alerte"
 
-#: src/dialogs.c:1095
-#, fuzzy
-msgid "Pounce buddy as:"
-msgstr "Compte à Alerter lorsque vos potes se connectent:"
-
-#: src/dialogs.c:1145
+#: src/dialogs.c:1199
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - Nouvelle Alerte"
 
-#: src/dialogs.c:1162
+#. <pounce type="who">
+#: src/dialogs.c:1210
+msgid "Pounce Who"
+msgstr ""
+
+#: src/dialogs.c:1221
 #, fuzzy
-msgid "Buddy:"
-msgstr "Pote:"
-
-#: src/dialogs.c:1177
+msgid "Account"
+msgstr "Comptes"
+
+#. </pounce type="who">
+#. <pounce type="when">
+#: src/dialogs.c:1245
+msgid "Pounce When"
+msgstr ""
+
+#: src/dialogs.c:1255
 msgid "Pounce on sign on"
 msgstr "Alerter à la connection"
 
-#: src/dialogs.c:1182
+#: src/dialogs.c:1260
 msgid "Pounce on return from away"
 msgstr "Alerter lorsque le pote reviens"
 
-#: src/dialogs.c:1186
+#: src/dialogs.c:1266
 msgid "Pounce on return from idle"
 msgstr "Alerter lorsque le pote redeviens actif"
 
-#: src/dialogs.c:1194
+#. </pounce type="when">
+#. <pounce type="action">
+#: src/dialogs.c:1278
 #, fuzzy
-msgid "Open IM window on pounce"
-msgstr "Ouvrir automatiquement la fenetre des messages lors d'une alerte"
-
-#: src/dialogs.c:1199
+msgid "Pounce Action"
+msgstr "Connection"
+
+#: src/dialogs.c:1289
 #, fuzzy
-msgid "Send IM on pounce"
-msgstr "Envoyer un message lors d'une alerte"
-
-#: src/dialogs.c:1208
+msgid "Open IM Window"
+msgstr "Fenêtre de message"
+
+#: src/dialogs.c:1294
+msgid "Popup Notification"
+msgstr ""
+
+#: src/dialogs.c:1299
 #, fuzzy
-msgid "Message:"
-msgstr "Message:"
-
-#: src/dialogs.c:1220
+msgid "Send Message"
+msgstr "Envoyer le message sous le pseudo: "
+
+#: src/dialogs.c:1312
 #, fuzzy
 msgid "Execute command on pounce"
 msgstr "Executer une commande lors d'une alerte"
 
-#: src/dialogs.c:1229
-msgid "Command:"
-msgstr "Commande:"
-
-#: src/dialogs.c:1242
+#: src/dialogs.c:1325
 #, fuzzy
 msgid "Play sound on pounce"
 msgstr "Jouer un son lors d'une alerte"
 
-#: src/dialogs.c:1251
-#, fuzzy
-msgid "Sound:"
-msgstr "Son:"
-
-#: src/dialogs.c:1268
+#. </pounce type="action">
+#: src/dialogs.c:1340
 msgid "Save this pounce after activation"
 msgstr "Sauvegarder cette alerte pour un usage ultérieur"
 
-#: src/dialogs.c:1357
+#: src/dialogs.c:1422
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - Donner vos informations personnelles"
 
-#: src/dialogs.c:1389
+#: src/dialogs.c:1431
+msgid "Directory Info"
+msgstr "Information de l'annuaire"
+
+#: src/dialogs.c:1453
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Autoriser les recherches sur le web à trouver vos informations"
 
 #. Line 1
-#: src/dialogs.c:1392 src/dialogs.c:2098
+#: src/dialogs.c:1456 src/dialogs.c:2157
 msgid "First Name"
 msgstr "Prénom"
 
 #. Line 2
-#: src/dialogs.c:1403 src/dialogs.c:2110
+#: src/dialogs.c:1467 src/dialogs.c:2169
 msgid "Middle Name"
 msgstr "Deuxième prénom"
 
 #. Line 3
-#: src/dialogs.c:1415 src/dialogs.c:2122
+#: src/dialogs.c:1479 src/dialogs.c:2181
 msgid "Last Name"
 msgstr "Nom"
 
 #. Line 4
-#: src/dialogs.c:1426 src/dialogs.c:2134
+#: src/dialogs.c:1490 src/dialogs.c:2193
 msgid "Maiden Name"
 msgstr "Nom de jeune-fille"
 
-#. Line 5
-#: src/dialogs.c:1437 src/dialogs.c:2146
-msgid "City"
-msgstr "Ville"
-
 #. Line 6
-#: src/dialogs.c:1448 src/dialogs.c:2157
+#: src/dialogs.c:1512 src/dialogs.c:2216
 msgid "State"
 msgstr "Etat"
 
 #. Line 7
-#: src/dialogs.c:1459 src/dialogs.c:2168
+#: src/dialogs.c:1523 src/dialogs.c:2227
 msgid "Country"
 msgstr "Pays"
 
-#: src/dialogs.c:1514
+#: src/dialogs.c:1577
 msgid "New Passwords Do Not Match"
 msgstr "Les nouveaux password diffèrent"
 
-#: src/dialogs.c:1514 src/dialogs.c:1519
+#: src/dialogs.c:1577 src/dialogs.c:1582
 msgid "Gaim - Change Password Error"
 msgstr "Gaim - Erreur au changement de Mot de Passe"
 
-#: src/dialogs.c:1519
+#: src/dialogs.c:1582
 msgid "Fill out all fields completely"
 msgstr "Remplissez tous les champs"
 
-#: src/dialogs.c:1546 src/toc.c:606
-msgid "Gaim - Password Change"
-msgstr "Gaim - Changement de mot de passe"
-
-#: src/dialogs.c:1577
+#: src/dialogs.c:1637
 msgid "Original Password"
 msgstr "Mot de Passe courrant"
 
-#: src/dialogs.c:1591
+#: src/dialogs.c:1651
 msgid "New Password"
 msgstr "Nouveau Mot de Passe"
 
-#: src/dialogs.c:1605
+#: src/dialogs.c:1665
 msgid "New Password (again)"
 msgstr "Nouveau Mot de passe (confirmation)"
 
-#: src/dialogs.c:1650
+#: src/dialogs.c:1706
 msgid "Gaim - Set User Info"
 msgstr "Gaim - Message d'information"
 
-#: src/dialogs.c:1748
+#: src/dialogs.c:1814
 msgid "Below are the results of your search: "
 msgstr "Résultats de votre recherche: "
 
-#: src/dialogs.c:1872 src/dialogs.c:1879
+#: src/dialogs.c:1947 src/dialogs.c:1954
 msgid "Permit"
 msgstr "Autoriser"
 
-#: src/dialogs.c:1874 src/dialogs.c:1881
+#: src/dialogs.c:1949 src/dialogs.c:1956
 msgid "Deny"
 msgstr "Refuser"
 
-#: src/dialogs.c:1922
+#: src/dialogs.c:1993
 #, fuzzy
 msgid "Gaim - Add Permit"
 msgstr "Gaim - Ajouter des autorisation/Permission"
 
-#: src/dialogs.c:1924
+#: src/dialogs.c:1995
 #, fuzzy
 msgid "Gaim - Add Deny"
 msgstr "Gaim - Ajouter des Refus"
 
-#: src/dialogs.c:1995
+#: src/dialogs.c:2055
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - Tracer la Conversation"
 
-#: src/dialogs.c:2205
+#: src/dialogs.c:2133 src/dialogs.c:2296
+msgid "Search for Buddy"
+msgstr "Rechercher un Pote"
+
+#: src/dialogs.c:2261
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - trouver un pote d'après ses Infos."
 
-#: src/dialogs.c:2235
+#: src/dialogs.c:2290
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - Trouver un ami d'après son Email"
 
-#: src/dialogs.c:2248
+#: src/dialogs.c:2303
 msgid "Email"
 msgstr "Email"
 
-#: src/dialogs.c:2347
+#: src/dialogs.c:2398
 msgid "URL"
 msgstr "Site Web"
 
 #. Right side: frame with description and the filepath of plugin
-#: src/dialogs.c:2355 src/plugins.c:308
+#: src/dialogs.c:2406 src/plugins.c:211
 msgid "Description"
 msgstr "Description"
 
-#: src/dialogs.c:2381
+#: src/dialogs.c:2430
 msgid "Gaim - Add URL"
 msgstr "Gaim - Ajouter une adresse internet"
 
-#: src/dialogs.c:2524 src/dialogs.c:2537 src/dialogs.c:2574
+#: src/dialogs.c:2581 src/dialogs.c:2602 src/dialogs.c:2656
 msgid "Select Text Color"
 msgstr "Selectionner la couleur de texte"
 
-#: src/dialogs.c:2561
+#: src/dialogs.c:2635
 #, fuzzy
 msgid "Select Background Color"
 msgstr "Selectionner la couleur de fond"
 
-#: src/dialogs.c:2925
-#, c-format
-msgid "Error reading file %s"
-msgstr "Erreur à la lecture du fichier %s"
-
-#: src/dialogs.c:2926 src/dialogs.c:3580 src/oscar.c:2365 src/oscar.c:2875
-#: src/toc.c:1422 src/toc.c:1439 src/toc.c:1499 src/toc.c:1541 src/toc.c:1675
-#: src/toc.c:1705 src/toc.c:1761
-msgid "Error"
-msgstr "Erreur"
-
-#: src/dialogs.c:3003
+#: src/dialogs.c:2857
+msgid "Import to:"
+msgstr ""
+
+#: src/dialogs.c:2881
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Importer la liste de Potes"
 
 #. We shouldn't allow a blank title
-#: src/dialogs.c:3066
+#: src/dialogs.c:2948
 msgid "You cannot create an away message with a blank title"
 msgstr "Vous ne pouvez créer un message d'absence avec un titre vide"
 
 #. We shouldn't allow a blank message
-#: src/dialogs.c:3073
+#: src/dialogs.c:2955
 msgid "You cannot create an empty away message"
 msgstr "Vous ne pouvez créer un message d'absence vide"
 
-#: src/dialogs.c:3140
+#: src/dialogs.c:3023
 msgid "Gaim - New away message"
 msgstr "Gaim - Nouveau message d'absence"
 
-#: src/dialogs.c:3150
+#: src/dialogs.c:3033
 #, fuzzy
 msgid "New away message"
 msgstr "Nouveau Message d'absence"
 
-#: src/dialogs.c:3163
+#: src/dialogs.c:3046
 msgid "Away title: "
 msgstr "Titre du Message d'absence: "
 
-#: src/dialogs.c:3203
+#: src/dialogs.c:3085
 #, fuzzy
 msgid "Use"
 msgstr "Utiliser"
 
-#: src/dialogs.c:3207
+#: src/dialogs.c:3089
 msgid "Save & Use"
 msgstr "Utiliser et Sauvegarder"
 
 #. show everything
-#: src/dialogs.c:3376
+#: src/dialogs.c:3292
 #, fuzzy
 msgid "Smile!"
 msgstr "Souriez!"
 
-#: src/dialogs.c:3429
+#: src/dialogs.c:3344
 #, fuzzy
 msgid "Alias Buddy"
 msgstr "Ajouter un Pote"
 
-#: src/dialogs.c:3466
+#: src/dialogs.c:3377
 #, fuzzy
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - Ajouter un Pote"
 
-#: src/dialogs.c:3543
+#: src/dialogs.c:3449
 #, fuzzy
 msgid "Gaim - Save Log File"
 msgstr "Gaim - Enregistrer les logs sous..."
 
-#: src/dialogs.c:3578
+#: src/dialogs.c:3481
 #, fuzzy, c-format
 msgid "Unable to remove file %s - %s"
 msgstr "Impossible de détruire le fichier %s - %s"
 
-#: src/dialogs.c:3609
+#: src/dialogs.c:3509
 msgid "Really clear log?"
 msgstr "Effacer les logs?"
 
-#: src/dialogs.c:3627
+#: src/dialogs.c:3524
 #, fuzzy
 msgid "Okay"
 msgstr "Ok"
 
-#: src/dialogs.c:3723
+#: src/dialogs.c:3695
+#, fuzzy
+msgid "Date"
+msgstr "Etat"
+
+#: src/dialogs.c:3758
+#, fuzzy
+msgid "Conversation"
+msgstr "Conversations"
+
+#: src/dialogs.c:3781
 #, fuzzy
 msgid "Clear"
 msgstr "Fermer"
 
-#: src/dialogs.c:3821
+#: src/dialogs.c:3859
 #, fuzzy
 msgid "Gaim - Rename Group"
 msgstr "Gaim - Renommer un groupe"
 
-#: src/dialogs.c:3831
+#: src/dialogs.c:3869
 msgid "Rename Group"
 msgstr "Renommer un groupe"
 
-#: src/dialogs.c:3838 src/dialogs.c:3926
+#: src/dialogs.c:3876 src/dialogs.c:3982
 #, fuzzy
 msgid "New name:"
 msgstr "Pseudonyme:"
 
-#: src/dialogs.c:3909
+#: src/dialogs.c:3965
 #, fuzzy
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - Renommer un Pote"
 
-#: src/dialogs.c:3919
+#: src/dialogs.c:3975
 #, fuzzy
 msgid "Rename Buddy"
 msgstr "Gaim - Renommer un Pote"
 
-#: src/gaimrc.c:980
+#. Below is basically stolen from plugins.c
+#: src/dialogs.c:4059
+#, fuzzy
+msgid "Gaim - Select Perl Script"
+msgstr "Gaim - Selectionnez un script perl"
+
+#: src/gaimrc.c:1113
 #, c-format
 msgid "Could not open config file %s."
 msgstr "Ne peux ouvrir le fichier de configuration %s."
 
-#: src/gaimrc.c:981
+#: src/gaimrc.c:1114
 #, fuzzy
 msgid "Preferences Error"
 msgstr "Erreur de Préférences"
 
-#: src/html.c:167
-#, c-format
-msgid "Getting %d bytes from %s"
-msgstr "Obtention de %d octets de %s"
-
-#: src/html.c:181
-msgid "Getting Data"
-msgstr "Recuperation de donnée"
-
-#: src/html.c:213
+#: src/html.c:183
 #, c-format
 msgid "Receieved: '%s'\n"
 msgstr "Reçu: '%s'\n"
 
-#: src/html.c:238
+#: src/html.c:221
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Erreur à l'ouvcerture de la connection.\n"
 
-#: src/multi.c:361 src/prefs.c:189
+#: src/multi.c:427
+#, fuzzy
+msgid "Gaim - Load Buddy Icon"
+msgstr "Gaim - Ajouter un Pote"
+
+#: src/multi.c:470
 #, fuzzy
-msgid "General Options"
-msgstr "Options Générales"
-
-#: src/multi.c:366
+msgid "Buddy Icon File:"
+msgstr "Icon du pote"
+
+#: src/multi.c:481
+#, fuzzy
+msgid "Browse"
+msgstr "Navigateur"
+
+#: src/multi.c:486 src/prefs.c:1512
+#, fuzzy
+msgid "Reset"
+msgstr "Mettre à zéro"
+
+#: src/multi.c:513
 #, fuzzy
 msgid "Screenname:"
 msgstr "Pseudonyme:"
 
-#: src/multi.c:375
-#, fuzzy
-msgid "Password:"
-msgstr "Mot de Passe:"
-
-#: src/multi.c:386
+#: src/multi.c:533
 msgid "Protocol:"
 msgstr "Protocole:"
 
-#: src/multi.c:391
+#: src/multi.c:538
 msgid "Remember Password"
 msgstr "Mémoriser le mot de passe"
 
-#: src/multi.c:392
+#: src/multi.c:539
 #, fuzzy
 msgid "Auto-Login"
 msgstr "Connection automatique"
 
-#: src/multi.c:458
+#: src/multi.c:579
+msgid "New Mail Notifications"
+msgstr ""
+
+#: src/multi.c:727
 #, fuzzy
 msgid "Gaim - Modify Account"
 msgstr "Gaim - Modifier le Compte"
 
-#: src/multi.c:565
+#: src/multi.c:846
 #, fuzzy
 msgid "Enter Password"
 msgstr "Entrer le Mot de Passe"
 
-#: src/multi.c:653
+#: src/multi.c:935
 #, fuzzy, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Voulez vous détruire %s?"
 
-#: src/multi.c:690
+#: src/multi.c:972
 #, fuzzy
 msgid "Gaim - Account Editor"
 msgstr "Gaim - Liste des Comptes"
 
-#: src/multi.c:709
+#: src/multi.c:991
 #, fuzzy
 msgid "Select All"
 msgstr "Les Sectionner tous"
 
-#: src/multi.c:714
+#: src/multi.c:996
 #, fuzzy
 msgid "Select Autos"
 msgstr "Sectionner ceux qui se connectent automatiquement"
 
-#: src/multi.c:718
+#: src/multi.c:1000
 #, fuzzy
 msgid "Select None"
 msgstr "N'en Sectionner aucun"
 
-#: src/multi.c:732
+#: src/multi.c:1014
 msgid "Modify"
 msgstr "Modifier"
 
-#: src/multi.c:736
+#: src/multi.c:1018
 #, fuzzy
 msgid "Sign On/Off"
 msgstr "Connection/Deconnection"
 
-#: src/multi.c:740
+#: src/multi.c:1022
 #, fuzzy
 msgid "Delete"
 msgstr "Détruire"
 
-#: src/multi.c:914
+#: src/multi.c:1256
 #, c-format
 msgid ""
 "%s\n"
-"%s was unable to sign on: %s"
+"%s: %s"
+msgstr ""
+
+#: src/multi.c:1275
+#, fuzzy, c-format
+msgid "%s was unable to sign on"
 msgstr ""
 "%s\n"
 "%s n'a pas pu se connecter: %s"
 
-#: src/oscar.c:341 src/oscar.c:358 src/toc.c:351 src/toc.c:361 src/toc.c:422
-msgid "Disconnected."
-msgstr "Déconnecté."
-
-#: src/oscar.c:349
-#, fuzzy
-msgid "connection error (rend)\n"
-msgstr "erreur à la connection!\n"
-
-#: src/oscar.c:357
-#, fuzzy
-msgid "major connection error\n"
-msgstr "erreur majeure à la connection!\n"
-
-#: src/oscar.c:370 src/toc.c:585
-#, c-format
-msgid "You have been disconnected from chat room %s."
-msgstr "Vous avez été déconnecté du salon %s."
-
-#: src/oscar.c:371
-#, fuzzy
-msgid "Chat Error!"
-msgstr "Erreur de salon!"
-
-#: src/oscar.c:381
-#, fuzzy
-msgid "Chat is currently unavailable"
-msgstr "Le salon est inaccessible."
-
-#: src/oscar.c:382
-#, fuzzy
-msgid "Gaim - Chat"
-msgstr "Gaim - Salon"
-
-#: src/oscar.c:437 src/oscar.c:490
-#, fuzzy
-msgid "Couldn't connect to host"
-msgstr "incapable de se connecter au serveur\n"
-
-#: src/oscar.c:445
-msgid "Password sent, waiting for response\n"
-msgstr "Mot de passe envoyé, en attente de réponse\n"
-
-#: src/oscar.c:456
-#, c-format
-msgid "Logging in %s\n"
-msgstr "Connection de %s.\n"
-
-#: src/oscar.c:471
-msgid "internal connection error\n"
-msgstr "erreur interne de connection\n"
-
-#: src/oscar.c:472
-msgid "Unable to login to AIM"
-msgstr "Impossible de se connecter à AIM"
-
-#: src/oscar.c:477
-#, c-format
-msgid "Signon: %s"
-msgstr "Connection: %s"
-
-#: src/oscar.c:546
-msgid "Signed off.\n"
-msgstr "Hors Ligne.\n"
-
-#: src/oscar.c:565 src/oscar.c:708
-msgid "Could Not Connect"
-msgstr "Impossible de se Connecter"
-
-#: src/oscar.c:573
-msgid "Connection established, cookie sent"
-msgstr "Connection établie, cookie envoyé"
-
-#. connecting too frequently
-#: src/oscar.c:622
+#: src/multi.c:1286
 #, fuzzy
-msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
-msgstr "Vous vous êtes connecté/déconnecté trop fréquemment. Attendez 10 minutes et Réessayez. Si vous continuez d'essayer, il vous faudra attendre encore plus longtemps."
-
-#. client too old
-#: src/oscar.c:632
-msgid "The client version you are using is too old. Please upgrade at "
-msgstr "La version du client que vous utilisez est trop ancienne. Veillez la mettre à jour à"
-
-#: src/oscar.c:636 src/toc.c:375
-msgid "Authentication Failed"
-msgstr "Echec de Vérification."
-
-#: src/oscar.c:665
-msgid "Internal Error"
-msgstr "Erreur Interne"
-
-#: src/oscar.c:1248 src/oscar.c:2759
-#, fuzzy, c-format
-msgid "Direct IM with %s established"
-msgstr "Connection directe avec %s établie"
-
-#. message too large
-#: src/oscar.c:1868
-#, 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:1873
-#, c-format
-msgid "You missed a message from %s for unknown reasons."
-msgstr "Vous avez raté un message de %s pour des raisons inconnues."
-
-#: src/oscar.c:1908
-#, c-format
-msgid "Your message to %s did not get sent: %s"
-msgstr "Votre message vers %s n'a pas été envoyé: %s"
-
-#: src/oscar.c:1909 src/oscar.c:1928
-msgid "Reason unknown"
-msgstr "Raison inconnue"
-
-#: src/oscar.c:1927
-#, c-format
-msgid "User information for %s unavailable: %s"
-msgstr "Les Informations sur l'utilisateur %s ne sont pas disponibles: %s"
-
-#: src/oscar.c:1968
-#, c-format
-msgid ""
-"Username : <B>%s</B>  %s <BR>\n"
-"%sWarning Level : <B>%d %%</B><BR>\n"
-"Online Since : <B>%s</B><BR>\n"
-"Idle Minutes : <B>%d</B>\n"
-"<BR>\n"
-"<HR><BR>\n"
-"%s<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG SRC=\"free_icon.gif"
-"\"> : Normal AIM User<br><IMG SRC=\"aol_icon.gif\"> : AOL User <br><IMG SRC="
-"\"dt_icon.gif\"> : Trial AIM User <br><IMG SRC=\"admin_icon.gif\"> : "
-"Administrator"
-msgstr ""
-"Nom d'utilisateur : <B>%s</B>  %s <BR>\n"
-"%sNiveau de Blame : <B>%d %%</B><BR>\n"
-"En ligne depuis : <B>%s</B><BR>\n"
-"Temps d'inactivité : <B>%d</B>\n"
-"<BR>\n"
-"<HR><BR>\n"
-"%s<br><BODY BGCOLOR=WHITE><hr><I>Légende:</I><br><br><IMG SRC=\"free_icon.gif"
-"\"> : Utilisateur d'aim normal<br><IMG SRC=\"aol_icon.gif\"> : Utilisateur d'AOL <br><IMG SRC="
-"\"dt_icon.gif\"> : Utilisateur d'aim avec client non officiel<br><IMG SRC=\"admin_icon.gif\"> : "
-"Administrateur"
-
-
-#: src/oscar.c:1990
-msgid "<i>No Information Provided</i>"
-msgstr "<i>Pas d'information</i>"
-
-#: src/oscar.c:1991
-msgid "<i>User has no away message</i>"
-msgstr "<i>L'utilisateur n'a pas de message d'absence</i>"
-
-#: src/oscar.c:2017
-msgid "Your connection may be lost."
-msgstr "Votre connection risque d'etre coupée"
-
-#: src/oscar.c:2018
-msgid "AOL error"
-msgstr "erreur d'AOL"
-
-#: src/oscar.c:2605
-msgid "Exchange:"
-msgstr "Echange:"
-
-#: src/oscar.c:2816
-#, fuzzy, c-format
-msgid "Direct IM with %s closed"
-msgstr "Connection directe avec %s fermée"
-
-#: src/oscar.c:2875
-#, fuzzy
-msgid "Unable to open Direct IM"
-msgstr "Impossible de faire une connection directe"
-
-#: src/oscar.c:2885
-#, c-format
-msgid ""
-"You have selected to open a Direct IM connection with %s. Doing this will "
-"let them see your IP address, and may be a security risk. Do you wish to "
-"continue?"
-msgstr ""
-"Vous voulez ouvrir une connection directe avec %s. Faire ceci peut"
-"leur permettre de voir votre ip, et résulter en un risque de sécurité."
-"voulez vous continuer?"
-
-#: src/oscar.c:2902
-#, fuzzy
-msgid "Get Away Msg"
-msgstr "Obtenir le Message d'absence"
-
-#: src/oscar.c:2910
-#, fuzzy
-msgid "Direct IM"
-msgstr "Connection directe"
-
-#: src/oscar.c:3050
-msgid ""
-"Unfortunately, currently Oscar only allows new user registration by going to "
-"http://aim.aol.com/aimnew/Aim/register.adp?"
-"promo=106723&pageset=Aim&client=no. Clicking the Register button will open "
-"the URL for you."
-msgstr ""
-"Malheureusement, pour l'instant Oscar ne permet d'ajouter des utilisateurs qu'en allant à "
-"http://aim.aol.com/aimnew/Aim/register.adp?"
-"promo=106723&pageset=Aim&client=no. Clicker sur le bouton d'enregistrement ouvrira "
-"l'adresse pour vous."
-
-#. Below is basically stolen from plugins.c
-#: src/perl.c:656
-#, fuzzy
-msgid "Gaim - Select Perl Script"
-msgstr "Gaim - Selectionnez un script perl"
-
-#: src/perl.c:704
+msgid "Notice"
+msgstr "Voix"
+
+#: src/perl.c:856
 msgid "Perl Scripts"
 msgstr "Scripts Perl"
 
-#: src/plugins.c:129
+#: src/plugins.c:113
 msgid "Gaim - Plugin List"
 msgstr "Gaim - Liste des Plugins"
 
-#: src/plugins.c:206 src/plugins.c:212 src/plugins.c:222
-msgid "Plugin Error"
-msgstr "Erreur de Plugin"
-
-#: src/plugins.c:275
+#: src/plugins.c:178
 msgid "Gaim - Plugins"
 msgstr "Gaim - Plugins"
 
-#: src/plugins.c:335
+#: src/plugins.c:238
 #, fuzzy
 msgid "Filepath:"
 msgstr "Chemin du Fichier:"
 
-#: src/plugins.c:353
+#: src/plugins.c:256
 msgid "Load"
 msgstr "Charger"
 
-#: src/plugins.c:356
+#: src/plugins.c:259
 msgid "Load a plugin from a file"
 msgstr "Charger un plugin à partir du fichier"
 
-#: src/plugins.c:358
+#: src/plugins.c:261
 #, fuzzy
 msgid "Configure"
 msgstr "Configurer le Plugin"
 
-#: src/plugins.c:361
+#: src/plugins.c:264
 msgid "Configure settings of the selected plugin"
 msgstr "Configure les options du plugin sélectionné"
 
-#: src/plugins.c:363
+#: src/plugins.c:266
 msgid "Reload"
 msgstr "Recharger"
 
-#: src/plugins.c:367
+#: src/plugins.c:270
 #, fuzzy
 msgid "Reload the selected plugin"
 msgstr "Recharger le plugin sélectionné"
 
-#: src/plugins.c:369
+#: src/plugins.c:272
 #, fuzzy
 msgid "Unload"
 msgstr "Décharger le Plugin"
 
-#: src/plugins.c:372
+#: src/plugins.c:275
 #, fuzzy
 msgid "Unload the selected plugin"
 msgstr "Décharger le Plugin sélectionné"
 
-#: src/plugins.c:377
+#: src/plugins.c:280
 #, fuzzy
 msgid "Close this window"
 msgstr "Fermer cette fenetre"
 
-#: src/prefs.c:197 src/prefs.c:362 src/prefs.c:503 src/prefs.c:602
-#: src/prefs.c:835 src/prefs.c:1366 src/prefs.c:1628 src/prefs.c:1835
-#: src/prefs.c:2220
+#: src/prefs.c:190
+#, fuzzy
+msgid "General Options"
+msgstr "Options Générales"
+
+#: src/prefs.c:198 src/prefs.c:373 src/prefs.c:539 src/prefs.c:640
+#: src/prefs.c:893 src/prefs.c:1037 src/prefs.c:1262 src/prefs.c:1576
+#: src/prefs.c:1850 src/prefs.c:2283
 msgid "All options take effect immediately unless otherwise noted."
-msgstr "Toutes les options sont prises en compte immédiatement sauf précision du cas contraire."
-
-#: src/prefs.c:209
+msgstr ""
+"Toutes les options sont prises en compte immédiatement sauf précision du cas "
+"contraire."
+
+#: src/prefs.c:210
 msgid "Miscellaneous"
 msgstr "Autres"
 
-#: src/prefs.c:217
+#: src/prefs.c:218
 msgid "Use borderless buttons"
 msgstr "Utiliser des boutons sans bordures"
 
@@ -1638,43 +2322,43 @@
 msgid "Show Buddy Ticker"
 msgstr "Afficher la barre de potes (Ticker)"
 
-#: src/prefs.c:228
+#: src/prefs.c:227
 msgid "Show Debug Window"
 msgstr "Afficher la fenetre de debug"
 
-#: src/prefs.c:232
+#: src/prefs.c:230
 #, fuzzy
 msgid "Report Idle Times"
 msgstr "Afficher les temps d'inactivité"
 
-#: src/prefs.c:240
+#: src/prefs.c:238
 msgid "None"
 msgstr "Aucune"
 
+#: src/prefs.c:239
+msgid "Gaim Use"
+msgstr "Utilisation de Gaim"
+
 #: src/prefs.c:241
-msgid "Gaim Use"
-msgstr "Utilisation de Gaim"
-
-#: src/prefs.c:243
 #, fuzzy
 msgid "X Use"
 msgstr "Utilisation de X"
 
-#: src/prefs.c:254
+#: src/prefs.c:252
 #, fuzzy
 msgid "Log all conversations"
 msgstr "Tracer toutes les conversations"
 
-#: src/prefs.c:255
+#: src/prefs.c:253
 #, fuzzy
 msgid "Strip HTML from logs"
 msgstr "Enlever l'HTML des traces"
 
-#: src/prefs.c:261
+#: src/prefs.c:259
 msgid "Log when buddies sign on/sign off"
 msgstr "Logger les connections/déconnection des potes"
 
-#: src/prefs.c:262
+#: src/prefs.c:261
 msgid "Log when buddies become idle/un-idle"
 msgstr "Logger lorsque les potes deviennent actif/inactif"
 
@@ -1686,380 +2370,459 @@
 msgid "Log your own signons/idleness/awayness"
 msgstr "Logger vos propres connections, inactivités, absences"
 
-#: src/prefs.c:265
+#: src/prefs.c:266
 msgid "Individual log file for each buddy's signons"
 msgstr "Log individuel pour chaque compte"
 
-#: src/prefs.c:267
+#: src/prefs.c:269
 msgid "Browser"
 msgstr "Navigateur"
 
-#: src/prefs.c:279
+#: src/prefs.c:281
 msgid "KFM"
 msgstr "KFM"
 
-#: src/prefs.c:280
+#: src/prefs.c:282
+msgid "Opera"
+msgstr ""
+
+#: src/prefs.c:283
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/prefs.c:283
+#: src/prefs.c:286
 msgid "Pop up new window by default"
 msgstr "Afficher une nouvelle fenêtre par défaut"
 
-#: src/prefs.c:290
+#: src/prefs.c:293
 msgid "GNOME URL Handler"
 msgstr "Programme de gestion d'adresses Gnome"
 
-#: src/prefs.c:292
+#: src/prefs.c:295
+msgid "Galeon"
+msgstr ""
+
+#: src/prefs.c:296
 msgid "Manual"
 msgstr "Manuel"
 
-#: src/prefs.c:354
+#: src/prefs.c:365
 #, fuzzy
 msgid "Proxy Options"
 msgstr "Options de proxy"
 
-#: src/prefs.c:366
+#: src/prefs.c:377
 msgid ""
 "Not all protocols can use these proxy options. Please see the README file "
 "for details."
 msgstr ""
-"Les protocoles ne peuvent pas tous utiliser les options de proxy. Veuillez lire le fichier README"
-"pour plus d'informations."
-
-#: src/prefs.c:495
+"Les protocoles ne peuvent pas tous utiliser les options de proxy. Veuillez "
+"lire le fichier READMEpour plus d'informations."
+
+#: src/prefs.c:382
+#, fuzzy
+msgid "Proxy Type"
+msgstr "Proxy"
+
+#: src/prefs.c:394
+msgid "Proxy Server"
+msgstr ""
+
+#: src/prefs.c:397
+#, fuzzy
+msgid "No Proxy"
+msgstr "Proxy"
+
+#: src/prefs.c:409
+#, fuzzy
+msgid "SOCKS 4"
+msgstr "Proxy SOCKS v4"
+
+#: src/prefs.c:419
+msgid "SOCKS 5"
+msgstr ""
+
+#: src/prefs.c:428
+msgid "HTTP"
+msgstr ""
+
+#: src/prefs.c:452
+#, fuzzy
+msgid "Host"
+msgstr "Serveur TOC:"
+
+#: src/prefs.c:468
+#, fuzzy
+msgid "Port"
+msgstr "Port:"
+
+#: src/prefs.c:485
+#, fuzzy
+msgid "User"
+msgstr "Utilisateur:"
+
+#: src/prefs.c:501
+#, fuzzy
+msgid "Password"
+msgstr "Mot de Passe:"
+
+#: src/prefs.c:531
 #, fuzzy
 msgid "Buddy List Options"
 msgstr "Options de la Liste de Potes"
 
-#: src/prefs.c:507
+#: src/prefs.c:543
 #, fuzzy
 msgid "Buddy List Window"
 msgstr "Fenêtre de la Liste de Potes"
 
-#: src/prefs.c:519
+#: src/prefs.c:555
 msgid "Hide IM/Info/Chat buttons"
 msgstr "Cacher tout"
 
-#: src/prefs.c:521
+#: src/prefs.c:557
 #, fuzzy
 msgid "Automatically show buddy list on sign on"
 msgstr "Afficher la liste des potes automagiquement"
 
-#: src/prefs.c:524
+#: src/prefs.c:560
 #, fuzzy
 msgid "Save Window Size/Position"
 msgstr "Mémoriser la taille et la position des fenêtres"
 
-#: src/prefs.c:530
+#: src/prefs.c:567
 msgid "Show pictures on buttons"
 msgstr "Afficher les images sur les boutons"
 
-#: src/prefs.c:535
+#: src/prefs.c:572
 #, fuzzy
 msgid "Display Buddy List near applet"
 msgstr "Positionner la liste des potes près de l'applet"
 
-#: src/prefs.c:538
+#: src/prefs.c:575
 msgid "Group Displays"
 msgstr "Affichage des groupes"
 
-#: src/prefs.c:550
+#: src/prefs.c:587
 msgid "Hide groups with no online buddies"
 msgstr "Cacher les groupes ne contenant aucun pote connecté"
 
-#: src/prefs.c:556
+#: src/prefs.c:593
 msgid "Show numbers in groups"
 msgstr "Afficher le nombre de potes dans les groupes"
 
-#: src/prefs.c:558
+#: src/prefs.c:595
 #, fuzzy
 msgid "Buddy Displays"
 msgstr "Liste de Potes"
 
-#: src/prefs.c:570
+#: src/prefs.c:607
 #, fuzzy
 msgid "Show buddy type icons"
 msgstr "afficher les images des potes"
 
-#: src/prefs.c:571
+#: src/prefs.c:608
 msgid "Show warning levels"
 msgstr "Afficher le niveau d'Avertissement"
 
-#: src/prefs.c:577
+#: src/prefs.c:614
 msgid "Show idle times"
 msgstr "Afficher les temps d'inactivité"
 
-#: src/prefs.c:594
+#: src/prefs.c:615
+msgid "Grey idle buddies"
+msgstr ""
+
+#: src/prefs.c:632
 #, fuzzy
 msgid "Conversation Options"
 msgstr "Tracer toutes les conversations"
 
-#: src/prefs.c:606
+#: src/prefs.c:644
 #, fuzzy
 msgid "Keyboard Options"
 msgstr "Options Clavier"
 
-#: src/prefs.c:618
+#: src/prefs.c:656
 msgid "Enter sends message"
 msgstr "La touche Entrer envoie les messages"
 
-#: src/prefs.c:619
+#: src/prefs.c:657
 #, fuzzy
 msgid "Control-Enter sends message"
 msgstr "Ctrl + Entrer envoie les messages"
 
-#: src/prefs.c:620
+#: src/prefs.c:658
 msgid "Escape closes window"
 msgstr "Echap ferme la fenêtre"
 
-#: src/prefs.c:626
+#: src/prefs.c:664
 msgid "Control-{B/I/U/S} inserts HTML tags"
 msgstr "Ctrl + {B/I/U/S} insert des tags HTML"
 
-#: src/prefs.c:627
+#: src/prefs.c:665
 msgid "Control-(number) inserts smileys"
 msgstr "Ctrl + (nombre) insert un smiley"
 
-#: src/prefs.c:628
+#: src/prefs.c:666
 msgid "F2 toggles timestamp display"
 msgstr "F2 affiche/coupe l'affichage de l'heure sur les messages"
 
-#: src/prefs.c:630
+#: src/prefs.c:668
 #, fuzzy
 msgid "Display and General Options"
 msgstr "Options généralles et d'affichage"
 
-#: src/prefs.c:642
+#: src/prefs.c:680
 #, fuzzy
 msgid "Show graphical smileys"
 msgstr "Afficher graphiquement les smileys"
 
-#: src/prefs.c:643
+#: src/prefs.c:681
 #, fuzzy
 msgid "Show timestamp on messages"
 msgstr "Afficher l'heure sur les messages"
 
-#: src/prefs.c:644
+#: src/prefs.c:682
 #, fuzzy
 msgid "Show URLs as links"
 msgstr "Envoyer les URL comme des liens cliquables"
 
-#: src/prefs.c:645
+#: src/prefs.c:683
 #, fuzzy
 msgid "Highlight misspelled words"
 msgstr "Surligner automagiquement les mots mal orthographiés"
 
-#: src/prefs.c:646 src/prefs.c:1857
+#: src/prefs.c:684 src/prefs.c:1872
 msgid "Sending messages removes away status"
 msgstr "L'envoi de message supprime le statut d'absence"
 
-#: src/prefs.c:647 src/prefs.c:1864
+#: src/prefs.c:685 src/prefs.c:1885
 #, fuzzy
 msgid "Queue new messages when away"
 msgstr "Mettre les messages en attente lors d'une absence"
 
-#: src/prefs.c:653
+#: src/prefs.c:691
 #, fuzzy
 msgid "Ignore colors"
 msgstr "Ignorer les couleurs envoyées"
 
-#: src/prefs.c:654
+#: src/prefs.c:692
 #, fuzzy
 msgid "Ignore font faces"
 msgstr "Ignorer les Polices"
 
-#: src/prefs.c:655
+#: src/prefs.c:693
 #, fuzzy
 msgid "Ignore font sizes"
 msgstr "Ignorer la taille des Polices"
 
-#: src/prefs.c:656
+#: src/prefs.c:694
 #, fuzzy
 msgid "Ignore TiK Automated Messages"
 msgstr "Ignorer les messages automatiques TiK"
 
-#: src/prefs.c:657 src/prefs.c:1855
+#: src/prefs.c:695 src/prefs.c:1870
 msgid "Ignore new conversations when away"
 msgstr "Ignorer les nouvelles conversations lors des absences"
 
-#: src/prefs.c:827
+#: src/prefs.c:884
 #, fuzzy
 msgid "IM Options"
 msgstr "Options de Message"
 
-#: src/prefs.c:839
+#: src/prefs.c:897 src/prefs.c:2832
 msgid "IM Window"
 msgstr "Fenêtre de message"
 
-#: src/prefs.c:855 src/prefs.c:899
+#: src/prefs.c:913 src/prefs.c:1057
 #, fuzzy
 msgid "Show buttons as: "
 msgstr "Afficher les boutons sous la forme:"
 
-#: src/prefs.c:859 src/prefs.c:903
+#: src/prefs.c:917 src/prefs.c:1062
 msgid "Pictures And Text"
 msgstr "Image et texte"
 
-#: src/prefs.c:860 src/prefs.c:904
+#: src/prefs.c:918 src/prefs.c:1064
 msgid "Pictures"
 msgstr "Image"
 
-#: src/prefs.c:861 src/prefs.c:905
+#: src/prefs.c:919 src/prefs.c:1065
 #, fuzzy
 msgid "Text"
 msgstr "Texte"
 
-#: src/prefs.c:871
+#: src/prefs.c:930
 #, fuzzy
 msgid "Show all conversations in one tabbed window"
 msgstr "Afficher toutes les conversations dans une fenêtre avec des onglets"
 
-#: src/prefs.c:872 src/prefs.c:916
+#: src/prefs.c:932
+#, fuzzy
+msgid "Show chats in the same tabbed window"
+msgstr "Afficher les (dé)connection dans une fenêtre avec onglets"
+
+#: src/prefs.c:939 src/prefs.c:1085
 #, fuzzy
 msgid "Raise windows on events"
 msgstr "Maximiser les fenêtres recevant un message"
 
-#: src/prefs.c:873
+#: src/prefs.c:940
 #, fuzzy
 msgid "Show logins in window"
 msgstr "Afficher les (dé)connection dans la fenêtre"
 
-#: src/prefs.c:879 src/prefs.c:923
+#: src/prefs.c:941
+msgid "Show aliases in tabs/titles"
+msgstr ""
+
+#: src/prefs.c:942
+#, fuzzy
+msgid "Hide window on send"
+msgstr "Maximiser les fenêtres recevant un message"
+
+#: src/prefs.c:944 src/prefs.c:1088
+#, fuzzy
+msgid "Window Sizes"
+msgstr "Fenêtres"
+
+#: src/prefs.c:952 src/prefs.c:1096
 msgid "New window width:"
 msgstr "Largeur de la nouvelle fenêtre"
 
-#: src/prefs.c:880 src/prefs.c:924
+#: src/prefs.c:953 src/prefs.c:1097
 msgid "New window height:"
 msgstr "Hauteur de la nouvelle fenêtre"
 
-#: src/prefs.c:881 src/prefs.c:925
+#: src/prefs.c:954 src/prefs.c:1098
 msgid "Entry widget height:"
 msgstr "Hauteur de la zone de texte (à envoyer)"
 
-#: src/prefs.c:883
+#: src/prefs.c:956 src/prefs.c:1100
+#, fuzzy
+msgid "Tab Placement"
+msgstr "Placement des onglets sur la fenêtre de message"
+
+#: src/prefs.c:976 src/prefs.c:1120
+msgid "Top"
+msgstr "Haut"
+
+#: src/prefs.c:978 src/prefs.c:1122
+msgid "Bottom"
+msgstr "Bas"
+
+#: src/prefs.c:985 src/prefs.c:1129
+msgid "Left"
+msgstr "Gauche"
+
+#: src/prefs.c:987 src/prefs.c:1131
+msgid "Right"
+msgstr "Droite"
+
+#: src/prefs.c:991
+#, fuzzy
+msgid "Buddy Icons"
+msgstr "Icon du pote"
+
+#: src/prefs.c:1003
+#, fuzzy
+msgid "Hide Buddy Icons"
+msgstr "Icon du pote"
+
+#: src/prefs.c:1029
+#, fuzzy
+msgid "Chat Options"
+msgstr "Options"
+
+#: src/prefs.c:1041
 msgid "Group Chat Window"
 msgstr "Fenêtre de discution en groupe"
 
-#: src/prefs.c:915
+#: src/prefs.c:1076
 #, fuzzy
 msgid "Show all chats in one tabbed window"
 msgstr "Afficher les (dé)connection dans une fenêtre avec onglets"
 
-#: src/prefs.c:917
+#: src/prefs.c:1078
+#, fuzzy
+msgid "Show conversations in the same tabbed window"
+msgstr "Afficher toutes les conversations dans une fenêtre avec des onglets"
+
+#: src/prefs.c:1086
 msgid "Show people joining/leaving in window"
 msgstr "Afficher les arrivée/départ dans la fenêtre"
 
-#: src/prefs.c:927
-#, fuzzy
-msgid "Tabbed Window Options"
-msgstr "Options de la fenêtre avec onglets"
-
-#: src/prefs.c:939
-msgid "IM Tab Placement:"
-msgstr "Placement des onglets sur la fenêtre de message"
-
-#: src/prefs.c:951 src/prefs.c:985
-msgid "Top"
-msgstr "Haut"
-
-#: src/prefs.c:953 src/prefs.c:987
-msgid "Bottom"
-msgstr "Bas"
-
-#: src/prefs.c:960 src/prefs.c:994
-msgid "Left"
-msgstr "Gauche"
-
-#: src/prefs.c:962 src/prefs.c:996
-msgid "Right"
-msgstr "Droite"
-
-#: src/prefs.c:973
-msgid "Chat Tab Placement:"
-msgstr "Placement des onglets sur la fenêtre de Salon"
-
-#: src/prefs.c:1031 src/prefs.c:1033 src/prefs.c:1241 src/prefs.c:1243
-msgid "Gaim Chat"
-msgstr "Salon Gaim"
-
-#: src/prefs.c:1179 src/prefs.c:2697
-msgid "Chat Rooms"
-msgstr "Salons"
-
-#: src/prefs.c:1197
-msgid "Refresh"
-msgstr "Rafraichir"
-
-#: src/prefs.c:1222
-msgid "List of available chats"
-msgstr "Liste des salons disponibles"
-
-#: src/prefs.c:1232
-msgid "List of subscribed chats"
-msgstr "Liste des salons souscrits"
-
-#: src/prefs.c:1358 src/prefs.c:2692
+#: src/prefs.c:1134
+msgid "Tab Completion"
+msgstr ""
+
+#: src/prefs.c:1146
+msgid "Tab-Complete Nicks"
+msgstr ""
+
+#: src/prefs.c:1152
+msgid "Old-Style Tab Completion"
+msgstr ""
+
+#: src/prefs.c:1254 src/prefs.c:2842
 #, fuzzy
 msgid "Font Options"
 msgstr "Options de police"
 
-#: src/prefs.c:1375
-msgid "Underlined Text"
-msgstr "Texte Souligné"
-
-#: src/prefs.c:1376
-msgid "Strike Text"
-msgstr "Texte barré"
-
-#: src/prefs.c:1406 src/prefs.c:1424 src/prefs.c:1446
+#: src/prefs.c:1280
+#, fuzzy
+msgid "Italic Text"
+msgstr "Texte en Italique"
+
+#: src/prefs.c:1324 src/prefs.c:1342 src/prefs.c:1364
 #, fuzzy
 msgid "Select"
 msgstr "Sectionner une police"
 
-#: src/prefs.c:1444
+#: src/prefs.c:1362
 msgid "Font Face for Text"
 msgstr "Police pour le Texte"
 
-#: src/prefs.c:1459
+#: src/prefs.c:1377
 #, fuzzy
 msgid "Font Size for Text"
 msgstr "Taille de la police pour le Texte"
 
-#: src/prefs.c:1541
+#: src/prefs.c:1472
 #, fuzzy
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim - configuration sonore"
 
-#: src/prefs.c:1576
-#, fuzzy
-msgid "Reset"
-msgstr "Mettre à zéro"
-
-#: src/prefs.c:1581
+#: src/prefs.c:1507
+msgid "Play"
+msgstr ""
+
+#: src/prefs.c:1517
 #, fuzzy
 msgid "Choose..."
 msgstr "Choisir..."
 
-#: src/prefs.c:1620
+#: src/prefs.c:1568
 #, fuzzy
 msgid "Sound Options"
 msgstr "Options sonores"
 
-#: src/prefs.c:1648
+#: src/prefs.c:1596
 #, fuzzy
 msgid "No sounds when you log in"
 msgstr "Aucun son lors de votre connection"
 
-#: src/prefs.c:1649 src/prefs.c:1856
+#: src/prefs.c:1602 src/prefs.c:1871
 msgid "Sounds while away"
 msgstr "Jouer les sons même lorsque vous êtes absent"
 
-#: src/prefs.c:1655
-msgid "Beep instead of playing sound"
-msgstr "Bipper au lieu de jouer un son"
-
-#: src/prefs.c:1665
+#: src/prefs.c:1612
+#, fuzzy
+msgid "Sound Player:"
+msgstr "Son:"
+
+#: src/prefs.c:1681
 #, c-format
 msgid ""
 "Command to play sound files\n"
@@ -2068,225 +2831,244 @@
 "Commande pour diffuser un fichier son\n"
 "(%s pour le nom de fichier; lecteur interne si vide)"
 
-#: src/prefs.c:1676
+#: src/prefs.c:1692
 msgid "Events"
 msgstr "Evènements"
 
-#: src/prefs.c:1684
+#: src/prefs.c:1700
 msgid "Sound when buddy logs in"
 msgstr "Son quand vos potes se connectent"
 
-#: src/prefs.c:1685
+#: src/prefs.c:1701
 msgid "Sound when buddy logs out"
 msgstr "Son quand vos potes se déconnectent"
 
-#: src/prefs.c:1691
+#: src/prefs.c:1707
 #, fuzzy
 msgid "Sound when received message begins conversation"
 msgstr "Son à la réception d'un message qui commence une conversation"
 
-#: src/prefs.c:1692
+#: src/prefs.c:1709
 msgid "Sound when message is received"
 msgstr "Son à la reception d'un message"
 
-#: src/prefs.c:1693
+#: src/prefs.c:1710
 msgid "Sound when message is sent"
 msgstr "Son à l'envoi d'un message"
 
-#: src/prefs.c:1699
+#: src/prefs.c:1716
 #, fuzzy
 msgid "Sound in chat rooms when people enter"
 msgstr "Son lorsque les personnes entrent dans un salon"
 
-#: src/prefs.c:1700
+#: src/prefs.c:1717
 #, fuzzy
 msgid "Sound in chat rooms when people leave"
 msgstr "Son lorsque les personnes sortent d'un salon"
 
-#: src/prefs.c:1701
+#: src/prefs.c:1718
 #, fuzzy
 msgid "Sound in chat rooms when you talk"
 msgstr "Son lorsque vous parlez dans un salon"
 
-#: src/prefs.c:1702
+#: src/prefs.c:1719
 #, fuzzy
 msgid "Sound in chat rooms when others talk"
 msgstr "Son lorsque les autres personnes parlent dans un salon"
 
-#: src/prefs.c:1827 src/prefs.c:2719
+#: src/prefs.c:1842 src/prefs.c:2864
 #, fuzzy
 msgid "Away Messages"
 msgstr "Messages d'absence"
 
-#: src/prefs.c:1863
+#: src/prefs.c:1879
 msgid "Don't send auto-response"
 msgstr "Ne pas envoyer de réponse automatique"
 
-#: src/prefs.c:1874
+#: src/prefs.c:1880
+#, fuzzy
+msgid "Only send auto-response when idle"
+msgstr "Ne pas envoyer de réponse automatique"
+
+#: src/prefs.c:1895
+msgid "Time between sending auto-responses (in seconds):"
+msgstr ""
+
+#: src/prefs.c:1910
 msgid "Auto Away after"
 msgstr "Passer automatiquement en mode absent après"
 
-#: src/prefs.c:1888
+#: src/prefs.c:1924
 msgid "minutes using"
 msgstr "minutes en utilisant"
 
-#: src/prefs.c:1901
+#: src/prefs.c:1937
 #, fuzzy
 msgid "Messages"
 msgstr "Messages"
 
-#: src/prefs.c:1913
+#: src/prefs.c:1949
 #, fuzzy
 msgid "Title"
 msgstr "Titre"
 
-#: src/prefs.c:1917
-#, fuzzy
-msgid "Message"
-msgstr "Message"
-
-#: src/prefs.c:1956
+#: src/prefs.c:1994
 msgid "Edit"
 msgstr "Editer"
 
-#: src/prefs.c:1960
+#: src/prefs.c:1998
 #, fuzzy
 msgid "Make Away"
 msgstr "Etre absent maintenant"
 
-#: src/prefs.c:2212
+#: src/prefs.c:2275
 #, fuzzy
 msgid "Privacy Options"
 msgstr "Options de filtrage"
 
-#: src/prefs.c:2228
+#: src/prefs.c:2291
 msgid "Set privacy for:"
 msgstr "Mettre en place un filtre pour:"
 
-#: src/prefs.c:2247
+#: src/prefs.c:2310
 msgid "Allow all users to contact me"
 msgstr "Permettre à tous les utiliseurs de me contacter"
 
-#: src/prefs.c:2248
+#: src/prefs.c:2311
 msgid "Allow only the users below"
 msgstr "Permettre aux utiliseurs ci dessous"
 
-#: src/prefs.c:2250
+#: src/prefs.c:2313
 msgid "Allow List"
 msgstr "List de Permission"
 
-#: src/prefs.c:2281
+#: src/prefs.c:2344
 #, fuzzy
 msgid "Deny all users"
 msgstr "Interdire à tous"
 
-#: src/prefs.c:2282
+#: src/prefs.c:2345
 msgid "Block the users below"
 msgstr "Bloquer les utilisateurs ci dessous"
 
-#: src/prefs.c:2284
+#: src/prefs.c:2347
 #, fuzzy
 msgid "Block List"
 msgstr "Bloquer la liste"
 
-#: src/prefs.c:2379
+#: src/prefs.c:2442
 msgid "Gaim - Preferences"
 msgstr "Gaim - Préférences"
 
-#: src/prefs.c:2459
+#: src/prefs.c:2525
 msgid "Gaim debug output window"
 msgstr "fenêtre de debug Gaim"
 
-#: src/prefs.c:2653
+#: src/prefs.c:2798
 msgid "General"
 msgstr "Géneral"
 
-#: src/prefs.c:2658
+#: src/prefs.c:2803
 #, fuzzy
 msgid "Proxy"
 msgstr "Proxy"
 
-#: src/prefs.c:2682
+#: src/prefs.c:2827
 #, fuzzy
 msgid "Conversations"
 msgstr "Conversations"
 
-#: src/prefs.c:2687
-msgid "Windows"
-msgstr "Fenêtres"
-
-#: src/prefs.c:2708
+#: src/prefs.c:2853
 msgid "Sounds"
 msgstr "Sons"
 
-#: src/prefs.c:2730
+#: src/prefs.c:2875
 msgid "Privacy"
 msgstr "Filtre"
 
-#: src/prpl.c:76
+#: src/prpl.c:70
 msgid ""
 "You have attempted to load a protocol which was not compiled from the same "
 "version of the source as this application was. Unfortunately, because it is "
 "not the same version I cannot safely tell you which one it was. Needless to "
 "say, it was not successfully loaded."
 msgstr ""
-"Vous avez essayé de charger un protocole qui n'a pas été compilé à partir de la même "
-"version des sources que cette application. Malheureusement, à cause de cette différence "
-"Je ne peux vous dire laquelle c'était. Evidement, le chargement a échoué."
-
-#: src/prpl.c:80
+"Vous avez essayé de charger un protocole qui n'a pas été compilé à partir de "
+"la même version des sources que cette application. Malheureusement, à cause "
+"de cette différence Je ne peux vous dire laquelle c'était. Evidement, le "
+"chargement a échoué."
+
+#: src/prpl.c:74
 #, fuzzy
 msgid "Protocol Error"
 msgstr "Erreur de Protocole"
 
-#: src/prpl.c:100
+#: src/prpl.c:93
 #, c-format
 msgid "%s was using %s, which got removed. %s is now offline."
 msgstr "%s utilisait %s, qui a été enlevé. %s est maintenant hors ligne."
 
-#: src/prpl.c:103
+#: src/prpl.c:96
 #, fuzzy
 msgid "Disconnect"
 msgstr "Déconnecter"
 
-#: src/prpl.c:143
+#: src/prpl.c:133
 #, fuzzy
 msgid "Accept?"
 msgstr "Accepter?"
 
-#: src/prpl.c:163 src/prpl.c:235
-msgid "Accept"
-msgstr "Accepter"
-
-#: src/prpl.c:208
+#: src/prpl.c:199
 #, fuzzy
 msgid "Gaim - Prompt"
 msgstr "Gaim - Message"
 
-#: src/prpl.c:303
+#: src/prpl.c:419
 #, fuzzy
-msgid "Gaim - New User Registration"
+msgid "Gaim - New Mail"
+msgstr "Gaim - Envoyer le fichier"
+
+#: src/prpl.c:445
+msgid "Open Mail"
+msgstr ""
+
+#: src/prpl.c:564
+#, fuzzy, c-format
+msgid "%s%s%s%s has made %s their buddy%s%s%s"
+msgstr "%s a ajouté %s dans sa liste"
+
+#: src/prpl.c:572
+msgid ""
+"\n"
+"\n"
+"Do you wish to add them to your buddy list?"
+msgstr ""
+
+#: src/prpl.c:615
+msgid ""
+"You do not currently have any protocols available that are able to register "
+"new accounts."
+msgstr ""
+
+#: src/prpl.c:652
+#, fuzzy
+msgid "Gaim - Registration"
 msgstr "Gaim - Enregistrement d'un nouvel utilisateur"
 
-#: src/prpl.c:312
-msgid "New User Registration"
-msgstr "Enregistrement d'un nouvel utilisateur"
-
-#: src/prpl.c:324
-msgid "Register new user for"
-msgstr "Enregistrer le nouvel utilisateur pour"
-
-#: src/prpl.c:552
+#: src/prpl.c:667
+msgid "Registration Information"
+msgstr ""
+
+#: src/prpl.c:684
+msgid "Register"
+msgstr "S'enregistrer"
+
+#: src/server.c:55
 #, fuzzy
-msgid "Gaim - Select File"
-msgstr "Gaim - Sélectionner le fichier"
-
-#: src/prpl.c:554
-#, fuzzy
-msgid "Gaim - Send File"
-msgstr "Gaim - Envoyer le fichier"
-
-#: src/server.c:56
+msgid "Please enter your password"
+msgstr "Entrez votre mot de passe"
+
+#: src/server.c:62
 msgid ""
 "You cannot log this account in; you do not have the protocol it uses loaded, "
 "or the protocol does not have a login function."
@@ -2294,120 +3076,166 @@
 "Vous ne pouvez vous connecter; vous n'avez pas chargé le protocole employé, "
 "ou le protocole n'a pas de fonction permettant la connection."
 
-#: src/server.c:58
+#: src/server.c:64
 #, fuzzy
 msgid "Login Error"
 msgstr "Erreur de Connection"
 
-#: src/server.c:487
+#: src/server.c:550
 #, fuzzy, c-format
 msgid "(%d messages)"
 msgstr "(%d messages)"
 
-#: src/server.c:493
+#: src/server.c:556
 #, fuzzy
 msgid "(1 message)"
 msgstr "(1 message)"
 
-#: src/server.c:781
+#: src/server.c:747
+#, fuzzy
+msgid "Warned"
+msgstr "Donner un Avertissement"
+
+#: src/server.c:818
 msgid "Yes"
 msgstr "Oui"
 
-#: src/server.c:782
+#: src/server.c:819
 msgid "No"
 msgstr "Non"
 
-#: src/toc.c:324 src/toc.c:331
+#: src/server.c:995
 #, fuzzy
-msgid "Connection Closed"
-msgstr "Connection Terminée"
-
-#: src/toc.c:366
-msgid "Waiting for reply..."
-msgstr "En attente d'une réponse..."
-
-#: src/toc.c:429
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "TOC est revenu de sa pause. Vous pouvez désormais renvoyer des messages à nouveau."
-
-#: src/toc.c:430
-msgid "TOC Resume"
-msgstr "TOC retour"
-
-#: src/toc.c:587
+msgid "More Info"
+msgstr "Obtenir des informations"
+
 #, fuzzy
-msgid "Chat Error"
-msgstr "Erreur de Salon"
-
-#: src/toc.c:606
+#~ msgid "Gaim - Buddy"
+#~ msgstr "Gaim - Pote"
+
+#~ msgid "Napster registration is currently under development"
+#~ msgstr "Enregistrement à Napster est encore en développement"
+
+#~ msgid "file not found: %s\n"
+#~ msgstr "Fichier non trouvé: %s\n"
+
+#~ msgid "by Email"
+#~ msgstr "Par son Email"
+
+#~ msgid "by Dir Info"
+#~ msgstr "Par ses Informations Personnelles"
+
+#~ msgid "Settings"
+#~ msgstr "Préférences"
+
+#~ msgid "User Info"
+#~ msgstr "Information sur l'utilisateur"
+
+#~ msgid "Invite who?"
+#~ msgstr "Inviter qui ?"
+
+#~ msgid "With message:"
+#~ msgstr "En utilisant le message:"
+
+#~ msgid "Gaim - Error %d"
+#~ msgstr "Gaim - Erreur %d"
+
 #, fuzzy
-msgid "Password Change Successeful"
-msgstr "Changement de mot de passe effectué"
-
-#: src/toc.c:609
-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 ""
-"TOC a envoyé la commande PAUSE. Lorsque ceci arrive TOC ignore tous les messages "
-"envoyés et peux vous déconnecter si vous en envoyer un. Gaim empèchera ceci. "
-"Ce n'est que temporaire, soyez patient."
-
-#: src/toc.c:612
-msgid "TOC Pause"
-msgstr "TOC en Pause"
-
-#: src/toc.c:1016
+#~ msgid "Pounce buddy as:"
+#~ msgstr "Compte à Alerter lorsque vos potes se connectent:"
+
+#, fuzzy
+#~ msgid "Buddy:"
+#~ msgstr "Pote:"
+
+#, fuzzy
+#~ msgid "Open IM window on pounce"
+#~ msgstr "Ouvrir automatiquement la fenetre des messages lors d'une alerte"
+
+#, fuzzy
+#~ msgid "Send IM on pounce"
+#~ msgstr "Envoyer un message lors d'une alerte"
+
 #, fuzzy
-msgid "Community:"
-msgstr "Communauté:"
-
-#: src/toc.c:1037
-#, fuzzy
-msgid "Get Dir Info"
-msgstr "Info Personnelle"
-
-#: src/toc.c:1215
-msgid ""
-"Unfortunately, currently TOC only allows new user registration by going to "
-"http://aim.aol.com/aimnew/Aim/register.adp?"
-"promo=106723&pageset=Aim&client=no. Clicking the Register button will open "
-"the URL for you."
-msgstr ""
-"Malheureusement, pour l'instant TOC ne permet de s'enregistrer qu'en allant à "
-"http://aim.aol.com/aimnew/Aim/register.adp?"
-"promo=106723&pageset=Aim&client=no. Clicker le bouton Enregister ouvrira "
-"l'URL pour vous."
-
-#: src/toc.c:1499 src/toc.c:1541 src/toc.c:1675 src/toc.c:1761
+#~ msgid "Message:"
+#~ msgstr "Message:"
+
+#~ msgid "Command:"
+#~ msgstr "Commande:"
+
+#~ msgid "Getting %d bytes from %s"
+#~ msgstr "Obtention de %d octets de %s"
+
+#~ msgid "Logging in %s\n"
+#~ msgstr "Connection de %s.\n"
+
+#~ msgid ""
+#~ "Unfortunately, currently Oscar only allows new user registration by going to "
+#~ "http://aim.aol.com/aimnew/Aim/register.adp?promo=106723&pageset=Aim&client=no"
+#~ ". Clicking the Register button will open the URL for you."
+#~ msgstr ""
+#~ "Malheureusement, pour l'instant Oscar ne permet d'ajouter des utilisateurs "
+#~ "qu'en allant à "
+#~ "http://aim.aol.com/aimnew/Aim/register.adp?promo=106723&pageset=Aim&client=no"
+#~ ". Clicker sur le bouton d'enregistrement ouvrira l'adresse pour vous."
+
+#~ msgid "Plugin Error"
+#~ msgstr "Erreur de Plugin"
+
 #, fuzzy
-msgid "Could not connect for transfer!"
-msgstr "N'a pu se connecter pour le transfert!"
-
-#: src/toc.c:1705
-msgid "Could not write file header!"
-msgstr "N'a pu écrire l'en tête du fichier"
-
-#: src/toc.c:1794
-msgid "Gaim - Save As..."
-msgstr "Gaim - Enregistrer sous..."
-
-#: src/toc.c:1833
-#, fuzzy, c-format
-msgid "%s requests %s to accept %d file%s: %s (%.2f %s)%s%s"
-msgstr "%s demande à %s d'accepter %d fichier%s: %s (%.2f %s)%s%s"
-
-#: src/toc.c:1838
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s vous demande de leur envoyer un fichier"
-
-#~ msgid "Export Buddy List"
-#~ msgstr "Exporter une Liste de Potes"
-
-#~ msgid "Error writing file %s"
-#~ msgstr "Erreur à l'écriture du fichier %s"
+#~ msgid "Tabbed Window Options"
+#~ msgstr "Options de la fenêtre avec onglets"
+
+#~ msgid "Chat Tab Placement:"
+#~ msgstr "Placement des onglets sur la fenêtre de Salon"
+
+#~ msgid "Gaim Chat"
+#~ msgstr "Salon Gaim"
+
+#~ msgid "Chat Rooms"
+#~ msgstr "Salons"
+
+#~ msgid "Refresh"
+#~ msgstr "Rafraichir"
+
+#~ msgid "List of available chats"
+#~ msgstr "Liste des salons disponibles"
+
+#~ msgid "List of subscribed chats"
+#~ msgstr "Liste des salons souscrits"
+
+#~ msgid "Underlined Text"
+#~ msgstr "Texte Souligné"
+
+#~ msgid "Strike Text"
+#~ msgstr "Texte barré"
+
+#~ msgid "Beep instead of playing sound"
+#~ msgstr "Bipper au lieu de jouer un son"
+
+#~ msgid "New User Registration"
+#~ msgstr "Enregistrement d'un nouvel utilisateur"
+
+#~ msgid "Register new user for"
+#~ msgstr "Enregistrer le nouvel utilisateur pour"
+
+#, fuzzy
+#~ msgid "Gaim - Select File"
+#~ msgstr "Gaim - Sélectionner le fichier"
+
+#, fuzzy
+#~ msgid "Community:"
+#~ msgstr "Communauté:"
+
+#~ msgid ""
+#~ "Unfortunately, currently TOC only allows new user registration by going to "
+#~ "http://aim.aol.com/aimnew/Aim/register.adp?promo=106723&pageset=Aim&client=no"
+#~ ". Clicking the Register button will open the URL for you."
+#~ msgstr ""
+#~ "Malheureusement, pour l'instant TOC ne permet de s'enregistrer qu'en allant "
+#~ "à "
+#~ "http://aim.aol.com/aimnew/Aim/register.adp?promo=106723&pageset=Aim&client=no"
+#~ ". Clicker le bouton Enregister ouvrira l'URL pour vous."
 
 #~ msgid "Gaim - Export Buddy List"
 #~ msgstr "Gaim - Exporter la liste de Potes"
@@ -2432,10 +3260,6 @@
 #~ msgstr "Couleur de texte"
 
 #, fuzzy
-#~ msgid "Chat Options"
-#~ msgstr "Options"
-
-#, fuzzy
 #~ msgid "Sound Events"
 #~ msgstr "Sons"
 
@@ -2490,17 +3314,6 @@
 #~ msgid "GetFile Error"
 #~ msgstr "Gaim - Erreur %d"
 
-#~ msgid ""
-#~ "Username : <B>%s</B>\n"
-#~ "<BR>Warning Level : <B>%d %%</B>\n"
-#~ "<BR>Online Since : <B>%s</B><BR>Idle Minutes : <B>%d</B>\n"
-#~ "<BR><HR><BR>%s\n"
-#~ msgstr ""
-#~ "Pseudonyme : <B>%s</B>\n"
-#~ "<BR>Niveau d'avertissement : <B>%d %%</B>\n"
-#~ "<BR>En Ligne depuis : <B>%s</B><BR>Minutes d'inactivité : <B>%d</B>\n"
-#~ "<BR><HR><BR>%s\n"
-
 #~ msgid "Receiving %s from %s"
 #~ msgstr "Reception de %s en provenance de %s"
 
@@ -2539,9 +3352,6 @@
 #~ 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"
@@ -2550,12 +3360,6 @@
 #~ msgid "TOC Options"
 #~ msgstr "Options"
 
-#~ msgid "TOC Host:"
-#~ msgstr "Serveur TOC:"
-
-#~ msgid "Port:"
-#~ msgstr "Port:"
-
 #~ msgid "Login Host:"
 #~ msgstr "Connection au serveur:"
 
@@ -2592,9 +3396,6 @@
 #~ 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"
 
@@ -2626,9 +3427,6 @@
 #~ msgid "No Idle"
 #~ msgstr "Actif"
 
-#~ msgid "SOCKS v4 Proxy"
-#~ msgstr "Proxy SOCKS v4"
-
 #~ msgid "SOCKS v5 Proxy (DOES NOT WORK!)"
 #~ msgstr "Proxy SOCKS v5 (NE MARCHE PAS!)"
 
--- a/po/ko.po	Fri Feb 22 23:47:55 2002 +0000
+++ b/po/ko.po	Fri Feb 22 23:48:23 2002 +0000
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim 0.48\n"
-"POT-Creation-Date: 2001-11-01 09:55-0800\n"
+"POT-Creation-Date: 2002-02-17 12:41-0800\n"
 "PO-Revision-Date: 2001-11-07 16:22+0900\n"
 "Last-Translator: ÀÌÈ£¼® <alee@debian.org>\n"
 "Language-Team: artsilly and alee team <>\n"
@@ -13,271 +13,343 @@
 "Content-Type: text/plain; charset=euc-kr\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/protocols/gg/gg.c:68
-msgid "Available"
-msgstr "¸Þ½ÃÁö ¹ÞÀ» ¼ö ÀÖÀ½"
-
-#: src/protocols/gg/gg.c:69
-msgid "Available for friends only"
-msgstr "Ä£±¸µé¿¡°Ô¸¸ ¸Þ½ÃÁö ¹ÞÀ» ¼ö ÀÖÀ½"
-
-# src/applet.c:169 src/buddy.c:445 src/buddy.c:2486 src/buddy.c:2618
-#: src/applet.c:291
-#: src/buddy.c:478
-#: src/buddy.c:2274
-#: src/buddy.c:2410
-#: src/protocols/gg/gg.c:70
-msgid "Away"
-msgstr "ÀÚ¸®ºñ¿ò"
-
-#: src/protocols/gg/gg.c:71
-msgid "Away for friends only"
-msgstr "Ä£±¸µé¿¡°Ô¸¸ ÀÚ¸®ºñ¿ò Ç¥½Ã"
-
-# src/buddy_chat.c:287 src/buddy_chat.c:977 src/buddy_chat.c:1124
-#: src/protocols/gg/gg.c:72
-msgid "Invisible"
-msgstr "º¸ÀÌÁö ¾Êµµ·Ï ÇÔ"
-
-#: src/protocols/gg/gg.c:73
-msgid "Invisible for friends only"
-msgstr "Ä£±¸µé¿¡°Ô¸¸ º¸ÀÌÁö ¾Êµµ·Ï ÇÔ"
-
-#: src/protocols/gg/gg.c:74
-msgid "Unavailable"
-msgstr "¸Þ½ÃÁö ¹ÞÀ» ¼ö ¾øÀ½"
-
 # src/dialogs.c:477
-#: src/protocols/gg/gg.c:168
+#: src/protocols/gg/gg.c:182
 msgid "Unable to resolve hostname."
 msgstr "È£½ºÆ®À̸§À» IP·Î ¹Ù²Ü ¼ö ¾ø½À´Ï´Ù/"
 
 # src/oscar.c:472
-#: src/protocols/gg/gg.c:171
+#: src/protocols/gg/gg.c:185
 msgid "Unable to connect to server."
 msgstr "¼­¹ö¿¡ Á¢¼ÓÇÒ ¼ö ¾ø½À´Ï´Ù."
 
-#: src/protocols/gg/gg.c:174
+#: src/protocols/gg/gg.c:188
 msgid "Invalid response from server."
 msgstr "¼­¹ö·ÎºÎÅÍ À¯È¿ÇÏÁö ¾ÊÀº ÀÀ´äÀÌ ¿Ô½À´Ï´Ù."
 
 # src/dialogs.c:2925
-#: src/protocols/gg/gg.c:177
+#: src/protocols/gg/gg.c:191
 msgid "Error while reading from socket."
 msgstr "¼ÒÄÏ¿¡¼­ Àд Áß¿¡ ¿¡·¯°¡ ¹ß»ýÇÏ¿´½À´Ï´Ù."
 
-#: src/protocols/gg/gg.c:180
+#: src/protocols/gg/gg.c:194
 msgid "Error while writting to socket."
 msgstr "¼ÒÄÏ¿¡ ¾²´Â Áß¿¡ ¿¡·¯°¡ ³µ½À´Ï´Ù."
 
 # src/oscar.c:636 src/toc.c:375
-#: src/protocols/gg/gg.c:183
+#: src/protocols/gg/gg.c:197
 msgid "Authentification failed."
 msgstr "ÀÎÁõ ½ÇÆÐ"
 
-#: src/protocols/gg/gg.c:186
+#: src/protocols/gg/gg.c:200
 msgid "Unknown Error Code."
 msgstr "¾Ë ¼ö ¾ø´Â ¿¡·¯ ÄÚµå."
 
-# plugins/yay/yay.c:183 src/dialogs.c:3066 src/dialogs.c:3073
-# src/oscar.c:1869 src/oscar.c:1874 src/oscar.c:1910 src/oscar.c:1929
-#: src/protocols/gg/gg.c:191
-#: src/protocols/gg/gg.c:597
-#: src/protocols/gg/gg.c:696
-#: src/protocols/gg/gg.c:838
-#: src/protocols/gg/gg.c:875
-#: src/protocols/gg/gg.c:919
-msgid "Gadu-Gadu Error"
-msgstr "°¡µÎ-°¡µÎ ¿À·ù"
-
-#: src/protocols/gg/gg.c:311
+#: src/protocols/gg/gg.c:302
 #, c-format
 msgid "Status: %s"
 msgstr "»óÅÂ: %s"
 
-#: src/protocols/gg/gg.c:326
+#: src/protocols/gg/gg.c:317
 msgid "Nick:"
 msgstr "º°¸í:"
 
-#: src/protocols/gg/gg.c:327
+#: src/protocols/gg/gg.c:318
 msgid "Gadu-Gadu User"
 msgstr "°¡µÎ-°¡µÎ À¯Àú"
 
+# src/oscar.c:565 src/oscar.c:708
+#: src/protocols/gg/gg.c:337
+#, fuzzy
+msgid "Could not connect"
+msgstr "¿¬°áÇÒ ¼ö ¾ø½À´Ï´Ù"
+
+# src/dialogs.c:477
+#: src/protocols/gg/gg.c:344
+#, fuzzy
+msgid "Unable to read socket"
+msgstr "%s ÆÄÀÏÀ» ÀÐÀ» ¼ö ¾ø½À´Ï´Ù."
+
 # src/oscar.c:2875
-#: src/protocols/gg/gg.c:462
+#: src/protocols/gg/gg.c:455
 msgid "Unable to connect."
 msgstr "Á¢¼ÓÇÒ ¼ö ¾ø½À´Ï´Ù."
 
-# src/buddy.c:2225
-#: src/protocols/gg/gg.c:473
-msgid "Handshake"
-msgstr "¾ç¹æÇâ Çڵ彦ÀÌÅ·"
-
-# src/toc.c:324 src/toc.c:331
-#: src/protocols/gg/gg.c:475
-msgid "Connecting to GG server"
-msgstr "°¡µÎ-°¡µÎ ¼­¹ö¿¡ Á¢¼ÓÁßÀÔ´Ï´Ù"
+#: src/protocols/gg/gg.c:465
+msgid "Reading data"
+msgstr ""
+
+#: src/protocols/gg/gg.c:468
+msgid "Balancer handshake"
+msgstr ""
 
 # src/toc.c:366
-#: src/protocols/gg/gg.c:478
-msgid "Waiting for server key"
+#: src/protocols/gg/gg.c:471
+#, fuzzy
+msgid "Reading server key"
 msgstr "¼­¹ö Å°¸¦ ±â´Ù¸®´Â Áß"
 
-# src/buddy.c:2136
-#: src/protocols/gg/gg.c:480
-msgid "Sending key"
-msgstr "Å°¸¦ º¸³»´Â Áß"
-
-#: src/protocols/gg/gg.c:543
+#: src/protocols/gg/gg.c:474
+msgid "Exchanging key hash"
+msgstr ""
+
+#: src/protocols/gg/gg.c:482
+msgid "Critical error in GG library\n"
+msgstr ""
+
+# src/oscar.c:472
+#: src/protocols/gg/gg.c:521
+#, fuzzy
+msgid "Unable to ping server"
+msgstr "¼­¹ö¿¡ Á¢¼ÓÇÒ ¼ö ¾ø½À´Ï´Ù."
+
+# src/conversation.c:2095
+#: src/protocols/gg/gg.c:533
+msgid "Send as message"
+msgstr "äÆýà ¾²ÀÌ´Â °èÁ¤:"
+
+#: src/protocols/gg/gg.c:541
 msgid "Looking up GG server"
 msgstr "°¡µÎ-°¡µÎ ¼­¹ö¸¦ ã½À´Ï´Ù"
 
-#: src/protocols/gg/gg.c:546
+#: src/protocols/gg/gg.c:544
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "À߸øµÈ °¡µÎ-°¡µÎ UIN ÀÔ´Ï´Ù"
 
 # src/toc.c:324 src/toc.c:331
-#: src/protocols/gg/gg.c:573
+#: src/protocols/gg/gg.c:570
 #, c-format
 msgid "Connect to %s failed"
 msgstr "%s ·ÎÀÇ Á¢¼ÓÀÌ ²÷°å½À´Ï´Ù"
 
-#: src/protocols/gg/gg.c:596
+#: src/protocols/gg/gg.c:594
 msgid "You are trying to send message to invalid Gadu-Gadu UIN!"
 msgstr "À߸øµÈ °¡µÎ-°¡µÎ UINÀ¸·Î ¸Þ½ÃÁö¸¦ º¸³»·Á°í ÇÏ°íÀÖ½À´Ï´Ù!"
 
-#: src/protocols/gg/gg.c:696
+# plugins/yay/yay.c:183 src/dialogs.c:3066 src/dialogs.c:3073
+# src/oscar.c:1869 src/oscar.c:1874 src/oscar.c:1910 src/oscar.c:1929
+#: src/protocols/gg/gg.c:595 src/protocols/gg/gg.c:657
+#: src/protocols/gg/gg.c:762 src/protocols/gg/gg.c:768
+#: src/protocols/gg/gg.c:821 src/protocols/gg/gg.c:833
+#: src/protocols/gg/gg.c:845 src/protocols/gg/gg.c:956
+#: src/protocols/gg/gg.c:984 src/protocols/gg/gg.c:1043
+#: src/protocols/gg/gg.c:1066 src/protocols/gg/gg.c:1116
+#: src/protocols/gg/gg.c:1149 src/protocols/gg/gg.c:1214
+msgid "Gadu-Gadu Error"
+msgstr "°¡µÎ-°¡µÎ ¿À·ù"
+
+#: src/protocols/gg/gg.c:657
 msgid "Couldn't get search results"
 msgstr "°Ë»ö °á°ú¸¦ ¾òÀ» ¼ö ¾ø½À´Ï´Ù"
 
-#: src/protocols/gg/gg.c:701
+#: src/protocols/gg/gg.c:662
 msgid "Gadu-Gadu Search Engine"
 msgstr "°¡µÎ-°¡µÎ °Ë»ö ¿£Áø"
 
-#: src/protocols/gg/gg.c:728
+#: src/protocols/gg/gg.c:687
 msgid "Active"
 msgstr "È°¼ºÈ­"
 
 # src/server.c:781
-#: src/protocols/gg/gg.c:729
+#: src/protocols/gg/gg.c:688
 msgid "yes"
 msgstr "³×"
 
 # src/buddy.c:448 src/buddy.c:2484 src/buddy_chat.c:520 src/buddy_chat.c:935
 # src/buddy_chat.c:1165 src/conversation.c:2168
-#: src/protocols/gg/gg.c:729
+#: src/protocols/gg/gg.c:688
 msgid "no"
 msgstr "¾Æ´Ï¿ä"
 
-#: src/protocols/gg/gg.c:733
+#: src/protocols/gg/gg.c:692
 msgid "UIN"
 msgstr "UIN"
 
 # src/dialogs.c:1392 src/dialogs.c:2098
-#: src/protocols/gg/gg.c:737
+#: src/protocols/gg/gg.c:696
 msgid "First name"
 msgstr "À̸§"
 
 # src/aim.c:266
-#: src/protocols/gg/gg.c:742
+#: src/protocols/gg/gg.c:701
 msgid "Second Name"
 msgstr "¼º"
 
-#: src/protocols/gg/gg.c:746
+#: src/protocols/gg/gg.c:705
 msgid "Nick"
 msgstr "º°¸í"
 
-#: src/protocols/gg/gg.c:753
-#: src/protocols/gg/gg.c:756
+#: src/protocols/gg/gg.c:712 src/protocols/gg/gg.c:715
 msgid "Birth year"
 msgstr "»ý³â"
 
-#: src/protocols/gg/gg.c:762
-#: src/protocols/gg/gg.c:764
-#: src/protocols/gg/gg.c:766
+#: src/protocols/gg/gg.c:721 src/protocols/gg/gg.c:723
+#: src/protocols/gg/gg.c:725
 msgid "Sex"
 msgstr "¼ºº°"
 
 # src/dialogs.c:1437 src/dialogs.c:2146
 #. Line 5
-#: src/dialogs.c:1384
-#: src/dialogs.c:2065
-#: src/protocols/gg/gg.c:770
+#: src/dialogs.c:1501 src/dialogs.c:2205 src/protocols/gg/gg.c:729
 msgid "City"
 msgstr "±º/±¸"
 
-#: src/protocols/gg/gg.c:838
-msgid "Couldn't send search request"
+#: src/protocols/gg/gg.c:761
+msgid "There is no Buddy List stored on server. Sorry!"
+msgstr ""
+
+#: src/protocols/gg/gg.c:768
+msgid "Couldn't Import Buddies List from Server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:815
+msgid "Buddies List sucessfully transfered into Server"
+msgstr ""
+
+# plugins/yay/yay.c:183 src/dialogs.c:3066 src/dialogs.c:3073
+# src/oscar.c:1869 src/oscar.c:1874 src/oscar.c:1910 src/oscar.c:1929
+#: src/protocols/gg/gg.c:816 src/protocols/gg/gg.c:828
+#: src/protocols/gg/gg.c:840
+#, fuzzy
+msgid "Gadu-Gadu Information"
+msgstr "°¡µÎ-°¡µÎ ¿À·ù"
+
+#: src/protocols/gg/gg.c:821
+msgid "Couldn't transfer Buddies List into Server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:827
+msgid "Buddies List sucessfully deleted from Server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:833
+msgid "Couldn't delete Buddies List from Server"
+msgstr ""
+
+# src/toc.c:606
+#: src/protocols/gg/gg.c:839
+#, fuzzy
+msgid "Password changed sucessfully"
+msgstr "Æнº¿öµå°¡ ¹Ù²î¾ú½À´Ï´Ù."
+
+#: src/protocols/gg/gg.c:845
+msgid "Password couldn't be changed"
+msgstr ""
+
+#: src/protocols/gg/gg.c:956
+#, fuzzy
+msgid "Couldn't send http request"
 msgstr "°Ë»ö ¿äûÀ» º¸³¾ ¼ö ¾ø½À´Ï´Ù"
 
-#: src/protocols/gg/gg.c:874
-#: src/protocols/gg/gg.c:918
+#: src/protocols/gg/gg.c:982
+#, c-format
+msgid "Buddies List import from Server failed (%s)"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1041
+#, c-format
+msgid "Buddies List export to Server failed (%s)"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1064
+#, c-format
+msgid "Deletion of Buddies List from Server failed (%s)"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1114 src/protocols/gg/gg.c:1212
 #, c-format
 msgid "Connect to search service failed (%s)"
 msgstr "°Ë»ö ¼­ºñ½º¿¡ Á¢¼ÓÀÌ µÇÁö ¾Ê½À´Ï´Ù.(%s)"
 
+# src/buddy.c:2657 src/dialogs.c:1558
+#: src/protocols/gg/gg.c:1147
+#, fuzzy, c-format
+msgid "Changing Password failed (%s)"
+msgstr "Æнº¿öµå ¹Ù²Ù±â"
+
 # src/buddy.c:2653 src/dialogs.c:1367
-#: src/protocols/gg/gg.c:884
-#: src/protocols/gg/gg.c:893
+#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1175
 msgid "Directory Search"
 msgstr "µð·ºÅ丮 °Ë»ö"
 
+# src/buddy.c:2657 src/dialogs.c:1558
+#: src/dialogs.c:1618 src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
+msgid "Change Password"
+msgstr "Æнº¿öµå ¹Ù²Ù±â"
+
+# src/buddy.c:2595
+#: src/protocols/gg/gg.c:1162 src/protocols/gg/gg.c:1179
+#, fuzzy
+msgid "Import Buddies List from Server"
+msgstr "Ä£±¸¸ñ·Ï °¡Á®¿À±â"
+
+# src/buddy.c:2595
+#: src/protocols/gg/gg.c:1164 src/protocols/gg/gg.c:1180
+#, fuzzy
+msgid "Export Buddies List to Server"
+msgstr "Ä£±¸¸ñ·Ï °¡Á®¿À±â"
+
+#: src/protocols/gg/gg.c:1166 src/protocols/gg/gg.c:1181
+msgid "Delete Buddies List from Server"
+msgstr ""
+
 # src/conversation.c:2095
-#: src/protocols/gg/gg.c:960
-msgid "Send as message"
+#: src/protocols/icq/gaim_icq.c:308
+#, fuzzy
+msgid "Send message through server"
 msgstr "äÆýà ¾²ÀÌ´Â °èÁ¤:"
 
 # plugins/icq/gaim_icq.c:442 src/oscar.c:2895 src/toc.c:1031
-#: src/protocols/icq/gaim_icq.c:464
-#: src/protocols/irc/irc.c:1444
-#: src/protocols/jabber/jabber.c:1644
-#: src/protocols/oscar/oscar.c:2640
-#: src/protocols/toc/toc.c:1198
+#: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1538
+#: src/protocols/jabber/jabber.c:2021 src/protocols/oscar/oscar.c:2847
+#: src/protocols/toc/toc.c:1201
 msgid "Get Info"
 msgstr "Á¤º¸ °¡Á®¿À±â"
 
-#: src/protocols/irc/irc.c:425
-#: src/protocols/irc/irc.c:943
+#: src/protocols/irc/irc.c:429 src/protocols/irc/irc.c:962
 #, c-format
 msgid "<B>%s has changed the topic to: %s</B>"
 msgstr "<B>%s °¡ ÁÖÁ¦¸¦ %s ·Î ¹Ù²Ù¾ú½À´Ï´Ù</B>"
 
-#: src/protocols/irc/irc.c:659
+#: src/protocols/irc/irc.c:682
 msgid "No such nick/channel"
 msgstr "±×·± ´ëÈ­¸íÀ̳ª ä³ÎÀÌ ¾ø½À´Ï´Ù."
 
 # src/toc.c:587
-#: src/protocols/irc/irc.c:659
-#: src/protocols/irc/irc.c:662
-#: src/protocols/irc/irc.c:664
-#: src/protocols/irc/irc.c:879
+#: src/protocols/irc/irc.c:682 src/protocols/irc/irc.c:685
+#: src/protocols/irc/irc.c:687 src/protocols/irc/irc.c:891
 msgid "IRC Error"
 msgstr "IRC ¿À·ù"
 
-#: src/protocols/irc/irc.c:662
+#: src/protocols/irc/irc.c:685
 msgid "No such server"
 msgstr "±×·± ¼­¹ö´Â Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù."
 
-#: src/protocols/irc/irc.c:664
+#: src/protocols/irc/irc.c:687
 msgid "No nickname given"
 msgstr "´ëÈ­¸íÀ» ÁÖÁö ¾Ê¾Ò½À´Ï´Ù."
 
 # src/dialogs.c:474
-#: src/protocols/irc/irc.c:823
+#: src/protocols/irc/irc.c:819
 msgid "Unable to write"
 msgstr "¾µ ¼ö ¾ø½À´Ï´Ù."
 
-#: src/protocols/irc/irc.c:877
+#: src/protocols/irc/irc.c:889
 #, c-format
 msgid "You have been kicked from %s: %s"
 msgstr "%s·ÎºÎÅÍ °­Á¦ ÅðÀåµÇ¾ú½À´Ï´Ù: %s"
 
-#: src/protocols/irc/irc.c:1276
+#: src/protocols/irc/irc.c:894
+#, c-format
+msgid "Kicked by %s: %s"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1357
 #, c-format
 msgid "You have left %s"
 msgstr "%s¸¦ ³²°ÜµÎ¾ú½À´Ï´Ù."
 
-#: src/protocols/irc/irc.c:1277
+#: src/protocols/irc/irc.c:1358
 msgid "IRC Part"
 msgstr "IRC ´ëÈ­½Ç¿¡¼­ ³ª°¡±â"
 
@@ -288,276 +360,394 @@
 # src/dialogs.c:3199 src/dialogs.c:3423 src/dialogs.c:3619 src/dialogs.c:3852
 # src/dialogs.c:3940 src/multi.c:479 src/multi.c:593 src/multi.c:893
 # src/prpl.c:159 src/prpl.c:231
-#: src/protocols/irc/irc.c:1349
+#: src/protocols/irc/irc.c:1443
 msgid "Channel:"
 msgstr "ä³Î:"
 
 # src/multi.c:375
-#: src/multi.c:506
-#: src/protocols/irc/irc.c:1353
+#: src/multi.c:522 src/protocols/irc/irc.c:1447
 msgid "Password:"
 msgstr "Æнº¿öµå:"
 
-#: src/protocols/jabber/jabber.c:1352
+#: src/protocols/jabber/jabber.c:1692
 msgid "Room:"
 msgstr "´ëÈ­½Ç:"
 
-#: src/protocols/jabber/jabber.c:1356
+#: src/protocols/jabber/jabber.c:1696
 msgid "Server:"
 msgstr "¼­¹ö:"
 
 # src/buddy.c:2225
-#: src/protocols/jabber/jabber.c:1361
+#: src/protocols/jabber/jabber.c:1701
 msgid "Handle:"
 msgstr "ó¸®:"
 
+# src/oscar.c:2902
+#: src/buddy_chat.c:875 src/protocols/jabber/jabber.c:2026
+#: src/protocols/oscar/oscar.c:2854
+msgid "Get Away Msg"
+msgstr "ÀÚ¸®ºñ¿ò ¸Þ½ÃÁö ¹Þ±â"
+
 # src/dialogs.c:2926 src/dialogs.c:3580 src/oscar.c:2365 src/oscar.c:2875
 # src/toc.c:1422 src/toc.c:1439 src/toc.c:1499 src/toc.c:1541 src/toc.c:1675
 # src/toc.c:1705 src/toc.c:1761
-#: src/protocols/msn/msn.c:566
+#: src/protocols/msn/msn.c:653 src/protocols/msn/msn.c:1909
+#: src/protocols/msn/msn.c:1942
 msgid "MSN Error"
 msgstr "MSN ¿À·ù"
 
 # src/dialogs.c:3140
-#: src/protocols/msn/msn.c:566
+#: src/protocols/msn/msn.c:653
 msgid "Gaim was unable to send a message"
 msgstr "°¡ÀÓÀ» ÅëÇØ ¸Þ½ÃÁö¸¦ º¸³¾ ¼ö ¾ø½À´Ï´Ù."
 
+# src/oscar.c:370 src/toc.c:585
+#: src/protocols/msn/msn.c:960
+#, fuzzy
+msgid "You have been disconnected. You have signed on from another location."
+msgstr "%s ´ëÈ­½Ç°úÀÇ Á¢¼ÓÀÌ ²÷°å½À´Ï´Ù."
+
+# src/dialogs.c:1426 src/dialogs.c:2134
+#: src/protocols/msn/msn.c:1909 src/protocols/msn/msn.c:1942
+#, fuzzy
+msgid "Invalid name"
+msgstr "ó³à½ÃÀý ¼º"
+
 # src/buddy_chat.c:104 src/oscar.c:2590 src/toc.c:1001
-#: src/protocols/napster/napster.c:444
-#: src/protocols/oscar/oscar.c:2338
-#: src/protocols/toc/toc.c:1086
+#: src/protocols/napster/napster.c:450 src/protocols/oscar/oscar.c:2536
+#: src/protocols/toc/toc.c:1088
 msgid "Join what group:"
 msgstr "Âü°¡ÇÒ ±×·ì:"
 
 # src/oscar.c:2816
-#: src/protocols/oscar/oscar.c:292
+#: src/protocols/oscar/oscar.c:305
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "%s¿ÍÀÇ Á÷Á¢ Á¢¼ÓÀÌ ²÷°å½À´Ï´Ù"
 
 # src/oscar.c:349
-#: src/protocols/oscar/oscar.c:328
-msgid ""
-"connection error (rend)\n"
-""
-msgstr ""
-"Á¢¼Ó ¿À·ù (½É°¢)\n"
-""
+#: src/protocols/oscar/oscar.c:341
+msgid "connection error (rend)\n"
+msgstr "Á¢¼Ó ¿À·ù (½É°¢)\n"
 
 # src/oscar.c:357
-#: src/protocols/oscar/oscar.c:339
-msgid ""
-"major connection error\n"
-""
-msgstr ""
-"Á¢¼Ó ¿À·ù (Áß¿ä)\n"
-""
+#: src/protocols/oscar/oscar.c:352
+msgid "major connection error\n"
+msgstr "Á¢¼Ó ¿À·ù (Áß¿ä)\n"
 
 # src/oscar.c:341 src/oscar.c:358 src/toc.c:351 src/toc.c:361 src/toc.c:422
-#: src/protocols/oscar/oscar.c:340
-#: src/protocols/toc/toc.c:510
-#: src/protocols/toc/toc.c:520
-#: src/protocols/toc/toc.c:586
+#: src/protocols/oscar/oscar.c:353 src/protocols/toc/toc.c:509
+#: src/protocols/toc/toc.c:522 src/protocols/toc/toc.c:588
 msgid "Disconnected."
 msgstr "²÷¾îÁü."
 
 # src/oscar.c:370 src/toc.c:585
-#: src/protocols/oscar/oscar.c:352
-#: src/protocols/toc/toc.c:754
+#: src/protocols/oscar/oscar.c:365 src/protocols/toc/toc.c:756
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "%s ´ëÈ­½Ç°úÀÇ Á¢¼ÓÀÌ ²÷°å½À´Ï´Ù."
 
 # src/oscar.c:371
-#: src/protocols/oscar/oscar.c:353
+#: src/protocols/oscar/oscar.c:366
 msgid "Chat Error!"
 msgstr "äÆà ¿À·ù!"
 
 # src/oscar.c:381
-#: src/protocols/oscar/oscar.c:363
+#: src/protocols/oscar/oscar.c:378
 msgid "Chat is currently unavailable"
 msgstr "Áö±ÝÀº äÆÃÇÒ ¼ö ¾ø½À´Ï´Ù."
 
 # src/oscar.c:382
-#: src/protocols/oscar/oscar.c:364
+#: src/protocols/oscar/oscar.c:379
 msgid "Gaim - Chat"
 msgstr "°¡ÀÓ - äÆÃ"
 
 # src/oscar.c:437 src/oscar.c:490
-#: src/protocols/oscar/oscar.c:423
-#: src/protocols/oscar/oscar.c:482
+#: src/protocols/oscar/oscar.c:438 src/protocols/oscar/oscar.c:498
 msgid "Couldn't connect to host"
 msgstr "È£½ºÆ®¿¡ ¿¬°áÇÒ ¼ö ¾ø½À´Ï´Ù."
 
 # src/oscar.c:445
-#: src/protocols/oscar/oscar.c:431
-msgid ""
-"Password sent, waiting for response\n"
-""
-msgstr ""
-"Æнº¿öµå¸¦ º¸³»°í ÀÀ´äÀ» ±â´Ù¸³´Ï´Ù\n"
-""
-
-# src/oscar.c:456
-#: src/protocols/oscar/oscar.c:442
-#, c-format
-msgid ""
-"Logging in %s\n"
-""
-msgstr ""
-"%s ¿¡ Á¢¼ÓÁß\n"
-""
+#: src/protocols/oscar/oscar.c:446
+msgid "Password sent, waiting for response\n"
+msgstr "Æнº¿öµå¸¦ º¸³»°í ÀÀ´äÀ» ±â´Ù¸³´Ï´Ù\n"
 
 # src/oscar.c:471
-#: src/protocols/oscar/oscar.c:463
-msgid ""
-"internal connection error\n"
-""
-msgstr ""
-"³»ºÎ Á¢¼Ó ¿À·ù\n"
-""
+#: src/protocols/oscar/oscar.c:479
+msgid "internal connection error\n"
+msgstr "³»ºÎ Á¢¼Ó ¿À·ù\n"
 
 # src/oscar.c:472
-#: src/protocols/oscar/oscar.c:464
+#: src/protocols/oscar/oscar.c:480
 msgid "Unable to login to AIM"
 msgstr "AIM ¿¡ ·Î±×ÀÎÇÒ ¼ö ¾ø½À´Ï´Ù"
 
 # src/oscar.c:477
-#: src/protocols/oscar/oscar.c:469
+#: src/protocols/oscar/oscar.c:485
 #, c-format
 msgid "Signon: %s"
 msgstr "Á¢¼Ó: %s"
 
 # src/oscar.c:546
-#: src/protocols/oscar/oscar.c:525
-msgid ""
-"Signed off.\n"
-""
-msgstr ""
-"Á¢¼Ó ²÷±â.\n"
-""
+#: src/protocols/oscar/oscar.c:557
+msgid "Signed off.\n"
+msgstr "Á¢¼Ó ²÷±â.\n"
 
 # src/oscar.c:565 src/oscar.c:708
-#: src/protocols/oscar/oscar.c:544
-#: src/protocols/oscar/oscar.c:691
+#: src/protocols/oscar/oscar.c:576 src/protocols/oscar/oscar.c:696
 msgid "Could Not Connect"
 msgstr "¿¬°áÇÒ ¼ö ¾ø½À´Ï´Ù"
 
 # src/oscar.c:573
-#: src/protocols/oscar/oscar.c:552
+#: src/protocols/oscar/oscar.c:584
 msgid "Connection established, cookie sent"
 msgstr "¿¬°áÇÏ°í ÄíÅ°¸¦ º¸³Â½À´Ï´Ù"
 
 # src/dialogs.c:535 src/oscar.c:627
 #. Incorrect nick/password
-#: src/protocols/oscar/oscar.c:601
-#: src/protocols/toc/toc.c:458
+#: src/protocols/oscar/oscar.c:610 src/protocols/toc/toc.c:457
 msgid "Incorrect nickname or password."
 msgstr "¾ÆÀ̵𳪠Æнº¿öµå°¡ Ʋ·È½À´Ï´Ù."
 
 #. Suspended account
-#: src/protocols/oscar/oscar.c:606
+#: src/protocols/oscar/oscar.c:615
 msgid "Your account is currently suspended."
 msgstr "°èÁ¤ÀÌ ÇöÀç »ç¿ë º¸·ù »óÅÂÀÔ´Ï´Ù."
 
 # src/oscar.c:622
 #. connecting too frequently
-#: src/protocols/oscar/oscar.c:610
-msgid "You have been connecting and disconnecting too frequently. Wait ten minutes and try again. If you continue to try, you will need to wait even longer."
-msgstr "³Ê¹« ÀÚÁÖ ¿¬°áÇÏ°í ²÷°í ÇÏ¿´½À´Ï´Ù. 10ºÐÀ» ±â´Ù¸° ÈÄ ´Ù½Ã ½ÃµµÇϽʽÿä. °è¼Ó ½ÃµµÇÑ´Ù¸é ±â´Ù·Á¾ß ÇÏ´Â ½Ã°£ÀÌ ´õ ±æ¾îÁý´Ï´Ù."
+#: src/protocols/oscar/oscar.c:619
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"³Ê¹« ÀÚÁÖ ¿¬°áÇÏ°í ²÷°í ÇÏ¿´½À´Ï´Ù. 10ºÐÀ» ±â´Ù¸° ÈÄ ´Ù½Ã ½ÃµµÇϽʽÿä. °è¼Ó "
+"½ÃµµÇÑ´Ù¸é ±â´Ù·Á¾ß ÇÏ´Â ½Ã°£ÀÌ ´õ ±æ¾îÁý´Ï´Ù."
 
 # src/oscar.c:632
 #. client too old
-#: src/protocols/oscar/oscar.c:615
+#: src/protocols/oscar/oscar.c:624
 msgid "The client version you are using is too old. Please upgrade at "
-msgstr "»ç¿ëÇÏ°í Àִ Ŭ¶óÀ̾ðÆ®°¡ ³Ê¹« ¿À·¡µÇ¾ú½À´Ï´Ù. ´ÙÀ½ À§Ä¡¿¡¼­ ¾÷±×·¹À̵åÇϽʽÿÀ. "
+msgstr ""
+"»ç¿ëÇÏ°í Àִ Ŭ¶óÀ̾ðÆ®°¡ ³Ê¹« ¿À·¡µÇ¾ú½À´Ï´Ù. ´ÙÀ½ À§Ä¡¿¡¼­ "
+"¾÷±×·¹À̵åÇϽʽÿÀ. "
 
 # src/oscar.c:636 src/toc.c:375
-#: src/protocols/oscar/oscar.c:619
-#: src/protocols/toc/toc.c:538
+#: src/protocols/oscar/oscar.c:628 src/protocols/toc/toc.c:540
 msgid "Authentication Failed"
 msgstr "ÀÎÁõ ½ÇÆÐ"
 
 # src/oscar.c:665
-#: src/protocols/oscar/oscar.c:647
+#: src/protocols/oscar/oscar.c:650
 msgid "Internal Error"
 msgstr "³»ºÎ ¿À·ù"
 
 # src/oscar.c:1248 src/oscar.c:2759
-#: src/protocols/oscar/oscar.c:1233
-#: src/protocols/oscar/oscar.c:2544
+#: src/protocols/oscar/oscar.c:1204 src/protocols/oscar/oscar.c:2744
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "%s¿Í Á÷Á¢ Á¢¼ÓµÇ¾ú½À´Ï´Ù"
 
 # src/oscar.c:1868
-#: src/protocols/oscar/oscar.c:1472
-#, c-format
-msgid "You missed %d message%s from %s because %s invalid."
+#: src/protocols/oscar/oscar.c:1454
+#, fuzzy, c-format
+msgid "You missed %d message from %s because it was invalid."
 msgstr "%d%s°³ÀÇ %s´ÔÀ¸·ÎºÎÅÍÀÇ ¸Þ½ÃÁö¸¦ ³õÃƽÀ´Ï´Ù.(%s°¡ À¯È¿ÇÏÁö ¾ÊÀ½)"
 
 # src/oscar.c:1868
-#: src/protocols/oscar/oscar.c:1482
-#, c-format
-msgid "You missed %d message%s from %s because %s too large."
+#: src/protocols/oscar/oscar.c:1455
+#, fuzzy, c-format
+msgid "You missed %d messages from %s because they were invalid."
+msgstr "%d%s°³ÀÇ %s´ÔÀ¸·ÎºÎÅÍÀÇ ¸Þ½ÃÁö¸¦ ³õÃƽÀ´Ï´Ù.(%s°¡ À¯È¿ÇÏÁö ¾ÊÀ½)"
+
+# src/oscar.c:1868
+#: src/protocols/oscar/oscar.c:1464
+#, fuzzy, c-format
+msgid "You missed %d message from %s because it was too large."
 msgstr "%d%s°³ÀÇ %s´ÔÀ¸·ÎºÎÅÍÀÇ ¸Þ½ÃÁö¸¦ ³õÃƽÀ´Ï´Ù.(%s°¡ ³Ê¹« Å­)"
 
 # src/oscar.c:1868
-#: src/protocols/oscar/oscar.c:1492
-#, c-format
-msgid "You missed %d message%s from %s because the rate limit has been exceeded."
+#: src/protocols/oscar/oscar.c:1465
+#, fuzzy, c-format
+msgid "You missed %d messages from %s because they were too large."
+msgstr "%d%s°³ÀÇ %s´ÔÀ¸·ÎºÎÅÍÀÇ ¸Þ½ÃÁö¸¦ ³õÃƽÀ´Ï´Ù.(»ó´ë¹æÀÌ ³Ê¹« ºÎµµ´öÇÔ)"
+
+# src/oscar.c:1868
+#: src/protocols/oscar/oscar.c:1474
+#, fuzzy, c-format
+msgid "You missed %d message from %s because the rate limit has been exceeded."
+msgstr "%d%s°³ÀÇ %s´ÔÀ¸·ÎºÎÅÍÀÇ ¸Þ½ÃÁö¸¦ ³õÃƽÀ´Ï´Ù.(Á¦Çѽð£ ÃÊ°ú)"
+
+# src/oscar.c:1868
+#: src/protocols/oscar/oscar.c:1475
+#, fuzzy, c-format
+msgid ""
+"You missed %d messages from %s because the rate limit has been exceeded."
 msgstr "%d%s°³ÀÇ %s´ÔÀ¸·ÎºÎÅÍÀÇ ¸Þ½ÃÁö¸¦ ³õÃƽÀ´Ï´Ù.(Á¦Çѽð£ ÃÊ°ú)"
 
 # src/oscar.c:1868
-#: src/protocols/oscar/oscar.c:1501
-#, c-format
-msgid "You missed %d message%s from %s because they are too evil."
+#: src/protocols/oscar/oscar.c:1484
+#, fuzzy, c-format
+msgid "You missed %d message from %s because it was too evil."
+msgstr "%d%s°³ÀÇ %s´ÔÀ¸·ÎºÎÅÍÀÇ ¸Þ½ÃÁö¸¦ ³õÃƽÀ´Ï´Ù.(»ó´ë¹æÀÌ ³Ê¹« ºÎµµ´öÇÔ)"
+
+# src/oscar.c:1868
+#: src/protocols/oscar/oscar.c:1485
+#, fuzzy, c-format
+msgid "You missed %d messages from %s because they are too evil."
 msgstr "%d%s°³ÀÇ %s´ÔÀ¸·ÎºÎÅÍÀÇ ¸Þ½ÃÁö¸¦ ³õÃƽÀ´Ï´Ù.(»ó´ë¹æÀÌ ³Ê¹« ºÎµµ´öÇÔ)"
 
 # src/oscar.c:1868
-#: src/protocols/oscar/oscar.c:1510
-#, c-format
-msgid "You missed %d message%s from %s because you are too evil."
+#: src/protocols/oscar/oscar.c:1494
+#, fuzzy, c-format
+msgid "You missed %d message from %s because you are too evil."
 msgstr "%d%s°³ÀÇ %s´ÔÀ¸·ÎºÎÅÍÀÇ ¸Þ½ÃÁö¸¦ ³õÃƽÀ´Ï´Ù.(´ç½ÅÀÌ ³Ê¹« ºÎµµ´öÇÔ)"
 
 # src/oscar.c:1868
-#: src/protocols/oscar/oscar.c:1518
-#, c-format
-msgid "You missed %d message%s from %s for unknown reasons."
+#: src/protocols/oscar/oscar.c:1495
+#, fuzzy, c-format
+msgid "You missed %d messages from %s because you are too evil."
+msgstr "%d%s°³ÀÇ %s´ÔÀ¸·ÎºÎÅÍÀÇ ¸Þ½ÃÁö¸¦ ³õÃƽÀ´Ï´Ù.(´ç½ÅÀÌ ³Ê¹« ºÎµµ´öÇÔ)"
+
+# src/oscar.c:1868
+#: src/protocols/oscar/oscar.c:1503
+#, fuzzy, c-format
+msgid "You missed %d message from %s for unknown reasons."
+msgstr "%d%s°³ÀÇ %s´ÔÀ¸·ÎºÎÅÍÀÇ ¸Þ½ÃÁö¸¦ ³õÃƽÀ´Ï´Ù.(¾Ë ¼ö ¾ø´Â ÀÌÀ¯)"
+
+# src/oscar.c:1868
+#: src/protocols/oscar/oscar.c:1504
+#, fuzzy, c-format
+msgid "You missed %d messages from %s for unknown reasons."
 msgstr "%d%s°³ÀÇ %s´ÔÀ¸·ÎºÎÅÍÀÇ ¸Þ½ÃÁö¸¦ ³õÃƽÀ´Ï´Ù.(¾Ë ¼ö ¾ø´Â ÀÌÀ¯)"
 
 # plugins/yay/yay.c:183 src/dialogs.c:3066 src/dialogs.c:3073
 # src/oscar.c:1869 src/oscar.c:1874 src/oscar.c:1910 src/oscar.c:1929
-#: src/dialogs.c:2805
-#: src/dialogs.c:2811
-#: src/protocols/oscar/oscar.c:1524
-#: src/protocols/oscar/oscar.c:1556
-#: src/protocols/oscar/oscar.c:1574
-#: src/protocols/yahoo/yay.c:168
+#: src/dialogs.c:2949 src/dialogs.c:2955 src/protocols/oscar/oscar.c:1509
+#: src/protocols/oscar/oscar.c:1547 src/protocols/oscar/oscar.c:1565
+#: src/protocols/oscar/oscar.c:1994 src/protocols/yahoo/yahoo.c:501
 msgid "Gaim - Error"
 msgstr "°¡ÀÓ - ¿À·ù"
 
+#: src/protocols/oscar/oscar.c:1526
+#, c-format
+msgid "SNAC threw error: %s\n"
+msgstr ""
+
+# plugins/yay/yay.c:183 src/dialogs.c:3066 src/dialogs.c:3073
+# src/oscar.c:1869 src/oscar.c:1874 src/oscar.c:1910 src/oscar.c:1929
+#: src/protocols/oscar/oscar.c:1528
+#, fuzzy
+msgid "Gaim - Oscar SNAC Error"
+msgstr "°¡ÀÓ - ¿À·ù"
+
 # src/oscar.c:1908
-#: src/protocols/oscar/oscar.c:1554
+#: src/protocols/oscar/oscar.c:1545
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr "%s´Ô¿¡°Ô °¡Áö ¸øÇÑ ¸Þ½ÃÁö: %s"
 
 # src/oscar.c:1909 src/oscar.c:1928
-#: src/protocols/oscar/oscar.c:1555
-#: src/protocols/oscar/oscar.c:1573
+#: src/protocols/oscar/oscar.c:1546 src/protocols/oscar/oscar.c:1564
 msgid "Reason unknown"
 msgstr "¾Ë ¼ö ¾ø´Â ÀÌÀ¯"
 
 # src/oscar.c:1927
-#: src/protocols/oscar/oscar.c:1572
+#: src/protocols/oscar/oscar.c:1563
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr "%s´ÔÀÇ »ç¿ëÀÚ Á¤º¸¸¦ ¹Þ¾Æ¿Ã ¼ö ¾ø½À´Ï´Ù: %s"
 
-#: src/protocols/oscar/oscar.c:1613
-#, c-format
+# src/buddy.c:2121
+#: src/buddy.c:1906 src/protocols/oscar/oscar.c:1591
+msgid "Buddy Icon"
+msgstr "Ä£±¸ ¾ÆÀÌÄÜ"
+
+# src/buddy.c:2124
+#: src/buddy.c:1909 src/protocols/oscar/oscar.c:1594
+msgid "Voice"
+msgstr "À½¼º"
+
+# src/buddy.c:2127
+#: src/buddy.c:1912 src/protocols/oscar/oscar.c:1597
+msgid "IM Image"
+msgstr "±×¸² ¸Þ½ÃÁö"
+
+# src/buddy.c:446 src/buddy.c:2130 src/buddy.c:2485
+#: src/buddy.c:488 src/buddy.c:1915 src/buddy.c:2343 src/prefs.c:2837
+#: src/protocols/oscar/oscar.c:1600
+msgid "Chat"
+msgstr "äÆÃ"
+
+# src/buddy.c:2133
+#: src/buddy.c:1918 src/protocols/oscar/oscar.c:1603
+msgid "Get File"
+msgstr "ÆÄÀÏ ¹Þ±â"
+
+# src/buddy.c:2136
+#: src/buddy.c:1921 src/protocols/oscar/oscar.c:1606
+msgid "Send File"
+msgstr "ÆÄÀÏ º¸³»±â"
+
+# src/buddy.c:2139
+#: src/buddy.c:1925 src/protocols/oscar/oscar.c:1610
+msgid "Games"
+msgstr "°ÔÀÓ"
+
+# src/buddy.c:2142
+#: src/buddy.c:1928 src/protocols/oscar/oscar.c:1613
+msgid "Stocks"
+msgstr "Áõ±Ç"
+
+# src/buddy.c:2727 src/prefs.c:2671
+#: src/buddy.c:1931 src/protocols/oscar/oscar.c:1616
+#, fuzzy
+msgid "Send Buddy List"
+msgstr "Ä£±¸ ¸ñ·Ï"
+
+#: src/buddy.c:1934 src/protocols/oscar/oscar.c:1619
+msgid "EveryBuddy Bug"
+msgstr ""
+
+# src/dialogs.c:3203
+#: src/buddy.c:1937 src/protocols/oscar/oscar.c:1622
+#, fuzzy
+msgid "AP User"
+msgstr "»ç¿ëÀÚ"
+
+#: src/buddy.c:1940 src/protocols/oscar/oscar.c:1625
+msgid "ICQ RTF"
+msgstr ""
+
+#: src/buddy.c:1943 src/protocols/oscar/oscar.c:1628
+msgid "Nihilist"
+msgstr ""
+
+#: src/buddy.c:1946 src/protocols/oscar/oscar.c:1631
+msgid "ICQ Server Relay"
+msgstr ""
+
+#: src/buddy.c:1949 src/protocols/oscar/oscar.c:1634
+msgid "ICQ Unknown"
+msgstr ""
+
+#: src/buddy.c:1952 src/protocols/oscar/oscar.c:1637
+msgid "Trillian Encryption"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1674
+msgid ""
+"<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG "
+"SRC=\"free_icon.gif\"> : Normal AIM User<br><IMG SRC=\"aol_icon.gif\"> : AOL "
+"User <br><IMG SRC=\"dt_icon.gif\"> : Trial AIM User <br><IMG "
+"SRC=\"admin_icon.gif\"> : Administrator"
+msgstr ""
+"<br><BODY BGCOLOR=WHITE><hr><I>±¸ºÐ:</I><br><br><IMG SRC=\"free_icon.gif\"> "
+": º¸Åë AIM »ç¿ëÀÚ<br><IMG SRC=\"aol_icon.gif\"> : AOL »ç¿ëÀÚ <br><IMG "
+"SRC=\"dt_icon.gif\"> : AIM ½ÃÇè¿ë ¹öÀü »ç¿ëÀÚ <br><IMG "
+"SRC=\"admin_icon.gif\"> : °ü¸®ÀÚ"
+
+#: src/protocols/oscar/oscar.c:1686
 msgid ""
 "Username : <B>%s</B>  %s <BR>\n"
 "%sWarning Level : <B>%d %%</B><BR>\n"
@@ -565,7 +755,6 @@
 "Idle Minutes : <B>%d</B>\n"
 "<BR>\n"
 "<HR><BR>\n"
-""
 msgstr ""
 "»ç¿ëÀÚ À̸§ : <B>%s</B><BR>\n"
 "°æ°í ¼öÁØ : <B>%d %%</B><BR>\n"
@@ -573,329 +762,345 @@
 "½¬°íÀÖ´Â ½Ã°£ : <B>%d</B>\n"
 "<BR>\n"
 "<HR><BR>\n"
-""
-
-#: src/protocols/oscar/oscar.c:1624
-msgid "<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG SRC=\"free_icon.gif\"> : Normal AIM User<br><IMG SRC=\"aol_icon.gif\"> : AOL User <br><IMG SRC=\"dt_icon.gif\"> : Trial AIM User <br><IMG SRC=\"admin_icon.gif\"> : Administrator"
-msgstr "<br><BODY BGCOLOR=WHITE><hr><I>±¸ºÐ:</I><br><br><IMG SRC=\"free_icon.gif\"> : º¸Åë AIM »ç¿ëÀÚ<br><IMG SRC=\"aol_icon.gif\"> : AOL »ç¿ëÀÚ <br><IMG SRC=\"dt_icon.gif\"> : AIM ½ÃÇè¿ë ¹öÀü »ç¿ëÀÚ <br><IMG SRC=\"admin_icon.gif\"> : °ü¸®ÀÚ"
+
+# src/oscar.c:1991
+#: src/protocols/oscar/oscar.c:1714
+msgid "<i>User has no away message</i>"
+msgstr "<i>»ç¿ëÀÚÀÇ ÀÚ¸®ºñ¿ò ¸Þ½ÃÁö°¡ ¾ø½À´Ï´Ù</i>"
+
+# src/buddy.c:2217
+#: src/protocols/oscar/oscar.c:1726
+#, fuzzy
+msgid "Client Capabilities: "
+msgstr "»ç¿ë°¡´É: %s\n"
 
 # src/oscar.c:1990
-#: src/protocols/oscar/oscar.c:1634
+#: src/protocols/oscar/oscar.c:1734
 msgid "<i>No Information Provided</i>"
 msgstr "<i>Á¤º¸°¡ ¾ø½À´Ï´Ù</i>"
 
-# src/oscar.c:1991
-#: src/protocols/oscar/oscar.c:1635
-msgid "<i>User has no away message</i>"
-msgstr "<i>»ç¿ëÀÚÀÇ ÀÚ¸®ºñ¿ò ¸Þ½ÃÁö°¡ ¾ø½À´Ï´Ù</i>"
-
 # src/oscar.c:2017
-#: src/protocols/oscar/oscar.c:1660
+#: src/protocols/oscar/oscar.c:1757
 msgid "Your connection may be lost."
 msgstr "Á¢¼ÓÀÌ ²÷°å½À´Ï´Ù."
 
 # src/oscar.c:2018
-#: src/protocols/oscar/oscar.c:1661
+#: src/protocols/oscar/oscar.c:1758
 msgid "AOL error"
 msgstr "AOL ¿À·ù"
 
+#: src/protocols/oscar/oscar.c:1993
+msgid ""
+"The last message was not sent because you are over the rate limit. Please "
+"wait 10 seconds and try again."
+msgstr ""
+
 # src/dialogs.c:2926 src/dialogs.c:3580 src/oscar.c:2365 src/oscar.c:2875
 # src/toc.c:1422 src/toc.c:1439 src/toc.c:1499 src/toc.c:1541 src/toc.c:1675
 # src/toc.c:1705 src/toc.c:1761
-#: src/dialogs.c:3338
-#: src/protocols/oscar/oscar.c:2083
-#: src/protocols/oscar/oscar.c:2618
-#: src/protocols/toc/toc.c:1543
-#: src/protocols/toc/toc.c:1560
-#: src/protocols/toc/toc.c:1620
-#: src/protocols/toc/toc.c:1662
-#: src/protocols/toc/toc.c:1781
-#: src/protocols/toc/toc.c:1811
-#: src/protocols/toc/toc.c:1867
+#: src/dialogs.c:3482 src/protocols/oscar/oscar.c:2267
+#: src/protocols/oscar/oscar.c:2818 src/protocols/toc/toc.c:1546
+#: src/protocols/toc/toc.c:1563 src/protocols/toc/toc.c:1623
+#: src/protocols/toc/toc.c:1665 src/protocols/toc/toc.c:1784
+#: src/protocols/toc/toc.c:1814 src/protocols/toc/toc.c:1870
 msgid "Error"
 msgstr "¿À·ù"
 
 # src/oscar.c:2605
-#: src/protocols/oscar/oscar.c:2342
-#: src/protocols/toc/toc.c:1090
+#: src/protocols/oscar/oscar.c:2540 src/protocols/toc/toc.c:1092
 msgid "Exchange:"
 msgstr "±³È¯:"
 
 # src/oscar.c:2875
-#: src/protocols/oscar/oscar.c:2618
+#: src/protocols/oscar/oscar.c:2818
 msgid "Unable to open Direct IM"
 msgstr "Á÷Á¢ ¸Þ½ÃÁö¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù"
 
 # src/oscar.c:2885
-#: src/protocols/oscar/oscar.c:2628
+#: src/protocols/oscar/oscar.c:2828
 #, c-format
-msgid "You have selected to open a Direct IM connection with %s. Doing this will let them see your IP address, and may be a security risk. Do you wish to continue?"
-msgstr "%s´Ô°úÀÇ Á÷Á¢ Á¢¼ÓÀ» ¼±ÅÃÇß½À´Ï´Ù. »ó´ë¹æ°ú Á÷Á¢ Á¢¼ÓÇÒ °æ¿ì »ó´ë¹æÀÌ ´ç½ÅÀÇ IP ÁÖ¼Ò¸¦ º¼ ¼ö ÀÖÀ¸¸ç, ÀÌ´Â º¸¾È»óÀÇ À§ÇèÀÌ µÉ ¼ö ÀÖ½À´Ï´Ù. Á÷Á¢ Á¢¼ÓÇÒ±î¿ä?"
-
-# src/oscar.c:2902
-#: src/protocols/oscar/oscar.c:2646
-msgid "Get Away Msg"
-msgstr "ÀÚ¸®ºñ¿ò ¸Þ½ÃÁö ¹Þ±â"
+msgid ""
+"You have selected to open a Direct IM connection with %s. Doing this will "
+"let them see your IP address, and may be a security risk. Do you wish to "
+"continue?"
+msgstr ""
+"%s´Ô°úÀÇ Á÷Á¢ Á¢¼ÓÀ» ¼±ÅÃÇß½À´Ï´Ù. »ó´ë¹æ°ú Á÷Á¢ Á¢¼ÓÇÒ °æ¿ì »ó´ë¹æÀÌ ´ç½ÅÀÇ "
+"IP ÁÖ¼Ò¸¦ º¼ ¼ö ÀÖÀ¸¸ç, ÀÌ´Â º¸¾È»óÀÇ À§ÇèÀÌ µÉ ¼ö ÀÖ½À´Ï´Ù. Á÷Á¢ Á¢¼ÓÇÒ±î¿ä?"
 
 # src/oscar.c:2910
-#: src/protocols/oscar/oscar.c:2653
+#: src/protocols/oscar/oscar.c:2861
 msgid "Direct IM"
 msgstr "Á÷Á¢ ¸Þ½ÃÁö"
 
+# src/buddy.c:2217
+#: src/protocols/oscar/oscar.c:2869
+#, fuzzy
+msgid "Get Capabilities"
+msgstr "»ç¿ë°¡´É: %s\n"
+
 # src/dialogs.c:474
-#: src/protocols/toc/toc.c:397
+#: src/protocols/toc/toc.c:396
 #, c-format
 msgid "Unable to write file %s."
 msgstr "%s ÆÄÀÏ¿¡ ¾µ ¼ö ¾ø½À´Ï´Ù."
 
 # src/dialogs.c:477
-#: src/protocols/toc/toc.c:400
+#: src/protocols/toc/toc.c:399
 #, c-format
 msgid "Unable to read file %s."
 msgstr "%s ÆÄÀÏÀ» ÀÐÀ» ¼ö ¾ø½À´Ï´Ù."
 
 # src/dialogs.c:480
-#: src/protocols/toc/toc.c:403
+#: src/protocols/toc/toc.c:402
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "¸Þ½ÃÁö°¡ ³Ê¹« ±æ¾î¼­ ¸¶Áö¸· %s ¹ÙÀÌÆ®°¡ ©·È½À´Ï´Ù."
 
 # src/dialogs.c:483
-#: src/protocols/toc/toc.c:406
+#: src/protocols/toc/toc.c:405
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s´ÔÀº ÇöÀç ·Î±×ÀÎÇÏÁö ¾Ê¾Ò½À´Ï´Ù."
 
 # src/dialogs.c:486
-#: src/protocols/toc/toc.c:409
+#: src/protocols/toc/toc.c:408
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "%s´Ô¿¡°Ô °æ°í¸¦ º¸³»´Â °ÍÀº Çã¿ëµÇÁö ¾Ê½À´Ï´Ù."
 
 # src/dialogs.c:489
-#: src/protocols/toc/toc.c:412
+#: src/protocols/toc/toc.c:411
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "¼­¹öÀÇ ¼ÓµµÇѰ踦 ³Ñ¾ú±â ¶§¹®¿¡ ¸Þ½ÃÁö¸¦ ¹ö·È½À´Ï´Ù."
 
 # src/dialogs.c:492
-#: src/protocols/toc/toc.c:415
+#: src/protocols/toc/toc.c:414
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "%s¿¡ äÆà Âü°¡¸¦ ÇÒ ¼ö ¾ø½À´Ï´Ù."
 
 # src/dialogs.c:495
-#: src/protocols/toc/toc.c:418
+#: src/protocols/toc/toc.c:417
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "%s´Ô¿¡°Ô ³Ê¹« »¡¸® ¸Þ½ÃÁö¸¦ º¸³»°í ÀÖ½À´Ï´Ù."
 
 # src/dialogs.c:498
-#: src/protocols/toc/toc.c:421
+#: src/protocols/toc/toc.c:420
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "%s´Ô¿¡°Ô¼­ ¿Â ¸Þ½ÃÁö°¡ ³Ê¹« Ä¿¼­ ³õÃƽÀ´Ï´Ù."
 
 # src/dialogs.c:501
-#: src/protocols/toc/toc.c:424
+#: src/protocols/toc/toc.c:423
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "%s´Ô¿¡°Ô¼­ ¿Â ¸Þ½ÃÁö°¡ ³Ê¹« »¡¶ó¼­ ³õÃƽÀ´Ï´Ù."
 
 # src/dialogs.c:504
-#: src/protocols/toc/toc.c:427
+#: src/protocols/toc/toc.c:426
 msgid "Failure."
 msgstr "½ÇÆÐ."
 
 # src/dialogs.c:507
-#: src/protocols/toc/toc.c:430
+#: src/protocols/toc/toc.c:429
 msgid "Too many matches."
 msgstr "ÇØ´ç Ç׸ñÀÌ ³Ê¹« ¸¹½À´Ï´Ù."
 
 # src/dialogs.c:510
-#: src/protocols/toc/toc.c:433
+#: src/protocols/toc/toc.c:432
 msgid "Need more qualifiers."
 msgstr "´õ »ó¼¼È÷ ÁöÁ¤ÇϽʽÿä."
 
 # src/dialogs.c:513
-#: src/protocols/toc/toc.c:436
+#: src/protocols/toc/toc.c:435
 msgid "Dir service temporarily unavailable."
 msgstr "µð·ºÅ丮 ¼­ºñ½º¸¦ ÀϽÃÀûÀ¸·Î »ç¿ëÇÒ ¼ö ¾ø½À´Ï´Ù."
 
 # src/dialogs.c:516
-#: src/protocols/toc/toc.c:439
+#: src/protocols/toc/toc.c:438
 msgid "Email lookup restricted."
 msgstr "¸ÞÀÏ Ã£¾Æº¸±â°¡ ±ÝÁöµÇ¾î ÀÖ½À´Ï´Ù."
 
 # src/dialogs.c:519
-#: src/protocols/toc/toc.c:442
+#: src/protocols/toc/toc.c:441
 msgid "Keyword ignored."
 msgstr "Å°¿öµå°¡ ¹«½ÃµÇ¾ú½À´Ï´Ù."
 
 # src/dialogs.c:522
-#: src/protocols/toc/toc.c:445
+#: src/protocols/toc/toc.c:444
 msgid "No keywords."
 msgstr "Å°¿öµå°¡ ¾ø½À´Ï´Ù."
 
 # src/dialogs.c:525
-#: src/protocols/toc/toc.c:448
+#: src/protocols/toc/toc.c:447
 msgid "User has no directory information."
 msgstr "»ç¿ëÀÚ°¡ µð·ºÅ丮 Á¤º¸¸¦ °®°í ÀÖÁö ¾Ê½À´Ï´Ù."
 
 # src/dialogs.c:529
-#: src/protocols/toc/toc.c:452
+#: src/protocols/toc/toc.c:451
 msgid "Country not supported."
 msgstr "Áö¿øµÇÁö ¾Ê´Â ±¹°¡ÀÔ´Ï´Ù."
 
 # src/dialogs.c:532
-#: src/protocols/toc/toc.c:455
+#: src/protocols/toc/toc.c:454
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "¾Ë ¼ö ¾ø´Â ½ÇÆÐ: %s."
 
 # src/dialogs.c:538
-#: src/protocols/toc/toc.c:461
+#: src/protocols/toc/toc.c:460
 msgid "The service is temporarily unavailable."
 msgstr "Àá½Ã ¼­ºñ½º°¡ »ç¿ëºÒ°¡´ÉÇÕ´Ï´Ù."
 
 # src/dialogs.c:541
-#: src/protocols/toc/toc.c:464
+#: src/protocols/toc/toc.c:463
 msgid "Your warning level is currently too high to log in."
 msgstr "·Î±×ÀÎÇϱ⿡ °æ°í ¼öÁØÀÌ ³ô½À´Ï´Ù."
 
 # src/dialogs.c:544
-#: src/protocols/toc/toc.c:467
-msgid "You have been connecting and disconnecting too frequently.  Wait ten minutes and try again.  If you continue to try, you will need to wait even longer."
-msgstr "³Ê¹« ÀÚÁÖ ¿¬°áÇÏ°í ²÷°íÇÏ¿´½À´Ï´Ù. 10ºÐÀ» ±â´Ù¸° ÈÄ ´Ù½Ã ½ÃµµÇϽʽÿä. °è¼Ó ½ÃµµÇÑ´Ù¸é ±â´Ù·Á¾ß ÇÏ´Â ½Ã°£ÀÌ ´õ ±æ¾îÁý´Ï´Ù."
+#: src/protocols/toc/toc.c:466
+msgid ""
+"You have been connecting and disconnecting too frequently.  Wait ten minutes "
+"and try again.  If you continue to try, you will need to wait even longer."
+msgstr ""
+"³Ê¹« ÀÚÁÖ ¿¬°áÇÏ°í ²÷°íÇÏ¿´½À´Ï´Ù. 10ºÐÀ» ±â´Ù¸° ÈÄ ´Ù½Ã ½ÃµµÇϽʽÿä. °è¼Ó "
+"½ÃµµÇÑ´Ù¸é ±â´Ù·Á¾ß ÇÏ´Â ½Ã°£ÀÌ ´õ ±æ¾îÁý´Ï´Ù."
 
 # src/dialogs.c:547
-#: src/protocols/toc/toc.c:470
+#: src/protocols/toc/toc.c:469
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Á¢¼Ó Áß¿¡ ¾Ë ¼ö ¾ø´Â ¿À·ù°¡ ¹ß»ýÇÏ¿´½À´Ï´Ù: %s."
 
 # src/dialogs.c:550
-#: src/protocols/toc/toc.c:473
+#: src/protocols/toc/toc.c:472
 #, c-format
 msgid "An unknown error, %d, has occured.  Info: %s"
 msgstr "¾Ë ¼ö ¾ø´Â ¿À·ù, %d°¡ ¹ß»ýÇÏ¿´½À´Ï´Ù.  Á¤º¸: %s"
 
 # src/toc.c:324 src/toc.c:331
-#: src/protocols/toc/toc.c:490
+#: src/protocols/toc/toc.c:489
 msgid "Connection Closed"
 msgstr "¿¬°áÀÌ ²÷°å½À´Ï´Ù."
 
 # src/toc.c:366
-#: src/protocols/toc/toc.c:525
+#: src/protocols/toc/toc.c:527
 msgid "Waiting for reply..."
 msgstr "´ë´äÀ» ±â´Ù¸®´Â Áß..."
 
 # src/toc.c:429
-#: src/protocols/toc/toc.c:594
+#: src/protocols/toc/toc.c:596
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC°¡ ´Ù½Ã ½ÃÀÛ Çß½À´Ï´Ù. ¸Þ½ÃÁö »ç¿ëÀ» ´Ù½Ã ÇÒ ¼ö ÀÖ½À´Ï´Ù."
 
 # src/toc.c:430
-#: src/protocols/toc/toc.c:595
+#: src/protocols/toc/toc.c:597
 msgid "TOC Resume"
 msgstr "TOC ´Ù½Ã ½ÃÀÛ"
 
 # src/toc.c:587
-#: src/protocols/toc/toc.c:756
+#: src/protocols/toc/toc.c:758
 msgid "Chat Error"
 msgstr "äÆà ¿À·ù"
 
 # src/toc.c:606
-#: src/protocols/toc/toc.c:775
+#: src/protocols/toc/toc.c:777
 msgid "Password Change Successeful"
 msgstr "Æнº¿öµå°¡ ¹Ù²î¾ú½À´Ï´Ù."
 
 # src/dialogs.c:1546 src/toc.c:606
-#: src/dialogs.c:1490
-#: src/protocols/toc/toc.c:775
+#: src/dialogs.c:1607 src/protocols/toc/toc.c:777
 msgid "Gaim - Password Change"
 msgstr "°¡ÀÓ - Æнº¿öµå º¯°æ"
 
 # src/toc.c:609
-#: src/protocols/toc/toc.c:778
-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 "TOC°¡ PAUSE ¸í·ÉÀ» º¸³Â½À´Ï´Ù. TOC´Â PAUSE ¸í·ÉÀ» º¸³»¸é ¸ðµç ¸Þ½ÃÁö¸¦ ¹«½ÃÇÕ´Ï´Ù. ±×¸®°í ¸¸¾à ´ç½ÅÀÌ ¸Þ½ÃÁö¸¦ º¸³»¸é °­Á¦·Î Á¢¼ÓÁ¾·áµÉ ¼ö ÀÖ½À´Ï´Ù. ÀÌ°ÍÀº ÀϽÃÀûÀÎ Çö»óÀÌ´Ï ½Å°æ¾²Áö ¸¶½Ê½Ã¿À."
+#: src/protocols/toc/toc.c:780
+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 ""
+"TOC°¡ PAUSE ¸í·ÉÀ» º¸³Â½À´Ï´Ù. TOC´Â PAUSE ¸í·ÉÀ» º¸³»¸é ¸ðµç ¸Þ½ÃÁö¸¦ "
+"¹«½ÃÇÕ´Ï´Ù. ±×¸®°í ¸¸¾à ´ç½ÅÀÌ ¸Þ½ÃÁö¸¦ º¸³»¸é °­Á¦·Î Á¢¼ÓÁ¾·áµÉ ¼ö "
+"ÀÖ½À´Ï´Ù. ÀÌ°ÍÀº ÀϽÃÀûÀÎ Çö»óÀÌ´Ï ½Å°æ¾²Áö ¸¶½Ê½Ã¿À."
 
 # src/toc.c:612
-#: src/protocols/toc/toc.c:781
+#: src/protocols/toc/toc.c:783
 msgid "TOC Pause"
 msgstr "TOC Àá½Ã ¸ØÃã"
 
 # src/toc.c:1037
-#: src/protocols/toc/toc.c:1204
+#: src/protocols/toc/toc.c:1207
 msgid "Get Dir Info"
 msgstr "µð·ºÅ丮 Á¤º¸ °¡Á®¿À±â"
 
 # src/toc.c:1499 src/toc.c:1541 src/toc.c:1675 src/toc.c:1761
-#: src/protocols/toc/toc.c:1620
-#: src/protocols/toc/toc.c:1662
-#: src/protocols/toc/toc.c:1781
-#: src/protocols/toc/toc.c:1867
+#: src/protocols/toc/toc.c:1623 src/protocols/toc/toc.c:1665
+#: src/protocols/toc/toc.c:1784 src/protocols/toc/toc.c:1870
 msgid "Could not connect for transfer!"
 msgstr "Àü¼ÛÀ» À§ÇÑ ¿¬°áÀ» ÇÒ ¼ö ¾ø½À´Ï´Ù!"
 
 # src/toc.c:1705
-#: src/protocols/toc/toc.c:1811
+#: src/protocols/toc/toc.c:1814
 msgid "Could not write file header!"
 msgstr "ÆÄÀÏ Çì´õ¸¦ ¾µ ¼ö ¾ø½À´Ï´Ù!"
 
 # src/toc.c:1794
-#: src/protocols/toc/toc.c:1900
+#: src/protocols/toc/toc.c:1903
 msgid "Gaim - Save As..."
 msgstr "°¡ÀÓ - »õ À̸§À¸·Î ÀúÀå"
 
 # src/toc.c:1833
-#: src/protocols/toc/toc.c:1939
-#, c-format
-msgid "%s requests %s to accept %d file%s: %s (%.2f %s)%s%s"
+#: src/protocols/toc/toc.c:1944
+#, fuzzy, c-format
+msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+msgstr "%s °¡ %s %d°³ÀÇ %s ÆÄÀÏÀ» Á¢¼öÇϱ⸦ ¿äûÇÏ¿´½À´Ï´Ù :%s (%.2f %s)%s%s"
+
+# src/toc.c:1833
+#: src/protocols/toc/toc.c:1945
+#, fuzzy, c-format
+msgid "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr "%s °¡ %s %d°³ÀÇ %s ÆÄÀÏÀ» Á¢¼öÇϱ⸦ ¿äûÇÏ¿´½À´Ï´Ù :%s (%.2f %s)%s%s"
 
 # src/toc.c:1838
-#: src/protocols/toc/toc.c:1944
+#: src/protocols/toc/toc.c:1950
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s °¡ ´ç½Å¿¡°Ô ÆÄÀÏÀ» º¸³»´Þ¶ó°í ¿äûÇÏ¿´½À´Ï´Ù"
 
 # plugins/yay/yay.c:183
-#: src/protocols/yahoo/yay.c:168
+#: src/protocols/yahoo/yahoo.c:501
 msgid "Your message did not get sent."
 msgstr "¸Þ½ÃÁö°¡ Àü´ÞµÇÁö ¾Ê¾Ò½À´Ï´Ù."
 
-# src/buddy.c:2516 src/dialogs.c:678
-#: src/protocols/yahoo/yay.c:698
-msgid "Send offline message"
-msgstr "¿ÀÇÁ¶óÀÎ ¸Þ½ÃÁö º¸³»±â"
-
-#: src/protocols/zephyr/zephyr.c:778
+#: src/protocols/zephyr/zephyr.c:802
 msgid "ZLocate"
 msgstr "ZÀ§Ä¡"
 
-#: src/protocols/zephyr/zephyr.c:815
+#: src/protocols/zephyr/zephyr.c:839
 msgid "Class:"
 msgstr "Ŭ·¡½º:"
 
-#: src/protocols/zephyr/zephyr.c:819
+#: src/protocols/zephyr/zephyr.c:843
 msgid "Instance:"
 msgstr "ÀνºÅϽº:"
 
-#: src/protocols/zephyr/zephyr.c:823
+#: src/protocols/zephyr/zephyr.c:847
 msgid "Recipient:"
 msgstr "¼ö½Å:"
 
 # src/buddy.c:2708
-#: src/about.c:94
+#: src/about.c:93
 #, c-format
 msgid "About Gaim v%s"
 msgstr "°¡ÀÓÀº"
 
 # src/about.c:124
-#: src/about.c:127
+#: src/about.c:126
 msgid ""
-"Gaim is a client that supports AOL's Instant Messenger protocol. It is written\n"
+"Gaim is a client that supports AOL's Instant Messenger protocol. It is "
+"written\n"
 "using Gtk+ and is licensed under the GPL.\n"
 "\n"
 "URL: "
@@ -906,54 +1111,33 @@
 "\n"
 "ÀÎÅͳÝÁÖ¼Ò:"
 
-#: src/about.c:128
-msgid ""
-"\n"
-"\n"
-"IRC: #gaim on irc.openprojects.net"
-msgstr ""
-"\n"
-"\n"
-"IRC: irc.openprojects.net ¼­¹öÀÇ #gaim ä³Î·Î Á¢¼ÓÇϽʽÿÀ."
-
 #: src/about.c:137
 msgid ""
-"Rob Flynn (maintainer)               rob@marko.net\n"
-"Eric Warmenhoven (lead coder)  warmenhoven@yahoo.com\n"
+"Active Developers\n"
+"====================\n"
+"Rob Flynn (maintainer) [ rob@marko.net ]\n"
+"Sean Egan (coder)      [ bj91704@binghamton.edu ]\n"
 "\n"
+"Crazy Patch Writers\n"
+"===================\n"
 "Benjamin Miller\n"
 "Decklin Foster\n"
-"Sean Egan\n"
+"\n"
+"Retired Developers\n"
+"===================\n"
 "Jim Duchek\n"
-"Mark Spencer (original author)   markster@marko.net"
+"Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
+"Mark Spencer (original author)   [ markster@marko.net ]"
 msgstr ""
-"Rob Flynn (Ã¥ÀÓÀÚ)               rob@marko.net\n"
-"Eric Warmenhoven (ÇÙ½É ÄÚµù)  warmenhoven@yahoo.com\n"
-"\n"
-"Benjamin Miller\n"
-"Decklin Foster\n"
-"Sean Egan\n"
-"Jim Duchek\n"
-"Mark Spencer (¿øÀúÀÚ)   markster@marko.net"
 
 # plugins/yay/yay.c:250 src/about.c:179 src/aim.c:303 src/buddy.c:2607
 # src/buddy_chat.c:971 src/buddy_chat.c:1125 src/buddy_chat.c:1152
 # src/conversation.c:2135 src/dialogs.c:440 src/dialogs.c:3719
 # src/multi.c:744 src/plugins.c:374 src/prefs.c:2429 src/prpl.c:359
-#: src/about.c:148
-#: src/about.c:213
-#: src/aim.c:295
-#: src/buddy.c:2399
-#: src/buddy_chat.c:1296
-#: src/buddy_chat.c:1395
-#: src/buddy_chat.c:1425
-#: src/conversation.c:2295
-#: src/dialogs.c:446
-#: src/dialogs.c:3631
-#: src/multi.c:1002
-#: src/plugins.c:277
-#: src/prefs.c:2415
-#: src/prpl.c:438
+#: src/about.c:155 src/aim.c:296 src/buddy.c:2469 src/buddy_chat.c:1311
+#: src/buddy_chat.c:1408 src/buddy_chat.c:1438 src/conversation.c:2417
+#: src/dialogs.c:563 src/dialogs.c:3777 src/multi.c:1026 src/plugins.c:277
+#: src/prefs.c:2496 src/prpl.c:438 src/prpl.c:679 src/server.c:991
 msgid "Close"
 msgstr "´Ý±â"
 
@@ -961,130 +1145,114 @@
 #. this makes the sizes not work.
 #. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
 #. gtk_widget_grab_default(button);
-#: src/about.c:168
+#: src/about.c:175
 msgid "Web Site"
 msgstr "»çÀÌÆ®"
 
-#: src/about.c:223
-msgid "Relax, help is just around the corner. The first thing you'll need to do is get an AIM account; you can get one from http://aim.aol.com/. Just click the button that says \"New Users\" and you can create an account that way. Once you have your account, enter the username and password into the login window that comes up when you start Gaim, and click the Signon button. Once you're online, you can talk to one of the Gaim developers for more assistance; their contact information is in the AUTHORS file in the Gaim source, or at "
-msgstr "±äÀåÀ» Ǫ½Ê½Ã¿À. µµ¿ò¸»Àº ±¸¼®±¸¼®¿¡ ÀÖ½À´Ï´Ù. ¸ÕÀú AIM °èÁ¤À» ¸¸µé¾î¾ß ÇÕ´Ï´Ù. AIM °èÁ¤Àº http://aim.aol.com/¿¡¼­ ¸¸µé ¼ö ÀÖ½À´Ï´Ù. \"New Users\" ¹öÆ°À» Ŭ¸¯ÇÏ¸é »õ °èÁ¤À» ¸¸µé ¼ö ÀÖ½À´Ï´Ù. °èÁ¤À» ¸¸µé¾úÀ¸¸é °¡ÀÓÀ» ½ÇÇàÇÒ ¶§ ³ª¿À´Â ·Î±×ÀΠâ¿¡ »ç¿ëÀÚID¿Í ºñ¹Ð¹øÈ£¸¦ ÀÔ·ÂÇÏ°í Á¢¼Ó ¹öÆ°À» Ŭ¸¯ÇϽʽÿÀ. Á¢¼ÓÀÌ µÇ¸é °¡ÀÓ °³¹ßÀÚ¿Í À̾߱âÇÒ ¼ö ÀÖ½À´Ï´Ù. °¡ÀÓ °³¹ßÀڵ鿡 ´ëÇÑ Á¤º¸´Â °¡ÀÓ ¼Ò½ºÀÇ AUTHORS ÆÄÀÏ¿¡ µé¾îÀÖ½À´Ï´Ù. ¶Ç´Â ´ÙÀ½ À§Ä¡¿¡¼­µµ ¾Ë¾Æº¼ ¼ö ÀÖ½À´Ï´Ù"
-
-#: src/about.c:234
-msgid "contactinfo.php. If you can't get online and still need more assistance, feel free to email us at gaim@marko.net. Thanks for using Gaim!"
-msgstr "contactinfo.php. ¸¸¾à ¿©ÀüÈ÷ Á¢¼ÓÇÒ ¼ö ¾ø°Å³ª º¸´Ù ¸¹Àº µµ¿òÀÌ ÇÊ¿äÇÏ´Ù¸é gaim@marko.net À¸·Î ¸ÞÀÏÀ» º¸³»ÁֽʽÿÀ. °¡ÀÓÀ» »ç¿ëÇØ Áּż­ °¨»çÇÕ´Ï´Ù."
-
 # src/aim.c:137 src/buddy.c:2600
-#: src/aim.c:128
-#: src/buddy.c:2392
+#: src/aim.c:129 src/buddy.c:2462
 msgid "Signoff"
 msgstr "Á¢¼Ó ²÷±â"
 
 # src/aim.c:149
-#: src/aim.c:140
+#: src/aim.c:141
 msgid "Please enter your logon"
 msgstr "»ç¿ëÀÚ °èÁ¤À» ÀÔ·ÂÇϼ¼¿ä"
 
 # src/aim.c:149 src/aim.c:154 src/multi.c:917
-#: src/aim.c:140
-#: src/multi.c:1231
-#: src/server.c:53
+#: src/aim.c:141 src/multi.c:1276 src/server.c:55
 msgid "Signon Error"
 msgstr "Á¢¼Ó ¿À·ù"
 
 # src/aim.c:248
-#: src/aim.c:238
+#: src/aim.c:239
 msgid "Gaim - Login"
 msgstr "°¡ÀÓ - ·Î±×ÀÎ"
 
 # src/aim.c:266
-#: src/aim.c:256
+#: src/aim.c:257
 msgid "Screen Name: "
 msgstr "¾ÆÀ̵ð: "
 
 # src/aim.c:280
-#: src/aim.c:272
+#: src/aim.c:273
 msgid "Password: "
 msgstr "Æнº¿öµå: "
 
 # src/aim.c:301 src/buddy.c:2604
-#: src/aim.c:293
-#: src/buddy.c:2396
+#: src/aim.c:294 src/buddy.c:2466
 msgid "Quit"
 msgstr "³¡³»±â"
 
 # src/aim.c:306 src/aim.c:647 src/buddy.c:2662
-#: src/aim.c:298
-#: src/aim.c:745
-#: src/buddy.c:2422
+#: src/aim.c:299 src/aim.c:755 src/buddy.c:2492
 msgid "Accounts"
 msgstr "°èÁ¤"
 
 # src/aim.c:308 src/multi.c:597
-#: src/aim.c:300
-#: src/multi.c:854
+#: src/aim.c:301 src/multi.c:878
 msgid "Signon"
 msgstr "Á¢¼Ó"
 
-# src/buddy.c:2703
-#: src/aim.c:332
-msgid "Help!"
-msgstr "µµ¿ò¸»!"
+# src/applet.c:352
+#: src/aim.c:333
+#, fuzzy
+msgid "About"
+msgstr "...¿¡ ´ëÇÏ¿©"
 
 # src/aim.c:341 src/prefs.c:1632 src/prefs.c:1839
-#: src/aim.c:333
-#: src/prefs.c:1525
-#: src/prefs.c:1799
+#: src/aim.c:334 src/prefs.c:1580 src/prefs.c:1854
 msgid "Options"
 msgstr "¿É¼Ç"
 
 # src/aim.c:343 src/aim.c:650 src/buddy.c:2679 src/plugins.c:289
 #. Left side: frame with list of plugin file names
-#: src/aim.c:335
-#: src/aim.c:748
-#: src/buddy.c:2440
-#: src/plugins.c:192
+#: src/aim.c:336 src/aim.c:758 src/buddy.c:2510 src/plugins.c:192
 msgid "Plugins"
 msgstr "Ç÷¯±×ÀÎ"
 
 # src/aim.c:644 src/buddy.c:2671
-#: src/aim.c:742
-#: src/buddy.c:2432
+#: src/aim.c:752 src/buddy.c:2502
 msgid "Preferences"
 msgstr "¼³Á¤"
 
 # src/applet.c:111
-#: src/applet.c:197
+#: src/applet.c:199
 msgid "Attempting to sign on...."
 msgstr "Á¢¼ÓÀ» ½ÃµµÇÕ´Ï´Ù...."
 
 # src/applet.c:116
-#: src/applet.c:200
+#: src/applet.c:202
 msgid "Offline. Click to bring up login box."
 msgstr "Á¢¼ÓµÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù. Ŭ¸¯ÇÏ¸é ·Î±×ÀÎ È­¸éÀÌ ³ª¿É´Ï´Ù."
 
-#: src/applet.c:216
+#: src/applet.c:218
 #, c-format
 msgid "Away: %d pending."
 msgstr "ÀÚ¸®ºñ¿ò: %d µ¿¾È"
 
 # src/applet.c:169 src/buddy.c:445 src/buddy.c:2486 src/buddy.c:2618
-#: src/applet.c:219
+#: src/applet.c:221
 msgid "Away."
 msgstr "ÀÚ¸®ºñ¿ò"
 
+# src/applet.c:169 src/buddy.c:445 src/buddy.c:2486 src/buddy.c:2618
+#: src/applet.c:293 src/buddy.c:487 src/buddy.c:2344 src/buddy.c:2480
+msgid "Away"
+msgstr "ÀÚ¸®ºñ¿ò"
+
 # src/applet.c:172 src/away.c:333
-#: src/applet.c:294
-#: src/away.c:387
+#: src/applet.c:296 src/away.c:389
 msgid "New Away Message"
 msgstr "»õ·Î¿î ÀÚ¸®ºñ¿ò ¸Þ½ÃÁö"
 
 # src/applet.c:309
-#: src/applet.c:441
+#: src/applet.c:443
 msgid "Can't create Gaim applet!"
 msgstr "°¡ÀÓ ¾ÖÇø´À» ¸¸µé ¼ö ¾ø½À´Ï´Ù!"
 
 # src/applet.c:352
-#: src/applet.c:458
+#: src/applet.c:464
 msgid "About..."
 msgstr "...¿¡ ´ëÇÏ¿©"
 
@@ -1094,24 +1262,22 @@
 msgstr "°¡ÀÓ - ÀÚ¸®ºñ¿ò!"
 
 # src/away.c:196
-#: src/away.c:249
+#: src/away.c:251
 msgid "I'm Back!"
 msgstr "³»°¡ µ¹¾Æ¿Ô´Ù!"
 
 # src/away.c:212 src/away.c:292 src/away.c:460
-#: src/away.c:265
-#: src/away.c:345
-#: src/away.c:519
+#: src/away.c:267 src/away.c:347 src/away.c:521
 msgid "Back"
 msgstr "µÚ·Î"
 
 # src/away.c:353
-#: src/away.c:407
+#: src/away.c:409
 msgid "Remove Away Message"
 msgstr "ÀÚ¸®ºñ¿ò ¸Þ½ÃÁö ¾ø¾Ö±â"
 
 # src/away.c:529
-#: src/away.c:595
+#: src/away.c:597
 msgid "Set All Away"
 msgstr "¸ðµç ÀÚ¸®ºñ¿ò ¸Þ½ÃÁö »ç¿ë"
 
@@ -1120,190 +1286,103 @@
 # src/dialogs.c:1007 src/dialogs.c:1893 src/multi.c:728 src/prefs.c:1198
 # src/prefs.c:1952 src/prefs.c:2269 src/prefs.c:2303
 #. Put the buttons in the box
-#: src/buddy.c:473
-#: src/buddy.c:2509
-#: src/buddy_chat.c:1430
-#: src/conversation.c:1934
-#: src/conversation.c:2310
-#: src/dialogs.c:764
-#: src/dialogs.c:948
-#: src/dialogs.c:1828
-#: src/multi.c:986
-#: src/prefs.c:1913
-#: src/prefs.c:2255
-#: src/prefs.c:2289
+#: src/buddy.c:482 src/buddy.c:2579 src/buddy_chat.c:1443
+#: src/conversation.c:2043 src/conversation.c:2432 src/dialogs.c:881
+#: src/dialogs.c:1065 src/dialogs.c:1968 src/multi.c:1010 src/prefs.c:1990
+#: src/prefs.c:2332 src/prefs.c:2366
 msgid "Add"
 msgstr "Ãß°¡"
 
 # src/buddy.c:441 src/buddy.c:2748 src/dialogs.c:893 src/dialogs.c:989
-#: src/buddy.c:474
-#: src/buddy.c:2510
-#: src/dialogs.c:774
-#: src/dialogs.c:921
+#: src/buddy.c:483 src/buddy.c:2580 src/dialogs.c:891 src/dialogs.c:1038
 msgid "Group"
 msgstr "±×·ì"
 
 # src/buddy.c:442 src/buddy.c:2749 src/buddy_chat.c:1159
 # src/conversation.c:1785 src/conversation.c:2147 src/prefs.c:1199
 # src/prefs.c:1966 src/prefs.c:2273 src/prefs.c:2307
-#: src/buddy.c:475
-#: src/buddy.c:2511
-#: src/buddy_chat.c:1432
-#: src/conversation.c:1920
-#: src/conversation.c:2307
-#: src/prefs.c:1927
-#: src/prefs.c:2259
-#: src/prefs.c:2293
+#: src/buddy.c:484 src/buddy.c:2581 src/buddy_chat.c:1445
+#: src/conversation.c:2029 src/conversation.c:2429 src/prefs.c:2004
+#: src/prefs.c:2336 src/prefs.c:2370
 msgid "Remove"
 msgstr "Á¦°Å"
 
-# src/buddy.c:446 src/buddy.c:2130 src/buddy.c:2485
-#: src/buddy.c:479
-#: src/buddy.c:1893
-#: src/buddy.c:2273
-#: src/prefs.c:2740
-msgid "Chat"
-msgstr "äÆÃ"
-
 # src/buddy.c:447 src/buddy.c:648 src/buddy.c:761 src/buddy.c:2483
 # src/buddy_chat.c:507 src/buddy_chat.c:927
-#: src/buddy.c:480
-#: src/buddy.c:616
-#: src/buddy.c:759
-#: src/buddy.c:2271
-#: src/buddy_chat.c:820
-#: src/buddy_chat.c:1252
+#: src/buddy.c:489 src/buddy.c:627 src/buddy.c:774 src/buddy.c:2341
+#: src/buddy_chat.c:850 src/buddy_chat.c:1267
 msgid "IM"
 msgstr "¸Þ½ÃÁö"
 
 # src/buddy.c:448 src/buddy.c:2484 src/buddy_chat.c:520 src/buddy_chat.c:935
 # src/buddy_chat.c:1165 src/conversation.c:2168
-#: src/buddy.c:481
-#: src/buddy.c:2272
-#: src/buddy_chat.c:836
-#: src/buddy_chat.c:1260
-#: src/buddy_chat.c:1438
-#: src/conversation.c:2328
+#: src/buddy.c:490 src/buddy.c:2342 src/buddy_chat.c:866 src/buddy_chat.c:1275
+#: src/buddy_chat.c:1451 src/conversation.c:2450
 msgid "Info"
 msgstr "Á¤º¸"
 
 # src/buddy.c:654 src/buddy.c:767 src/dialogs.c:983 src/dialogs.c:3421
 # src/dialogs.c:3436
 #. Put the buttons in the box
-#: src/buddy.c:621
-#: src/buddy.c:764
-#: src/dialogs.c:913
-#: src/dialogs.c:3192
-#: src/dialogs.c:3207
+#: src/buddy.c:632 src/buddy.c:779 src/dialogs.c:1030 src/dialogs.c:3336
+#: src/dialogs.c:3351
 msgid "Alias"
 msgstr "º°¸í"
 
 # src/buddy.c:660 src/buddy.c:787
-#: src/buddy.c:626
-#: src/buddy.c:783
+#: src/buddy.c:637 src/buddy.c:798
 msgid "Add Buddy Pounce"
 msgstr "Ä£±¸¾Ë¸² Ãß°¡"
 
 # src/buddy.c:666 src/buddy.c:793
-#: src/buddy.c:633
-#: src/buddy.c:789
+#: src/buddy.c:644 src/buddy.c:804
 msgid "View Log"
 msgstr "·Î±× º¸±â"
 
 # src/buddy.c:749 src/buddy.c:781
-#: src/buddy.c:748
-#: src/buddy.c:777
+#: src/buddy.c:761 src/buddy.c:792
 msgid "Rename"
 msgstr "À̸§ ¹Ù²Ù±â"
 
 # src/buddy.c:774
-#: src/buddy.c:771
+#: src/buddy.c:786
 msgid "Un-Alias"
 msgstr "º°¸í Á¦°Å"
 
 # src/buddy.c:2623
-#: src/buddy.c:1471
-#: src/buddy.c:2415
+#: src/buddy.c:1493 src/buddy.c:2485
 msgid "Buddy Pounce"
 msgstr "Ä£±¸¾Ë¸²"
 
 # src/buddy.c:1808
-#: src/buddy.c:1543
+#: src/buddy.c:1565
 msgid "New Buddy Pounce"
 msgstr "»õ Ä£±¸¾Ë¸²"
 
 # src/buddy.c:1826
-#: src/buddy.c:1561
+#: src/buddy.c:1583
 msgid "Remove Buddy Pounce"
 msgstr "Ä£±¸¾Ë¸² »èÁ¦"
 
-# src/buddy.c:2121
-#: src/buddy.c:1884
-msgid "Buddy Icon"
-msgstr "Ä£±¸ ¾ÆÀÌÄÜ"
-
-# src/buddy.c:2124
-#: src/buddy.c:1887
-msgid "Voice"
-msgstr "À½¼º"
-
-# src/buddy.c:2127
-#: src/buddy.c:1890
-msgid "IM Image"
-msgstr "±×¸² ¸Þ½ÃÁö"
-
-# src/buddy.c:2133
-#: src/buddy.c:1896
-msgid "Get File"
-msgstr "ÆÄÀÏ ¹Þ±â"
-
-# src/buddy.c:2136
-#: src/buddy.c:1899
-msgid "Send File"
-msgstr "ÆÄÀÏ º¸³»±â"
-
-# src/buddy.c:2139
-#: src/buddy.c:1902
-msgid "Games"
-msgstr "°ÔÀÓ"
-
-# src/buddy.c:2142
-#: src/buddy.c:1905
-msgid "Stocks"
-msgstr "Áõ±Ç"
-
 # src/buddy.c:2194
-#: src/buddy.c:1976
+#: src/buddy.c:2029
 #, c-format
-msgid ""
-"Logged in: %s\n"
-""
-msgstr ""
-"%s ¿¡ Á¢¼Ó\n"
-""
+msgid "Logged in: %s\n"
+msgstr "%s ¿¡ Á¢¼Ó\n"
 
 # src/buddy.c:2205
-#: src/buddy.c:1988
-#, c-format
-msgid ""
-"Warnings: %d%%\n"
-""
-msgstr ""
-"°æ°í: %d%%\n"
-""
+#: src/buddy.c:2041
+msgid "Warnings: %d%%\n"
+msgstr "°æ°í: %d%%\n"
 
 # src/buddy.c:2217
-#: src/buddy.c:2000
+#: src/buddy.c:2053
 #, c-format
-msgid ""
-"Capabilities: %s\n"
-""
-msgstr ""
-"»ç¿ë°¡´É: %s\n"
-""
+msgid "Capabilities: %s\n"
+msgstr "»ç¿ë°¡´É: %s\n"
 
 # src/buddy.c:2221
-#: src/buddy.c:2004
+#: src/buddy.c:2057
 #, c-format
 msgid ""
 "Alias: %s               \n"
@@ -1315,152 +1394,149 @@
 "%s%s%s%s%s%s"
 
 # src/buddy.c:2225
-#: src/buddy.c:2008
+#: src/buddy.c:2061
 msgid "Idle: "
 msgstr "½¬°íÀÖ´Â ½Ã°£:"
 
 # src/buddy.c:2294
-#: src/buddy.c:2078
+#: src/buddy.c:2132 src/buddy.c:2136
 #, c-format
 msgid "%s logged in."
 msgstr "%s´ÔÀÌ Á¢¼ÓÇϼ̽À´Ï´Ù."
 
 # src/buddy.c:2346
-#: src/buddy.c:2133
+#: src/buddy.c:2195 src/buddy.c:2199
 #, c-format
 msgid "%s logged out."
 msgstr "%s´ÔÀÌ Á¢¼ÓÀ» ²÷¾ú½À´Ï´Ù."
 
 # src/buddy.c:2515
-#: src/buddy.c:2306
+#: src/buddy.c:2376
 msgid "Information on selected Buddy"
 msgstr "¼±ÅÃÇÑ Ä£±¸¿¡ ´ëÇÑ Á¤º¸"
 
 # src/buddy.c:2516 src/dialogs.c:678
-#: src/buddy.c:2307
-#: src/dialogs.c:571
+#: src/buddy.c:2377 src/dialogs.c:688
 msgid "Send Instant Message"
 msgstr "¸Þ½ÃÁö º¸³»±â"
 
 # src/buddy.c:2517
-#: src/buddy.c:2308
+#: src/buddy.c:2378
 msgid "Start/join a Buddy Chat"
 msgstr "äÆà ½ÃÀÛ/Âü°¡"
 
 # src/buddy.c:2518
-#: src/buddy.c:2309
+#: src/buddy.c:2379
 msgid "Activate Away Message"
 msgstr "ÀÚ¸®ºñ¿ò ¸Þ½ÃÁö »ç¿ë"
 
 # src/buddy.c:2582
-#: src/buddy.c:2372
+#: src/buddy.c:2442
 msgid "File"
 msgstr "ÆÄÀÏ"
 
 # src/buddy.c:2586
-#: src/buddy.c:2376
+#: src/buddy.c:2446
 msgid "Add A Buddy"
 msgstr "Ä£±¸ Ãß°¡"
 
 # src/buddy.c:2588
-#: src/buddy.c:2378
+#: src/buddy.c:2448
 msgid "Join A Chat"
 msgstr "äÆà Âü°¡"
 
 # src/buddy.c:2590
-#: src/buddy.c:2380
+#: src/buddy.c:2450
 msgid "New Instant Message"
 msgstr "»õ ¸Þ½ÃÁö"
 
 # src/dialogs.c:733
-#: src/buddy.c:2382
-#: src/dialogs.c:623
+#: src/buddy.c:2452 src/dialogs.c:740
 msgid "Get User Info"
 msgstr "»ç¿ëÀÚ Á¤º¸ °¡Á®¿À±â"
 
 # src/buddy.c:2595
-#: src/buddy.c:2387
+#: src/buddy.c:2457
 msgid "Import Buddy List"
 msgstr "Ä£±¸¸ñ·Ï °¡Á®¿À±â"
 
 # src/buddy.c:2613
-#: src/buddy.c:2405
+#: src/buddy.c:2475
 msgid "Tools"
 msgstr "µµ±¸"
 
 # src/buddy.c:2666
-#: src/buddy.c:2428
+#: src/buddy.c:2498
 msgid "Protocol Actions"
 msgstr "ÇÁ·ÎÅäÄÝ ¼¼ºÎ ¼³Á¤"
 
 # src/buddy.c:2673
-#: src/buddy.c:2434
+#: src/buddy.c:2504
 msgid "View System Log"
 msgstr "½Ã½ºÅÛ ·Î±× º¸±â"
 
 # src/buddy.c:2684
-#: src/buddy.c:2446
+#: src/buddy.c:2516
 msgid "Perl"
 msgstr "ÆÞ(½ºÅ©¸³Æ®)"
 
 # src/buddy.c:2687
-#: src/buddy.c:2449
+#: src/buddy.c:2519
 msgid "Load Script"
 msgstr "½ºÅ©¸³Æ® »ç¿ë"
 
 # src/buddy.c:2691
-#: src/buddy.c:2453
+#: src/buddy.c:2523
 msgid "Unload All Scripts"
 msgstr "¸ðµç ½ºÅ©¸³Æ® »ç¿ë¾ÈÇÔ"
 
 # src/buddy.c:2695
-#: src/buddy.c:2457
+#: src/buddy.c:2527
 msgid "List Scripts"
 msgstr "½ºÅ©¸³Æ® ¸ñ·Ï"
 
 # src/buddy.c:2703
-#: src/buddy.c:2465
+#: src/buddy.c:2535
 msgid "Help"
 msgstr "µµ¿ò¸»"
 
 # src/buddy.c:2708
-#: src/buddy.c:2470
+#: src/buddy.c:2540
 msgid "About Gaim"
 msgstr "°¡ÀÓÀº"
 
 # src/buddy.c:2727 src/prefs.c:2671
-#: src/buddy.c:2489
-#: src/prefs.c:2719
+#: src/buddy.c:2559 src/prefs.c:2816
 msgid "Buddy List"
 msgstr "Ä£±¸ ¸ñ·Ï"
 
 # src/buddy.c:2781
-#: src/buddy.c:2542
+#: src/buddy.c:2612
 msgid "Add a new Buddy"
 msgstr "»õ Ä£±¸ Ãß°¡"
 
 # src/buddy.c:2782
-#: src/buddy.c:2543
+#: src/buddy.c:2613
 msgid "Add a new Group"
 msgstr "»õ ±×·ì Ãß°¡"
 
 # src/buddy.c:2783
-#: src/buddy.c:2544
+#: src/buddy.c:2614
 msgid "Remove selected Buddy/Group"
 msgstr "¼±ÅÃÇÑ Ä£±¸³ª ±×·ì Á¦°Å"
 
 # src/buddy.c:2808
-#: src/buddy.c:2569
+#: src/buddy.c:2639
 msgid "Online"
 msgstr "¿¬°á"
 
 # src/buddy.c:2810
-#: src/buddy.c:2571
+#: src/buddy.c:2641
 msgid "Edit Buddies"
 msgstr "ÆíÁý"
 
 # src/buddy.c:2847
-#: src/buddy.c:2611
+#: src/buddy.c:2681
 msgid "Gaim - Buddy List"
 msgstr "°¡ÀÓ - Ä£±¸¸ñ·Ï"
 
@@ -1486,31 +1562,13 @@
 # src/dialogs.c:3199 src/dialogs.c:3423 src/dialogs.c:3619 src/dialogs.c:3852
 # src/dialogs.c:3940 src/multi.c:479 src/multi.c:593 src/multi.c:893
 # src/prpl.c:159 src/prpl.c:231
-#: src/buddy_chat.c:304
-#: src/buddy_chat.c:392
-#: src/dialogs.c:419
-#: src/dialogs.c:589
-#: src/dialogs.c:647
-#: src/dialogs.c:766
-#: src/dialogs.c:944
-#: src/dialogs.c:1233
-#: src/dialogs.c:1438
-#: src/dialogs.c:1562
-#: src/dialogs.c:1622
-#: src/dialogs.c:1817
-#: src/dialogs.c:1999
-#: src/dialogs.c:2174
-#: src/dialogs.c:2245
-#: src/dialogs.c:2937
-#: src/dialogs.c:3194
-#: src/dialogs.c:3375
-#: src/dialogs.c:3744
-#: src/dialogs.c:3830
-#: src/multi.c:720
-#: src/multi.c:850
-#: src/multi.c:1184
-#: src/prpl.c:150
-#: src/prpl.c:224
+#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:444
+#: src/dialogs.c:535 src/dialogs.c:706 src/dialogs.c:764 src/dialogs.c:883
+#: src/dialogs.c:1061 src/dialogs.c:1350 src/dialogs.c:1555 src/dialogs.c:1679
+#: src/dialogs.c:1739 src/dialogs.c:1957 src/dialogs.c:2139 src/dialogs.c:2314
+#: src/dialogs.c:2385 src/dialogs.c:3081 src/dialogs.c:3338 src/dialogs.c:3519
+#: src/dialogs.c:3890 src/dialogs.c:3996 src/dialogs.c:4642 src/multi.c:744
+#: src/multi.c:874 src/multi.c:1208 src/prpl.c:150 src/prpl.c:224
 msgid "Cancel"
 msgstr "Ãë¼Ò"
 
@@ -1520,23 +1578,18 @@
 msgstr "Âü°¡"
 
 # src/buddy_chat.c:287 src/buddy_chat.c:977 src/buddy_chat.c:1124
-#: src/buddy_chat.c:393
-#: src/buddy_chat.c:396
-#: src/buddy_chat.c:1302
-#: src/buddy_chat.c:1394
+#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1317
+#: src/buddy_chat.c:1407
 msgid "Invite"
 msgstr "ÃÊ´ë"
 
 # src/dialogs.c:972 src/dialogs.c:3431
-#: src/buddy_chat.c:412
-#: src/dialogs.c:1113
-#: src/dialogs.c:3202
+#: src/buddy_chat.c:412 src/dialogs.c:1230 src/dialogs.c:3346
 msgid "Buddy"
 msgstr "Ä£±¸"
 
 # src/prefs.c:1917
-#: src/buddy_chat.c:417
-#: src/prefs.c:1878
+#: src/buddy_chat.c:417 src/prefs.c:1953
 msgid "Message"
 msgstr "¸Þ½ÃÁö"
 
@@ -1546,951 +1599,926 @@
 msgstr "°¡ÀÓ - ´ëÈ­½Ç·Î Ä£±¸¸¦ ÃÊ´ëÇÕ´Ï´Ù."
 
 # src/buddy_chat.c:513 src/buddy_chat.c:931
-#: src/buddy_chat.c:827
+#: src/buddy_chat.c:857
 msgid "Un-Ignore"
 msgstr "¹«½ÃÇÏÁö ¾ÊÀ½"
 
 # src/buddy_chat.c:513 src/buddy_chat.c:931
-#: src/buddy_chat.c:829
-#: src/buddy_chat.c:1256
+#: src/buddy_chat.c:859 src/buddy_chat.c:1271
 msgid "Ignore"
 msgstr "¹«½Ã"
 
 # src/buddy_chat.c:565 src/buddy_chat.c:671
 #. don't remove them from ignored in case they re-enter
-#: src/buddy_chat.c:873
-#: src/buddy_chat.c:993
+#: src/buddy_chat.c:922 src/buddy_chat.c:1034 src/buddy_chat.c:1497
+#: src/buddy_chat.c:1530
 #, c-format
 msgid "%d %s in room"
 msgstr "%d %sÀÌ(°¡) ´ëÈ­½Ç¿¡ ÀÖ½À´Ï´Ù."
 
 # src/buddy_chat.c:572
-#: src/buddy_chat.c:881
+#: src/buddy_chat.c:930
 #, c-format
 msgid "%s entered the room."
 msgstr "%s´ÔÀÌ ´ëÈ­½Ç¿¡ µé¾î¿À¼Ì½À´Ï´Ù."
 
 # src/buddy_chat.c:635
-#: src/buddy_chat.c:955
+#: src/buddy_chat.c:996
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s´ÔÀÌ ´ëÈ­¸íÀ» %s·Î ¹Ù²Ù¼Ì½À´Ï´Ù."
 
 # src/buddy_chat.c:678
-#: src/buddy_chat.c:1001
+#: src/buddy_chat.c:1043
+#, fuzzy, c-format
+msgid "%s left the room (%s)."
+msgstr "%s´ÔÀÌ ´ëÈ­½Ç¿¡¼­ ³ª°¡¼Ì½À´Ï´Ù."
+
+# src/buddy_chat.c:678
+#: src/buddy_chat.c:1045
 #, c-format
 msgid "%s left the room."
 msgstr "%s´ÔÀÌ ´ëÈ­½Ç¿¡¼­ ³ª°¡¼Ì½À´Ï´Ù."
 
 # src/buddy_chat.c:805
-#: src/buddy_chat.c:1131
+#: src/buddy_chat.c:1144
 msgid "Gaim - Group Chats"
 msgstr "°¡ÀÓ - ±×·ì äÆÃ"
 
 # src/buddy_chat.c:866
-#: src/buddy_chat.c:1192
+#: src/buddy_chat.c:1207
 msgid "Topic:"
 msgstr "ÁÖÁ¦:"
 
 # src/buddy_chat.c:908
-#: src/buddy_chat.c:1233
+#: src/buddy_chat.c:1248
 msgid "0 people in room"
 msgstr "´ëÈ­½Ç¿¡ ¾Æ¹«µµ ¾ø½À´Ï´Ù."
 
 # src/buddy_chat.c:982 src/buddy_chat.c:1123
-#: src/buddy_chat.c:1307
-#: src/buddy_chat.c:1393
+#: src/buddy_chat.c:1322 src/buddy_chat.c:1406
 msgid "Whisper"
 msgstr "±Ó¼Ó¸»"
 
 # src/buddy_chat.c:987 src/buddy_chat.c:1121 src/buddy_chat.c:1167
 # src/conversation.c:2179
-#: src/buddy_chat.c:1312
-#: src/buddy_chat.c:1391
-#: src/buddy_chat.c:1440
-#: src/conversation.c:2339
+#: src/buddy_chat.c:1327 src/buddy_chat.c:1404 src/buddy_chat.c:1453
+#: src/conversation.c:2461
 msgid "Send"
 msgstr "º¸³»±â"
 
 # src/buddy_chat.c:1161 src/conversation.c:2156
-#: src/buddy_chat.c:1434
-#: src/conversation.c:2316
+#: src/buddy_chat.c:1447 src/conversation.c:2438
 msgid "Block"
 msgstr "Â÷´Ü"
 
 # src/buddy_chat.c:1163 src/conversation.c:2162 src/dialogs.c:380
 # src/dialogs.c:405
-#: src/buddy_chat.c:1436
-#: src/conversation.c:2322
-#: src/dialogs.c:390
-#: src/dialogs.c:415
+#: src/buddy_chat.c:1449 src/conversation.c:2444 src/dialogs.c:419
+#: src/dialogs.c:448
 msgid "Warn"
 msgstr "°æ°í"
 
 # src/conversation.c:372
-#: src/conversation.c:387
+#: src/conversation.c:392
 msgid "Gaim - Save Conversation"
 msgstr "°¡ÀÓ - ´ëÈ­ ÀúÀå"
 
-# src/conversation.c:520
-#: src/conversation.c:542
-#, c-format
-msgid ""
-"Removing '%s' from buddylist.\n"
-""
-msgstr ""
-"'%s' ¸¦ Ä£±¸¸ñ·Ï¿¡¼­ »®´Ï´Ù.\n"
-""
-
-#: src/conversation.c:925
+#: src/conversation.c:1037
 msgid "Unable to send message: too large"
 msgstr "¸Þ½ÃÁö¸¦ º¸³¾ ¼ö ¾ø½À´Ï´Ù : ³Ê¹« Å®´Ï´Ù."
 
 # src/prefs.c:1917
-#: src/conversation.c:925
-#: src/conversation.c:927
+#: src/conversation.c:1037 src/conversation.c:1039
 msgid "Message Error"
 msgstr "¸Þ½ÃÁö ¿À·ù"
 
-#: src/conversation.c:927
+#: src/conversation.c:1039
 msgid "Unable to send message: Unknown reason"
 msgstr "¸Þ½ÃÁö¸¦ º¸³¾ ¼ö ¾ø½À´Ï´Ù : ¾Ë ¼ö ¾ø´Â ÀÌÀ¯"
 
 # src/conversation.c:1085
-#: src/conversation.c:1146
+#: src/conversation.c:1258
 #, c-format
 msgid "Currently at %d, "
 msgstr "ÇöÀç´Â %d¿¡, "
 
 # src/conversation.c:1093
-#: src/conversation.c:1154
+#: src/conversation.c:1266
 #, c-format
-msgid ""
-"Setting position to %d\n"
-""
-msgstr ""
-"%d·Î À§Ä¡¸¦ ¿Å±é´Ï´Ù\n"
-""
+msgid "Setting position to %d\n"
+msgstr "%d·Î À§Ä¡¸¦ ¿Å±é´Ï´Ù\n"
 
 # src/conversation.c:1619 src/prefs.c:1373
-#: src/conversation.c:1725
-#: src/prefs.c:1233
+#: src/conversation.c:1832 src/prefs.c:1274
 msgid "Bold Text"
 msgstr "±½Àº ±ÛÀÚ"
 
 # src/conversation.c:1619
-#: src/conversation.c:1725
+#: src/conversation.c:1832
 msgid "Bold"
 msgstr "±½°Ô"
 
 # src/conversation.c:1623 src/prefs.c:1374
-#: src/conversation.c:1729
+#: src/conversation.c:1836
 msgid "Italics Text"
 msgstr "±â¿ïÀÎ ±ÛÀÚ"
 
 # src/conversation.c:1624
-#: src/conversation.c:1730
+#: src/conversation.c:1837
 msgid "Italics"
 msgstr "±â¿ïÀÓ"
 
 # src/conversation.c:1627
-#: src/conversation.c:1733
-#: src/prefs.c:1245
+#: src/conversation.c:1840 src/prefs.c:1286
 msgid "Underline Text"
 msgstr "¹ØÁÙÄ£ ±ÛÀÚ"
 
 # src/conversation.c:1628
-#: src/conversation.c:1734
+#: src/conversation.c:1841
 msgid "Underline"
 msgstr "¹ØÁÙ"
 
 # src/conversation.c:1632
-#: src/conversation.c:1738
-#: src/prefs.c:1251
+#: src/conversation.c:1845 src/prefs.c:1292
 msgid "Strike through Text"
 msgstr "°¡¿îµ¥ÁÙÄ£ ±ÛÀÚ"
 
 # src/conversation.c:1632
-#: src/conversation.c:1738
+#: src/conversation.c:1845
 msgid "Strike"
 msgstr "°¡¿îµ¥ÁÙ"
 
 # src/conversation.c:1638
-#: src/conversation.c:1744
+#: src/conversation.c:1851
 msgid "Decrease font size"
 msgstr "±ÛÀÚ Å©±â ÁÙÀ̱â"
 
 # src/conversation.c:1638
-#: src/conversation.c:1744
+#: src/conversation.c:1851
 msgid "Small"
 msgstr "ÀÛ°Ô"
 
 # src/conversation.c:1641
-#: src/conversation.c:1747
+#: src/conversation.c:1854
 msgid "Normal font size"
 msgstr "º¸Åë ±ÛÀÚ Å©±â"
 
 # src/conversation.c:1641
-#: src/conversation.c:1747
+#: src/conversation.c:1854
 msgid "Normal"
 msgstr "º¸Åë"
 
 # src/conversation.c:1644
-#: src/conversation.c:1750
+#: src/conversation.c:1857
 msgid "Increase font size"
 msgstr "±ÛÀÚ Å©±â Å°¿ì±â"
 
 # src/conversation.c:1644
-#: src/conversation.c:1750
+#: src/conversation.c:1857
 msgid "Big"
 msgstr "Å©°Ô"
 
 # src/conversation.c:1651 src/dialogs.c:2686 src/dialogs.c:2702
-#: src/conversation.c:1757
-#: src/dialogs.c:2625
-#: src/dialogs.c:2644
+#: src/conversation.c:1864 src/dialogs.c:2756 src/dialogs.c:2780
 msgid "Select Font"
 msgstr "±Û²Ã ¼±ÅÃ"
 
 # src/conversation.c:1652
-#: src/conversation.c:1758
+#: src/conversation.c:1865
 msgid "Font"
 msgstr "±Û²Ã"
 
 # src/conversation.c:1655 src/prefs.c:1404
-#: src/conversation.c:1761
-#: src/prefs.c:1281
+#: src/conversation.c:1868 src/prefs.c:1322
 msgid "Text Color"
 msgstr "±ÛÀÚ »ö±ò"
 
 # src/conversation.c:1656 src/conversation.c:1660
-#: src/conversation.c:1762
-#: src/conversation.c:1766
+#: src/conversation.c:1869 src/conversation.c:1873
 msgid "Color"
 msgstr "»ö±ò"
 
 # src/conversation.c:1660 src/prefs.c:1422
-#: src/conversation.c:1766
-#: src/prefs.c:1299
+#: src/conversation.c:1873 src/prefs.c:1340
 msgid "Background Color"
 msgstr "¹ÙÅÁÈ­¸é »ö"
 
 # src/conversation.c:1667 src/dialogs.c:2328
-#: src/conversation.c:1773
-#: src/dialogs.c:2239
+#: src/conversation.c:1880 src/dialogs.c:2379
 msgid "Insert Link"
 msgstr "¿¬°á ³Ö±â"
 
 # src/conversation.c:1668
-#: src/conversation.c:1774
+#: src/conversation.c:1881
 msgid "Link"
 msgstr "¿¬°á"
 
 # src/conversation.c:1671
-#: src/conversation.c:1777
+#: src/conversation.c:1884
 msgid "Insert smiley face"
 msgstr "½º¸¶Àϸ® ¾ÆÀÌÄÜ »ðÀÔ"
 
 # src/conversation.c:1671
-#: src/conversation.c:1777
+#: src/conversation.c:1884
 msgid "Smiley"
 msgstr "½º¸¶Àϸ® ±âÈ£"
 
 # src/conversation.c:1678
-#: src/conversation.c:1784
+#: src/conversation.c:1891
 msgid "Enable logging"
 msgstr "±â·Ï Çϱâ"
 
 # src/conversation.c:1679 src/prefs.c:246
-#: src/conversation.c:1785
-#: src/prefs.c:244
+#: src/conversation.c:1892 src/prefs.c:244
 msgid "Logging"
 msgstr "±â·Ï"
 
 # src/conversation.c:1688
-#: src/conversation.c:1794
+#: src/conversation.c:1901
 msgid "Save Conversation"
 msgstr "´ëÈ­ ÀúÀå"
 
 # src/conversation.c:1689 src/dialogs.c:1496 src/dialogs.c:1689
 # src/dialogs.c:3211 src/dialogs.c:3728
-#: src/conversation.c:1795
-#: src/dialogs.c:1442
-#: src/dialogs.c:1626
-#: src/dialogs.c:2949
-#: src/dialogs.c:3640
+#: src/conversation.c:1902 src/dialogs.c:1559 src/dialogs.c:1743
+#: src/dialogs.c:3093 src/dialogs.c:3786 src/dialogs.c:4649
 msgid "Save"
 msgstr "ÀúÀå"
 
 # src/conversation.c:1693
-#: src/conversation.c:1799
+#: src/conversation.c:1906
 msgid "Enable sounds"
 msgstr "¼Ò¸® »ç¿ë"
 
 # src/conversation.c:1694
-#: src/conversation.c:1800
+#: src/conversation.c:1907
 msgid "Sound"
 msgstr "¼Ò¸®"
 
 # src/conversation.c:2008
-#: src/conversation.c:2168
+#: src/conversation.c:2290
 msgid "Gaim - Conversations"
 msgstr "°¡ÀÓ - ´ëÈ­"
 
 # src/conversation.c:2095
-#: src/conversation.c:2255
+#: src/conversation.c:2377
 msgid "Send message as: "
 msgstr "äÆýà ¾²ÀÌ´Â °èÁ¤:"
 
 # src/toc.c:1794
-#: src/conversation.c:2744
+#: src/conversation.c:2986
 msgid "Gaim - Save Icon"
 msgstr "°¡ÀÓ - ¾ÆÀÌÄÜ ÀúÀå"
 
-#: src/conversation.c:2771
+#: src/conversation.c:3013
 msgid "Disable Animation"
 msgstr "¾Ö´Ï¸ÅÀÌ¼Ç »ç¿ë¾ÈÇÔ"
 
 # src/conversation.c:1693
-#: src/conversation.c:2776
+#: src/conversation.c:3018
 msgid "Enable Animation"
 msgstr "¾Ö´Ï¸ÅÀÌ¼Ç »ç¿ë"
 
 # src/buddy.c:2121
-#: src/conversation.c:2782
+#: src/conversation.c:3024
 msgid "Hide Icon"
 msgstr "¾ÆÀÌÄÜ ¼û±â±â"
 
 # src/toc.c:1794
-#: src/conversation.c:2788
+#: src/conversation.c:3030
 msgid "Save Icon As..."
 msgstr "»õ À̸§À¸·Î ¾ÆÀÌÄÜ ÀúÀå..."
 
 # src/dialogs.c:367
-#: src/dialogs.c:378
+#: src/dialogs.c:407
 msgid "Gaim - Warn user?"
 msgstr "°¡ÀÓ - »ç¿ëÀÚ¿¡°Ô °æ°í º¸³»±â"
 
 # src/dialogs.c:388
-#: src/dialogs.c:398
+#: src/dialogs.c:427
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "%s´Ô¿¡°Ô Á¤¸»·Î °æ°í¸¦ º¸³»½Ã·Æ´Ï±î?"
 
 # src/dialogs.c:393
-#: src/dialogs.c:403
+#: src/dialogs.c:432
 msgid "Warn anonymously?"
 msgstr "°æ°í¸¦ À͸íÀ¸·Î º¸³¾±î¿ä?"
 
 # src/dialogs.c:397
-#: src/dialogs.c:407
+#: src/dialogs.c:436
 msgid "Anonymous warnings are less harsh."
 msgstr "À͸íÀÇ °æ°í´Â ¹®Á¦¸¦ ´ú ÀÏÀ¸Å³ ¼ö ÀÖ½À´Ï´Ù."
 
+# src/conversation.c:520
+#: src/dialogs.c:464
+#, c-format
+msgid "Removing '%s' from buddylist.\n"
+msgstr "'%s' ¸¦ Ä£±¸¸ñ·Ï¿¡¼­ »®´Ï´Ù.\n"
+
+# src/dialogs.c:3821
+#: src/dialogs.c:490
+#, fuzzy, c-format
+msgid "Gaim - Remove %s?"
+msgstr "°¡ÀÓ - ±×·ì À̸§ ¹Ù²Þ"
+
+# src/dialogs.c:3919
+#: src/dialogs.c:503
+#, fuzzy
+msgid "Remove Buddy"
+msgstr "Ä£±¸ À̸§ ¹Ù²Þ"
+
+#: src/dialogs.c:513
+#, c-format
+msgid ""
+"You are about to remove '%s' from\n"
+"your buddylist. Do you want to continue?"
+msgstr ""
+
+# src/prpl.c:163 src/prpl.c:235
+#: src/dialogs.c:525 src/prpl.c:154 src/prpl.c:228
+msgid "Accept"
+msgstr "Á¢¼ö"
+
 # src/dialogs.c:612 src/dialogs.c:702 src/dialogs.c:762 src/dialogs.c:1286
 # src/dialogs.c:1624 src/dialogs.c:1737 src/dialogs.c:2079 src/dialogs.c:2265
 # src/dialogs.c:2333 src/dialogs.c:3857 src/dialogs.c:3945 src/multi.c:483
 #. Build OK Button
-#: src/dialogs.c:515
-#: src/dialogs.c:594
-#: src/dialogs.c:652
-#: src/dialogs.c:1237
-#: src/dialogs.c:1566
-#: src/dialogs.c:1677
-#: src/dialogs.c:1998
-#: src/dialogs.c:2178
-#: src/dialogs.c:2244
-#: src/dialogs.c:3749
-#: src/dialogs.c:3835
-#: src/multi.c:725
+#: src/dialogs.c:632 src/dialogs.c:711 src/dialogs.c:769 src/dialogs.c:1354
+#: src/dialogs.c:1683 src/dialogs.c:1830 src/dialogs.c:2138 src/dialogs.c:2318
+#: src/dialogs.c:2384 src/dialogs.c:3895 src/dialogs.c:4001 src/multi.c:749
 msgid "OK"
 msgstr "È®ÀÎ"
 
 # src/dialogs.c:668
-#: src/dialogs.c:561
+#: src/dialogs.c:678
 msgid "Gaim - IM user"
 msgstr "°¡ÀÓ - ¸Þ½ÃÁö º¸³»±â"
 
 # src/dialogs.c:685
-#: src/dialogs.c:578
+#: src/dialogs.c:695
 msgid "IM who:"
 msgstr "º¸³¾ Ä£±¸: "
 
 # src/dialogs.c:740
-#: src/dialogs.c:630
+#: src/dialogs.c:747
 msgid "User:"
 msgstr "»ç¿ëÀÚ:"
 
 # src/dialogs.c:768
 #. Finish up
-#: src/dialogs.c:657
+#: src/dialogs.c:774
 msgid "Gaim - Get User Info"
 msgstr "°¡ÀÓ - »ç¿ëÀÚ Á¤º¸ °¡Á®¿À±â"
 
 # src/dialogs.c:838
-#: src/dialogs.c:719
+#: src/dialogs.c:836
 msgid "Buddies"
 msgstr "Ä£±¸¸ñ·Ï"
 
 # src/dialogs.c:891
-#: src/dialogs.c:772
+#: src/dialogs.c:889
 msgid "Add Group"
 msgstr "±×·ì Ãß°¡"
 
 # src/dialogs.c:921
-#: src/dialogs.c:797
+#: src/dialogs.c:914
 msgid "Gaim - Add Group"
 msgstr "°¡ÀÓ - ±×·ì Ãß°¡"
 
 # src/dialogs.c:948
-#: src/dialogs.c:881
+#: src/dialogs.c:998
 msgid "Gaim - Add Buddy"
 msgstr "°¡ÀÓ - Ä£±¸ Ãß°¡"
 
 # src/dialogs.c:962
-#: src/dialogs.c:893
+#: src/dialogs.c:1010
 msgid "Add Buddy"
 msgstr "Ä£±¸ Ãß°¡"
 
-#: src/dialogs.c:903
+#: src/dialogs.c:1020
 msgid "Contact"
 msgstr "¾ÆÀ̵ð"
 
 # src/dialogs.c:891
 #. Set up stuff for the account box
-#: src/dialogs.c:931
+#: src/dialogs.c:1048
 msgid "Add To"
 msgstr "Ãß°¡"
 
 # src/dialogs.c:1026
-#: src/dialogs.c:966
+#: src/dialogs.c:1083
 msgid "Please enter a buddy to pounce."
 msgstr "Ä£±¸¾Ë¸²¿¡ µî·ÏÇÒ Ä£±¸¸¦ ÀÔ·ÂÇϼ¼¿ä."
 
 # src/dialogs.c:1026
-#: src/dialogs.c:966
+#: src/dialogs.c:1083
 msgid "Buddy Pounce Error"
 msgstr "Ä£±¸¾Ë¸² ¿À·ù"
 
 # src/dialogs.c:1145
-#: src/dialogs.c:1082
+#: src/dialogs.c:1199
 msgid "Gaim - New Buddy Pounce"
 msgstr "°¡ÀÓ - »õ Ä£±¸¾Ë¸²"
 
 #. <pounce type="who">
-#: src/dialogs.c:1093
+#: src/dialogs.c:1210
 msgid "Pounce Who"
 msgstr "Ä£±¸Ã£±â - ´©±¸?"
 
 # src/aim.c:306 src/aim.c:647 src/buddy.c:2662
-#: src/dialogs.c:1104
+#: src/dialogs.c:1221
 msgid "Account"
 msgstr "°èÁ¤"
 
 #. </pounce type="who">
 #. <pounce type="when">
-#: src/dialogs.c:1128
+#: src/dialogs.c:1245
 msgid "Pounce When"
 msgstr "Ä£±¸Ã£±â - ¾ðÁ¦?"
 
 # src/dialogs.c:1177
-#: src/dialogs.c:1138
+#: src/dialogs.c:1255
 msgid "Pounce on sign on"
 msgstr "Ä£±¸°¡ Á¢¼ÓÇÒ ¶§ ¾Ë¸²"
 
 # src/dialogs.c:1182
-#: src/dialogs.c:1143
+#: src/dialogs.c:1260
 msgid "Pounce on return from away"
 msgstr "Ä£±¸°¡ ÀÚ¸®ºñ¿ò¿¡¼­ µ¹¾Æ¿Ã ¶§ ¾Ë¸²"
 
 # src/dialogs.c:1186
-#: src/dialogs.c:1149
+#: src/dialogs.c:1266
 msgid "Pounce on return from idle"
 msgstr "Ä£±¸°¡ ½¬°íÀÖÀ½¿¡¼­ µ¹¾Æ¿Ã ¶§ ¾Ë¸²"
 
 # src/buddy.c:2666
 #. </pounce type="when">
 #. <pounce type="action">
-#: src/dialogs.c:1161
+#: src/dialogs.c:1278
 msgid "Pounce Action"
 msgstr "Ä£±¸Ã£±â Çൿ"
 
 # src/prefs.c:839
-#: src/dialogs.c:1172
+#: src/dialogs.c:1289
 msgid "Open IM Window"
 msgstr "¸Þ½ÃÁö â ¿­±â"
 
-#: src/dialogs.c:1177
+#: src/dialogs.c:1294
 msgid "Popup Notification"
 msgstr "Æ˾÷âÀ¸·Î Á¤º¸Àü´Þ"
 
 # src/conversation.c:2095
-#: src/dialogs.c:1182
+#: src/dialogs.c:1299
 msgid "Send Message"
 msgstr "¸Þ½ÃÁö º¸³»±â"
 
 # src/dialogs.c:1220
-#: src/dialogs.c:1195
+#: src/dialogs.c:1312
 msgid "Execute command on pounce"
 msgstr "Ä£±¸¾Ë¸²½Ã ¸í·É ½ÇÇà"
 
 # src/dialogs.c:1242
-#: src/dialogs.c:1208
+#: src/dialogs.c:1325
 msgid "Play sound on pounce"
 msgstr "Ä£±¸¾Ë¸²½Ã ¼Ò¸® ³»±â"
 
 # src/dialogs.c:1268
 #. </pounce type="action">
-#: src/dialogs.c:1223
+#: src/dialogs.c:1340
 msgid "Save this pounce after activation"
 msgstr "´ÙÀ½¹ø ÀÛµ¿½Ã ÀÌ Ä£±¸¾Ë¸²À» ÀúÀå"
 
 # src/dialogs.c:1357
-#: src/dialogs.c:1305
+#: src/dialogs.c:1422
 msgid "Gaim - Set Dir Info"
 msgstr "°¡ÀÓ - µð·ºÅ丮 Á¤º¸ ¼³Á¤"
 
 # src/buddy.c:2653 src/dialogs.c:1367
-#: src/dialogs.c:1314
+#: src/dialogs.c:1431
 msgid "Directory Info"
 msgstr "µð·ºÅ丮 Á¤º¸"
 
 # src/dialogs.c:1389
-#: src/dialogs.c:1336
+#: src/dialogs.c:1453
 msgid "Allow Web Searches To Find Your Info"
 msgstr "À¥À» ÅëÇÏ¿© ³ªÀÇ Á¤º¸¸¦ °Ë»öÇÒ ¼ö ÀÖµµ·Ï Çã¿ë"
 
 # src/dialogs.c:1392 src/dialogs.c:2098
 #. Line 1
-#: src/dialogs.c:1339
-#: src/dialogs.c:2017
+#: src/dialogs.c:1456 src/dialogs.c:2157
 msgid "First Name"
 msgstr "¼º"
 
 # src/dialogs.c:1403 src/dialogs.c:2110
 #. Line 2
-#: src/dialogs.c:1350
-#: src/dialogs.c:2029
+#: src/dialogs.c:1467 src/dialogs.c:2169
 msgid "Middle Name"
 msgstr "Áß°£ À̸§"
 
 # src/dialogs.c:1415 src/dialogs.c:2122
 #. Line 3
-#: src/dialogs.c:1362
-#: src/dialogs.c:2041
+#: src/dialogs.c:1479 src/dialogs.c:2181
 msgid "Last Name"
 msgstr "À̸§"
 
 # src/dialogs.c:1426 src/dialogs.c:2134
 #. Line 4
-#: src/dialogs.c:1373
-#: src/dialogs.c:2053
+#: src/dialogs.c:1490 src/dialogs.c:2193
 msgid "Maiden Name"
 msgstr "ó³à½ÃÀý ¼º"
 
 # src/dialogs.c:1448 src/dialogs.c:2157
 #. Line 6
-#: src/dialogs.c:1395
-#: src/dialogs.c:2076
+#: src/dialogs.c:1512 src/dialogs.c:2216
 msgid "State"
 msgstr "½Ã/µµ"
 
 # src/dialogs.c:1459 src/dialogs.c:2168
 #. Line 7
-#: src/dialogs.c:1406
-#: src/dialogs.c:2087
+#: src/dialogs.c:1523 src/dialogs.c:2227
 msgid "Country"
 msgstr "±¹°¡"
 
 # src/dialogs.c:1514
-#: src/dialogs.c:1460
+#: src/dialogs.c:1577
 msgid "New Passwords Do Not Match"
 msgstr "»õ Æнº¿öµå°¡ ÀÏÄ¡ÇÏÁö ¾Ê½À´Ï´Ù"
 
 # src/dialogs.c:1514 src/dialogs.c:1519
-#: src/dialogs.c:1460
-#: src/dialogs.c:1465
+#: src/dialogs.c:1577 src/dialogs.c:1582
 msgid "Gaim - Change Password Error"
 msgstr "°¡ÀÓ - Æнº¿öµå º¯°æ ½ÇÆÐ"
 
 # src/dialogs.c:1519
-#: src/dialogs.c:1465
+#: src/dialogs.c:1582
 msgid "Fill out all fields completely"
 msgstr "¸ðµç Ç׸ñÀ» ¿ÏÀüÈ÷ ä¿ì½Ê½Ã¿ä"
 
-# src/buddy.c:2657 src/dialogs.c:1558
-#: src/dialogs.c:1501
-msgid "Change Password"
-msgstr "Æнº¿öµå ¹Ù²Ù±â"
-
 # src/dialogs.c:1577
-#: src/dialogs.c:1520
+#: src/dialogs.c:1637
 msgid "Original Password"
 msgstr "¿ø·¡ Æнº¿öµå"
 
 # src/dialogs.c:1591
-#: src/dialogs.c:1534
+#: src/dialogs.c:1651
 msgid "New Password"
 msgstr "»õ Æнº¿öµå"
 
 # src/dialogs.c:1605
-#: src/dialogs.c:1548
+#: src/dialogs.c:1665
 msgid "New Password (again)"
 msgstr "»õ Æнº¿öµå (Çѹø´õ)"
 
 # src/dialogs.c:1650
-#: src/dialogs.c:1589
+#: src/dialogs.c:1706
 msgid "Gaim - Set User Info"
 msgstr "°¡ÀÓ - »ç¿ëÀÚ Á¤º¸ ¼³Á¤"
 
 # src/dialogs.c:1748
-#: src/dialogs.c:1682
+#: src/dialogs.c:1814
 msgid "Below are the results of your search: "
 msgstr "°Ë»öÀÇ °á°ú´Â ´ÙÀ½°ú °°½À´Ï´Ù: "
 
 # src/dialogs.c:1872 src/dialogs.c:1879
-#: src/dialogs.c:1807
-#: src/dialogs.c:1814
+#: src/dialogs.c:1947 src/dialogs.c:1954
 msgid "Permit"
 msgstr "Çã¿ë"
 
 # src/dialogs.c:1874 src/dialogs.c:1881
-#: src/dialogs.c:1809
-#: src/dialogs.c:1816
+#: src/dialogs.c:1949 src/dialogs.c:1956
 msgid "Deny"
 msgstr "°ÅºÎ"
 
 # src/dialogs.c:1922
-#: src/dialogs.c:1853
+#: src/dialogs.c:1993
 msgid "Gaim - Add Permit"
 msgstr "°¡ÀÓ - Çã¿ë/°ÅºÎ ¸ñ·Ï¿¡ Ãß°¡"
 
 # src/dialogs.c:1924
-#: src/dialogs.c:1855
+#: src/dialogs.c:1995
 msgid "Gaim - Add Deny"
 msgstr "°¡ÀÓ - Çã¿ë/°ÅºÎ ¸ñ·Ï¿¡ Ãß°¡"
 
 # src/dialogs.c:1995
-#: src/dialogs.c:1915
+#: src/dialogs.c:2055
 msgid "Gaim - Log Conversation"
 msgstr "°¡ÀÓ - ´ëÈ­ ±â·Ï"
 
 # src/buddy.c:2632 src/dialogs.c:2074 src/dialogs.c:2241
-#: src/dialogs.c:1993
-#: src/dialogs.c:2156
+#: src/dialogs.c:2133 src/dialogs.c:2296
 msgid "Search for Buddy"
 msgstr "Ä£±¸ ã±â"
 
 # src/dialogs.c:2205
-#: src/dialogs.c:2121
+#: src/dialogs.c:2261
 msgid "Gaim - Find Buddy By Info"
 msgstr "°¡ÀÓ - Á¤º¸·Î Ä£±¸ ã±â"
 
 # src/dialogs.c:2235
-#: src/dialogs.c:2150
+#: src/dialogs.c:2290
 msgid "Gaim - Find Buddy By Email"
 msgstr "°¡ÀÓ - ¸ÞÀÏ ÁּҷΠģ±¸ ã±â"
 
 # src/dialogs.c:2248
-#: src/dialogs.c:2163
+#: src/dialogs.c:2303
 msgid "Email"
 msgstr "¸ÞÀÏ"
 
 # src/dialogs.c:2347
-#: src/dialogs.c:2258
+#: src/dialogs.c:2398
 msgid "URL"
 msgstr "URL"
 
 # src/dialogs.c:2355 src/plugins.c:308
 #. Right side: frame with description and the filepath of plugin
-#: src/dialogs.c:2266
-#: src/plugins.c:211
+#: src/dialogs.c:2406 src/plugins.c:211
 msgid "Description"
 msgstr "¼³¸í"
 
 # src/dialogs.c:2381
-#: src/dialogs.c:2290
+#: src/dialogs.c:2430
 msgid "Gaim - Add URL"
 msgstr "°¡ÀÓ - URL Ãß°¡"
 
 # src/dialogs.c:2524 src/dialogs.c:2537 src/dialogs.c:2574
-#: src/dialogs.c:2441
-#: src/dialogs.c:2462
-#: src/dialogs.c:2516
+#: src/dialogs.c:2581 src/dialogs.c:2602 src/dialogs.c:2656
 msgid "Select Text Color"
 msgstr "±ÛÀÚ »ö±ò ¼±ÅÃ"
 
 # src/dialogs.c:2561
-#: src/dialogs.c:2495
+#: src/dialogs.c:2635
 msgid "Select Background Color"
 msgstr "¹ÙÅÁ»ö ¼±ÅÃ"
 
-#: src/dialogs.c:2719
+#: src/dialogs.c:2857
 msgid "Import to:"
 msgstr "°¡Á®¿À±â :"
 
 # src/dialogs.c:3003
-#: src/dialogs.c:2743
+#: src/dialogs.c:2881
 msgid "Gaim - Import Buddy List"
 msgstr "°¡ÀÓ - Ä£±¸¸ñ·Ï °¡Á®¿À±â"
 
 # src/dialogs.c:3066
 #. We shouldn't allow a blank title
-#: src/dialogs.c:2804
+#: src/dialogs.c:2948
 msgid "You cannot create an away message with a blank title"
 msgstr "ºñ¾îÀÖ´Â Á¦¸ñÀÇ ÀÚ¸®ºñ¿ò ¸Þ½ÃÁö´Â ¸¸µé ¼ö ¾ø½À´Ï´Ù"
 
 # src/dialogs.c:3073
 #. We shouldn't allow a blank message
-#: src/dialogs.c:2811
+#: src/dialogs.c:2955
 msgid "You cannot create an empty away message"
 msgstr "ºñ¾îÀÖ´Â ÀÚ¸®ºñ¿ò ¸Þ½ÃÁö´Â ¸¸µé ¼ö ¾ø½À´Ï´Ù"
 
 # src/dialogs.c:3140
-#: src/dialogs.c:2879
+#: src/dialogs.c:3023
 msgid "Gaim - New away message"
 msgstr "°¡ÀÓ - ÀÚ¸®ºñ¿ò ¸Þ½ÃÁö »õ·Î ¸¸µé±â"
 
 # src/dialogs.c:3150
-#: src/dialogs.c:2889
+#: src/dialogs.c:3033
 msgid "New away message"
 msgstr "»õ·Î¿î ÀÚ¸®ºñ¿ò ¸Þ½ÃÁö"
 
 # src/dialogs.c:3163
-#: src/dialogs.c:2902
+#: src/dialogs.c:3046
 msgid "Away title: "
 msgstr "ÀÚ¸®ºñ¿ò ÀÌÀ¯: "
 
 # src/dialogs.c:3203
-#: src/dialogs.c:2941
+#: src/dialogs.c:3085
 msgid "Use"
 msgstr "»ç¿ë"
 
 # src/dialogs.c:3207
-#: src/dialogs.c:2945
+#: src/dialogs.c:3089
 msgid "Save & Use"
 msgstr "ÀúÀå ¹× »ç¿ë"
 
 # src/dialogs.c:3376
 #. show everything
-#: src/dialogs.c:3148
+#: src/dialogs.c:3292
 msgid "Smile!"
 msgstr "¿ô¾î!"
 
 # src/dialogs.c:3429
-#: src/dialogs.c:3200
+#: src/dialogs.c:3344
 msgid "Alias Buddy"
 msgstr "Ä£±¸ º°¸í"
 
 # src/dialogs.c:3466
-#: src/dialogs.c:3233
+#: src/dialogs.c:3377
 msgid "Gaim - Alias Buddy"
 msgstr "°¡ÀÓ - Ä£±¸ º°¸í"
 
 # src/dialogs.c:3543
-#: src/dialogs.c:3305
+#: src/dialogs.c:3449
 msgid "Gaim - Save Log File"
 msgstr "°¡ÀÓ - ·Î±×ÆÄÀÏ ÀúÀå"
 
 # src/dialogs.c:3578
-#: src/dialogs.c:3337
+#: src/dialogs.c:3481
 #, c-format
 msgid "Unable to remove file %s - %s"
 msgstr "%s - %s ÆÄÀÏÀ» Áö¿ï ¼ö ¾ø½À´Ï´Ù."
 
 # src/dialogs.c:3609
-#: src/dialogs.c:3365
+#: src/dialogs.c:3509
 msgid "Really clear log?"
 msgstr "Á¤¸»·Î ·Î±×¸¦ Áö¿ï±î¿ä?"
 
 # src/dialogs.c:3627
-#: src/dialogs.c:3380
+#: src/dialogs.c:3524
 msgid "Okay"
 msgstr "ÁÁ¾Æ"
 
 # src/dialogs.c:1448 src/dialogs.c:2157
-#: src/dialogs.c:3551
+#: src/dialogs.c:3695
 msgid "Date"
 msgstr "³¯Â¥"
 
 # src/prefs.c:2682
-#: src/dialogs.c:3614
+#: src/dialogs.c:3758
 msgid "Conversation"
 msgstr "´ëÈ­"
 
 # src/dialogs.c:3723
-#: src/dialogs.c:3635
+#: src/dialogs.c:3781
 msgid "Clear"
 msgstr "Áö¿ì±â"
 
 # src/dialogs.c:3821
-#: src/dialogs.c:3713
+#: src/dialogs.c:3859
 msgid "Gaim - Rename Group"
 msgstr "°¡ÀÓ - ±×·ì À̸§ ¹Ù²Þ"
 
 # src/dialogs.c:3831
-#: src/dialogs.c:3723
+#: src/dialogs.c:3869
 msgid "Rename Group"
 msgstr "±×·ì À̸§ º¯°æ"
 
 # src/dialogs.c:3838 src/dialogs.c:3926
-#: src/dialogs.c:3730
-#: src/dialogs.c:3816
+#: src/dialogs.c:3876 src/dialogs.c:3982
 msgid "New name:"
 msgstr "»õ·Î¿î À̸§:"
 
 # src/dialogs.c:3909
-#: src/dialogs.c:3799
+#: src/dialogs.c:3965
 msgid "Gaim - Rename Buddy"
 msgstr "°¡ÀÓ - Ä£±¸ À̸§ ¹Ù²Þ"
 
 # src/dialogs.c:3919
-#: src/dialogs.c:3809
+#: src/dialogs.c:3975
 msgid "Rename Buddy"
 msgstr "Ä£±¸ À̸§ ¹Ù²Þ"
 
 # src/perl.c:656
 #. Below is basically stolen from plugins.c
-#: src/dialogs.c:3893
+#: src/dialogs.c:4059
 msgid "Gaim - Select Perl Script"
 msgstr "°¡ÀÓ - ÆÞ ½ºÅ©¸³Æ® ¼±ÅÃ"
 
 # src/gaimrc.c:980
-#: src/gaimrc.c:1107
+#: src/gaimrc.c:1113
 #, c-format
 msgid "Could not open config file %s."
 msgstr "¼³Á¤ÆÄÀÏ %s¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù."
 
 # src/gaimrc.c:981
-#: src/gaimrc.c:1108
+#: src/gaimrc.c:1114
 msgid "Preferences Error"
 msgstr "¼³Á¤ ¿À·ù"
 
 # src/html.c:213
 #: src/html.c:183
 #, c-format
-msgid ""
-"Receieved: '%s'\n"
-""
-msgstr ""
-"¹ÞÀº³»¿ë: '%s'\n"
-""
+msgid "Receieved: '%s'\n"
+msgstr "¹ÞÀº³»¿ë: '%s'\n"
 
 # src/html.c:238
 #: src/html.c:221
-msgid ""
-"g003: Error opening connection.\n"
-""
-msgstr ""
-"g003: ¿¬°á ¿À·ù.\n"
-""
+msgid "g003: Error opening connection.\n"
+msgstr "g003: ¿¬°á ¿À·ù.\n"
 
 # src/dialogs.c:948
-#: src/multi.c:411
+#: src/multi.c:427
 msgid "Gaim - Load Buddy Icon"
 msgstr "°¡ÀÓ - Ä£±¸ ¾ÆÀÌÄÜ ºÒ·¯¿À±â"
 
 # src/buddy.c:2121
-#: src/multi.c:454
+#: src/multi.c:470
 msgid "Buddy Icon File:"
 msgstr "Ä£±¸ ¾ÆÀÌÄÜ ÆÄÀÏ:"
 
 # src/prefs.c:267
-#: src/multi.c:465
+#: src/multi.c:481
 msgid "Browse"
 msgstr "Ž»ö"
 
 # src/prefs.c:1576
-#: src/multi.c:470
-#: src/prefs.c:1457
+#: src/multi.c:486 src/prefs.c:1512
 msgid "Reset"
 msgstr "¸®¼Â"
 
 # src/multi.c:366
-#: src/multi.c:497
+#: src/multi.c:513
 msgid "Screenname:"
 msgstr "¾ÆÀ̵ð: "
 
 # src/multi.c:386
-#: src/multi.c:517
+#: src/multi.c:533
 msgid "Protocol:"
 msgstr "ÇÁ·ÎÅäÄÝ:"
 
 # src/multi.c:391
-#: src/multi.c:522
+#: src/multi.c:538
 msgid "Remember Password"
 msgstr "Æнº¿öµå ÀúÀå"
 
 # src/multi.c:392
-#: src/multi.c:523
+#: src/multi.c:539
 msgid "Auto-Login"
 msgstr "ÀÚµ¿ ·Î±×ÀÎ"
 
-#: src/multi.c:563
+#: src/multi.c:579
 msgid "New Mail Notifications"
 msgstr "»õ·Î¿î ¸ÞÀÏ Å뺸¼³Á¤"
 
 # src/multi.c:458
-#: src/multi.c:703
+#: src/multi.c:727
 msgid "Gaim - Modify Account"
 msgstr "°¡ÀÓ - °èÁ¤ ¼öÁ¤"
 
 # src/multi.c:565
-#: src/multi.c:822
+#: src/multi.c:846
 msgid "Enter Password"
 msgstr "Æнº¿öµå"
 
 # src/multi.c:653
-#: src/multi.c:911
+#: src/multi.c:935
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "%s ¸¦ Á¤¸» Áö¿ì½Ã·Æ´Ï±î?"
 
 # src/multi.c:690
-#: src/multi.c:948
+#: src/multi.c:972
 msgid "Gaim - Account Editor"
 msgstr "°¡ÀÓ - °èÁ¤ ÆíÁý±â"
 
 # src/multi.c:709
-#: src/multi.c:967
+#: src/multi.c:991
 msgid "Select All"
 msgstr "¸ðµÎ ¼±ÅÃ"
 
 # src/multi.c:714
-#: src/multi.c:972
+#: src/multi.c:996
 msgid "Select Autos"
 msgstr "ÀÚµ¿Á¢¼Ó ¼±ÅÃ"
 
 # src/multi.c:718
-#: src/multi.c:976
+#: src/multi.c:1000
 msgid "Select None"
 msgstr "¸ðµÎ Ãë¼Ò"
 
 # src/multi.c:732
-#: src/multi.c:990
+#: src/multi.c:1014
 msgid "Modify"
 msgstr "¼öÁ¤"
 
 # src/multi.c:736
-#: src/multi.c:994
+#: src/multi.c:1018
 msgid "Sign On/Off"
 msgstr "Á¢¼Ó/²÷±â"
 
 # src/multi.c:740
-#: src/multi.c:998
+#: src/multi.c:1022
 msgid "Delete"
 msgstr "Áö¿ò"
 
-# src/multi.c:914
-#: src/multi.c:1226
+#: src/multi.c:1256
 #, c-format
 msgid ""
 "%s\n"
-"%s was unable to sign on: %s"
+"%s: %s"
+msgstr ""
+
+# src/multi.c:914
+#: src/multi.c:1275
+#, fuzzy, c-format
+msgid "%s was unable to sign on"
 msgstr ""
 "%s\n"
 "%s°¡ Á¢¼ÓÇÒ ¼ö ¾ø½À´Ï´Ù: %s"
 
+# src/buddy.c:2124
+#: src/multi.c:1286
+#, fuzzy
+msgid "Notice"
+msgstr "À½¼º"
+
 # src/perl.c:704
 #: src/perl.c:856
 msgid "Perl Scripts"
@@ -2564,16 +2592,9 @@
 # src/prefs.c:197 src/prefs.c:362 src/prefs.c:503 src/prefs.c:602
 # src/prefs.c:835 src/prefs.c:1366 src/prefs.c:1628 src/prefs.c:1835
 # src/prefs.c:2220
-#: src/prefs.c:198
-#: src/prefs.c:372
-#: src/prefs.c:538
-#: src/prefs.c:639
-#: src/prefs.c:868
-#: src/prefs.c:1003
-#: src/prefs.c:1221
-#: src/prefs.c:1521
-#: src/prefs.c:1795
-#: src/prefs.c:2206
+#: src/prefs.c:198 src/prefs.c:373 src/prefs.c:539 src/prefs.c:640
+#: src/prefs.c:893 src/prefs.c:1037 src/prefs.c:1262 src/prefs.c:1576
+#: src/prefs.c:1850 src/prefs.c:2283
 msgid "All options take effect immediately unless otherwise noted."
 msgstr "º°´Ù¸¥ ¾ð±ÞÀÌ ¾øÀ¸¸é ¸ðµç ¿É¼ÇÀº º¯°æ Áï½Ã Àû¿ëµË´Ï´Ù."
 
@@ -2681,448 +2702,460 @@
 msgid "GNOME URL Handler"
 msgstr "±×³ð URL 󸮱â"
 
+#: src/prefs.c:295
+msgid "Galeon"
+msgstr ""
+
 # src/prefs.c:292
-#: src/prefs.c:295
+#: src/prefs.c:296
 msgid "Manual"
 msgstr "¼öµ¿"
 
 # src/prefs.c:354
-#: src/prefs.c:364
+#: src/prefs.c:365
 msgid "Proxy Options"
 msgstr "ÇÁ·Ï½Ã ¿É¼Ç"
 
 # src/prefs.c:366
-#: src/prefs.c:376
-msgid "Not all protocols can use these proxy options. Please see the README file for details."
-msgstr "ÀÌ ÇÁ·Ï½Ã¸¦ »ç¿ëÇÒ ¼ö ¾ø´Â ÇÁ·ÎÅäÄÝÀÌ ÀÖ½À´Ï´Ù. ÀÚ¼¼ÇÑ Á¤º¸¸¦ ¿øÇϸé README ÆÄÀÏÀ» Àо½Ê½Ã¿À."
+#: src/prefs.c:377
+msgid ""
+"Not all protocols can use these proxy options. Please see the README file "
+"for details."
+msgstr ""
+"ÀÌ ÇÁ·Ï½Ã¸¦ »ç¿ëÇÒ ¼ö ¾ø´Â ÇÁ·ÎÅäÄÝÀÌ ÀÖ½À´Ï´Ù. ÀÚ¼¼ÇÑ Á¤º¸¸¦ ¿øÇϸé README "
+"ÆÄÀÏÀ» Àо½Ê½Ã¿À."
 
 # src/prefs.c:2658
-#: src/prefs.c:381
+#: src/prefs.c:382
 msgid "Proxy Type"
 msgstr "ÇÁ·Ï½Ã Á¾·ù"
 
+#: src/prefs.c:394
+msgid "Proxy Server"
+msgstr "ÇÁ·Ï½Ã ¼­¹ö"
+
 # src/prefs.c:2658
-#: src/prefs.c:393
+#: src/prefs.c:397
 msgid "No Proxy"
 msgstr "ÇÁ·Ï½Ã »ç¿ë¾ÈÇÔ"
 
-#: src/prefs.c:405
+#: src/prefs.c:409
 msgid "SOCKS 4"
 msgstr "SOCKS v4 ÇÁ·Ï½Ã"
 
-#: src/prefs.c:415
+#: src/prefs.c:419
 msgid "SOCKS 5"
 msgstr "SOCKS v5 ÇÁ·Ï½Ã"
 
-#: src/prefs.c:424
+#: src/prefs.c:428
 msgid "HTTP"
 msgstr "HTTP"
 
-#: src/prefs.c:433
-msgid "Proxy Server"
-msgstr "ÇÁ·Ï½Ã ¼­¹ö"
-
-#: src/prefs.c:451
+#: src/prefs.c:452
 msgid "Host"
 msgstr "È£½ºÆ®"
 
-#: src/prefs.c:467
+#: src/prefs.c:468
 msgid "Port"
 msgstr "Æ÷Æ®"
 
 # src/dialogs.c:3203
-#: src/prefs.c:484
+#: src/prefs.c:485
 msgid "User"
 msgstr "»ç¿ëÀÚ"
 
 # src/multi.c:375
-#: src/prefs.c:500
+#: src/prefs.c:501
 msgid "Password"
 msgstr "Æнº¿öµå"
 
 # src/prefs.c:495
-#: src/prefs.c:530
+#: src/prefs.c:531
 msgid "Buddy List Options"
 msgstr "Ä£±¸¸ñ·Ï ¿É¼Ç"
 
 # src/prefs.c:507
-#: src/prefs.c:542
+#: src/prefs.c:543
 msgid "Buddy List Window"
 msgstr "Ä£±¸¸ñ·Ïâ"
 
 # src/prefs.c:519
-#: src/prefs.c:554
+#: src/prefs.c:555
 msgid "Hide IM/Info/Chat buttons"
 msgstr "IM/Á¤º¸/äÆà ¹öÆ° ¼û±â±â"
 
 # src/prefs.c:521
-#: src/prefs.c:556
+#: src/prefs.c:557
 msgid "Automatically show buddy list on sign on"
 msgstr "Ä£±¸¸ñ·ÏÀ» ÀÚµ¿À¸·Î º¸¿©ÁÜ"
 
 # src/prefs.c:524
-#: src/prefs.c:559
+#: src/prefs.c:560
 msgid "Save Window Size/Position"
 msgstr "ÀϺΠâÀÇ Å©±â/À§Ä¡ ÀúÀå"
 
 # src/prefs.c:530
-#: src/prefs.c:566
+#: src/prefs.c:567
 msgid "Show pictures on buttons"
 msgstr "¹öÆ°¿¡ ±×¸² º¸¿©ÁÖ±â"
 
 # src/prefs.c:535
-#: src/prefs.c:571
+#: src/prefs.c:572
 msgid "Display Buddy List near applet"
 msgstr "Ä£±¸¸ñ·ÏÀº ¾ÖÇø´ ºÎ±Ù¿¡ Ç¥½Ã"
 
 # src/prefs.c:538
-#: src/prefs.c:574
+#: src/prefs.c:575
 msgid "Group Displays"
 msgstr "±×·ì Ç¥½Ã"
 
 # src/prefs.c:550
-#: src/prefs.c:586
+#: src/prefs.c:587
 msgid "Hide groups with no online buddies"
 msgstr "Á¢¼ÓµÈ Ä£±¸°¡ ¾ø´Â ±×·ì ¼û±â±â"
 
 # src/prefs.c:556
-#: src/prefs.c:592
+#: src/prefs.c:593
 msgid "Show numbers in groups"
 msgstr "±×·ì¿¡ Àοø Ç¥½Ã"
 
 # src/prefs.c:558
-#: src/prefs.c:594
+#: src/prefs.c:595
 msgid "Buddy Displays"
 msgstr "Ä£±¸ Ç¥½Ã"
 
 # src/prefs.c:570
-#: src/prefs.c:606
+#: src/prefs.c:607
 msgid "Show buddy type icons"
 msgstr "Ä£±¸ Á¾·ù ±×¸² º¸¿©ÁÖ±â"
 
 # src/prefs.c:571
-#: src/prefs.c:607
+#: src/prefs.c:608
 msgid "Show warning levels"
 msgstr "°æ°í ¼öÁØ Ç¥½Ã"
 
 # src/prefs.c:577
-#: src/prefs.c:613
+#: src/prefs.c:614
 msgid "Show idle times"
 msgstr "½¬°í ÀÖ´Â ½Ã°£ º¸¿©ÁÖ±â"
 
-#: src/prefs.c:614
+#: src/prefs.c:615
 msgid "Grey idle buddies"
 msgstr "ÀÚ¸®ºñ¿î Ä£±¸¸¦ ȸ»öÀ¸·Î Ç¥½ÃÇϱâ"
 
 # src/prefs.c:594
-#: src/prefs.c:631
+#: src/prefs.c:632
 msgid "Conversation Options"
 msgstr "´ëÈ­ ¿É¼Ç"
 
 # src/prefs.c:606
-#: src/prefs.c:643
+#: src/prefs.c:644
 msgid "Keyboard Options"
 msgstr "Å°º¸µå ¿É¼Ç"
 
 # src/prefs.c:618
-#: src/prefs.c:655
+#: src/prefs.c:656
 msgid "Enter sends message"
 msgstr "¿£ÅÍÅ°¸¦ ´©¸£¸é ¸Þ½ÃÁö º¸³»±â"
 
 # src/prefs.c:619
-#: src/prefs.c:656
+#: src/prefs.c:657
 msgid "Control-Enter sends message"
 msgstr "ÄÁÆ®·ÑÅ°¿Í ¿£ÅÍÅ°¸¦ ÇÔ²² ´­·¯ ¸Þ½ÃÁö º¸³»±â"
 
 # src/prefs.c:620
-#: src/prefs.c:657
+#: src/prefs.c:658
 msgid "Escape closes window"
 msgstr "Esc Å°¸¦ ´©¸£¸é âÀ» ´ÝÀ½"
 
 # src/prefs.c:626
-#: src/prefs.c:663
+#: src/prefs.c:664
 msgid "Control-{B/I/U/S} inserts HTML tags"
 msgstr "HTML ű׸¦ »ðÀÔÇϱâ À§ÇØ ÄÁÆ®·Ñ-{B/I/U/S} »ç¿ë"
 
 # src/prefs.c:627
-#: src/prefs.c:664
+#: src/prefs.c:665
 msgid "Control-(number) inserts smileys"
 msgstr "±×¸²À» Ãâ·ÂÇϱâ À§ÇØ ÄÁÆ®·Ñ-(¼ýÀÚ) »ç¿ë"
 
 # src/prefs.c:628
-#: src/prefs.c:665
+#: src/prefs.c:666
 msgid "F2 toggles timestamp display"
 msgstr "ŸÀÓ½ºÅÆÇÁ Ãâ·ÂÀ» Åä±ÛÇϱâ À§ÇØ F2 »ç¿ë"
 
 # src/prefs.c:630
-#: src/prefs.c:667
+#: src/prefs.c:668
 msgid "Display and General Options"
 msgstr "È­¸éÇ¥½Ã ¹× ÀÏ¹Ý ¿É¼Ç"
 
 # src/prefs.c:642
-#: src/prefs.c:679
+#: src/prefs.c:680
 msgid "Show graphical smileys"
 msgstr "À̸ðƼÄÜÀ» ±×¸²À¸·Î º¸¿©ÁÖ±â (½ÇÇè¼öÁØ)"
 
 # src/prefs.c:643
-#: src/prefs.c:680
+#: src/prefs.c:681
 msgid "Show timestamp on messages"
 msgstr "¸Þ½ÃÁö¿¡ ½Ã°£ Ç¥½Ã"
 
 # src/prefs.c:644
-#: src/prefs.c:681
+#: src/prefs.c:682
 msgid "Show URLs as links"
 msgstr "URL À» ¸µÅ©·Î º¸³»±â"
 
 # src/prefs.c:645
-#: src/prefs.c:682
+#: src/prefs.c:683
 msgid "Highlight misspelled words"
 msgstr "Ʋ¸° öÀÚ ÀÚµ¿À¸·Î Ç¥½Ã"
 
 # src/prefs.c:646 src/prefs.c:1857
-#: src/prefs.c:683
-#: src/prefs.c:1817
+#: src/prefs.c:684 src/prefs.c:1872
 msgid "Sending messages removes away status"
 msgstr "¸Þ½ÃÁö¸¦ º¸³»¸é ÀÚ¸®ºñ¿ò »óÅ¿¡¼­ ³ª¿À±â"
 
 # src/prefs.c:647 src/prefs.c:1864
-#: src/prefs.c:684
-#: src/prefs.c:1825
+#: src/prefs.c:685 src/prefs.c:1885
 msgid "Queue new messages when away"
 msgstr "ÀÚ¸®ºñ¿òÁß¿¡ »õ·Î¿î ¸Þ½ÃÁö ±â¾ï"
 
 # src/prefs.c:653
-#: src/prefs.c:690
+#: src/prefs.c:691
 msgid "Ignore colors"
 msgstr "»ö±ò ¹«½Ã"
 
 # src/prefs.c:654
-#: src/prefs.c:691
+#: src/prefs.c:692
 msgid "Ignore font faces"
 msgstr "±Û²Ã ¹«½Ã"
 
 # src/prefs.c:655
-#: src/prefs.c:692
+#: src/prefs.c:693
 msgid "Ignore font sizes"
 msgstr "±ÛÀÚ Å©±â ¹«½Ã"
 
 # src/prefs.c:656
-#: src/prefs.c:693
+#: src/prefs.c:694
 msgid "Ignore TiK Automated Messages"
 msgstr "TiK ÀÚµ¿È­µÈ ¸Þ½ÃÁö ¹«½Ã"
 
 # src/prefs.c:657 src/prefs.c:1855
-#: src/prefs.c:694
-#: src/prefs.c:1815
+#: src/prefs.c:695 src/prefs.c:1870
 msgid "Ignore new conversations when away"
 msgstr "ÀÚ¸®ºñ¿ò »óÅ½à »õ·Î¿î ´ëÈ­ ¹«½Ã"
 
 # src/prefs.c:827
-#: src/prefs.c:860
+#: src/prefs.c:884
 msgid "IM Options"
 msgstr "¸Þ½ÃÁö ¿É¼Ç"
 
 # src/prefs.c:839
-#: src/prefs.c:872
-#: src/prefs.c:2735
+#: src/prefs.c:897 src/prefs.c:2832
 msgid "IM Window"
 msgstr "¸Þ½ÃÁö â"
 
 # src/prefs.c:855 src/prefs.c:899
-#: src/prefs.c:888
-#: src/prefs.c:1023
+#: src/prefs.c:913 src/prefs.c:1057
 msgid "Show buttons as: "
 msgstr "´ÙÀ½°ú °°ÀÌ ¹öÆ°À» º¸ÀÔ´Ï´Ù: "
 
 # src/prefs.c:859 src/prefs.c:903
-#: src/prefs.c:892
-#: src/prefs.c:1028
+#: src/prefs.c:917 src/prefs.c:1062
 msgid "Pictures And Text"
 msgstr "¾ÆÀÌÄÜ°ú ±ÛÀÚ"
 
 # src/prefs.c:860 src/prefs.c:904
-#: src/prefs.c:893
-#: src/prefs.c:1030
+#: src/prefs.c:918 src/prefs.c:1064
 msgid "Pictures"
 msgstr "¾ÆÀÌÄܸ¸"
 
 # src/prefs.c:861 src/prefs.c:905
-#: src/prefs.c:894
-#: src/prefs.c:1031
+#: src/prefs.c:919 src/prefs.c:1065
 msgid "Text"
 msgstr "±ÛÀÚ¸¸"
 
 # src/prefs.c:871
-#: src/prefs.c:905
+#: src/prefs.c:930
 msgid "Show all conversations in one tabbed window"
 msgstr "¸ðµç ´ëÈ­¸¦ ÇϳªÀÇ Ã¢À¸·Î º¸¿©ÁÜ"
 
+# src/prefs.c:915
+#: src/prefs.c:932
+#, fuzzy
+msgid "Show chats in the same tabbed window"
+msgstr "¸ðµç ´ëÈ­¸¦ ÇϳªÀÇ Ã¢À¸·Î º¸¿©ÁÜ"
+
 # src/prefs.c:872 src/prefs.c:916
-#: src/prefs.c:907
-#: src/prefs.c:1044
+#: src/prefs.c:939 src/prefs.c:1085
 msgid "Raise windows on events"
 msgstr "¸Þ½ÃÁö°¡ ¿À¸é ÀÚµ¿À¸·Î ⠿ø²"
 
 # src/prefs.c:873
-#: src/prefs.c:908
+#: src/prefs.c:940
 msgid "Show logins in window"
 msgstr "â¿¡¼­ Á¢¼Ó º¸¿©ÁÖ±â"
 
+#: src/prefs.c:941
+msgid "Show aliases in tabs/titles"
+msgstr ""
+
+# src/prefs.c:872 src/prefs.c:916
+#: src/prefs.c:942
+#, fuzzy
+msgid "Hide window on send"
+msgstr "¸Þ½ÃÁö°¡ ¿À¸é ÀÚµ¿À¸·Î ⠿ø²"
+
 # src/prefs.c:2687
-#: src/prefs.c:910
-#: src/prefs.c:1047
+#: src/prefs.c:944 src/prefs.c:1088
 msgid "Window Sizes"
 msgstr "â Å©±â"
 
 # src/prefs.c:879 src/prefs.c:923
-#: src/prefs.c:918
-#: src/prefs.c:1055
+#: src/prefs.c:952 src/prefs.c:1096
 msgid "New window width:"
 msgstr "âÀÇ °¡·ÎÅ©±â"
 
 # src/prefs.c:880 src/prefs.c:924
-#: src/prefs.c:919
-#: src/prefs.c:1056
+#: src/prefs.c:953 src/prefs.c:1097
 msgid "New window height:"
 msgstr "âÀÇ ¼¼·ÎÅ©±â"
 
 # src/prefs.c:881 src/prefs.c:925
-#: src/prefs.c:920
-#: src/prefs.c:1057
+#: src/prefs.c:954 src/prefs.c:1098
 msgid "Entry widget height:"
 msgstr "¿£Æ®¸®Ã¢ ³ôÀÌ"
 
-#: src/prefs.c:922
-#: src/prefs.c:1059
+#: src/prefs.c:956 src/prefs.c:1100
 msgid "Tab Placement"
 msgstr "ÅÇ À§Ä¡"
 
 # src/prefs.c:951 src/prefs.c:985
-#: src/prefs.c:942
-#: src/prefs.c:1079
+#: src/prefs.c:976 src/prefs.c:1120
 msgid "Top"
 msgstr "ˤ"
 
 # src/prefs.c:953 src/prefs.c:987
-#: src/prefs.c:944
-#: src/prefs.c:1081
+#: src/prefs.c:978 src/prefs.c:1122
 msgid "Bottom"
 msgstr "¾Æ·¡"
 
 # src/prefs.c:960 src/prefs.c:994
-#: src/prefs.c:951
-#: src/prefs.c:1088
+#: src/prefs.c:985 src/prefs.c:1129
 msgid "Left"
 msgstr "¿ÞÂÊ"
 
 # src/prefs.c:962 src/prefs.c:996
-#: src/prefs.c:953
-#: src/prefs.c:1090
+#: src/prefs.c:987 src/prefs.c:1131
 msgid "Right"
 msgstr "¿À¸¥ÂÊ"
 
 # src/buddy.c:2121
-#: src/prefs.c:957
+#: src/prefs.c:991
 msgid "Buddy Icons"
 msgstr "Ä£±¸ ¾ÆÀÌÄÜ"
 
 # src/buddy.c:2121
-#: src/prefs.c:969
+#: src/prefs.c:1003
 msgid "Hide Buddy Icons"
 msgstr "Ä£±¸ ¾ÆÀÌÄÜ ¼û±â±â"
 
-#: src/prefs.c:995
+#: src/prefs.c:1029
 msgid "Chat Options"
 msgstr "äÆà ¿É¼Ç"
 
 # src/prefs.c:883
-#: src/prefs.c:1007
+#: src/prefs.c:1041
 msgid "Group Chat Window"
 msgstr "±×·ì äÆà â"
 
 # src/prefs.c:915
-#: src/prefs.c:1042
+#: src/prefs.c:1076
 msgid "Show all chats in one tabbed window"
 msgstr "¸ðµç ´ëÈ­¸¦ ÇϳªÀÇ Ã¢À¸·Î º¸¿©ÁÜ"
 
+# src/prefs.c:871
+#: src/prefs.c:1078
+#, fuzzy
+msgid "Show conversations in the same tabbed window"
+msgstr "¸ðµç ´ëÈ­¸¦ ÇϳªÀÇ Ã¢À¸·Î º¸¿©ÁÜ"
+
 # src/prefs.c:917
-#: src/prefs.c:1045
+#: src/prefs.c:1086
 msgid "Show people joining/leaving in window"
 msgstr "Ä£±¸°¡ Âü°¡ÇÏ´Â/¶°³ª´Â°ÍÀ» âÀ¸·Î º¸¿©ÁÜ"
 
-#: src/prefs.c:1093
+#: src/prefs.c:1134
 msgid "Tab Completion"
 msgstr "ÅÇ Å°·Î ÀÚµ¿¿Ï¼ºÇϱâ"
 
-#: src/prefs.c:1105
+#: src/prefs.c:1146
 msgid "Tab-Complete Nicks"
 msgstr "ÅÇ Å°·Î º°¸í ÀÚµ¿¿Ï¼ºÇϱâ"
 
-#: src/prefs.c:1111
+#: src/prefs.c:1152
 msgid "Old-Style Tab Completion"
 msgstr "¿¾³¯ ¹æ½ÄÀÇ ÀÚµ¿¿Ï¼ºÇϱâ"
 
 # src/prefs.c:1358 src/prefs.c:2692
-#: src/prefs.c:1213
-#: src/prefs.c:2745
+#: src/prefs.c:1254 src/prefs.c:2842
 msgid "Font Options"
 msgstr "ÆùÆ® ¿É¼Ç"
 
 # src/conversation.c:1623 src/prefs.c:1374
-#: src/prefs.c:1239
+#: src/prefs.c:1280
 msgid "Italic Text"
 msgstr "±â¿ïÀÎ ±ÛÀÚ"
 
 # src/prefs.c:1406 src/prefs.c:1424 src/prefs.c:1446
-#: src/prefs.c:1283
-#: src/prefs.c:1301
-#: src/prefs.c:1323
+#: src/prefs.c:1324 src/prefs.c:1342 src/prefs.c:1364
 msgid "Select"
 msgstr "¼±ÅÃ"
 
 # src/prefs.c:1444
-#: src/prefs.c:1321
+#: src/prefs.c:1362
 msgid "Font Face for Text"
 msgstr "»ç¿ëÇÒ ±Û²Ã"
 
 # src/prefs.c:1459
-#: src/prefs.c:1336
+#: src/prefs.c:1377
 msgid "Font Size for Text"
 msgstr "±ÛÀÚ¿¡ »ç¿ëÇÒ ±Û²Ã"
 
 # src/prefs.c:1541
-#: src/prefs.c:1422
+#: src/prefs.c:1472
 msgid "Gaim - Sound Configuration"
 msgstr "°¡ÀÓ - ¼Ò¸® ¼³Á¤"
 
+#: src/prefs.c:1507
+msgid "Play"
+msgstr ""
+
 # src/prefs.c:1581
-#: src/prefs.c:1462
+#: src/prefs.c:1517
 msgid "Choose..."
 msgstr "¼±ÅÃ..."
 
 # src/prefs.c:1620
-#: src/prefs.c:1513
+#: src/prefs.c:1568
 msgid "Sound Options"
 msgstr "¼Ò¸® ¿É¼Ç"
 
 # src/prefs.c:1648
-#: src/prefs.c:1541
+#: src/prefs.c:1596
 msgid "No sounds when you log in"
 msgstr "Á¢¼Ó½Ã ¼Ò¸® »ç¿ë ¾ÈÇÔ"
 
 # src/prefs.c:1649 src/prefs.c:1856
-#: src/prefs.c:1547
-#: src/prefs.c:1816
+#: src/prefs.c:1602 src/prefs.c:1871
 msgid "Sounds while away"
 msgstr "ÀÚ¸®ºñ¿ò½Ã ¼Ò¸® ³¿"
 
 # src/dialogs.c:1251
-#: src/prefs.c:1557
+#: src/prefs.c:1612
 msgid "Sound Player:"
 msgstr "¼Ò¸® Àç»ý±â:"
 
 # src/prefs.c:1665
-#: src/prefs.c:1626
+#: src/prefs.c:1681
 #, c-format
 msgid ""
 "Command to play sound files\n"
@@ -3132,175 +3165,190 @@
 "(%s ´Â ÆÄÀϸí; ºñ¾îÀÖÀ¸¸é ³»ÀåµÈ ¼Ò¸® »ç¿ë)"
 
 # src/prefs.c:1676
-#: src/prefs.c:1637
+#: src/prefs.c:1692
 msgid "Events"
 msgstr "À̺¥Æ®"
 
 # src/prefs.c:1684
-#: src/prefs.c:1645
+#: src/prefs.c:1700
 msgid "Sound when buddy logs in"
 msgstr "Ä£±¸°¡ µé¾î¿À¸é ¼Ò¸® ³»±â"
 
 # src/prefs.c:1685
-#: src/prefs.c:1646
+#: src/prefs.c:1701
 msgid "Sound when buddy logs out"
 msgstr "Ä£±¸°¡ ³ª°¡¸é ¼Ò¸® ³»±â"
 
 # src/prefs.c:1691
-#: src/prefs.c:1652
+#: src/prefs.c:1707
 msgid "Sound when received message begins conversation"
 msgstr "óÀ½ ¸Þ½ÃÁö¸¦ ¹Þ¾ÒÀ» ¶§ ¼Ò¸®³»±â"
 
 # src/prefs.c:1692
-#: src/prefs.c:1654
+#: src/prefs.c:1709
 msgid "Sound when message is received"
 msgstr "¸Þ½ÃÁö°¡ ¿À¸é ¼Ò¸® ³»±â"
 
 # src/prefs.c:1693
-#: src/prefs.c:1655
+#: src/prefs.c:1710
 msgid "Sound when message is sent"
 msgstr "¸Þ½ÃÁö¸¦ º¸³¾ ¶§ ¼Ò¸® ³»±â"
 
 # src/prefs.c:1699
-#: src/prefs.c:1661
+#: src/prefs.c:1716
 msgid "Sound in chat rooms when people enter"
 msgstr "äÆù濡 ¼Õ´ÔÀÌ µé¾î¿Ã ¶§ ¼Ò¸® ³»±â"
 
 # src/prefs.c:1700
-#: src/prefs.c:1662
+#: src/prefs.c:1717
 msgid "Sound in chat rooms when people leave"
 msgstr "äÆù濡¼­ ¼Õ´ÔÀÌ ³ª°¥ ¶§ ¼Ò¸® ³»±â"
 
 # src/prefs.c:1701
-#: src/prefs.c:1663
+#: src/prefs.c:1718
 msgid "Sound in chat rooms when you talk"
 msgstr "´ç½ÅÀÌ Ã¤Æù濡¼­ ¸»ÇÒ ¶§ ¼Ò¸® ³»±â"
 
 # src/prefs.c:1702
-#: src/prefs.c:1664
+#: src/prefs.c:1719
 msgid "Sound in chat rooms when others talk"
 msgstr "´Ù¸¥ »ç¶÷ÀÌ Ã¤Æù濡¼­ ¸»ÇÒ ¶§ ¼Ò¸® ³»±â"
 
 # src/prefs.c:1827 src/prefs.c:2719
-#: src/prefs.c:1787
-#: src/prefs.c:2767
+#: src/prefs.c:1842 src/prefs.c:2864
 msgid "Away Messages"
 msgstr "ÀÚ¸®ºñ¿ò ¸Þ½ÃÁö"
 
 # src/prefs.c:1863
-#: src/prefs.c:1824
+#: src/prefs.c:1879
 msgid "Don't send auto-response"
 msgstr "ÀÚµ¿ ´äº¯À» º¸³»Áö ¾ÊÀ½"
 
+# src/prefs.c:1863
+#: src/prefs.c:1880
+#, fuzzy
+msgid "Only send auto-response when idle"
+msgstr "ÀÚµ¿ ´äº¯À» º¸³»Áö ¾ÊÀ½"
+
+#: src/prefs.c:1895
+msgid "Time between sending auto-responses (in seconds):"
+msgstr ""
+
 # src/prefs.c:1874
-#: src/prefs.c:1835
+#: src/prefs.c:1910
 msgid "Auto Away after"
 msgstr "ÀÚµ¿À¸·Î ¸îºÐ ÈÄ ÀÚ¸®ºñ¿ò"
 
 # src/prefs.c:1888
-#: src/prefs.c:1849
+#: src/prefs.c:1924
 msgid "minutes using"
 msgstr "´ÙÀ½ÀÇ ¸Þ½ÃÁö¸¦ »ç¿ëÇÔ"
 
 # src/prefs.c:1901
-#: src/prefs.c:1862
+#: src/prefs.c:1937
 msgid "Messages"
 msgstr "¸Þ½ÃÁö"
 
 # src/prefs.c:1913
-#: src/prefs.c:1874
+#: src/prefs.c:1949
 msgid "Title"
 msgstr "Á¦¸ñ"
 
 # src/prefs.c:1956
-#: src/prefs.c:1917
+#: src/prefs.c:1994
 msgid "Edit"
 msgstr "ÆíÁý"
 
 # src/prefs.c:1960
-#: src/prefs.c:1921
+#: src/prefs.c:1998
 msgid "Make Away"
 msgstr "Áö±Ý ¹Ù·Î ÀÚ¸®ºñ¿ò"
 
 # src/prefs.c:2212
-#: src/prefs.c:2198
+#: src/prefs.c:2275
 msgid "Privacy Options"
 msgstr "°³ÀÎÁ¤º¸ ¿É¼Ç"
 
 # src/prefs.c:2228
-#: src/prefs.c:2214
+#: src/prefs.c:2291
 msgid "Set privacy for:"
 msgstr "°³ÀÎÁ¤º¸ ¼³Á¤:"
 
 # src/prefs.c:2247
-#: src/prefs.c:2233
+#: src/prefs.c:2310
 msgid "Allow all users to contact me"
 msgstr "¸ðµç »ç¿ëÀÚ°¡ ¿¬¶ôÇÒ ¼ö ÀÖµµ·Ï Çã¿ë"
 
 # src/prefs.c:2248
-#: src/prefs.c:2234
+#: src/prefs.c:2311
 msgid "Allow only the users below"
 msgstr "Çã¿ë ¸ñ·Ï¿¡ ÀÖ´Â »ç¿ëÀÚ¸¸ ¿¬¶ôÇÒ ¼ö ÀÖµµ·Ï Çã¿ë"
 
 # src/prefs.c:2250
-#: src/prefs.c:2236
+#: src/prefs.c:2313
 msgid "Allow List"
 msgstr "Çã¿ë ¸ñ·Ï"
 
 # src/prefs.c:2281
-#: src/prefs.c:2267
+#: src/prefs.c:2344
 msgid "Deny all users"
 msgstr "¸ðµç »ç¿ëÀÚ¸¦ °ÅºÎ"
 
 # src/prefs.c:2282
-#: src/prefs.c:2268
+#: src/prefs.c:2345
 msgid "Block the users below"
 msgstr "Â÷´Ü ¸ñ·Ï¿¡ ÀÖ´Â »ç¿ëÀÚ¸¦ Â÷´Ü"
 
 # src/prefs.c:2284
-#: src/prefs.c:2270
+#: src/prefs.c:2347
 msgid "Block List"
 msgstr "Â÷´Ü ¸ñ·Ï"
 
 # src/prefs.c:2379
-#: src/prefs.c:2365
+#: src/prefs.c:2442
 msgid "Gaim - Preferences"
 msgstr "°¡ÀÓ - ¼³Á¤"
 
 # src/prefs.c:2459
-#: src/prefs.c:2444
+#: src/prefs.c:2525
 msgid "Gaim debug output window"
 msgstr "°¡ÀÓ µð¹ö±ë Ãâ·Ââ"
 
 # src/prefs.c:2653
-#: src/prefs.c:2701
+#: src/prefs.c:2798
 msgid "General"
 msgstr "ÀϹÝ"
 
 # src/prefs.c:2658
-#: src/prefs.c:2706
+#: src/prefs.c:2803
 msgid "Proxy"
 msgstr "ÇÁ·Ï½Ã"
 
 # src/prefs.c:2682
-#: src/prefs.c:2730
+#: src/prefs.c:2827
 msgid "Conversations"
 msgstr "´ëÈ­"
 
 # src/prefs.c:2708
-#: src/prefs.c:2756
+#: src/prefs.c:2853
 msgid "Sounds"
 msgstr "¼Ò¸®"
 
 # src/prefs.c:2730
-#: src/prefs.c:2778
+#: src/prefs.c:2875
 msgid "Privacy"
 msgstr "»ç¿ëÀÚ Á¤º¸"
 
 # src/prpl.c:76
 #: src/prpl.c:70
-msgid "You have attempted to load a protocol which was not compiled from the same version of the source as this application was. Unfortunately, because it is not the same version I cannot safely tell you which one it was. Needless to say, it was not successfully loaded."
-msgstr "°°Àº ¹öÀüÀÇ ¼Ò½º¿¡¼­ ÄÄÆÄÀϵÇÁö ¾ÊÀº ÇÁ·ÎÅäÄÝÀ» ·ÎµåÇÏ·Á°í ½ÃµµÇß½À´Ï´Ù. Á¤»óÀûÀ¸·Î ·ÎµåÇÒ ¼ö ¾ø½À´Ï´Ù."
+msgid ""
+"You have attempted to load a protocol which was not compiled from the same "
+"version of the source as this application was. Unfortunately, because it is "
+"not the same version I cannot safely tell you which one it was. Needless to "
+"say, it was not successfully loaded."
+msgstr ""
+"°°Àº ¹öÀüÀÇ ¼Ò½º¿¡¼­ ÄÄÆÄÀϵÇÁö ¾ÊÀº ÇÁ·ÎÅäÄÝÀ» ·ÎµåÇÏ·Á°í ½ÃµµÇß½À´Ï´Ù. "
+"Á¤»óÀûÀ¸·Î ·ÎµåÇÒ ¼ö ¾ø½À´Ï´Ù."
 
 # src/prpl.c:80
 #: src/prpl.c:74
@@ -3323,12 +3371,6 @@
 msgid "Accept?"
 msgstr "Á¢¼ö?"
 
-# src/prpl.c:163 src/prpl.c:235
-#: src/prpl.c:154
-#: src/prpl.c:228
-msgid "Accept"
-msgstr "Á¢¼ö"
-
 # src/prpl.c:208
 #: src/prpl.c:199
 msgid "Gaim - Prompt"
@@ -3359,45 +3401,171 @@
 "\n"
 "Ä£±¸ ¸ñ·Ï¿¡ Ãß°¡ÇϽðڽÀ´Ï±î?"
 
+#: src/prpl.c:615
+msgid ""
+"You do not currently have any protocols available that are able to register "
+"new accounts."
+msgstr ""
+
+# src/conversation.c:2008
+#: src/prpl.c:652
+#, fuzzy
+msgid "Gaim - Registration"
+msgstr "°¡ÀÓ - ´ëÈ­"
+
+#: src/prpl.c:667
+msgid "Registration Information"
+msgstr ""
+
+# src/prefs.c:1576
+#: src/prpl.c:684
+#, fuzzy
+msgid "Register"
+msgstr "¸®¼Â"
+
 # src/aim.c:154
-#: src/server.c:53
+#: src/server.c:55
 msgid "Please enter your password"
 msgstr "Æнº¿öµå¸¦ ÀÔ·ÂÇϼ¼¿ä"
 
 # src/server.c:56
-#: src/server.c:60
-msgid "You cannot log this account in; you do not have the protocol it uses loaded, or the protocol does not have a login function."
-msgstr "ÀÌ °èÁ¤¿¡ ·Î±×¿ÂÇÒ ¼ö ¾ø½À´Ï´Ù. ÇØ´ç ÇÁ·ÎÅäÄÝÀ» ¼³Ä¡ÇÏÁö ¾Ê¾Ò°Å³ª ÇØ´ç ÇÁ·ÎÅäÄÝ¿¡ ·Î±×ÀÎ ±â´ÉÀÌ ¾ø½À´Ï´Ù."
+#: src/server.c:62
+msgid ""
+"You cannot log this account in; you do not have the protocol it uses loaded, "
+"or the protocol does not have a login function."
+msgstr ""
+"ÀÌ °èÁ¤¿¡ ·Î±×¿ÂÇÒ ¼ö ¾ø½À´Ï´Ù. ÇØ´ç ÇÁ·ÎÅäÄÝÀ» ¼³Ä¡ÇÏÁö ¾Ê¾Ò°Å³ª ÇØ´ç "
+"ÇÁ·ÎÅäÄÝ¿¡ ·Î±×ÀÎ ±â´ÉÀÌ ¾ø½À´Ï´Ù."
 
 # src/server.c:58
-#: src/server.c:62
+#: src/server.c:64
 msgid "Login Error"
 msgstr "Á¢¼Ó ¿À·ù"
 
 # src/server.c:487
-#: src/server.c:535
+#: src/server.c:550
 #, c-format
 msgid "(%d messages)"
 msgstr "(%d°³ÀÇ ¸Þ½ÃÁö)"
 
 # src/server.c:493
-#: src/server.c:541
+#: src/server.c:556
 msgid "(1 message)"
 msgstr "(1°³ÀÇ ¸Þ½ÃÁö)"
 
 # src/buddy_chat.c:1163 src/conversation.c:2162 src/dialogs.c:380
 # src/dialogs.c:405
-#: src/server.c:756
+#: src/server.c:747
 msgid "Warned"
 msgstr "°æ°í¹Þ¾Ò½À´Ï´Ù"
 
 # src/server.c:781
-#: src/server.c:827
+#: src/server.c:818
 msgid "Yes"
 msgstr "³×"
 
 # src/server.c:782
-#: src/server.c:828
+#: src/server.c:819
 msgid "No"
 msgstr "¾Æ´Ï¿ä"
 
+# plugins/icq/gaim_icq.c:442 src/oscar.c:2895 src/toc.c:1031
+#: src/server.c:995
+#, fuzzy
+msgid "More Info"
+msgstr "Á¤º¸ °¡Á®¿À±â"
+
+#~ msgid "Available"
+#~ msgstr "¸Þ½ÃÁö ¹ÞÀ» ¼ö ÀÖÀ½"
+
+#~ msgid "Available for friends only"
+#~ msgstr "Ä£±¸µé¿¡°Ô¸¸ ¸Þ½ÃÁö ¹ÞÀ» ¼ö ÀÖÀ½"
+
+#~ msgid "Away for friends only"
+#~ msgstr "Ä£±¸µé¿¡°Ô¸¸ ÀÚ¸®ºñ¿ò Ç¥½Ã"
+
+# src/buddy_chat.c:287 src/buddy_chat.c:977 src/buddy_chat.c:1124
+#~ msgid "Invisible"
+#~ msgstr "º¸ÀÌÁö ¾Êµµ·Ï ÇÔ"
+
+#~ msgid "Invisible for friends only"
+#~ msgstr "Ä£±¸µé¿¡°Ô¸¸ º¸ÀÌÁö ¾Êµµ·Ï ÇÔ"
+
+#~ msgid "Unavailable"
+#~ msgstr "¸Þ½ÃÁö ¹ÞÀ» ¼ö ¾øÀ½"
+
+# src/buddy.c:2225
+#~ msgid "Handshake"
+#~ msgstr "¾ç¹æÇâ Çڵ彦ÀÌÅ·"
+
+# src/toc.c:324 src/toc.c:331
+#~ msgid "Connecting to GG server"
+#~ msgstr "°¡µÎ-°¡µÎ ¼­¹ö¿¡ Á¢¼ÓÁßÀÔ´Ï´Ù"
+
+# src/buddy.c:2136
+#~ msgid "Sending key"
+#~ msgstr "Å°¸¦ º¸³»´Â Áß"
+
+# src/oscar.c:456
+#~ msgid "Logging in %s\n"
+#~ msgstr "%s ¿¡ Á¢¼ÓÁß\n"
+
+# src/buddy.c:2516 src/dialogs.c:678
+#~ msgid "Send offline message"
+#~ msgstr "¿ÀÇÁ¶óÀÎ ¸Þ½ÃÁö º¸³»±â"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "IRC: #gaim on irc.openprojects.net"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "IRC: irc.openprojects.net ¼­¹öÀÇ #gaim ä³Î·Î Á¢¼ÓÇϽʽÿÀ."
+
+#~ msgid ""
+#~ "Rob Flynn (maintainer)               rob@marko.net\n"
+#~ "Eric Warmenhoven (lead coder)  warmenhoven@yahoo.com\n"
+#~ "\n"
+#~ "Benjamin Miller\n"
+#~ "Decklin Foster\n"
+#~ "Sean Egan\n"
+#~ "Jim Duchek\n"
+#~ "Mark Spencer (original author)   markster@marko.net"
+#~ msgstr ""
+#~ "Rob Flynn (Ã¥ÀÓÀÚ)               rob@marko.net\n"
+#~ "Eric Warmenhoven (ÇÙ½É ÄÚµù)  warmenhoven@yahoo.com\n"
+#~ "\n"
+#~ "Benjamin Miller\n"
+#~ "Decklin Foster\n"
+#~ "Sean Egan\n"
+#~ "Jim Duchek\n"
+#~ "Mark Spencer (¿øÀúÀÚ)   markster@marko.net"
+
+#~ msgid ""
+#~ "Relax, help is just around the corner. The first thing you'll need to do is "
+#~ "get an AIM account; you can get one from http://aim.aol.com/. Just click the "
+#~ "button that says \"New Users\" and you can create an account that way. Once "
+#~ "you have your account, enter the username and password into the login window "
+#~ "that comes up when you start Gaim, and click the Signon button. Once you're "
+#~ "online, you can talk to one of the Gaim developers for more assistance; "
+#~ "their contact information is in the AUTHORS file in the Gaim source, or at "
+#~ msgstr ""
+#~ "±äÀåÀ» Ǫ½Ê½Ã¿À. µµ¿ò¸»Àº ±¸¼®±¸¼®¿¡ ÀÖ½À´Ï´Ù. ¸ÕÀú AIM °èÁ¤À» ¸¸µé¾î¾ß "
+#~ "ÇÕ´Ï´Ù. AIM °èÁ¤Àº http://aim.aol.com/¿¡¼­ ¸¸µé ¼ö ÀÖ½À´Ï´Ù. \"New Users\" "
+#~ "¹öÆ°À» Ŭ¸¯ÇÏ¸é »õ °èÁ¤À» ¸¸µé ¼ö ÀÖ½À´Ï´Ù. °èÁ¤À» ¸¸µé¾úÀ¸¸é °¡ÀÓÀ» ½ÇÇàÇÒ "
+#~ "¶§ ³ª¿À´Â ·Î±×ÀΠâ¿¡ »ç¿ëÀÚID¿Í ºñ¹Ð¹øÈ£¸¦ ÀÔ·ÂÇÏ°í Á¢¼Ó ¹öÆ°À» "
+#~ "Ŭ¸¯ÇϽʽÿÀ. Á¢¼ÓÀÌ µÇ¸é °¡ÀÓ °³¹ßÀÚ¿Í À̾߱âÇÒ ¼ö ÀÖ½À´Ï´Ù. °¡ÀÓ "
+#~ "°³¹ßÀڵ鿡 ´ëÇÑ Á¤º¸´Â °¡ÀÓ ¼Ò½ºÀÇ AUTHORS ÆÄÀÏ¿¡ µé¾îÀÖ½À´Ï´Ù. ¶Ç´Â ´ÙÀ½ "
+#~ "À§Ä¡¿¡¼­µµ ¾Ë¾Æº¼ ¼ö ÀÖ½À´Ï´Ù"
+
+#~ msgid ""
+#~ "contactinfo.php. If you can't get online and still need more assistance, "
+#~ "feel free to email us at gaim@marko.net. Thanks for using Gaim!"
+#~ msgstr ""
+#~ "contactinfo.php. ¸¸¾à ¿©ÀüÈ÷ Á¢¼ÓÇÒ ¼ö ¾ø°Å³ª º¸´Ù ¸¹Àº µµ¿òÀÌ ÇÊ¿äÇÏ´Ù¸é "
+#~ "gaim@marko.net À¸·Î ¸ÞÀÏÀ» º¸³»ÁֽʽÿÀ. °¡ÀÓÀ» »ç¿ëÇØ Áּż­ °¨»çÇÕ´Ï´Ù."
+
+# src/buddy.c:2703
+#~ msgid "Help!"
+#~ msgstr "µµ¿ò¸»!"
--- a/po/ru.po	Fri Feb 22 23:47:55 2002 +0000
+++ b/po/ru.po	Fri Feb 22 23:48:23 2002 +0000
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim 0.48\n"
-"POT-Creation-Date: 2001-11-15 11:03+0400\n"
+"POT-Creation-Date: 2002-02-17 12:41-0800\n"
 "PO-Revision-Date: 2001-11-16 13:51+0400\n"
 "Last-Translator: Sergey Volozhanin <svo@asplinux.ru>\n"
 "Language-Team: RUSSIAN <RU@li.org>\n"
@@ -13,494 +13,642 @@
 "Content-Type: text/plain; charset=KOI8-R\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/protocols/gg/gg.c:68
-msgid "Available"
-msgstr "äÏÓÔÕÐÅÎ"
-
-#: src/protocols/gg/gg.c:69
-msgid "Available for friends only"
-msgstr "äÏÓÔÕÐÅÎ ÔÏÌØËÏ ÄÌÑ ÄÒÕÚÅÊ"
-
-#: src/applet.c:291
-#: src/buddy.c:478
-#: src/buddy.c:2283
-#: src/buddy.c:2419
-#: src/protocols/gg/gg.c:70
-msgid "Away"
-msgstr "óÔÁÔÕÓ"
-
-#: src/protocols/gg/gg.c:71
-msgid "Away for friends only"
-msgstr "ïÔÏÛÅÌ ÔÏÌØËÏ ÄÌÑ ÄÒÕÚÅÊ"
-
-#: src/protocols/gg/gg.c:72
-msgid "Invisible"
-msgstr "îÅ×ÉÄÉÍÙÊ"
-
-#: src/protocols/gg/gg.c:73
-msgid "Invisible for friends only"
-msgstr "îÅ×ÉÄÉÍ ÔÏÌØËÏ ÄÌÑ ÄÒÕÚÅÊ"
-
-#: src/protocols/gg/gg.c:74
-msgid "Unavailable"
-msgstr "îÅÄÏÓÔÕÐÅÎ"
-
-#: src/protocols/gg/gg.c:168
+#: src/protocols/gg/gg.c:182
 #, fuzzy
 msgid "Unable to resolve hostname."
 msgstr "îÅÔ ×ÏÚÍÏÖÎÏÓÔÉ ÐÒÏÞÉÔÁÔØ ÆÁÊÌ %s"
 
-#: src/protocols/gg/gg.c:171
+#: src/protocols/gg/gg.c:185
 msgid "Unable to connect to server."
 msgstr "îÅ ÍÏÇÕ ÓÏÅÄÉÎÉÔØÓÑ Ó ÓÅÒ×ÅÒÏÍ."
 
-#: src/protocols/gg/gg.c:174
+#: src/protocols/gg/gg.c:188
 msgid "Invalid response from server."
 msgstr "ïÛÉÂÏÞÎÙÊ ÏÔ×ÅÔ ÓÅÒ×ÅÒÁ"
 
-#: src/protocols/gg/gg.c:177
+#: src/protocols/gg/gg.c:191
 msgid "Error while reading from socket."
 msgstr "ïÛÉÂËÁ ÐÒÉ ÞÔÅÎÉÉ ÉÚ ÓÏËÅÔÁ."
 
-#: src/protocols/gg/gg.c:180
+#: src/protocols/gg/gg.c:194
 msgid "Error while writting to socket."
 msgstr "ïÛÉÂËÁ ÐÒÉ ÚÁÐÉÓÉ × ÓÏËÅÔ"
 
-#: src/protocols/gg/gg.c:183
+#: src/protocols/gg/gg.c:197
 msgid "Authentification failed."
 msgstr "á×ÔÏÒÉÚÁÃÉÑ ÐÒÏ×ÁÌÅÎÁ"
 
-#: src/protocols/gg/gg.c:186
+#: src/protocols/gg/gg.c:200
 msgid "Unknown Error Code."
 msgstr "îÅÉÚ×ÅÓÔÎÙÊ ËÏÄ ÏÛÉÂÅÉ"
 
-#: src/protocols/gg/gg.c:191
-#: src/protocols/gg/gg.c:599
-#: src/protocols/gg/gg.c:698
-#: src/protocols/gg/gg.c:840
-#: src/protocols/gg/gg.c:877
-#: src/protocols/gg/gg.c:921
-msgid "Gadu-Gadu Error"
-msgstr "Gaim - ïÛÉÂËÁ Gadu"
-
-#: src/protocols/gg/gg.c:311
+#: src/protocols/gg/gg.c:302
 #, c-format
 msgid "Status: %s"
 msgstr "óÔÁÔÕÓ: %s"
 
-#: src/protocols/gg/gg.c:326
+#: src/protocols/gg/gg.c:317
 msgid "Nick:"
 msgstr "ðÓÅ×ÄÏÎÉÍ:"
 
-#: src/protocols/gg/gg.c:327
+#: src/protocols/gg/gg.c:318
 msgid "Gadu-Gadu User"
 msgstr "Gadu -ðÏÌØÚÏ×ÁÔÅÌØ Gadu"
 
-#: src/protocols/gg/gg.c:462
+#: src/protocols/gg/gg.c:337
+#, fuzzy
+msgid "Could not connect"
+msgstr "îÅ ÍÏÇÕ ÐÒÉÓÏÅÄÉÎÉÔØÓÑ"
+
+#: src/protocols/gg/gg.c:344
+#, fuzzy
+msgid "Unable to read socket"
+msgstr "îÅÔ ×ÏÚÍÏÖÎÏÓÔÉ ÐÒÏÞÉÔÁÔØ ÆÁÊÌ %s"
+
+#: src/protocols/gg/gg.c:455
 msgid "Unable to connect."
 msgstr "îÅ ÍÏÇÕ ÕÓÔÁÎÏ×ÉÔØ ÓÏÅÄÉÎÅÎÉÅ"
 
-#: src/protocols/gg/gg.c:473
-msgid "Handshake"
+#: src/protocols/gg/gg.c:465
+msgid "Reading data"
+msgstr ""
+
+#: src/protocols/gg/gg.c:468
+msgid "Balancer handshake"
 msgstr ""
 
-#: src/protocols/gg/gg.c:475
-msgid "Connecting to GG server"
-msgstr "óÏÅÄÉÎÅÎÉÅ Ë GG ÓÅÒ×ÅÒÕ"
-
-#: src/protocols/gg/gg.c:478
-msgid "Waiting for server key"
+#: src/protocols/gg/gg.c:471
+#, fuzzy
+msgid "Reading server key"
 msgstr "ïÖÉÄÁÅÔÓÑ ËÌÀÞ ÄÌÑ ÓÅÒ×ÅÒÁ"
 
-#: src/protocols/gg/gg.c:480
-msgid "Sending key"
-msgstr "ïÔÐÒÁ×ÉÔØ ËÌÀÞ"
-
-#: src/protocols/gg/gg.c:537
+#: src/protocols/gg/gg.c:474
+msgid "Exchanging key hash"
+msgstr ""
+
+#: src/protocols/gg/gg.c:482
+msgid "Critical error in GG library\n"
+msgstr ""
+
+#: src/protocols/gg/gg.c:521
+#, fuzzy
+msgid "Unable to ping server"
+msgstr "îÅ ÍÏÇÕ ÓÏÅÄÉÎÉÔØÓÑ Ó ÓÅÒ×ÅÒÏÍ."
+
+#: src/protocols/gg/gg.c:533
 msgid "Send as message"
 msgstr "ïÔÐÒÁ×ÉÔØ ËÁË ÓÏÏÂÝÅÎÉÅ"
 
-#: src/protocols/gg/gg.c:545
+#: src/protocols/gg/gg.c:541
 msgid "Looking up GG server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:548
+#: src/protocols/gg/gg.c:544
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr ""
 
-#: src/protocols/gg/gg.c:575
+#: src/protocols/gg/gg.c:570
 #, c-format
 msgid "Connect to %s failed"
 msgstr "óÏÅÄÉÎÅÎÉÅ Ó %s ÒÁÚÏÒ×ÁÎÏ"
 
-#: src/protocols/gg/gg.c:598
+#: src/protocols/gg/gg.c:594
 msgid "You are trying to send message to invalid Gadu-Gadu UIN!"
 msgstr ""
 
-#: src/protocols/gg/gg.c:698
+#: src/protocols/gg/gg.c:595 src/protocols/gg/gg.c:657
+#: src/protocols/gg/gg.c:762 src/protocols/gg/gg.c:768
+#: src/protocols/gg/gg.c:821 src/protocols/gg/gg.c:833
+#: src/protocols/gg/gg.c:845 src/protocols/gg/gg.c:956
+#: src/protocols/gg/gg.c:984 src/protocols/gg/gg.c:1043
+#: src/protocols/gg/gg.c:1066 src/protocols/gg/gg.c:1116
+#: src/protocols/gg/gg.c:1149 src/protocols/gg/gg.c:1214
+msgid "Gadu-Gadu Error"
+msgstr "Gaim - ïÛÉÂËÁ Gadu"
+
+#: src/protocols/gg/gg.c:657
 msgid "Couldn't get search results"
 msgstr ""
 
-#: src/protocols/gg/gg.c:703
+#: src/protocols/gg/gg.c:662
 msgid "Gadu-Gadu Search Engine"
 msgstr ""
 
-#: src/protocols/gg/gg.c:730
+#: src/protocols/gg/gg.c:687
 msgid "Active"
 msgstr ""
 
-#: src/protocols/gg/gg.c:731
+#: src/protocols/gg/gg.c:688
 msgid "yes"
 msgstr "ÄÁ"
 
-#: src/protocols/gg/gg.c:731
+#: src/protocols/gg/gg.c:688
 msgid "no"
 msgstr "ÎÅÔ"
 
-#: src/protocols/gg/gg.c:735
+#: src/protocols/gg/gg.c:692
 msgid "UIN"
 msgstr "UIN"
 
-#: src/protocols/gg/gg.c:739
+#: src/protocols/gg/gg.c:696
 msgid "First name"
 msgstr "éÍÑ"
 
-#: src/protocols/gg/gg.c:744
+#: src/protocols/gg/gg.c:701
 msgid "Second Name"
 msgstr "æÁÍÉÌÉÑ"
 
-#: src/protocols/gg/gg.c:748
+#: src/protocols/gg/gg.c:705
 msgid "Nick"
 msgstr "ðÓÅ×ÄÏÎÉÍ"
 
-#: src/protocols/gg/gg.c:755
-#: src/protocols/gg/gg.c:758
+#: src/protocols/gg/gg.c:712 src/protocols/gg/gg.c:715
 msgid "Birth year"
 msgstr "çÏÄ ÒÏÖÄÅÎÉÑ"
 
-#: src/protocols/gg/gg.c:764
-#: src/protocols/gg/gg.c:766
-#: src/protocols/gg/gg.c:768
+#: src/protocols/gg/gg.c:721 src/protocols/gg/gg.c:723
+#: src/protocols/gg/gg.c:725
 msgid "Sex"
 msgstr "ðÏÌ"
 
 #. Line 5
-#: src/dialogs.c:1385
-#: src/dialogs.c:2068
-#: src/protocols/gg/gg.c:772
+#: src/dialogs.c:1501 src/dialogs.c:2205 src/protocols/gg/gg.c:729
 msgid "City"
 msgstr "çÏÒÏÄ"
 
+#: src/protocols/gg/gg.c:761
+msgid "There is no Buddy List stored on server. Sorry!"
+msgstr ""
+
+#: src/protocols/gg/gg.c:768
+msgid "Couldn't Import Buddies List from Server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:815
+msgid "Buddies List sucessfully transfered into Server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:816 src/protocols/gg/gg.c:828
 #: src/protocols/gg/gg.c:840
-msgid "Couldn't send search request"
+#, fuzzy
+msgid "Gadu-Gadu Information"
+msgstr "Gaim - ïÛÉÂËÁ Gadu"
+
+#: src/protocols/gg/gg.c:821
+msgid "Couldn't transfer Buddies List into Server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:827
+msgid "Buddies List sucessfully deleted from Server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:833
+msgid "Couldn't delete Buddies List from Server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:876
-#: src/protocols/gg/gg.c:920
+#: src/protocols/gg/gg.c:839
+#, fuzzy
+msgid "Password changed sucessfully"
+msgstr "ðÁÒÏÌØ ÉÚÍÅÎÅÎ ÕÓÐÅÛÎÏ"
+
+#: src/protocols/gg/gg.c:845
+msgid "Password couldn't be changed"
+msgstr ""
+
+#: src/protocols/gg/gg.c:956
+#, fuzzy
+msgid "Couldn't send http request"
+msgstr "îÅ ÍÏÇÕ ÐÒÉÓÏÅÄÉÎÉÔØÓÑ Ë ÍÁÛÉÎÅ"
+
+#: src/protocols/gg/gg.c:982
+#, c-format
+msgid "Buddies List import from Server failed (%s)"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1041
+#, c-format
+msgid "Buddies List export to Server failed (%s)"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1064
+#, c-format
+msgid "Deletion of Buddies List from Server failed (%s)"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1114 src/protocols/gg/gg.c:1212
 #, c-format
 msgid "Connect to search service failed (%s)"
 msgstr ""
 
-#: src/protocols/gg/gg.c:886
-#: src/protocols/gg/gg.c:895
+#: src/protocols/gg/gg.c:1147
+#, fuzzy, c-format
+msgid "Changing Password failed (%s)"
+msgstr "óÍÅÎÉÔØ ÐÁÒÏÌØ"
+
+#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1175
 msgid "Directory Search"
 msgstr "ðÏÉÓË ËÁÔÁÌÏÇÁ"
 
-#: src/protocols/icq/gaim_icq.c:305
+#: src/dialogs.c:1618 src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
+msgid "Change Password"
+msgstr "óÍÅÎÉÔØ ÐÁÒÏÌØ"
+
+#: src/protocols/gg/gg.c:1162 src/protocols/gg/gg.c:1179
+#, fuzzy
+msgid "Import Buddies List from Server"
+msgstr "éÍÐÏÒÔ ÓÐÉÓËÁ ÐÏÌØÚÏ×ÁÔÅÌÅÊ"
+
+#: src/protocols/gg/gg.c:1164 src/protocols/gg/gg.c:1180
+#, fuzzy
+msgid "Export Buddies List to Server"
+msgstr "éÍÐÏÒÔ ÓÐÉÓËÁ ÐÏÌØÚÏ×ÁÔÅÌÅÊ"
+
+#: src/protocols/gg/gg.c:1166 src/protocols/gg/gg.c:1181
+msgid "Delete Buddies List from Server"
+msgstr ""
+
+#: src/protocols/icq/gaim_icq.c:308
 msgid "Send message through server"
 msgstr "ïÔÐÒÁ×ÉÔØ ÓÏÏÂÝÅÎÉÅ ÞÅÒÅÚ ÓÅÒ×ÅÒ"
 
-#: src/protocols/icq/gaim_icq.c:466
-#: src/protocols/irc/irc.c:1493
-#: src/protocols/jabber/jabber.c:1644
-#: src/protocols/oscar/oscar.c:2621
-#: src/protocols/toc/toc.c:1199
+#: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1538
+#: src/protocols/jabber/jabber.c:2021 src/protocols/oscar/oscar.c:2847
+#: src/protocols/toc/toc.c:1201
 msgid "Get Info"
 msgstr "ðÏÌÕÞÉÔØ ÉÎÆÏÒÍÁÃÉÀ"
 
-#: src/protocols/irc/irc.c:428
-#: src/protocols/irc/irc.c:920
+#: src/protocols/irc/irc.c:429 src/protocols/irc/irc.c:962
 #, c-format
 msgid "<B>%s has changed the topic to: %s</B>"
 msgstr "<B>%s ÓÍÅÎÉÌ ÔÏÐÉË ÎÁ: %s</B>"
 
-#: src/protocols/irc/irc.c:662
+#: src/protocols/irc/irc.c:682
 msgid "No such nick/channel"
 msgstr "îÅÔ ÔÁËÏÇÏ ÐÓÅ×ÄÏÎÉÍÁ/ËÁÎÁÌÁ"
 
-#: src/protocols/irc/irc.c:662
-#: src/protocols/irc/irc.c:665
-#: src/protocols/irc/irc.c:667
-#: src/protocols/irc/irc.c:856
+#: src/protocols/irc/irc.c:682 src/protocols/irc/irc.c:685
+#: src/protocols/irc/irc.c:687 src/protocols/irc/irc.c:891
 msgid "IRC Error"
 msgstr "ïÛÉÂËÁ IRC"
 
-#: src/protocols/irc/irc.c:665
+#: src/protocols/irc/irc.c:685
 msgid "No such server"
 msgstr "óÅÒ×ÅÒ ÎÅ ÎÁÊÄÅÎ"
 
-#: src/protocols/irc/irc.c:667
+#: src/protocols/irc/irc.c:687
 msgid "No nickname given"
 msgstr "îÅ ÚÁÄÁÎ ÐÓÅ×ÄÏÎÉÍ"
 
-#: src/protocols/irc/irc.c:799
+#: src/protocols/irc/irc.c:819
 msgid "Unable to write"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ"
 
-#: src/protocols/irc/irc.c:854
+#: src/protocols/irc/irc.c:889
 #, fuzzy, c-format
 msgid "You have been kicked from %s: %s"
 msgstr "ðÒÅÒ×ÁÎÏ ÓÏÅÄÉÎÅÎÉÅ Ó ÞÁÔÏÍ %s."
 
-#: src/protocols/irc/irc.c:1324
+#: src/protocols/irc/irc.c:894
+#, c-format
+msgid "Kicked by %s: %s"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1357
 #, c-format
 msgid "You have left %s"
 msgstr "÷Ù ÐÏËÉÎÕÌÉ %s"
 
-#: src/protocols/irc/irc.c:1325
+#: src/protocols/irc/irc.c:1358
 msgid "IRC Part"
 msgstr ""
 
-#: src/protocols/irc/irc.c:1398
+#: src/protocols/irc/irc.c:1443
 msgid "Channel:"
 msgstr "ëÁÎÁÌ:"
 
-#: src/multi.c:506
-#: src/protocols/irc/irc.c:1402
+#: src/multi.c:522 src/protocols/irc/irc.c:1447
 msgid "Password:"
 msgstr "ðÁÒÏÌØ"
 
-#: src/protocols/jabber/jabber.c:1352
+#: src/protocols/jabber/jabber.c:1692
 msgid "Room:"
 msgstr "þÁÔ:"
 
-#: src/protocols/jabber/jabber.c:1356
+#: src/protocols/jabber/jabber.c:1696
 msgid "Server:"
 msgstr "óÅÒ×ÅÒ:"
 
-#: src/protocols/jabber/jabber.c:1361
+#: src/protocols/jabber/jabber.c:1701
 msgid "Handle:"
 msgstr "ðÓÅ×ÄÏÎÉÍ:"
 
-#: src/protocols/msn/msn.c:566
-#: src/protocols/msn/msn.c:1689
-#: src/protocols/msn/msn.c:1722
+#: src/buddy_chat.c:875 src/protocols/jabber/jabber.c:2026
+#: src/protocols/oscar/oscar.c:2854
+msgid "Get Away Msg"
+msgstr "ðÏÌÕÞÉÔØ ÓÏÏÂÝÅÎÉÅ Ï ÏÔÓÕÔÓÔ×ÉÉ"
+
+#: src/protocols/msn/msn.c:653 src/protocols/msn/msn.c:1909
+#: src/protocols/msn/msn.c:1942
 msgid "MSN Error"
 msgstr "ïÛÉÂËÁ MSN"
 
-#: src/protocols/msn/msn.c:566
+#: src/protocols/msn/msn.c:653
 msgid "Gaim was unable to send a message"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1689
-#: src/protocols/msn/msn.c:1722
+#: src/protocols/msn/msn.c:960
+#, fuzzy
+msgid "You have been disconnected. You have signed on from another location."
+msgstr "ðÒÅÒ×ÁÎÏ ÓÏÅÄÉÎÅÎÉÅ Ó ÞÁÔÏÍ %s."
+
+#: src/protocols/msn/msn.c:1909 src/protocols/msn/msn.c:1942
 msgid "Invalid name"
 msgstr "îÅ×ÅÒÎÏÅ ÉÍÑ"
 
-#: src/protocols/napster/napster.c:450
-#: src/protocols/oscar/oscar.c:2319
-#: src/protocols/toc/toc.c:1087
+#: src/protocols/napster/napster.c:450 src/protocols/oscar/oscar.c:2536
+#: src/protocols/toc/toc.c:1088
 msgid "Join what group:"
 msgstr "÷ÏÊÔÉ × ÇÒÕÐÐÕ"
 
-#: src/protocols/oscar/oscar.c:295
+#: src/protocols/oscar/oscar.c:305
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "ðÒÑÍÏÅ ÓÏÅÄÉÎÅÎÉÅ Ó %s ÚÁËÒÙÔÏ"
 
-#: src/protocols/oscar/oscar.c:331
-msgid ""
-"connection error (rend)\n"
-""
-msgstr ""
-"ïÛÉÂËÁ ÓÏÅÄÉÎÅÎÉÑ (rend)\n"
-""
-
-#: src/protocols/oscar/oscar.c:342
-msgid ""
-"major connection error\n"
-""
-msgstr ""
-"ÓÅÒØÅÚÎÁÑ ÏÛÉÂËÁ ÓÏÅÄÉÎÅÎÉÑ\n"
-""
-
-#: src/protocols/oscar/oscar.c:343
-#: src/protocols/toc/toc.c:511
-#: src/protocols/toc/toc.c:521
-#: src/protocols/toc/toc.c:587
+#: src/protocols/oscar/oscar.c:341
+msgid "connection error (rend)\n"
+msgstr "ïÛÉÂËÁ ÓÏÅÄÉÎÅÎÉÑ (rend)\n"
+
+#: src/protocols/oscar/oscar.c:352
+msgid "major connection error\n"
+msgstr "ÓÅÒØÅÚÎÁÑ ÏÛÉÂËÁ ÓÏÅÄÉÎÅÎÉÑ\n"
+
+#: src/protocols/oscar/oscar.c:353 src/protocols/toc/toc.c:509
+#: src/protocols/toc/toc.c:522 src/protocols/toc/toc.c:588
 msgid "Disconnected."
 msgstr "óÏÅÄÉÎÅÎÉÅ ÒÁÚÏÒ×ÁÎÏ."
 
-#: src/protocols/oscar/oscar.c:355
-#: src/protocols/toc/toc.c:755
+#: src/protocols/oscar/oscar.c:365 src/protocols/toc/toc.c:756
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "ðÒÅÒ×ÁÎÏ ÓÏÅÄÉÎÅÎÉÅ Ó ÞÁÔÏÍ %s."
 
-#: src/protocols/oscar/oscar.c:356
+#: src/protocols/oscar/oscar.c:366
 msgid "Chat Error!"
 msgstr "þÁÔ ÏÛÉÂËÁ!"
 
-#: src/protocols/oscar/oscar.c:366
+#: src/protocols/oscar/oscar.c:378
 msgid "Chat is currently unavailable"
 msgstr "þÁÔ ×ÒÅÍÅÎÎÏ ÎÅÄÏÓÔÕÐÅÎ"
 
-#: src/protocols/oscar/oscar.c:367
+#: src/protocols/oscar/oscar.c:379
 msgid "Gaim - Chat"
 msgstr "Gaim - þÁÔ"
 
-#: src/protocols/oscar/oscar.c:426
-#: src/protocols/oscar/oscar.c:488
+#: src/protocols/oscar/oscar.c:438 src/protocols/oscar/oscar.c:498
 msgid "Couldn't connect to host"
 msgstr "îÅ ÍÏÇÕ ÐÒÉÓÏÅÄÉÎÉÔØÓÑ Ë ÍÁÛÉÎÅ"
 
-#: src/protocols/oscar/oscar.c:434
-msgid ""
-"Password sent, waiting for response\n"
-""
-msgstr ""
-"ðÁÒÏÌØ ÐÅÒÅÄÁÎ, ÖÄÉÔÅ ÏÔ×ÅÔÁ\n"
-""
-
-#: src/protocols/oscar/oscar.c:445
-#, c-format
-msgid ""
-"Logging in %s\n"
-""
-msgstr ""
-"ðÒÉÓÏÅÄÉÎÅÎÉÅ Ë %s\n"
-""
-
-#: src/protocols/oscar/oscar.c:450
-msgid "Send offline message"
-msgstr "ïÔÐÒÁ×ÉÔØ ÓÏÏÂÝÅÎÉÅ ÞÅÒÅÚ ÓÅÒ×ÅÒ"
-
-#: src/protocols/oscar/oscar.c:469
-msgid ""
-"internal connection error\n"
-""
-msgstr ""
-"×ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ ÓÏÅÄÉÎÅÎÉÑ\n"
-""
-
-#: src/protocols/oscar/oscar.c:470
+#: src/protocols/oscar/oscar.c:446
+msgid "Password sent, waiting for response\n"
+msgstr "ðÁÒÏÌØ ÐÅÒÅÄÁÎ, ÖÄÉÔÅ ÏÔ×ÅÔÁ\n"
+
+#: src/protocols/oscar/oscar.c:479
+msgid "internal connection error\n"
+msgstr "×ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ ÓÏÅÄÉÎÅÎÉÑ\n"
+
+#: src/protocols/oscar/oscar.c:480
 msgid "Unable to login to AIM"
 msgstr "îÅÍÏÇÕ ÓÏÅÄÉÎÉÔØÓÑ Ó AIM"
 
-#: src/protocols/oscar/oscar.c:475
+#: src/protocols/oscar/oscar.c:485
 #, c-format
 msgid "Signon: %s"
 msgstr "ðÏÄËÌÀÞÉÌÓÑ: %s"
 
-#: src/protocols/oscar/oscar.c:531
-msgid ""
-"Signed off.\n"
-""
-msgstr ""
-"ïÔËÌÀÞÉÌÓÑ.\n"
-""
-
-#: src/protocols/oscar/oscar.c:550
-#: src/protocols/oscar/oscar.c:668
+#: src/protocols/oscar/oscar.c:557
+msgid "Signed off.\n"
+msgstr "ïÔËÌÀÞÉÌÓÑ.\n"
+
+#: src/protocols/oscar/oscar.c:576 src/protocols/oscar/oscar.c:696
 msgid "Could Not Connect"
 msgstr "îÅ ÍÏÇÕ ÐÒÉÓÏÅÄÉÎÉÔØÓÑ"
 
-#: src/protocols/oscar/oscar.c:558
+#: src/protocols/oscar/oscar.c:584
 msgid "Connection established, cookie sent"
 msgstr "óÏÅÄÉÎÅÎÉÅ ÕÓÔÁÎÏ×ÌÅÎÏ, ÐÅÞÅÎØËÉ ×ÙÓÌÁÎÙ"
 
 #. Incorrect nick/password
-#: src/protocols/oscar/oscar.c:584
-#: src/protocols/toc/toc.c:459
+#: src/protocols/oscar/oscar.c:610 src/protocols/toc/toc.c:457
 msgid "Incorrect nickname or password."
 msgstr "îÅ ËÏÒÒÅËÔÎÙÊ ÐÓÅ×ÄÏÎÉÍ ÉÌÉ ÐÁÒÏÌØ."
 
 #. Suspended account
-#: src/protocols/oscar/oscar.c:589
+#: src/protocols/oscar/oscar.c:615
 msgid "Your account is currently suspended."
 msgstr "÷ÁÛÁ ÕÞÅÔÎÁÑ ÚÁÐÉÓØ ÚÁÂÌÏËÉÒÏ×ÁÎÁ."
 
 #. connecting too frequently
-#: src/protocols/oscar/oscar.c:593
-msgid "You have been connecting and disconnecting too frequently. Wait ten minutes and try again. If you continue to try, you will need to wait even longer."
-msgstr "÷Ù ÐÙÔÁÌÉÓØ ÓÏÅÄÉÎÉÔØÓÑ É ÏÔÓÏÅÄÉÎÉÔØÓÑ ÓÌÉÛËÏÍ ÞÁÓÔÏ. ðÏÄÏÖÄÉÔÅ 10 ÍÉÎÕÔ É ÐÏÐÒÏÂÕÊÔÅ ÅÝÅ ÒÁÚ. åÓÌÉ ×Ù ÂÕÄÅÔÅ ÐÒÏÄÏÌÖÁÔØ ÐÏÐÙÔËÉ ×ÁÍ ÐÒÉÄÅÔÓÑ ÐÏÄÏÖÄÁÔØ ÄÏÌØÛÅ."
+#: src/protocols/oscar/oscar.c:619
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"÷Ù ÐÙÔÁÌÉÓØ ÓÏÅÄÉÎÉÔØÓÑ É ÏÔÓÏÅÄÉÎÉÔØÓÑ ÓÌÉÛËÏÍ ÞÁÓÔÏ. ðÏÄÏÖÄÉÔÅ 10 ÍÉÎÕÔ É "
+"ÐÏÐÒÏÂÕÊÔÅ ÅÝÅ ÒÁÚ. åÓÌÉ ×Ù ÂÕÄÅÔÅ ÐÒÏÄÏÌÖÁÔØ ÐÏÐÙÔËÉ ×ÁÍ ÐÒÉÄÅÔÓÑ ÐÏÄÏÖÄÁÔØ "
+"ÄÏÌØÛÅ."
 
 #. client too old
-#: src/protocols/oscar/oscar.c:598
+#: src/protocols/oscar/oscar.c:624
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr "÷Ù ÉÓÐÏÌØÚÕÅÔÅ ÓÌÉÛËÏÍ ÓÔÁÒÕÀ ×ÅÒÓÉÀ ËÌÉÅÎÔÁ."
 
-#: src/protocols/oscar/oscar.c:602
-#: src/protocols/toc/toc.c:539
+#: src/protocols/oscar/oscar.c:628 src/protocols/toc/toc.c:540
 msgid "Authentication Failed"
 msgstr "á×ÔÏÒÉÚÁÃÉÑ ÐÒÏ×ÁÌÅÎÁ"
 
-#: src/protocols/oscar/oscar.c:624
+#: src/protocols/oscar/oscar.c:650
 msgid "Internal Error"
 msgstr "÷ÎÕÔÒÅÎÑÑ ÏÛÉÂËÁ"
 
-#: src/protocols/oscar/oscar.c:1184
-#: src/protocols/oscar/oscar.c:2525
+#: src/protocols/oscar/oscar.c:1204 src/protocols/oscar/oscar.c:2744
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "ðÒÑÍÏÅ ÓÏÅÄÉÎÅÎÉÅ Ó %s ÕÓÔÁÎÏ×ÌÅÎÏ"
 
-#: src/protocols/oscar/oscar.c:1423
-#, c-format
-msgid "You missed %d message%s from %s because %s invalid."
+#: src/protocols/oscar/oscar.c:1454
+#, fuzzy, c-format
+msgid "You missed %d message from %s because it was invalid."
 msgstr "÷Ù ÎÅ ÐÏÌÕÞÉÌÉ %d ÓÏÏÂÝÅÎÉÅ%s ÏÔ %s, ÏÎÏ ÎÅËÏÒÒÅËÔÎÏ."
 
-#: src/protocols/oscar/oscar.c:1433
-#, c-format
-msgid "You missed %d message%s from %s because %s too large."
+#: src/protocols/oscar/oscar.c:1455
+#, fuzzy, c-format
+msgid "You missed %d messages from %s because they were invalid."
+msgstr "÷Ù ÎÅ ÐÏÌÕÞÉÌÉ %d ÓÏÏÂÝÅÎÉÅ%s ÏÔ %s, ÏÎÏ ÎÅËÏÒÒÅËÔÎÏ."
+
+#: src/protocols/oscar/oscar.c:1464
+#, fuzzy, c-format
+msgid "You missed %d message from %s because it was too large."
 msgstr "÷Ù ÎÅ ÐÏÌÕÞÉÌÉ %d ÓÏÏÂÝÅÎÉÅ%s ÏÔ %s, %s ÓÌÉÛËÏÍ ×ÅÌÉËÏ."
 
-#: src/protocols/oscar/oscar.c:1443
-#, c-format
-msgid "You missed %d message%s from %s because the rate limit has been exceeded."
-msgstr "÷Ù ÎÅ ÐÏÌÕÞÉÌÉ%d ÓÏÏÂÝÅÎÉÅ%s ÏÔ %s, ÓÏÏÂÝÅÎÉÑ ÏÔÐÒÁ×ÌÑÌÉÓØ ÓÌÉÛËÏÍ ÞÁÓÔÏ."
-
-#: src/protocols/oscar/oscar.c:1452
-#, c-format
-msgid "You missed %d message%s from %s because they are too evil."
+#: src/protocols/oscar/oscar.c:1465
+#, fuzzy, c-format
+msgid "You missed %d messages from %s because they were too large."
+msgstr "÷Ù ÎÅ ÐÏÌÕÞÉÌÉ %d ÓÏÏÂÝÅÎÉÅ%s ÏÔ %s, ÏÎÏ ×ÁÍ ÎÅ ÐÏÎÒÁ×ÉÔÓÑ."
+
+#: src/protocols/oscar/oscar.c:1474
+#, fuzzy, c-format
+msgid "You missed %d message from %s because the rate limit has been exceeded."
+msgstr ""
+"÷Ù ÎÅ ÐÏÌÕÞÉÌÉ%d ÓÏÏÂÝÅÎÉÅ%s ÏÔ %s, ÓÏÏÂÝÅÎÉÑ ÏÔÐÒÁ×ÌÑÌÉÓØ ÓÌÉÛËÏÍ ÞÁÓÔÏ."
+
+#: src/protocols/oscar/oscar.c:1475
+#, fuzzy, c-format
+msgid ""
+"You missed %d messages from %s because the rate limit has been exceeded."
+msgstr ""
+"÷Ù ÎÅ ÐÏÌÕÞÉÌÉ%d ÓÏÏÂÝÅÎÉÅ%s ÏÔ %s, ÓÏÏÂÝÅÎÉÑ ÏÔÐÒÁ×ÌÑÌÉÓØ ÓÌÉÛËÏÍ ÞÁÓÔÏ."
+
+#: src/protocols/oscar/oscar.c:1484
+#, fuzzy, c-format
+msgid "You missed %d message from %s because it was too evil."
 msgstr "÷Ù ÎÅ ÐÏÌÕÞÉÌÉ %d ÓÏÏÂÝÅÎÉÅ%s ÏÔ %s, ÏÎÏ ×ÁÍ ÎÅ ÐÏÎÒÁ×ÉÔÓÑ."
 
-#: src/protocols/oscar/oscar.c:1461
-#, c-format
-msgid "You missed %d message%s from %s because you are too evil."
+#: src/protocols/oscar/oscar.c:1485
+#, fuzzy, c-format
+msgid "You missed %d messages from %s because they are too evil."
+msgstr "÷Ù ÎÅ ÐÏÌÕÞÉÌÉ %d ÓÏÏÂÝÅÎÉÅ%s ÏÔ %s, ÏÎÏ ×ÁÍ ÎÅ ÐÏÎÒÁ×ÉÔÓÑ."
+
+#: src/protocols/oscar/oscar.c:1494
+#, fuzzy, c-format
+msgid "You missed %d message from %s because you are too evil."
+msgstr "÷Ù ÎÅ ÐÏÌÕÞÉÌÉ %d ÓÏÏÂÝÅÎÉÅ%s ÏÔ %s, ÐÏ ÓÏÂÓÔ×ÅÎÎÏÍÕ ÖÅÌÁÎÉÀ."
+
+#: src/protocols/oscar/oscar.c:1495
+#, fuzzy, c-format
+msgid "You missed %d messages from %s because you are too evil."
 msgstr "÷Ù ÎÅ ÐÏÌÕÞÉÌÉ %d ÓÏÏÂÝÅÎÉÅ%s ÏÔ %s, ÐÏ ÓÏÂÓÔ×ÅÎÎÏÍÕ ÖÅÌÁÎÉÀ."
 
-#: src/protocols/oscar/oscar.c:1469
-#, c-format
-msgid "You missed %d message%s from %s for unknown reasons."
+#: src/protocols/oscar/oscar.c:1503
+#, fuzzy, c-format
+msgid "You missed %d message from %s for unknown reasons."
 msgstr "÷Ù ÎÅ ÐÏÌÕÞÉÌÉ %d ÓÏÏÂÝÅÎÉÅ%s ÏÔ %s ÐÏ ÎÅÉÚ×ÅÓÔÎÏÊ ÐÒÉÞÉÎÅ."
 
-#: src/dialogs.c:2808
-#: src/dialogs.c:2814
-#: src/protocols/oscar/oscar.c:1475
-#: src/protocols/oscar/oscar.c:1507
-#: src/protocols/oscar/oscar.c:1525
-#: src/protocols/yahoo/yahoo.c:500
+#: src/protocols/oscar/oscar.c:1504
+#, fuzzy, c-format
+msgid "You missed %d messages from %s for unknown reasons."
+msgstr "÷Ù ÎÅ ÐÏÌÕÞÉÌÉ %d ÓÏÏÂÝÅÎÉÅ%s ÏÔ %s ÐÏ ÎÅÉÚ×ÅÓÔÎÏÊ ÐÒÉÞÉÎÅ."
+
+#: src/dialogs.c:2949 src/dialogs.c:2955 src/protocols/oscar/oscar.c:1509
+#: src/protocols/oscar/oscar.c:1547 src/protocols/oscar/oscar.c:1565
+#: src/protocols/oscar/oscar.c:1994 src/protocols/yahoo/yahoo.c:501
 msgid "Gaim - Error"
 msgstr "Gaim - ïÛÉÂËÁ"
 
-#: src/protocols/oscar/oscar.c:1505
+#: src/protocols/oscar/oscar.c:1526
+#, c-format
+msgid "SNAC threw error: %s\n"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1528
+#, fuzzy
+msgid "Gaim - Oscar SNAC Error"
+msgstr "Gaim - ïÛÉÂËÁ"
+
+#: src/protocols/oscar/oscar.c:1545
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr "÷ÁÛÅ ÓÏÏÂÝÅÎÉÅ Ë %s ÎÅ ÏÔÐÒÁ×ÌÅÎÏ: %s"
 
-#: src/protocols/oscar/oscar.c:1506
-#: src/protocols/oscar/oscar.c:1524
+#: src/protocols/oscar/oscar.c:1546 src/protocols/oscar/oscar.c:1564
 msgid "Reason unknown"
 msgstr "ðÒÉÞÉÎÁ ÎÅÉÚ×ÅÓÔÎÁ"
 
-#: src/protocols/oscar/oscar.c:1523
+#: src/protocols/oscar/oscar.c:1563
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr "éÎÆÏÒÍÁÃÉÑ Ï ÐÏÌØÚÏ×ÁÔÅÌÅ %s ÎÅÄÏÓÔÕÐÎÁ: %s"
 
-#: src/protocols/oscar/oscar.c:1565
-#, c-format
+#: src/buddy.c:1906 src/protocols/oscar/oscar.c:1591
+msgid "Buddy Icon"
+msgstr "éËÏÎËÉ ÐÏÌØÚÏ×ÁÔÅÌÅÊ"
+
+#: src/buddy.c:1909 src/protocols/oscar/oscar.c:1594
+msgid "Voice"
+msgstr "çÏÌÏÓ"
+
+#: src/buddy.c:1912 src/protocols/oscar/oscar.c:1597
+msgid "IM Image"
+msgstr "IM éÚÏÂÒÁÖÅÎÉÅ"
+
+#: src/buddy.c:488 src/buddy.c:1915 src/buddy.c:2343 src/prefs.c:2837
+#: src/protocols/oscar/oscar.c:1600
+msgid "Chat"
+msgstr "þÁÔ"
+
+#: src/buddy.c:1918 src/protocols/oscar/oscar.c:1603
+msgid "Get File"
+msgstr "ðÏÌÕÞÉÔØ ÆÁÊÌ"
+
+#: src/buddy.c:1921 src/protocols/oscar/oscar.c:1606
+msgid "Send File"
+msgstr "ïÔÐÒÁ×ÉÔØ ÆÁÊÌ"
+
+#: src/buddy.c:1925 src/protocols/oscar/oscar.c:1610
+msgid "Games"
+msgstr "éÇÒÙ"
+
+#: src/buddy.c:1928 src/protocols/oscar/oscar.c:1613
+msgid "Stocks"
+msgstr "ûÁÂÌÏÎ"
+
+#: src/buddy.c:1931 src/protocols/oscar/oscar.c:1616
+#, fuzzy
+msgid "Send Buddy List"
+msgstr "óÐÉÓÏË ÐÏÌØÚÏ×ÁÔÅÌÅÊ"
+
+#: src/buddy.c:1934 src/protocols/oscar/oscar.c:1619
+msgid "EveryBuddy Bug"
+msgstr "EvryBuddy Bug"
+
+#: src/buddy.c:1937 src/protocols/oscar/oscar.c:1622
+#, fuzzy
+msgid "AP User"
+msgstr "ðÏÌØÚÏ×ÁÔÅÌØ"
+
+#: src/buddy.c:1940 src/protocols/oscar/oscar.c:1625
+msgid "ICQ RTF"
+msgstr ""
+
+#: src/buddy.c:1943 src/protocols/oscar/oscar.c:1628
+msgid "Nihilist"
+msgstr ""
+
+#: src/buddy.c:1946 src/protocols/oscar/oscar.c:1631
+msgid "ICQ Server Relay"
+msgstr ""
+
+#: src/buddy.c:1949 src/protocols/oscar/oscar.c:1634
+msgid "ICQ Unknown"
+msgstr ""
+
+#: src/buddy.c:1952 src/protocols/oscar/oscar.c:1637
+msgid "Trillian Encryption"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1674
+msgid ""
+"<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG "
+"SRC=\"free_icon.gif\"> : Normal AIM User<br><IMG SRC=\"aol_icon.gif\"> : AOL "
+"User <br><IMG SRC=\"dt_icon.gif\"> : Trial AIM User <br><IMG "
+"SRC=\"admin_icon.gif\"> : Administrator"
+msgstr ""
+"<br><BODY BGCOLOR=WHITE><hr><I>ìÅÇÅÎÄÁ:</I><br><br><IMG "
+"SRC=\"free_icon.gif\"> : ïÂÙÞÎÙÊ ÐÏÌØÚÏ×ÁÔÅÌØ AIM<br><IMG "
+"SRC=\"aol_icon.gif\"> : ðÏÌØÚÏ×ÁÔÅÌØ AOL <br><IMG SRC=\"dt_icon.gif\"> : "
+"÷ÒÅÍÅÎÎÙÊ ÐÏÌØÚÏ×ÁÔÅÌØ AIM<br><IMG SRC=\"admin_icon.gif\"> : áÄÍÉÎÉÓÔÒÁÔÏÒ"
+
+#: src/protocols/oscar/oscar.c:1686
 msgid ""
 "Username : <B>%s</B>  %s <BR>\n"
 "%sWarning Level : <B>%d %%</B><BR>\n"
@@ -508,7 +656,6 @@
 "Idle Minutes : <B>%d</B>\n"
 "<BR>\n"
 "<HR><BR>\n"
-""
 msgstr ""
 "UIN:<B>%s</B. %s <BR>\n"
 "%s õÒÏ×ÅÎØ ÐÒÅÄÕÐÒÅÖÄÅÎÉÊ:<B>%d %%</B><BR>\n"
@@ -516,269 +663,292 @@
 "íÏÌÞÉÔ:<B>%d</B>\n"
 "<BR>\n"
 "<HR><BR>\n"
-""
-
-#: src/protocols/oscar/oscar.c:1576
-msgid "<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG SRC=\"free_icon.gif\"> : Normal AIM User<br><IMG SRC=\"aol_icon.gif\"> : AOL User <br><IMG SRC=\"dt_icon.gif\"> : Trial AIM User <br><IMG SRC=\"admin_icon.gif\"> : Administrator"
-msgstr "<br><BODY BGCOLOR=WHITE><hr><I>ìÅÇÅÎÄÁ:</I><br><br><IMG SRC=\"free_icon.gif\"> : ïÂÙÞÎÙÊ ÐÏÌØÚÏ×ÁÔÅÌØ AIM<br><IMG SRC=\"aol_icon.gif\"> : ðÏÌØÚÏ×ÁÔÅÌØ AOL <br><IMG SRC=\"dt_icon.gif\"> : ÷ÒÅÍÅÎÎÙÊ ÐÏÌØÚÏ×ÁÔÅÌØ AIM<br><IMG SRC=\"admin_icon.gif\"> : áÄÍÉÎÉÓÔÒÁÔÏÒ"
-
-#: src/protocols/oscar/oscar.c:1586
+
+#: src/protocols/oscar/oscar.c:1714
+msgid "<i>User has no away message</i>"
+msgstr "<i>ðÏÌØÚÏ×ÁÔÅÌØ ÎÅ ÉÍÅÅÔ ÓÏÏÂÝÅÎÉÑ Ï ÏÔÓÕÔÓÔ×ÉÉ</i>"
+
+#: src/protocols/oscar/oscar.c:1726
+#, fuzzy
+msgid "Client Capabilities: "
+msgstr "ðÒÁ×Á: %s\n"
+
+#: src/protocols/oscar/oscar.c:1734
 msgid "<i>No Information Provided</i>"
 msgstr "<i>éÎÆÏÒÍÁÃÉÑ ÎÅ ÐÒÅÄÏÓÔÁ×ÌÅÎÁ</i>"
 
-#: src/protocols/oscar/oscar.c:1587
-msgid "<i>User has no away message</i>"
-msgstr "<i>ðÏÌØÚÏ×ÁÔÅÌØ ÎÅ ÉÍÅÅÔ ÓÏÏÂÝÅÎÉÑ Ï ÏÔÓÕÔÓÔ×ÉÉ</i>"
-
-#: src/protocols/oscar/oscar.c:1612
+#: src/protocols/oscar/oscar.c:1757
 msgid "Your connection may be lost."
 msgstr "óÏÅÄÉÎÅÎÉÅ ÍÏÖÅÔ ÂÙÔØ ÒÁÚÏÒ×ÁÎÏ."
 
-#: src/protocols/oscar/oscar.c:1613
+#: src/protocols/oscar/oscar.c:1758
 msgid "AOL error"
 msgstr "ïÛÉÂËÁ AOL"
 
-#: src/dialogs.c:3341
-#: src/protocols/oscar/oscar.c:2062
-#: src/protocols/oscar/oscar.c:2599
-#: src/protocols/toc/toc.c:1544
-#: src/protocols/toc/toc.c:1561
-#: src/protocols/toc/toc.c:1621
-#: src/protocols/toc/toc.c:1663
-#: src/protocols/toc/toc.c:1782
-#: src/protocols/toc/toc.c:1812
-#: src/protocols/toc/toc.c:1868
+#: src/protocols/oscar/oscar.c:1993
+msgid ""
+"The last message was not sent because you are over the rate limit. Please "
+"wait 10 seconds and try again."
+msgstr ""
+
+#: src/dialogs.c:3482 src/protocols/oscar/oscar.c:2267
+#: src/protocols/oscar/oscar.c:2818 src/protocols/toc/toc.c:1546
+#: src/protocols/toc/toc.c:1563 src/protocols/toc/toc.c:1623
+#: src/protocols/toc/toc.c:1665 src/protocols/toc/toc.c:1784
+#: src/protocols/toc/toc.c:1814 src/protocols/toc/toc.c:1870
 msgid "Error"
 msgstr "ïÛÉÂËÁ"
 
-#: src/protocols/oscar/oscar.c:2323
-#: src/protocols/toc/toc.c:1091
+#: src/protocols/oscar/oscar.c:2540 src/protocols/toc/toc.c:1092
 msgid "Exchange:"
 msgstr "ïÂÍÅÎ:"
 
-#: src/protocols/oscar/oscar.c:2599
+#: src/protocols/oscar/oscar.c:2818
 msgid "Unable to open Direct IM"
 msgstr "îÅÍÏÇÕ ÕÓÔÁÎÏ×ÉÔØ ÐÒÑÍÏÅ ÓÏÅÄÉÎÅÎÉÅ"
 
-#: src/protocols/oscar/oscar.c:2609
+#: src/protocols/oscar/oscar.c:2828
 #, c-format
-msgid "You have selected to open a Direct IM connection with %s. Doing this will let them see your IP address, and may be a security risk. Do you wish to continue?"
-msgstr "÷Ù ÈÏÔÉÔÅ ÓÏÚÄÁÔØ ÐÒÑÍÏÅ ÓÏÅÄÉÎÅÎÉÅ Ó %s. óÏÂÅÓÅÄÎÉË ÍÏÖÅÔ ÏÐÒÅÄÅÌÉÔØ ×ÁÛ IP ÁÄÒÅÓ, ÞÔÏ ÐÒÉ×ÅÄÅÔ Ë ÐÒÏÂÌÅÍÁÍ Ó ÂÅÚÏÐÁÓÎÏÓÔØÀ. ÷Ù ÈÏÔÉÔÅ ÐÒÏÄÏÌÖÉÔØ?"
-
-#: src/protocols/oscar/oscar.c:2627
-msgid "Get Away Msg"
-msgstr "ðÏÌÕÞÉÔØ ÓÏÏÂÝÅÎÉÅ Ï ÏÔÓÕÔÓÔ×ÉÉ"
-
-#: src/protocols/oscar/oscar.c:2634
+msgid ""
+"You have selected to open a Direct IM connection with %s. Doing this will "
+"let them see your IP address, and may be a security risk. Do you wish to "
+"continue?"
+msgstr ""
+"÷Ù ÈÏÔÉÔÅ ÓÏÚÄÁÔØ ÐÒÑÍÏÅ ÓÏÅÄÉÎÅÎÉÅ Ó %s. óÏÂÅÓÅÄÎÉË ÍÏÖÅÔ ÏÐÒÅÄÅÌÉÔØ ×ÁÛ IP "
+"ÁÄÒÅÓ, ÞÔÏ ÐÒÉ×ÅÄÅÔ Ë ÐÒÏÂÌÅÍÁÍ Ó ÂÅÚÏÐÁÓÎÏÓÔØÀ. ÷Ù ÈÏÔÉÔÅ ÐÒÏÄÏÌÖÉÔØ?"
+
+#: src/protocols/oscar/oscar.c:2861
 msgid "Direct IM"
 msgstr "ðÒÑÍÏÅ ÓÏÅÄÉÎÅÎÉÅ"
 
-#: src/protocols/toc/toc.c:398
+#: src/protocols/oscar/oscar.c:2869
+#, fuzzy
+msgid "Get Capabilities"
+msgstr "ðÒÁ×Á: %s\n"
+
+#: src/protocols/toc/toc.c:396
 #, c-format
 msgid "Unable to write file %s."
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÚÁÐÉÓÁÔØ ÆÁÊÌ %s"
 
-#: src/protocols/toc/toc.c:401
+#: src/protocols/toc/toc.c:399
 #, c-format
 msgid "Unable to read file %s."
 msgstr "îÅÔ ×ÏÚÍÏÖÎÏÓÔÉ ÐÒÏÞÉÔÁÔØ ÆÁÊÌ %s"
 
-#: src/protocols/toc/toc.c:404
+#: src/protocols/toc/toc.c:402
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "óÏÏÂÝÅÎÉÅ ÂÏÏÌØÛÏÅ, ÐÏÓÌÅÄÎÉÅ %s ÂÁÊÔ ÏÂÒÅÚÁÎÙ"
 
-#: src/protocols/toc/toc.c:407
+#: src/protocols/toc/toc.c:405
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s ÎÅ×ÅÒÎÁÑ ÒÅÇÉÓÔÒÁÃÉÑ"
 
-#: src/protocols/toc/toc.c:410
+#: src/protocols/toc/toc.c:408
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ %s ÎÅÄÏÓÔÕÐÅÎ."
 
-#: src/protocols/toc/toc.c:413
+#: src/protocols/toc/toc.c:411
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "óÏÏÂÝÅÎÉÅ ÂÙÌÏ ÏÐÕÝÅÎÎÏ, ×Ù ÐÒÅ×ÙÓÉÌÉ ÌÉÍÉÔ ÓÏÏÂÝÅÎÉÊ ÄÌÑ ÓÅÒ×ÅÒÁ."
 
-#: src/protocols/toc/toc.c:416
+#: src/protocols/toc/toc.c:414
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "þÁÔ Ó %s ÎÅ×ÏÚÍÏÖÅÎ"
 
-#: src/protocols/toc/toc.c:419
+#: src/protocols/toc/toc.c:417
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "÷Ù ÐÏÓÙÌÁÅÔÅ ÓÏÏÂÝÅÎÉÑ Ë %s ÓÌÉÛËÏÍ ÞÁÓÔÏ."
 
-#: src/protocols/toc/toc.c:422
+#: src/protocols/toc/toc.c:420
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "÷Ù ÎÅ ÐÏÌÕÞÉÌÉ ÓÏÏÂÝÅÎÉÅ ÏÔ %s, ÏÎÏ ÓÌÉÛËÏÍ ÂÏÌØÛÏÅ."
 
-#: src/protocols/toc/toc.c:425
+#: src/protocols/toc/toc.c:423
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "÷Ù ÎÅ ÐÏÌÕÞÉÌÉ ÓÏÏÂÝÅÎÉÅ ÏÔ %s, ÓÏÏÂÝÅÎÉÊ ÓÌÉÛËÏÍ ÍÎÏÇÏ."
 
-#: src/protocols/toc/toc.c:428
+#: src/protocols/toc/toc.c:426
 msgid "Failure."
 msgstr "îÅ ÕÄÁÌÏÓØ."
 
-#: src/protocols/toc/toc.c:431
+#: src/protocols/toc/toc.c:429
 msgid "Too many matches."
 msgstr "óÌÉÛËÏÍ ÍÎÏÇÏ ÓÏ×ÐÁÄÅÎÉÊ."
 
-#: src/protocols/toc/toc.c:434
+#: src/protocols/toc/toc.c:432
 msgid "Need more qualifiers."
 msgstr "õÔÏÞÎÉÔÅ."
 
-#: src/protocols/toc/toc.c:437
+#: src/protocols/toc/toc.c:435
 msgid "Dir service temporarily unavailable."
 msgstr "óÅÒ×ÉÓ ×ÒÅÍÅÎÎÏ ÎÅÄÏÓÔÕÐÅÎ."
 
-#: src/protocols/toc/toc.c:440
+#: src/protocols/toc/toc.c:438
 msgid "Email lookup restricted."
 msgstr "ðÒÏÓÍÏÔÒ email ÏÇÒÁÎÉÞÅÎ."
 
-#: src/protocols/toc/toc.c:443
+#: src/protocols/toc/toc.c:441
 msgid "Keyword ignored."
 msgstr "ëÌÀÞÅ×ÏÅ ÓÌÏ×Ï ÉÇÎÏÒÉÒÏ×ÁÎÏ."
 
-#: src/protocols/toc/toc.c:446
+#: src/protocols/toc/toc.c:444
 msgid "No keywords."
 msgstr "îÅÔ ËÌÀÞÅ×ÏÇÏ ÓÌÏ×Á."
 
-#: src/protocols/toc/toc.c:449
+#: src/protocols/toc/toc.c:447
 msgid "User has no directory information."
 msgstr "îÅÔ ÉÎÆÏÒÍÁÃÉÉ Ï ÐÏÌØÚÏ×ÁÔÅÌÅ."
 
-#: src/protocols/toc/toc.c:453
+#: src/protocols/toc/toc.c:451
 msgid "Country not supported."
 msgstr "îÅÔ ÐÏÄÄÅÒÖËÉ ÄÌÑ ÄÁÎÎÏÊ ÓÔÒÁÎÙ."
 
-#: src/protocols/toc/toc.c:456
+#: src/protocols/toc/toc.c:454
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "îÅÉÚ×ÅÓÔÎÁÑ ÏÛÉÂËÁ: %s."
 
-#: src/protocols/toc/toc.c:462
+#: src/protocols/toc/toc.c:460
 msgid "The service is temporarily unavailable."
 msgstr "üÔÏÔ ÓÅÒ×ÉÓ ×ÒÅÍÅÎÎÏ ÎÅÄÏÓÔÕÐÅÎ."
 
-#: src/protocols/toc/toc.c:465
+#: src/protocols/toc/toc.c:463
 msgid "Your warning level is currently too high to log in."
 msgstr "õÒÏ×ÅÎØ ÐÒÅÄÕÐÒÅÖÄÅÎÉÊ ÓÌÉÛËÏÍ ×ÅÌÉË ÞÔÏÂÙ ÐÒÉÓÏÅÄÉÎÉÔØÓÑ."
 
-#: src/protocols/toc/toc.c:468
-msgid "You have been connecting and disconnecting too frequently.  Wait ten minutes and try again.  If you continue to try, you will need to wait even longer."
-msgstr "÷Ù ÐÙÔÁÌÉÓØ ÓÏÅÄÉÎÉÔØÓÑ É ÏÔÓÏÅÄÉÎÉÔØÓÑ ÓÌÉÛËÏÍ ÞÁÓÔÏ. ðÏÄÏÖÄÉÔÅ 10 ÍÉÎÕÔ É ÐÏÐÒÏÂÕÊÔÅ ÅÝÅ ÒÁÚ. åÓÌÉ ×Ù ÂÕÄÅÔÅ ÐÒÏÄÏÌÖÁÔØ ÐÏÐÙÔËÉ ×ÁÍ ÐÒÉÄÅÔÓÑ ÐÏÄÏÖÄÁÔØ ÄÏÌØÛÅ."
-
-#: src/protocols/toc/toc.c:471
+#: src/protocols/toc/toc.c:466
+msgid ""
+"You have been connecting and disconnecting too frequently.  Wait ten minutes "
+"and try again.  If you continue to try, you will need to wait even longer."
+msgstr ""
+"÷Ù ÐÙÔÁÌÉÓØ ÓÏÅÄÉÎÉÔØÓÑ É ÏÔÓÏÅÄÉÎÉÔØÓÑ ÓÌÉÛËÏÍ ÞÁÓÔÏ. ðÏÄÏÖÄÉÔÅ 10 ÍÉÎÕÔ É "
+"ÐÏÐÒÏÂÕÊÔÅ ÅÝÅ ÒÁÚ. åÓÌÉ ×Ù ÂÕÄÅÔÅ ÐÒÏÄÏÌÖÁÔØ ÐÏÐÙÔËÉ ×ÁÍ ÐÒÉÄÅÔÓÑ ÐÏÄÏÖÄÁÔØ "
+"ÄÏÌØÛÅ."
+
+#: src/protocols/toc/toc.c:469
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "îÅÉÚ×ÅÓÔÎÁÑ ÏÛÉÂËÁ ÐÒÉ ÓÏÅÄÉÎÅÎÉÉ: %s."
 
-#: src/protocols/toc/toc.c:474
+#: src/protocols/toc/toc.c:472
 #, c-format
 msgid "An unknown error, %d, has occured.  Info: %s"
 msgstr "îÅÉÚ×ÅÓÔÎÁÑ ÏÛÉÂËÁ, %d.  éÎÆÏÒÍÁÃÉÑ: %s"
 
-#: src/protocols/toc/toc.c:491
+#: src/protocols/toc/toc.c:489
 msgid "Connection Closed"
 msgstr "óÏÅÄÉÎÅÎÉÅ ÒÁÚÏÒ×ÁÎÏ"
 
-#: src/protocols/toc/toc.c:526
+#: src/protocols/toc/toc.c:527
 msgid "Waiting for reply..."
 msgstr "ïÖÉÄÁÅÔÓÑ ÏÔ×ÅÔ..."
 
-#: src/protocols/toc/toc.c:595
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "TOC Ó×ÑÚØ ×ÏÓÓÔÁÎÏ×ÌÅÎÁ. ÷Ù ÍÏÖÅÔÅ ÏÔÐÒÁ×ÌÑÔØ ÓÏÏÂÝÅÎÉÅ "
-
 #: src/protocols/toc/toc.c:596
+msgid "TOC has come back from its pause. You may now send messages again."
+msgstr "TOC Ó×ÑÚØ ×ÏÓÓÔÁÎÏ×ÌÅÎÁ. ÷Ù ÍÏÖÅÔÅ ÏÔÐÒÁ×ÌÑÔØ ÓÏÏÂÝÅÎÉÅ "
+
+#: src/protocols/toc/toc.c:597
 msgid "TOC Resume"
 msgstr "TOC ÐÒÏÄÏÌÖÉÍ."
 
-#: src/protocols/toc/toc.c:757
+#: src/protocols/toc/toc.c:758
 msgid "Chat Error"
 msgstr "þÁÔ ÏÛÉÂËÁ"
 
-#: src/protocols/toc/toc.c:776
+#: src/protocols/toc/toc.c:777
 msgid "Password Change Successeful"
 msgstr "ðÁÒÏÌØ ÉÚÍÅÎÅÎ ÕÓÐÅÛÎÏ"
 
-#: src/dialogs.c:1491
-#: src/protocols/toc/toc.c:776
+#: src/dialogs.c:1607 src/protocols/toc/toc.c:777
 msgid "Gaim - Password Change"
 msgstr "Gaim - óÍÅÎÁ ÐÁÒÏÌÑ"
 
-#: src/protocols/toc/toc.c:779
-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 "TOC ÐÅÒÅÄÁÌ ËÏÍÁÎÄÕ PAUSE. ëÏÇÄÁ ÜÔÏ ÐÒÏÉÓÈÏÄÉÔ, TOC ÉÇÎÏÒÉÒÕÅÔ ×ÓÅ ÓÏÏÂÝÅÎÉÑ ÐÏÓÙÌÁÅÍÙÅ ÅÍÕ, É ÍÏÖÅÔ ÏÔËÌÀÞÉÔØ ×ÁÓ ÐÒÉ ÐÏÐÙÔËÅ ÐÅÒÅÓÌÁÔØ ÓÏÏÂÝÅÎÉÅ. Gaim ÎÅ ÐÏÚ×ÏÌÉÔ ×ÁÍ ÜÔÏÇÏ ÓÄÅÌÁÔØ. üÔÏ ×ÒÅÍÅÎÎÙÅ ÎÅÄÏÂÓÔ×Á - ÂÕÄØÔÅ ÔÅÒÐÅÌÉ×Ù."
-
-#: src/protocols/toc/toc.c:782
+#: src/protocols/toc/toc.c:780
+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 ""
+"TOC ÐÅÒÅÄÁÌ ËÏÍÁÎÄÕ PAUSE. ëÏÇÄÁ ÜÔÏ ÐÒÏÉÓÈÏÄÉÔ, TOC ÉÇÎÏÒÉÒÕÅÔ ×ÓÅ "
+"ÓÏÏÂÝÅÎÉÑ ÐÏÓÙÌÁÅÍÙÅ ÅÍÕ, É ÍÏÖÅÔ ÏÔËÌÀÞÉÔØ ×ÁÓ ÐÒÉ ÐÏÐÙÔËÅ ÐÅÒÅÓÌÁÔØ "
+"ÓÏÏÂÝÅÎÉÅ. Gaim ÎÅ ÐÏÚ×ÏÌÉÔ ×ÁÍ ÜÔÏÇÏ ÓÄÅÌÁÔØ. üÔÏ ×ÒÅÍÅÎÎÙÅ ÎÅÄÏÂÓÔ×Á - "
+"ÂÕÄØÔÅ ÔÅÒÐÅÌÉ×Ù."
+
+#: src/protocols/toc/toc.c:783
 msgid "TOC Pause"
 msgstr "TOC ðÁÕÚÁ"
 
-#: src/protocols/toc/toc.c:1205
+#: src/protocols/toc/toc.c:1207
 msgid "Get Dir Info"
 msgstr "ðÏÌÕÞÉÔØ ÉÎÆÏÒÍÁÃÉÀ"
 
-#: src/protocols/toc/toc.c:1621
-#: src/protocols/toc/toc.c:1663
-#: src/protocols/toc/toc.c:1782
-#: src/protocols/toc/toc.c:1868
+#: src/protocols/toc/toc.c:1623 src/protocols/toc/toc.c:1665
+#: src/protocols/toc/toc.c:1784 src/protocols/toc/toc.c:1870
 msgid "Could not connect for transfer!"
 msgstr "îÅÍÏÇÕ ÐÒÉÓÏÅÄÉÎÉÔØÓÑ ÄÌÑ ÐÅÒÅÄÁÞÉ ÆÁÊÌÁ!"
 
-#: src/protocols/toc/toc.c:1812
+#: src/protocols/toc/toc.c:1814
 msgid "Could not write file header!"
 msgstr "îÅ ÍÏÇÕ ÚÁÐÉÓÁÔØ ÚÁÇÏÌÏ×ÏË ÆÁÊÌÁ!"
 
-#: src/protocols/toc/toc.c:1901
+#: src/protocols/toc/toc.c:1903
 msgid "Gaim - Save As..."
 msgstr "Gaim - óÏÈÒÁÎÉÔØ ËÁË..."
 
-#: src/protocols/toc/toc.c:1940
-#, c-format
-msgid "%s requests %s to accept %d file%s: %s (%.2f %s)%s%s"
-msgstr "%s ÚÁÐÒÏÓÉÌ Õ %s ÐÏÄÄÔ×ÅÒÄÅÎÉÅ %d Ï ÐÅÒÅÄÁÞÅ ÆÁÊÌÁ %s: %s (%.2f %s)%s%s"
+#: src/protocols/toc/toc.c:1944
+#, fuzzy, c-format
+msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+msgstr ""
+"%s ÚÁÐÒÏÓÉÌ Õ %s ÐÏÄÄÔ×ÅÒÄÅÎÉÅ %d Ï ÐÅÒÅÄÁÞÅ ÆÁÊÌÁ %s: %s (%.2f %s)%s%s"
 
 #: src/protocols/toc/toc.c:1945
+#, fuzzy, c-format
+msgid "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+msgstr ""
+"%s ÚÁÐÒÏÓÉÌ Õ %s ÐÏÄÄÔ×ÅÒÄÅÎÉÅ %d Ï ÐÅÒÅÄÁÞÅ ÆÁÊÌÁ %s: %s (%.2f %s)%s%s"
+
+#: src/protocols/toc/toc.c:1950
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s ÚÁÐÒÏÓÉÌ ÐÅÒÅÄÁÞÕ ÆÁÊÌÁ"
 
-#: src/protocols/yahoo/yahoo.c:500
+#: src/protocols/yahoo/yahoo.c:501
 msgid "Your message did not get sent."
 msgstr "÷ÁÛÅ ÓÏÏÂÝÅÎÉÅ ÎÅ ÍÏÖÅÔ ÂÙÔØ ÏÔÐÒÁ×ÌÅÎÏ"
 
-#: src/protocols/zephyr/zephyr.c:778
+#: src/protocols/zephyr/zephyr.c:802
 msgid "ZLocate"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:815
+#: src/protocols/zephyr/zephyr.c:839
 msgid "Class:"
 msgstr "ëÌÁÓÓ:"
 
-#: src/protocols/zephyr/zephyr.c:819
+#: src/protocols/zephyr/zephyr.c:843
 msgid "Instance:"
 msgstr "úÁÐÒÏÓ:"
 
-#: src/protocols/zephyr/zephyr.c:823
+#: src/protocols/zephyr/zephyr.c:847
 msgid "Recipient:"
 msgstr "áÄÒÅÓÁÔ:"
 
-#: src/about.c:94
+#: src/about.c:93
 #, c-format
 msgid "About Gaim v%s"
 msgstr "ï Gaim ×ÅÒÓÉÑ%s "
 
-#: src/about.c:127
+#: src/about.c:126
 msgid ""
-"Gaim is a client that supports AOL's Instant Messenger protocol. It is written\n"
+"Gaim is a client that supports AOL's Instant Messenger protocol. It is "
+"written\n"
 "using Gtk+ and is licensed under the GPL.\n"
 "\n"
 "URL: "
@@ -788,153 +958,123 @@
 "ÒÁÓÐÒÏÓÔÒÁÎÑÅÔÓÑ ÐÏÄ ÌÉÃÅÎÚÉÅÊ GPL.\n"
 "URL: "
 
-#: src/about.c:128
-msgid ""
-"\n"
-"\n"
-"IRC: #gaim on irc.openprojects.net"
-msgstr ""
-"\n"
-"\n"
-"IRC: #gaim on irc.openprojects.net"
-
 #: src/about.c:137
 msgid ""
-"Rob Flynn (maintainer)               rob@marko.net\n"
-"Eric Warmenhoven (lead coder)  warmenhoven@yahoo.com\n"
+"Active Developers\n"
+"====================\n"
+"Rob Flynn (maintainer) [ rob@marko.net ]\n"
+"Sean Egan (coder)      [ bj91704@binghamton.edu ]\n"
 "\n"
+"Crazy Patch Writers\n"
+"===================\n"
 "Benjamin Miller\n"
 "Decklin Foster\n"
-"Sean Egan\n"
+"\n"
+"Retired Developers\n"
+"===================\n"
 "Jim Duchek\n"
-"Mark Spencer (original author)   markster@marko.net"
+"Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
+"Mark Spencer (original author)   [ markster@marko.net ]"
 msgstr ""
 
-#: src/about.c:148
-#: src/about.c:213
-#: src/aim.c:295
-#: src/buddy.c:2408
-#: src/buddy_chat.c:1301
-#: src/buddy_chat.c:1398
-#: src/buddy_chat.c:1428
-#: src/conversation.c:2293
-#: src/dialogs.c:447
-#: src/dialogs.c:3634
-#: src/multi.c:1002
-#: src/plugins.c:277
-#: src/prefs.c:2416
-#: src/prpl.c:438
+#: src/about.c:155 src/aim.c:296 src/buddy.c:2469 src/buddy_chat.c:1311
+#: src/buddy_chat.c:1408 src/buddy_chat.c:1438 src/conversation.c:2417
+#: src/dialogs.c:563 src/dialogs.c:3777 src/multi.c:1026 src/plugins.c:277
+#: src/prefs.c:2496 src/prpl.c:438 src/prpl.c:679 src/server.c:991
 msgid "Close"
 msgstr "úÁËÒÙÔØ"
 
 #. this makes the sizes not work.
 #. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
 #. gtk_widget_grab_default(button);
-#: src/about.c:168
+#: src/about.c:175
 msgid "Web Site"
 msgstr "éÎÔÅÒÎÅÔ óÁÊÔ"
 
-#: src/about.c:223
-msgid "Relax, help is just around the corner. The first thing you'll need to do is get an AIM account; you can get one from http://aim.aol.com/. Just click the button that says \"New Users\" and you can create an account that way. Once you have your account, enter the username and password into the login window that comes up when you start Gaim, and click the Signon button. Once you're online, you can talk to one of the Gaim developers for more assistance; their contact information is in the AUTHORS file in the Gaim source, or at "
-msgstr ""
-
-#: src/about.c:234
-msgid "contactinfo.php. If you can't get online and still need more assistance, feel free to email us at gaim@marko.net. Thanks for using Gaim!"
-msgstr ""
-
-#: src/aim.c:128
-#: src/buddy.c:2401
+#: src/aim.c:129 src/buddy.c:2462
 msgid "Signoff"
 msgstr "úÁ×ÅÒÛÅÎÉÅ ÓÅÁÎÓÁ"
 
-#: src/aim.c:140
+#: src/aim.c:141
 msgid "Please enter your logon"
 msgstr "ðÏÖÁÌÕÊÓÔÁ, ××ÅÄÉÔÅ ÷ÁÛÅ ÉÍÑ"
 
-#: src/aim.c:140
-#: src/multi.c:1231
-#: src/server.c:53
+#: src/aim.c:141 src/multi.c:1276 src/server.c:55
 msgid "Signon Error"
 msgstr "ïÛÉÂËÁ ÒÅÇÉÓÔÒÁÃÉÉ"
 
-#: src/aim.c:238
+#: src/aim.c:239
 msgid "Gaim - Login"
 msgstr "Gaim - òÅÇÉÓÔÒÁÃÉÑ"
 
-#: src/aim.c:256
+#: src/aim.c:257
 msgid "Screen Name: "
 msgstr "UIN"
 
-#: src/aim.c:272
+#: src/aim.c:273
 msgid "Password: "
 msgstr "ðÁÒÏÌØ"
 
-#: src/aim.c:293
-#: src/buddy.c:2405
+#: src/aim.c:294 src/buddy.c:2466
 msgid "Quit"
 msgstr "÷ÙÈÏÄ"
 
-#: src/aim.c:298
-#: src/aim.c:745
-#: src/buddy.c:2431
+#: src/aim.c:299 src/aim.c:755 src/buddy.c:2492
 msgid "Accounts"
 msgstr "õÞÅÔÎÙÅ ÚÁÐÉÓÉ"
 
-#: src/aim.c:300
-#: src/multi.c:854
+#: src/aim.c:301 src/multi.c:878
 msgid "Signon"
 msgstr "ðÏÄËÌÀÞÉÔØÓÑ"
 
-#: src/aim.c:332
-msgid "Help!"
-msgstr "ðÏÍÏÝØ!"
-
 #: src/aim.c:333
-#: src/prefs.c:1525
-#: src/prefs.c:1800
+#, fuzzy
+msgid "About"
+msgstr "ï ÐÒÏÇÒÁÍÍÅ..."
+
+#: src/aim.c:334 src/prefs.c:1580 src/prefs.c:1854
 msgid "Options"
 msgstr "ðÁÒÁÍÅÔÒÙ"
 
 #. Left side: frame with list of plugin file names
-#: src/aim.c:335
-#: src/aim.c:748
-#: src/buddy.c:2449
-#: src/plugins.c:192
+#: src/aim.c:336 src/aim.c:758 src/buddy.c:2510 src/plugins.c:192
 msgid "Plugins"
 msgstr "äÏÐÏÌÎÅÎÉÑ"
 
-#: src/aim.c:742
-#: src/buddy.c:2441
+#: src/aim.c:752 src/buddy.c:2502
 msgid "Preferences"
 msgstr "ó×ÏÊÓÔ×Á"
 
-#: src/applet.c:197
+#: src/applet.c:199
 msgid "Attempting to sign on...."
 msgstr "ðÏÐÙÔËÁ ÓÏÅÄÉÎÅÎÉÑ"
 
-#: src/applet.c:200
+#: src/applet.c:202
 msgid "Offline. Click to bring up login box."
 msgstr "ïÔËÌÀÞÅÎ.óÄÅÌÁÊÔÅ ÁËÔÉ×ÎÙÍ ÏËÎÏ ÒÅÇÉÓÔÒÁÃÉÉ."
 
-#: src/applet.c:216
+#: src/applet.c:218
 #, c-format
 msgid "Away: %d pending."
 msgstr ""
 
-#: src/applet.c:219
+#: src/applet.c:221
 msgid "Away."
 msgstr "ïÔÏÛÅÌ."
 
-#: src/applet.c:294
-#: src/away.c:387
+#: src/applet.c:293 src/buddy.c:487 src/buddy.c:2344 src/buddy.c:2480
+msgid "Away"
+msgstr "óÔÁÔÕÓ"
+
+#: src/applet.c:296 src/away.c:389
 msgid "New Away Message"
 msgstr "îÏ×ÏÅ ÓÏÏÂÝÅÎÉÅ Ï ÏÔÓÕÔÓÔ×ÉÉ"
 
-#: src/applet.c:441
+#: src/applet.c:443
 msgid "Can't create Gaim applet!"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ Gaim ÁÐÐÌÅÔ!"
 
-#: src/applet.c:462
+#: src/applet.c:464
 msgid "About..."
 msgstr "ï ÐÒÏÇÒÁÍÍÅ..."
 
@@ -942,184 +1082,99 @@
 msgid "Gaim - Away!"
 msgstr "Gaim - ïÔÏÛÅÌ!"
 
-#: src/away.c:249
+#: src/away.c:251
 msgid "I'm Back!"
 msgstr "÷ÅÒÎÕÌÓÑ!"
 
-#: src/away.c:265
-#: src/away.c:345
-#: src/away.c:519
+#: src/away.c:267 src/away.c:347 src/away.c:521
 msgid "Back"
 msgstr "÷ÅÒÎÕÌÓÑ"
 
-#: src/away.c:407
+#: src/away.c:409
 msgid "Remove Away Message"
 msgstr "õÄÁÌÉÔØ ÏÏÂÝÅÎÉÅ Ï ÏÔÓÕÔÓÔ×ÉÉ"
 
-#: src/away.c:595
+#: src/away.c:597
 msgid "Set All Away"
 msgstr "õÓÔÁÎÏ×ÉÔØ ×ÅÚÄÅ \"ÏÔÏÛÅÌ\""
 
 #. Put the buttons in the box
-#: src/buddy.c:473
-#: src/buddy.c:2518
-#: src/buddy_chat.c:1433
-#: src/conversation.c:1934
-#: src/conversation.c:2308
-#: src/dialogs.c:765
-#: src/dialogs.c:949
-#: src/dialogs.c:1831
-#: src/multi.c:986
-#: src/prefs.c:1914
-#: src/prefs.c:2256
-#: src/prefs.c:2290
+#: src/buddy.c:482 src/buddy.c:2579 src/buddy_chat.c:1443
+#: src/conversation.c:2043 src/conversation.c:2432 src/dialogs.c:881
+#: src/dialogs.c:1065 src/dialogs.c:1968 src/multi.c:1010 src/prefs.c:1990
+#: src/prefs.c:2332 src/prefs.c:2366
 msgid "Add"
 msgstr "äÏÂÁ×ÉÔØ"
 
-#: src/buddy.c:474
-#: src/buddy.c:2519
-#: src/dialogs.c:775
-#: src/dialogs.c:922
+#: src/buddy.c:483 src/buddy.c:2580 src/dialogs.c:891 src/dialogs.c:1038
 msgid "Group"
 msgstr "çÒÕÐÐÁ"
 
-#: src/buddy.c:475
-#: src/buddy.c:2520
-#: src/buddy_chat.c:1435
-#: src/conversation.c:1920
-#: src/conversation.c:2305
-#: src/prefs.c:1928
-#: src/prefs.c:2260
-#: src/prefs.c:2294
+#: src/buddy.c:484 src/buddy.c:2581 src/buddy_chat.c:1445
+#: src/conversation.c:2029 src/conversation.c:2429 src/prefs.c:2004
+#: src/prefs.c:2336 src/prefs.c:2370
 msgid "Remove"
 msgstr "õÄÁÌÉÔØ"
 
-#: src/buddy.c:479
-#: src/buddy.c:1898
-#: src/buddy.c:2282
-#: src/prefs.c:2741
-msgid "Chat"
-msgstr "þÁÔ"
-
-#: src/buddy.c:480
-#: src/buddy.c:616
-#: src/buddy.c:759
-#: src/buddy.c:2280
-#: src/buddy_chat.c:820
-#: src/buddy_chat.c:1257
+#: src/buddy.c:489 src/buddy.c:627 src/buddy.c:774 src/buddy.c:2341
+#: src/buddy_chat.c:850 src/buddy_chat.c:1267
 msgid "IM"
 msgstr "ïÔÐÒÁ×ÉÔØ ÓÏÏÂÝÅÎÉÅ"
 
-#: src/buddy.c:481
-#: src/buddy.c:2281
-#: src/buddy_chat.c:836
-#: src/buddy_chat.c:1265
-#: src/buddy_chat.c:1441
-#: src/conversation.c:2326
+#: src/buddy.c:490 src/buddy.c:2342 src/buddy_chat.c:866 src/buddy_chat.c:1275
+#: src/buddy_chat.c:1451 src/conversation.c:2450
 msgid "Info"
 msgstr "éÎÆÏÒÍÁÃÉÑ"
 
 #. Put the buttons in the box
-#: src/buddy.c:621
-#: src/buddy.c:764
-#: src/dialogs.c:914
-#: src/dialogs.c:3195
-#: src/dialogs.c:3210
+#: src/buddy.c:632 src/buddy.c:779 src/dialogs.c:1030 src/dialogs.c:3336
+#: src/dialogs.c:3351
 msgid "Alias"
 msgstr "ðÓÅ×ÄÏÎÉÍ"
 
-#: src/buddy.c:626
-#: src/buddy.c:783
+#: src/buddy.c:637 src/buddy.c:798
 msgid "Add Buddy Pounce"
 msgstr "ïÐÏ×ÅÝÅÎÉÅ"
 
-#: src/buddy.c:633
-#: src/buddy.c:789
+#: src/buddy.c:644 src/buddy.c:804
 msgid "View Log"
 msgstr "ðÒÏÓÍÏÔÒ ÖÕÒÎÁÌÁ"
 
-#: src/buddy.c:748
-#: src/buddy.c:777
+#: src/buddy.c:761 src/buddy.c:792
 msgid "Rename"
 msgstr "ðÅÒÅÉÍÅÎÏ×ÁÔØ"
 
-#: src/buddy.c:771
+#: src/buddy.c:786
 msgid "Un-Alias"
 msgstr "õÂÒÁÔØ ÐÓÅ×ÄÏÎÉÍ"
 
-#: src/buddy.c:1476
-#: src/buddy.c:2424
+#: src/buddy.c:1493 src/buddy.c:2485
 msgid "Buddy Pounce"
 msgstr "ïÐÏ×ÅÝÅÎÉÅ"
 
-#: src/buddy.c:1548
+#: src/buddy.c:1565
 msgid "New Buddy Pounce"
 msgstr "îÏ×ÏÅ ÏÐÏ×ÅÝÅÎÉÅ"
 
-#: src/buddy.c:1566
+#: src/buddy.c:1583
 msgid "Remove Buddy Pounce"
 msgstr "õÄÁÌÉÔØ ÏÐÏ×ÅÝÅÎÉÅ"
 
-#: src/buddy.c:1889
-msgid "Buddy Icon"
-msgstr "éËÏÎËÉ ÐÏÌØÚÏ×ÁÔÅÌÅÊ"
-
-#: src/buddy.c:1892
-msgid "Voice"
-msgstr "çÏÌÏÓ"
-
-#: src/buddy.c:1895
-msgid "IM Image"
-msgstr "IM éÚÏÂÒÁÖÅÎÉÅ"
-
-#: src/buddy.c:1901
-msgid "Get File"
-msgstr "ðÏÌÕÞÉÔØ ÆÁÊÌ"
-
-#: src/buddy.c:1904
-msgid "Send File"
-msgstr "ïÔÐÒÁ×ÉÔØ ÆÁÊÌ"
-
-#: src/buddy.c:1908
-msgid "Games"
-msgstr "éÇÒÙ"
-
-#: src/buddy.c:1911
-msgid "Stocks"
-msgstr "ûÁÂÌÏÎ"
-
-#: src/buddy.c:1914
-msgid "EveryBuddy Bug"
-msgstr "EvryBuddy Bug"
-
-#: src/buddy.c:1985
+#: src/buddy.c:2029
 #, c-format
-msgid ""
-"Logged in: %s\n"
-""
-msgstr ""
-"ðÏÄËÌÀÞÉÌÓÑ: %s\n"
-""
-
-#: src/buddy.c:1997
+msgid "Logged in: %s\n"
+msgstr "ðÏÄËÌÀÞÉÌÓÑ: %s\n"
+
+#: src/buddy.c:2041
+msgid "Warnings: %d%%\n"
+msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÑ: %d%%\n"
+
+#: src/buddy.c:2053
 #, c-format
-msgid ""
-"Warnings: %d%%\n"
-""
-msgstr ""
-"ðÒÅÄÕÐÒÅÖÄÅÎÉÑ: %d%%\n"
-""
-
-#: src/buddy.c:2009
-#, c-format
-msgid ""
-"Capabilities: %s\n"
-""
-msgstr ""
-"ðÒÁ×Á: %s\n"
-""
-
-#: src/buddy.c:2013
+msgid "Capabilities: %s\n"
+msgstr "ðÒÁ×Á: %s\n"
+
+#: src/buddy.c:2057
 #, c-format
 msgid ""
 "Alias: %s               \n"
@@ -1130,124 +1185,121 @@
 "éÄÅÎÔÉÆÉËÁÃÉÏÎÎÙÊ ÎÏÍÅÒ: %s\n"
 "%s%s%s%s%s%s"
 
-#: src/buddy.c:2017
+#: src/buddy.c:2061
 msgid "Idle: "
 msgstr "îÅ ÚÁÎÑÔ"
 
-#: src/buddy.c:2087
+#: src/buddy.c:2132 src/buddy.c:2136
 #, c-format
 msgid "%s logged in."
 msgstr "%s × ÓÅÔÉ"
 
-#: src/buddy.c:2142
+#: src/buddy.c:2195 src/buddy.c:2199
 #, c-format
 msgid "%s logged out."
 msgstr "%s ÏÔËÌÀÞÉÌÓÑ"
 
-#: src/buddy.c:2315
+#: src/buddy.c:2376
 msgid "Information on selected Buddy"
 msgstr "éÎÆÏÒÍÁÃÉÑ Ï ÐÏÌØÚÏ×ÁÔÅÌÅ"
 
-#: src/buddy.c:2316
-#: src/dialogs.c:572
+#: src/buddy.c:2377 src/dialogs.c:688
 msgid "Send Instant Message"
 msgstr "ïÔÐÒÁ×ÉÔØ ÓÏÏÂÝÅÎÉÅ"
 
-#: src/buddy.c:2317
+#: src/buddy.c:2378
 msgid "Start/join a Buddy Chat"
 msgstr "þÁÔ"
 
-#: src/buddy.c:2318
+#: src/buddy.c:2379
 msgid "Activate Away Message"
 msgstr "ïÔÏÛÅÌ!"
 
-#: src/buddy.c:2381
+#: src/buddy.c:2442
 msgid "File"
 msgstr "æÁÊÌ"
 
-#: src/buddy.c:2385
+#: src/buddy.c:2446
 msgid "Add A Buddy"
 msgstr "äÏÂÁ×ÉÔØ ÐÏÌØÚÏ×ÁÔÅÌÑ"
 
-#: src/buddy.c:2387
+#: src/buddy.c:2448
 msgid "Join A Chat"
 msgstr "ðÏÄËÌÀÞÉÔØÓÑ Ë ÞÁÔÕ"
 
-#: src/buddy.c:2389
+#: src/buddy.c:2450
 msgid "New Instant Message"
 msgstr "îÏ×ÏÅ ÓÏÏÂÝÅÎÉÅ"
 
-#: src/buddy.c:2391
-#: src/dialogs.c:624
+#: src/buddy.c:2452 src/dialogs.c:740
 msgid "Get User Info"
 msgstr "éÎÆÏÒÍÁÃÉÑ Ï ÐÏÌØÚÏ×ÁÔÅÌÅ"
 
-#: src/buddy.c:2396
+#: src/buddy.c:2457
 msgid "Import Buddy List"
 msgstr "éÍÐÏÒÔ ÓÐÉÓËÁ ÐÏÌØÚÏ×ÁÔÅÌÅÊ"
 
-#: src/buddy.c:2414
+#: src/buddy.c:2475
 msgid "Tools"
 msgstr "éÎÓÔÒÕÍÅÎÔÙ"
 
-#: src/buddy.c:2437
+#: src/buddy.c:2498
 msgid "Protocol Actions"
 msgstr "äÅÊÓÔ×ÉÑ"
 
-#: src/buddy.c:2443
+#: src/buddy.c:2504
 msgid "View System Log"
 msgstr "ðÒÏÓÍÏÔÒ ÓÉÓÔÅÍÎÙÈ ÓÏÏÂÝÅÎÉÊ"
 
-#: src/buddy.c:2455
+#: src/buddy.c:2516
 msgid "Perl"
 msgstr "Perl"
 
-#: src/buddy.c:2458
+#: src/buddy.c:2519
 msgid "Load Script"
 msgstr "úÁÇÒÕÚÉÔØ ÓËÒÉÐÔ"
 
-#: src/buddy.c:2462
+#: src/buddy.c:2523
 msgid "Unload All Scripts"
 msgstr "÷ÙÇÒÕÚÉÔØ ×ÓÅ ÓËÒÉÐÔÙ"
 
-#: src/buddy.c:2466
+#: src/buddy.c:2527
 msgid "List Scripts"
 msgstr "óÐÉÓÏË ÓËÒÉÐÔÏ×"
 
-#: src/buddy.c:2474
+#: src/buddy.c:2535
 msgid "Help"
 msgstr "ðÏÍÏÝØ"
 
-#: src/buddy.c:2479
+#: src/buddy.c:2540
 msgid "About Gaim"
 msgstr "ï ÐÒÏÇÒÁÍÍÅ"
 
-#: src/buddy.c:2498
-#: src/prefs.c:2720
+#: src/buddy.c:2559 src/prefs.c:2816
 msgid "Buddy List"
 msgstr "óÐÉÓÏË ÐÏÌØÚÏ×ÁÔÅÌÅÊ"
 
-#: src/buddy.c:2551
+#: src/buddy.c:2612
 msgid "Add a new Buddy"
 msgstr "äÏÂÁ×ÉÔØ ÎÏ×ÏÇÏ ÐÏÌØÚÏ×ÁÔÅÌÑ"
 
-#: src/buddy.c:2552
+#: src/buddy.c:2613
 msgid "Add a new Group"
 msgstr "äÏÂÁ×ÉÔØ ÎÏ×ÕÀ ÇÒÕÐÐÕ"
 
-#: src/buddy.c:2553
+#: src/buddy.c:2614
 msgid "Remove selected Buddy/Group"
 msgstr "õÄÁÌÉÔØ ×ÙÂÒÁÎÎÏÇÏ ÐÏÌØÚÏ×ÁÔÅÌÑ/ÇÒÕÐÐÕ"
 
-#: src/buddy.c:2578
+#: src/buddy.c:2639
 msgid "Online"
 msgstr "÷ ÓÅÔÉ"
 
-#: src/buddy.c:2580
+#: src/buddy.c:2641
 msgid "Edit Buddies"
 msgstr "÷ÓÅ ÐÏÌØÚÏ×ÁÔÅÌÉ"
 
-#: src/buddy.c:2620
+#: src/buddy.c:2681
 msgid "Gaim - Buddy List"
 msgstr "Gaim - CÐÉÓÏË ÐÏÌØÚÏ×ÁÔÅÌÅÊ"
 
@@ -1263,31 +1315,13 @@
 msgid "Join Chat As:"
 msgstr "÷ÏÊÔÉ × ÞÁÔ ËÁË:"
 
-#: src/buddy_chat.c:304
-#: src/buddy_chat.c:392
-#: src/dialogs.c:420
-#: src/dialogs.c:590
-#: src/dialogs.c:648
-#: src/dialogs.c:767
-#: src/dialogs.c:945
-#: src/dialogs.c:1234
-#: src/dialogs.c:1439
-#: src/dialogs.c:1563
-#: src/dialogs.c:1623
-#: src/dialogs.c:1820
-#: src/dialogs.c:2002
-#: src/dialogs.c:2177
-#: src/dialogs.c:2248
-#: src/dialogs.c:2940
-#: src/dialogs.c:3197
-#: src/dialogs.c:3378
-#: src/dialogs.c:3747
-#: src/dialogs.c:3852
-#: src/multi.c:720
-#: src/multi.c:850
-#: src/multi.c:1184
-#: src/prpl.c:150
-#: src/prpl.c:224
+#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:444
+#: src/dialogs.c:535 src/dialogs.c:706 src/dialogs.c:764 src/dialogs.c:883
+#: src/dialogs.c:1061 src/dialogs.c:1350 src/dialogs.c:1555 src/dialogs.c:1679
+#: src/dialogs.c:1739 src/dialogs.c:1957 src/dialogs.c:2139 src/dialogs.c:2314
+#: src/dialogs.c:2385 src/dialogs.c:3081 src/dialogs.c:3338 src/dialogs.c:3519
+#: src/dialogs.c:3890 src/dialogs.c:3996 src/dialogs.c:4642 src/multi.c:744
+#: src/multi.c:874 src/multi.c:1208 src/prpl.c:150 src/prpl.c:224
 msgid "Cancel"
 msgstr "ïÔÍÅÎÁ"
 
@@ -1295,21 +1329,16 @@
 msgid "Join"
 msgstr "ðÏÄËÌÀÞÉÔØÓÑ"
 
-#: src/buddy_chat.c:393
-#: src/buddy_chat.c:396
-#: src/buddy_chat.c:1307
-#: src/buddy_chat.c:1397
+#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1317
+#: src/buddy_chat.c:1407
 msgid "Invite"
 msgstr "ðÒÉÇÌÁÛÅÎÉÅ"
 
-#: src/buddy_chat.c:412
-#: src/dialogs.c:1114
-#: src/dialogs.c:3205
+#: src/buddy_chat.c:412 src/dialogs.c:1230 src/dialogs.c:3346
 msgid "Buddy"
 msgstr "ðÏÌØÚÏ×ÁÔÅÌØ(UIN)"
 
-#: src/buddy_chat.c:417
-#: src/prefs.c:1879
+#: src/buddy_chat.c:417 src/prefs.c:1953
 msgid "Message"
 msgstr "óÏÏÂÝÅÎÉÅ"
 
@@ -1317,787 +1346,758 @@
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - ðÒÉÇÌÁÛÅÎÉÅ ÐÏÌØÚÏ×ÁÔÅÌÑ × ÞÁÔ"
 
-#: src/buddy_chat.c:827
+#: src/buddy_chat.c:857
 msgid "Un-Ignore"
 msgstr "òÁÚÒÅÛÉÔØ"
 
-#: src/buddy_chat.c:829
-#: src/buddy_chat.c:1261
+#: src/buddy_chat.c:859 src/buddy_chat.c:1271
 msgid "Ignore"
 msgstr "ïÔËÁÚÁÔØ"
 
 #. don't remove them from ignored in case they re-enter
-#: src/buddy_chat.c:873
-#: src/buddy_chat.c:993
+#: src/buddy_chat.c:922 src/buddy_chat.c:1034 src/buddy_chat.c:1497
+#: src/buddy_chat.c:1530
 #, c-format
 msgid "%d %s in room"
 msgstr "%d %s × ÄÁÎÎÏÍ ÞÁÔÅ"
 
-#: src/buddy_chat.c:881
+#: src/buddy_chat.c:930
 #, c-format
 msgid "%s entered the room."
 msgstr "%s ×ÏÛÅÌ × ÄÁÎÎÙÊ ÞÁÔ"
 
-#: src/buddy_chat.c:955
+#: src/buddy_chat.c:996
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ÂÕÄÅÔ %s"
 
-#: src/buddy_chat.c:1001
+#: src/buddy_chat.c:1043
+#, fuzzy, c-format
+msgid "%s left the room (%s)."
+msgstr "%s ÐÏËÉÎÕÌ ÄÁÎÎÙÊ ÞÁÔ"
+
+#: src/buddy_chat.c:1045
 #, c-format
 msgid "%s left the room."
 msgstr "%s ÐÏËÉÎÕÌ ÄÁÎÎÙÊ ÞÁÔ"
 
-#: src/buddy_chat.c:1136
+#: src/buddy_chat.c:1144
 msgid "Gaim - Group Chats"
 msgstr "Gaim - ëÏÎÆÅÒÅÎÃÉÑ"
 
-#: src/buddy_chat.c:1197
+#: src/buddy_chat.c:1207
 msgid "Topic:"
 msgstr "ôÅÍÁ"
 
-#: src/buddy_chat.c:1238
+#: src/buddy_chat.c:1248
 msgid "0 people in room"
 msgstr "0 ÐÏÌØÚÏ×ÁÔÅÌÅÊ × ÄÁÎÎÏÍ ÞÁÔÅ"
 
-#: src/buddy_chat.c:1312
-#: src/buddy_chat.c:1396
+#: src/buddy_chat.c:1322 src/buddy_chat.c:1406
 msgid "Whisper"
 msgstr "äÉÁÌÏÇ"
 
-#: src/buddy_chat.c:1317
-#: src/buddy_chat.c:1394
-#: src/buddy_chat.c:1443
-#: src/conversation.c:2337
+#: src/buddy_chat.c:1327 src/buddy_chat.c:1404 src/buddy_chat.c:1453
+#: src/conversation.c:2461
 msgid "Send"
 msgstr "ïÔÐÒÁ×ÉÔØ"
 
-#: src/buddy_chat.c:1437
-#: src/conversation.c:2314
+#: src/buddy_chat.c:1447 src/conversation.c:2438
 msgid "Block"
 msgstr "âÌÏËÉÒÏ×ÁÔØ"
 
-#: src/buddy_chat.c:1439
-#: src/conversation.c:2320
-#: src/dialogs.c:391
-#: src/dialogs.c:416
+#: src/buddy_chat.c:1449 src/conversation.c:2444 src/dialogs.c:419
+#: src/dialogs.c:448
 msgid "Warn"
 msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ"
 
-#: src/conversation.c:387
+#: src/conversation.c:392
 msgid "Gaim - Save Conversation"
 msgstr "Gaim - óÏÈÒÁÎÉÔØ ÒÁÚÇÏ×ÏÒ"
 
-#: src/conversation.c:544
-#, c-format
-msgid ""
-"Removing '%s' from buddylist.\n"
-""
-msgstr ""
-"õÄÁÌÅÎÉÅ '%s' ÉÚ ÓÐÉÓËÁ ÐÏÌØÚÏ×ÁÔÅÌÅÊ.\n"
-""
-
-#: src/conversation.c:925
+#: src/conversation.c:1037
 msgid "Unable to send message: too large"
 msgstr "óÏÏÂÝÅÎÉÅ ÎÅ ÐÅÒÅÄÁÎÏ: ÏÎÏ ÏÞÅÎØ ×ÅÌÉËÏ"
 
-#: src/conversation.c:925
-#: src/conversation.c:927
+#: src/conversation.c:1037 src/conversation.c:1039
 msgid "Message Error"
 msgstr "ïÛÉÂËÁ ÓÏÏÂÝÅÎÉÑ"
 
-#: src/conversation.c:927
+#: src/conversation.c:1039
 msgid "Unable to send message: Unknown reason"
 msgstr "÷Ù ÎÅ ÐÏÌÕÞÉÌÉ ÓÏÏÂÝÅÎÉÅ:ðÒÉÞÉÎÁ ÎÅÉÚ×ÅÓÔÎÁ."
 
-#: src/conversation.c:1146
+#: src/conversation.c:1258
 #, c-format
 msgid "Currently at %d, "
 msgstr "÷ ÎÁÓÔÏÑÝÅÅ ×ÒÅÍÑ %d,"
 
-#: src/conversation.c:1154
+#: src/conversation.c:1266
 #, c-format
-msgid ""
-"Setting position to %d\n"
-""
-msgstr ""
-"õÓÔÁÎÏ×ÉÔØ ÐÏÚÉÃÉÀ ÒÁ×ÎÏÊ %d\n"
-""
-
-#: src/conversation.c:1725
-#: src/prefs.c:1233
+msgid "Setting position to %d\n"
+msgstr "õÓÔÁÎÏ×ÉÔØ ÐÏÚÉÃÉÀ ÒÁ×ÎÏÊ %d\n"
+
+#: src/conversation.c:1832 src/prefs.c:1274
 msgid "Bold Text"
 msgstr "öÉÒÎÙÊ"
 
-#: src/conversation.c:1725
+#: src/conversation.c:1832
 msgid "Bold"
 msgstr "öÉÒÎÙÊ"
 
-#: src/conversation.c:1729
+#: src/conversation.c:1836
 msgid "Italics Text"
 msgstr "îÁËÌÏÎÎÙÊ"
 
-#: src/conversation.c:1730
+#: src/conversation.c:1837
 msgid "Italics"
 msgstr "îÁËÌÏÎÎÙÊ"
 
-#: src/conversation.c:1733
-#: src/prefs.c:1245
+#: src/conversation.c:1840 src/prefs.c:1286
 msgid "Underline Text"
 msgstr "ðÏÄÞÅÒËÎÕÔÙÊ"
 
-#: src/conversation.c:1734
+#: src/conversation.c:1841
 msgid "Underline"
 msgstr "ðÏÄÞÅÒËÎÕÔÙÊ"
 
-#: src/conversation.c:1738
-#: src/prefs.c:1251
+#: src/conversation.c:1845 src/prefs.c:1292
 msgid "Strike through Text"
 msgstr "úÁÞÅÒËÎÕÔÙÊ ÔÅËÓÔ"
 
-#: src/conversation.c:1738
+#: src/conversation.c:1845
 msgid "Strike"
 msgstr "úÁÞÅÒËÎÕÔÙÊ"
 
-#: src/conversation.c:1744
+#: src/conversation.c:1851
 msgid "Decrease font size"
 msgstr "õÍÅÎØÛÉÔØ ÛÒÉÆÔ"
 
-#: src/conversation.c:1744
+#: src/conversation.c:1851
 msgid "Small"
 msgstr "íÁÌÅÎØËÉÊ"
 
-#: src/conversation.c:1747
+#: src/conversation.c:1854
 msgid "Normal font size"
 msgstr "îÏÒÍÁÌØÎÙÊ ÒÁÚÍÅÒ ÛÒÉÆÔÁ "
 
-#: src/conversation.c:1747
+#: src/conversation.c:1854
 msgid "Normal"
 msgstr "îÏÒÍÁÌØÎÙÊ"
 
-#: src/conversation.c:1750
+#: src/conversation.c:1857
 msgid "Increase font size"
 msgstr "õ×ÅÌÉÞÉÔØ ÛÒÉÆÔ"
 
-#: src/conversation.c:1750
+#: src/conversation.c:1857
 msgid "Big"
 msgstr "âÏÌØÛÏÊ"
 
-#: src/conversation.c:1757
-#: src/dialogs.c:2628
-#: src/dialogs.c:2647
+#: src/conversation.c:1864 src/dialogs.c:2756 src/dialogs.c:2780
 msgid "Select Font"
 msgstr "÷ÙÂÏÒ ÛÒÉÆÔÁ"
 
-#: src/conversation.c:1758
+#: src/conversation.c:1865
 msgid "Font"
 msgstr "ûÒÉÆÔ"
 
-#: src/conversation.c:1761
-#: src/prefs.c:1281
+#: src/conversation.c:1868 src/prefs.c:1322
 msgid "Text Color"
 msgstr "ã×ÅÔ ÔÅËÓÔÁ"
 
-#: src/conversation.c:1762
-#: src/conversation.c:1766
+#: src/conversation.c:1869 src/conversation.c:1873
 msgid "Color"
 msgstr "ã×ÅÔ"
 
-#: src/conversation.c:1766
-#: src/prefs.c:1299
+#: src/conversation.c:1873 src/prefs.c:1340
 msgid "Background Color"
 msgstr "ã×ÅÔ ÆÏÎÁ"
 
-#: src/conversation.c:1773
-#: src/dialogs.c:2242
+#: src/conversation.c:1880 src/dialogs.c:2379
 msgid "Insert Link"
 msgstr "÷ÓÔÁ×ÉÔØ ÓÓÙÌËÕ"
 
-#: src/conversation.c:1774
+#: src/conversation.c:1881
 msgid "Link"
 msgstr "óÓÙÌËÁ"
 
-#: src/conversation.c:1777
+#: src/conversation.c:1884
 msgid "Insert smiley face"
 msgstr "÷ÓÔÁ×ÉÔØ ÓÍÁÊÌÉË"
 
-#: src/conversation.c:1777
+#: src/conversation.c:1884
 msgid "Smiley"
 msgstr "óÍÁÊÌÉË"
 
-#: src/conversation.c:1784
+#: src/conversation.c:1891
 msgid "Enable logging"
 msgstr "òÁÚÒÅÛÅÎÁ ÒÅÇÉÓÔÒÁÃÉÑ"
 
-#: src/conversation.c:1785
-#: src/prefs.c:244
+#: src/conversation.c:1892 src/prefs.c:244
 msgid "Logging"
 msgstr "öÕÒÎÁÌ"
 
-#: src/conversation.c:1794
+#: src/conversation.c:1901
 msgid "Save Conversation"
 msgstr "óÏÈÒÁÎÉÔØ ÒÁÚÇÏ×ÏÒ"
 
-#: src/conversation.c:1795
-#: src/dialogs.c:1443
-#: src/dialogs.c:1627
-#: src/dialogs.c:2952
-#: src/dialogs.c:3643
+#: src/conversation.c:1902 src/dialogs.c:1559 src/dialogs.c:1743
+#: src/dialogs.c:3093 src/dialogs.c:3786 src/dialogs.c:4649
 msgid "Save"
 msgstr "óÏÈÒÁÎÉÔØ"
 
-#: src/conversation.c:1799
+#: src/conversation.c:1906
 msgid "Enable sounds"
 msgstr "òÁÚÒÅÛÉÔØ Ú×ÕË"
 
-#: src/conversation.c:1800
+#: src/conversation.c:1907
 msgid "Sound"
 msgstr "ú×ÕË"
 
-#: src/conversation.c:2166
+#: src/conversation.c:2290
 msgid "Gaim - Conversations"
 msgstr "Gaim - òÁÚÇÏ×ÏÒ"
 
-#: src/conversation.c:2253
+#: src/conversation.c:2377
 msgid "Send message as: "
 msgstr "ïÔÐÒÁ×ÉÔØ ÓÏÏÂÝÅÎÉÅ ËÁË:"
 
-#: src/conversation.c:2742
+#: src/conversation.c:2986
 msgid "Gaim - Save Icon"
 msgstr "Gaim - óÏÈÒÁÎÉÔØ ÉËÏÎËÕ"
 
-#: src/conversation.c:2769
+#: src/conversation.c:3013
 msgid "Disable Animation"
 msgstr "ïÔËÌÀÞÉÔØ ÁÎÉÍÁÃÉÀ"
 
-#: src/conversation.c:2774
+#: src/conversation.c:3018
 msgid "Enable Animation"
 msgstr "òÁÚÒÅÛÉÔØ ÁÎÉÍÁÃÉÀ"
 
-#: src/conversation.c:2780
+#: src/conversation.c:3024
 msgid "Hide Icon"
 msgstr "óÐÒÑÔÁÔØ ÉËÏÎËÕ"
 
-#: src/conversation.c:2786
+#: src/conversation.c:3030
 msgid "Save Icon As..."
 msgstr "óÏÈÒÁÎÉÔØ ÉËÏÎËÕ ËÁË..."
 
-#: src/dialogs.c:379
+#: src/dialogs.c:407
 msgid "Gaim - Warn user?"
 msgstr "ïÐÏ×ÅÓÔÉÔØ ÐÏÌØÚÏ×ÁÔÅÌÑ ?"
 
-#: src/dialogs.c:399
+#: src/dialogs.c:427
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÖÅÌÁÅÔÅ ÐÒÅÄÕÐÒÅÄÉÔØ %s?"
 
-#: src/dialogs.c:404
+#: src/dialogs.c:432
 msgid "Warn anonymously?"
 msgstr "ðÒÅÄÕÐÒÅÄÉÔØ ÁÎÏÎÉÍÎÏ?"
 
-#: src/dialogs.c:408
+#: src/dialogs.c:436
 msgid "Anonymous warnings are less harsh."
 msgstr "áÎÏÎÉÍÎÙÅ ÐÒÅÄÕÐÒÅÖÄÅÎÉÑ ÍÅÎÅÅ ÎÁÄÏÅÄÌÉ×Ù."
 
+#: src/dialogs.c:464
+#, c-format
+msgid "Removing '%s' from buddylist.\n"
+msgstr "õÄÁÌÅÎÉÅ '%s' ÉÚ ÓÐÉÓËÁ ÐÏÌØÚÏ×ÁÔÅÌÅÊ.\n"
+
+#: src/dialogs.c:490
+#, fuzzy, c-format
+msgid "Gaim - Remove %s?"
+msgstr "Gaim - ðÅÒÅÉÍÅÎÏ×ÁÔØ çÒÕÐÐÕ"
+
+#: src/dialogs.c:503
+#, fuzzy
+msgid "Remove Buddy"
+msgstr "ðÅÒÅÉÍÅÎÏ×ÁÔØ ÐÏÌØÚÏ×ÁÔÅÌÑ"
+
+#: src/dialogs.c:513
+#, c-format
+msgid ""
+"You are about to remove '%s' from\n"
+"your buddylist. Do you want to continue?"
+msgstr ""
+
+#: src/dialogs.c:525 src/prpl.c:154 src/prpl.c:228
+msgid "Accept"
+msgstr "óÏÇÌÁÓÅÎ"
+
 #. Build OK Button
-#: src/dialogs.c:516
-#: src/dialogs.c:595
-#: src/dialogs.c:653
-#: src/dialogs.c:1238
-#: src/dialogs.c:1567
-#: src/dialogs.c:1680
-#: src/dialogs.c:2001
-#: src/dialogs.c:2181
-#: src/dialogs.c:2247
-#: src/dialogs.c:3752
-#: src/dialogs.c:3857
-#: src/multi.c:725
+#: src/dialogs.c:632 src/dialogs.c:711 src/dialogs.c:769 src/dialogs.c:1354
+#: src/dialogs.c:1683 src/dialogs.c:1830 src/dialogs.c:2138 src/dialogs.c:2318
+#: src/dialogs.c:2384 src/dialogs.c:3895 src/dialogs.c:4001 src/multi.c:749
 msgid "OK"
 msgstr "OK"
 
-#: src/dialogs.c:562
+#: src/dialogs.c:678
 msgid "Gaim - IM user"
 msgstr "Gaim - óÏÏÂÝÅÎÉÅ"
 
-#: src/dialogs.c:579
+#: src/dialogs.c:695
 msgid "IM who:"
 msgstr "ëÏÍÕ (UIN):"
 
-#: src/dialogs.c:631
+#: src/dialogs.c:747
 msgid "User:"
 msgstr "ðÏÌØÚÏ×ÁÔÅÌØ(UIN):"
 
 #. Finish up
-#: src/dialogs.c:658
+#: src/dialogs.c:774
 msgid "Gaim - Get User Info"
 msgstr "éÎÆÏÒÍÁÃÉÑ Ï ÐÏÌØÚÏ×ÁÔÅÌÅ"
 
-#: src/dialogs.c:720
+#: src/dialogs.c:836
 msgid "Buddies"
 msgstr "ðÏÌØÚÏ×ÁÔÅÌÉ"
 
-#: src/dialogs.c:773
+#: src/dialogs.c:889
 msgid "Add Group"
 msgstr "äÏÂÁ×ÉÔØ ÇÒÕÐÐÕ"
 
-#: src/dialogs.c:798
+#: src/dialogs.c:914
 msgid "Gaim - Add Group"
 msgstr "Gaim - äÏÂÁ×ÉÔØ ÇÒÕÐÐÕ"
 
-#: src/dialogs.c:882
+#: src/dialogs.c:998
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - äÏÂÁ×ÉÔØ ÐÏÌØÚÏ×ÁÔÅÌÑ"
 
-#: src/dialogs.c:894
+#: src/dialogs.c:1010
 msgid "Add Buddy"
 msgstr "äÏÂÁ×ÉÔØ ÐÏÌØÚÏ×ÁÔÅÌÑ"
 
-#: src/dialogs.c:904
+#: src/dialogs.c:1020
 msgid "Contact"
 msgstr "UIN"
 
 #. Set up stuff for the account box
-#: src/dialogs.c:932
+#: src/dialogs.c:1048
 msgid "Add To"
 msgstr "äÏÂÁ×ÉÔØ Ë"
 
-#: src/dialogs.c:967
+#: src/dialogs.c:1083
 msgid "Please enter a buddy to pounce."
 msgstr "÷×ÅÄÉÔÅ ÐÏÌØÚÏ×ÁÔÅÌÑ"
 
-#: src/dialogs.c:967
+#: src/dialogs.c:1083
 msgid "Buddy Pounce Error"
 msgstr "ïÛÉÂËÁ"
 
-#: src/dialogs.c:1083
+#: src/dialogs.c:1199
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - îÏ×ÏÅ ÏÐÏ×ÅÝÅÎÉÅ"
 
 #. <pounce type="who">
-#: src/dialogs.c:1094
+#: src/dialogs.c:1210
 msgid "Pounce Who"
 msgstr "ïÐÏ×ÅÓÔÉÔØ"
 
-#: src/dialogs.c:1105
+#: src/dialogs.c:1221
 msgid "Account"
 msgstr "õÞÅÔÎaÑ ÚÁÐÉÓØ"
 
 #. </pounce type="who">
 #. <pounce type="when">
-#: src/dialogs.c:1129
+#: src/dialogs.c:1245
 msgid "Pounce When"
 msgstr "ëÏÇÄÁ ÏÐÏ×ÅÝÁÔØ"
 
-#: src/dialogs.c:1139
+#: src/dialogs.c:1255
 msgid "Pounce on sign on"
 msgstr "ïÐÏ×ÅÓÔÉÔØ ÐÒÉ ÐÏÄËÌÀÞÅÎÉÉ"
 
-#: src/dialogs.c:1144
+#: src/dialogs.c:1260
 msgid "Pounce on return from away"
 msgstr "ïÐÏ×ÅÓÔÉÔØ Ï ×ÏÚ×ÒÁÔÅ"
 
-#: src/dialogs.c:1150
+#: src/dialogs.c:1266
 msgid "Pounce on return from idle"
 msgstr "ïÐÏ×ÅÓÔÉÔØ Ï ÎÅÚÁÎÑÔÏÓÔÉ"
 
 #. </pounce type="when">
 #. <pounce type="action">
-#: src/dialogs.c:1162
+#: src/dialogs.c:1278
 msgid "Pounce Action"
 msgstr "äÅÓÔ×ÉÅ ÐÒÉ ÏÐÏ×ÅÝÅÎÉÉ"
 
-#: src/dialogs.c:1173
+#: src/dialogs.c:1289
 msgid "Open IM Window"
 msgstr "ïÔËÒÙÔØ ÏËÎÏ ÓÏÏÂÝÅÎÉÑ"
 
-#: src/dialogs.c:1178
+#: src/dialogs.c:1294
 msgid "Popup Notification"
 msgstr "÷ÓÐÌÙ×ÁÀÝÅÅ Õ×ÅÄÏÍÌÅÎÉÅ"
 
-#: src/dialogs.c:1183
+#: src/dialogs.c:1299
 msgid "Send Message"
 msgstr "ïÔÐÒÁ×ÉÔØ ÓÏÏÂÝÅÎÉÅ"
 
-#: src/dialogs.c:1196
+#: src/dialogs.c:1312
 msgid "Execute command on pounce"
 msgstr "÷ÙÐÏÌÎÉÔØ ËÏÍÁÎÄÕ ÐÒÉ ÏÐÏ×ÅÝÅÎÉÉ"
 
-#: src/dialogs.c:1209
+#: src/dialogs.c:1325
 msgid "Play sound on pounce"
 msgstr "ðÒÏÉÇÒÙ×ÁÔØ Ú×ÕË ÐÒÉ ÏÐÏ×ÅÝÅÎÉÉ"
 
 #. </pounce type="action">
-#: src/dialogs.c:1224
+#: src/dialogs.c:1340
 msgid "Save this pounce after activation"
 msgstr "óÏÈÒÁÎÉÔØ ÎÁÓÔÒÏÊËÉ ÏÐÏ×ÅÝÅÎÉÑ"
 
-#: src/dialogs.c:1306
+#: src/dialogs.c:1422
 msgid "Gaim - Set Dir Info"
 msgstr "÷ÁÛÉ ÄÁÎÎÙÅ"
 
-#: src/dialogs.c:1315
+#: src/dialogs.c:1431
 msgid "Directory Info"
 msgstr "ðÒÏÆÉÌØ"
 
-#: src/dialogs.c:1337
+#: src/dialogs.c:1453
 msgid "Allow Web Searches To Find Your Info"
 msgstr "òÁÚÒÅÛÉÔØ ÐÏÉÓË ÎÁ web ÄÌÑ ÐÏÌÕÞÅÎÉÑ ×ÁÛÉÈ ÄÁÎÎÙÈ."
 
 #. Line 1
-#: src/dialogs.c:1340
-#: src/dialogs.c:2020
+#: src/dialogs.c:1456 src/dialogs.c:2157
 msgid "First Name"
 msgstr "éÍÑ"
 
 #. Line 2
-#: src/dialogs.c:1351
-#: src/dialogs.c:2032
+#: src/dialogs.c:1467 src/dialogs.c:2169
 msgid "Middle Name"
 msgstr "ïÔÞÅÓÔ×Ï"
 
 #. Line 3
-#: src/dialogs.c:1363
-#: src/dialogs.c:2044
+#: src/dialogs.c:1479 src/dialogs.c:2181
 msgid "Last Name"
 msgstr "æÁÍÉÌÉÑ"
 
 #. Line 4
-#: src/dialogs.c:1374
-#: src/dialogs.c:2056
+#: src/dialogs.c:1490 src/dialogs.c:2193
 msgid "Maiden Name"
 msgstr "äÅ×ÉÞØÑ ÆÁÍÉÌÉÑ"
 
 #. Line 6
-#: src/dialogs.c:1396
-#: src/dialogs.c:2079
+#: src/dialogs.c:1512 src/dialogs.c:2216
 msgid "State"
 msgstr "òÅÓÐÕÂÌÉËÁ/ïÂÌÁÓÔØ"
 
 #. Line 7
-#: src/dialogs.c:1407
-#: src/dialogs.c:2090
+#: src/dialogs.c:1523 src/dialogs.c:2227
 msgid "Country"
 msgstr "óÔÒÁÎÁ"
 
-#: src/dialogs.c:1461
+#: src/dialogs.c:1577
 msgid "New Passwords Do Not Match"
 msgstr "îÅÓÏ×ÐÁÄÅÎÉÅ ÐÁÒÏÌÑ"
 
-#: src/dialogs.c:1461
-#: src/dialogs.c:1466
+#: src/dialogs.c:1577 src/dialogs.c:1582
 msgid "Gaim - Change Password Error"
 msgstr "Gaim - ïÛÉÂËÁ ÓÍÅÎÙ ÐÁÒÏÌÑ"
 
-#: src/dialogs.c:1466
+#: src/dialogs.c:1582
 msgid "Fill out all fields completely"
 msgstr "úÁÐÏÌÎÉÔÅ ×ÓÅ ÐÏÌÑ"
 
-#: src/dialogs.c:1502
-msgid "Change Password"
-msgstr "óÍÅÎÉÔØ ÐÁÒÏÌØ"
-
-#: src/dialogs.c:1521
+#: src/dialogs.c:1637
 msgid "Original Password"
 msgstr "óÔÁÒÙÊ ÐÁÒÏÌØ"
 
-#: src/dialogs.c:1535
+#: src/dialogs.c:1651
 msgid "New Password"
 msgstr "îÏ×ÙÊ ÐÁÒÏÌØ"
 
-#: src/dialogs.c:1549
+#: src/dialogs.c:1665
 msgid "New Password (again)"
 msgstr "îÏ×ÙÊ ÐÁÒÏÌØ (ÅÝÅ ÒÁÚ)"
 
-#: src/dialogs.c:1590
+#: src/dialogs.c:1706
 msgid "Gaim - Set User Info"
 msgstr "Gaim - õÓÔÁÎ×ËÁ ÉÎÆÏÒÍÁÃÉÉ"
 
-#: src/dialogs.c:1685
+#: src/dialogs.c:1814
 msgid "Below are the results of your search: "
 msgstr "òÅÚÕÌØÔÁÔ ÐÏÉÓËÁ"
 
-#: src/dialogs.c:1810
-#: src/dialogs.c:1817
+#: src/dialogs.c:1947 src/dialogs.c:1954
 msgid "Permit"
 msgstr "òÁÚÒÅÛÉÔØ"
 
-#: src/dialogs.c:1812
-#: src/dialogs.c:1819
+#: src/dialogs.c:1949 src/dialogs.c:1956
 msgid "Deny"
 msgstr "úÁÐÒÅÔÉÔØ"
 
-#: src/dialogs.c:1856
+#: src/dialogs.c:1993
 msgid "Gaim - Add Permit"
 msgstr "Gaim - òÁÚÒÅÛÉÔØ"
 
-#: src/dialogs.c:1858
+#: src/dialogs.c:1995
 msgid "Gaim - Add Deny"
 msgstr "Gaim - úÁÐÒÅÔÉÔØ"
 
-#: src/dialogs.c:1918
+#: src/dialogs.c:2055
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - öÕÒÎÁÌ ÂÅÓÅÄÙ"
 
-#: src/dialogs.c:1996
-#: src/dialogs.c:2159
+#: src/dialogs.c:2133 src/dialogs.c:2296
 msgid "Search for Buddy"
 msgstr "ðÏÉÓË ÐÏÌØÚÏ×ÁÔÅÌÑ"
 
-#: src/dialogs.c:2124
+#: src/dialogs.c:2261
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - ðÏÉÓË ÐÏ ÉÎÆÏÒÍÁÃÉÉ"
 
-#: src/dialogs.c:2153
+#: src/dialogs.c:2290
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - ðÏÉÓË ÐÏ Email"
 
-#: src/dialogs.c:2166
+#: src/dialogs.c:2303
 msgid "Email"
 msgstr "e-mail"
 
-#: src/dialogs.c:2261
+#: src/dialogs.c:2398
 msgid "URL"
 msgstr "URL"
 
 #. Right side: frame with description and the filepath of plugin
-#: src/dialogs.c:2269
-#: src/plugins.c:211
+#: src/dialogs.c:2406 src/plugins.c:211
 msgid "Description"
 msgstr "ïÐÉÓÁÎÉÅ"
 
-#: src/dialogs.c:2293
+#: src/dialogs.c:2430
 msgid "Gaim - Add URL"
 msgstr "Gaim - äÏÂÁ×ÉÔØ URL"
 
-#: src/dialogs.c:2444
-#: src/dialogs.c:2465
-#: src/dialogs.c:2519
+#: src/dialogs.c:2581 src/dialogs.c:2602 src/dialogs.c:2656
 msgid "Select Text Color"
 msgstr "÷ÙÂÏÒ Ã×ÅÔÁ ÔÅËÓÔÁ"
 
-#: src/dialogs.c:2498
+#: src/dialogs.c:2635
 msgid "Select Background Color"
 msgstr "÷ÙÂÏÒ Ã×ÅÔÁ ÆÏÎÁ"
 
-#: src/dialogs.c:2722
+#: src/dialogs.c:2857
 msgid "Import to:"
 msgstr "éÍÐÏÒÔ:"
 
-#: src/dialogs.c:2746
+#: src/dialogs.c:2881
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - éÍÐÏÒÔ ÓÐÉÓËÁ ÐÏÌØÚÏ×ÁÔÅÌÑ"
 
 #. We shouldn't allow a blank title
-#: src/dialogs.c:2807
+#: src/dialogs.c:2948
 msgid "You cannot create an away message with a blank title"
 msgstr "÷Ù ÎÅ ÍÏÖÅÔÅ ÓÏÚÄÁÔØ ÓÏÏÂÝÅÎÉÅ ÂÅÚ ÚÁÇÏÌÏ×ËÁ"
 
 #. We shouldn't allow a blank message
-#: src/dialogs.c:2814
+#: src/dialogs.c:2955
 msgid "You cannot create an empty away message"
 msgstr "÷Ù ÎÅ ÍÏÖÅÔÅ ÓÏÚÄÁÔØ ÐÕÓÔÏÅ ÓÏÏÂÝÅÎÉÅ"
 
-#: src/dialogs.c:2882
+#: src/dialogs.c:3023
 msgid "Gaim - New away message"
 msgstr "Gaim - óÏÏÂÝÅÎÉÅ Ï ÏÔÓÕÔÓÔ×ÉÉ"
 
-#: src/dialogs.c:2892
+#: src/dialogs.c:3033
 msgid "New away message"
 msgstr "óÏÏÂÝÅÎÉÅ"
 
-#: src/dialogs.c:2905
+#: src/dialogs.c:3046
 msgid "Away title: "
 msgstr "îÁÚ×ÁÎÉÅ"
 
-#: src/dialogs.c:2944
+#: src/dialogs.c:3085
 msgid "Use"
 msgstr "ðÒÉÍÅÎÉÔØ"
 
-#: src/dialogs.c:2948
+#: src/dialogs.c:3089
 msgid "Save & Use"
 msgstr "óÏÈÒÁÎÉÔØ É ÐÒÉÍÅÎÉÔØ"
 
 #. show everything
-#: src/dialogs.c:3151
+#: src/dialogs.c:3292
 msgid "Smile!"
 msgstr "óÍÁÊÌ!"
 
-#: src/dialogs.c:3203
+#: src/dialogs.c:3344
 msgid "Alias Buddy"
 msgstr "ðÓÅ×ÄÏÎÉÍ ÐÏÌØÚÏ×ÁÔÅÌÑ"
 
-#: src/dialogs.c:3236
+#: src/dialogs.c:3377
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - óÍÅÎÁ ÐÓÅ×ÄÏÎÉÍÁ"
 
-#: src/dialogs.c:3308
+#: src/dialogs.c:3449
 msgid "Gaim - Save Log File"
 msgstr "Gaim - óÏÈÒÁÎÉÔØ"
 
-#: src/dialogs.c:3340
+#: src/dialogs.c:3481
 #, c-format
 msgid "Unable to remove file %s - %s"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ ÆÁÊÌ %s - %s"
 
-#: src/dialogs.c:3368
+#: src/dialogs.c:3509
 msgid "Really clear log?"
 msgstr "äÅÊÓÔ×ÉÔÅÌØÎÏ ÏÞÉÓÔÉÔØ ÖÕÒÎÁÌ?"
 
-#: src/dialogs.c:3383
+#: src/dialogs.c:3524
 msgid "Okay"
 msgstr "ïËÅÊ"
 
-#: src/dialogs.c:3554
+#: src/dialogs.c:3695
 msgid "Date"
 msgstr "äÁÔÁ"
 
-#: src/dialogs.c:3617
+#: src/dialogs.c:3758
 msgid "Conversation"
 msgstr "âÅÓÅÄÁ"
 
-#: src/dialogs.c:3638
+#: src/dialogs.c:3781
 msgid "Clear"
 msgstr "ïÞÉÓÔÉÔØ"
 
-#: src/dialogs.c:3716
+#: src/dialogs.c:3859
 msgid "Gaim - Rename Group"
 msgstr "Gaim - ðÅÒÅÉÍÅÎÏ×ÁÔØ çÒÕÐÐÕ"
 
-#: src/dialogs.c:3726
+#: src/dialogs.c:3869
 msgid "Rename Group"
 msgstr "ðÅÒÅÉÍÅÎÏ×ÁÔØ çÒÕÐÐÕ"
 
-#: src/dialogs.c:3733
-#: src/dialogs.c:3838
+#: src/dialogs.c:3876 src/dialogs.c:3982
 msgid "New name:"
 msgstr "îÏ×ÙÊ ÎÏÍÅÒ(UIN):"
 
-#: src/dialogs.c:3821
+#: src/dialogs.c:3965
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - ðÅÒÅÉÍÅÎÏ×ÁÔØ ÐÏÌØÚÏ×ÁÔÅÌÑ"
 
-#: src/dialogs.c:3831
+#: src/dialogs.c:3975
 msgid "Rename Buddy"
 msgstr "ðÅÒÅÉÍÅÎÏ×ÁÔØ ÐÏÌØÚÏ×ÁÔÅÌÑ"
 
 #. Below is basically stolen from plugins.c
-#: src/dialogs.c:3915
+#: src/dialogs.c:4059
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - ÷ÙÂÏÒ ÓËÒÉÐÔÁ Perl"
 
-#: src/gaimrc.c:1107
+#: src/gaimrc.c:1113
 #, c-format
 msgid "Could not open config file %s."
 msgstr "îÅ ÍÏÇÕ ÏÔËÒÙÔØ ÆÁÊÌ ËÏÎÆÉÇÕÒÁÃÉÉ %s."
 
-#: src/gaimrc.c:1108
+#: src/gaimrc.c:1114
 msgid "Preferences Error"
 msgstr "ïÛÉÂËÁ ÐÁÒÁÍÅÔÒÏ×"
 
 #: src/html.c:183
 #, c-format
-msgid ""
-"Receieved: '%s'\n"
-""
-msgstr ""
-"ðÒÉÎÑÔÏ: '%s'\n"
-""
+msgid "Receieved: '%s'\n"
+msgstr "ðÒÉÎÑÔÏ: '%s'\n"
 
 #: src/html.c:221
-msgid ""
-"g003: Error opening connection.\n"
-""
-msgstr ""
-"g003: ïÛÉÂËÁ ÓÏÚÄÁÎÉÑ ÓÏÅÄÉÎÅÎÉÑ.\n"
-""
-
-#: src/multi.c:411
+msgid "g003: Error opening connection.\n"
+msgstr "g003: ïÛÉÂËÁ ÓÏÚÄÁÎÉÑ ÓÏÅÄÉÎÅÎÉÑ.\n"
+
+#: src/multi.c:427
 msgid "Gaim - Load Buddy Icon"
 msgstr "Gaim - úÁÇÒÕÚÉÔØ ÉËÏÎËÕ ÐÏÌØÚÏ×ÁÔÅÌÑ"
 
-#: src/multi.c:454
+#: src/multi.c:470
 msgid "Buddy Icon File:"
 msgstr "æÁÊÌ ÉËÏÎÏË ÐÏÌØÚÏ×ÁÔÅÌÅÊ:"
 
-#: src/multi.c:465
+#: src/multi.c:481
 msgid "Browse"
 msgstr "ðÒÏÓÍÏÔÒ"
 
-#: src/multi.c:470
-#: src/prefs.c:1457
+#: src/multi.c:486 src/prefs.c:1512
 msgid "Reset"
 msgstr "óÂÒÏÓ"
 
-#: src/multi.c:497
+#: src/multi.c:513
 msgid "Screenname:"
 msgstr "îÏÍÅÒ (UIN)"
 
-#: src/multi.c:517
+#: src/multi.c:533
 msgid "Protocol:"
 msgstr "ðÒÏÔÏËÏÌ"
 
-#: src/multi.c:522
+#: src/multi.c:538
 msgid "Remember Password"
 msgstr "úÁÐÏÍÎÉÔØ ÐÁÒÏÌØ"
 
-#: src/multi.c:523
+#: src/multi.c:539
 msgid "Auto-Login"
 msgstr "ðÏÄËÌÀÞÉÔØÓÑ Á×ÔÏÍÁÔÉÞÅÓËÉ"
 
-#: src/multi.c:563
+#: src/multi.c:579
 msgid "New Mail Notifications"
 msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ Ï ÎÏ×ÏÊ ÐÏÞÔÅ"
 
-#: src/multi.c:703
+#: src/multi.c:727
 msgid "Gaim - Modify Account"
 msgstr "Gaim - òÅÄÁËÔÉÒÏ×ÁÎÉÅ"
 
-#: src/multi.c:822
+#: src/multi.c:846
 msgid "Enter Password"
 msgstr "÷×ÅÄÉÔÅ ÐÁÒÏÌØ"
 
-#: src/multi.c:911
+#: src/multi.c:935
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "÷Ù ÓÏÇÌÁÓÎÙ ÕÄÁÌÉÔØ %s?"
 
-#: src/multi.c:948
+#: src/multi.c:972
 msgid "Gaim - Account Editor"
 msgstr "Gaim - õÞÅÔÎÙÅ ÚÁÐÉÓÉ"
 
-#: src/multi.c:967
+#: src/multi.c:991
 msgid "Select All"
 msgstr "÷ÙÂÒÁÔØ ×ÓÅ"
 
-#: src/multi.c:972
+#: src/multi.c:996
 msgid "Select Autos"
 msgstr "ôÅËÕÝÉÊ"
 
-#: src/multi.c:976
+#: src/multi.c:1000
 msgid "Select None"
 msgstr "ïÔÍÅÎÉÔØ"
 
-#: src/multi.c:990
+#: src/multi.c:1014
 msgid "Modify"
 msgstr "éÚÍÅÎÉÔØ"
 
-#: src/multi.c:994
+#: src/multi.c:1018
 msgid "Sign On/Off"
 msgstr "÷ËÌ/÷ÙËÌ"
 
-#: src/multi.c:998
+#: src/multi.c:1022
 msgid "Delete"
 msgstr "õÄÁÌÉÔØ"
 
-#: src/multi.c:1226
+#: src/multi.c:1256
 #, c-format
 msgid ""
 "%s\n"
-"%s was unable to sign on: %s"
+"%s: %s"
+msgstr ""
+
+#: src/multi.c:1275
+#, fuzzy, c-format
+msgid "%s was unable to sign on"
 msgstr ""
 "%s\n"
 "%s ÎÅ×ÏÚÍÏÖÎÏ ÓÏÅÄÉÎÉÔØÓÑ: %s"
 
+#: src/multi.c:1286
+#, fuzzy
+msgid "Notice"
+msgstr "çÏÌÏÓ"
+
 #: src/perl.c:856
 msgid "Perl Scripts"
 msgstr "Perl óËÒÉÐÔ"
@@ -2154,16 +2154,9 @@
 msgid "General Options"
 msgstr "ïÓÎÏ×ÎÙÅ ÐÁÒÁÍÅÔÒÙ"
 
-#: src/prefs.c:198
-#: src/prefs.c:372
-#: src/prefs.c:538
-#: src/prefs.c:639
-#: src/prefs.c:868
-#: src/prefs.c:1003
-#: src/prefs.c:1221
-#: src/prefs.c:1521
-#: src/prefs.c:1796
-#: src/prefs.c:2207
+#: src/prefs.c:198 src/prefs.c:373 src/prefs.c:539 src/prefs.c:640
+#: src/prefs.c:893 src/prefs.c:1037 src/prefs.c:1262 src/prefs.c:1576
+#: src/prefs.c:1850 src/prefs.c:2283
 msgid "All options take effect immediately unless otherwise noted."
 msgstr "÷ÓÅ ÎÁÓÔÒÏÊËÉ ÓÒÁÂÁÔÙ×ÁÀÔ ÎÅÍÅÄÌÅÎÎÏ, ÅÓÌÉ ÎÅ ÕËÁÚÁÎÏ ÏÂÒÁÔÎÏÅ."
 
@@ -2252,382 +2245,385 @@
 msgstr "GNOME URL Handler"
 
 #: src/prefs.c:295
+msgid "Galeon"
+msgstr ""
+
+#: src/prefs.c:296
 msgid "Manual"
 msgstr "äÒÕÇÏÊ"
 
-#: src/prefs.c:364
+#: src/prefs.c:365
 msgid "Proxy Options"
 msgstr "ðÁÒÁÍÅÔÒÙ Proxy"
 
-#: src/prefs.c:376
-msgid "Not all protocols can use these proxy options. Please see the README file for details."
+#: src/prefs.c:377
+msgid ""
+"Not all protocols can use these proxy options. Please see the README file "
+"for details."
 msgstr ""
 "îÅ ×ÓÅ ÐÒÏÔÏËÏÌÙ ÍÏÇÕÔ ÉÓÐÏÌØÚÏ×ÁÔØ ÜÔÉ Ó×ÏÊÓÔ×Á ÐÒÏËÓÉ.\n"
 "óÍÏÔÒÉÔÅ ÆÁÊÌ README ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ ÄÅÔÁÌØÎÏÊ ÉÎÆÏÒÍÁÃÉÉ."
 
-#: src/prefs.c:381
+#: src/prefs.c:382
 msgid "Proxy Type"
 msgstr "ôÉÐ Proxy"
 
-#: src/prefs.c:393
+#: src/prefs.c:394
+msgid "Proxy Server"
+msgstr "Proxy ÓÅÒ×ÅÒ"
+
+#: src/prefs.c:397
 msgid "No Proxy"
 msgstr "ðÒÏËÓÉ ÏÔÓÔÕÔÓÔ×ÕÅÔ"
 
-#: src/prefs.c:405
+#: src/prefs.c:409
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: src/prefs.c:415
+#: src/prefs.c:419
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: src/prefs.c:424
+#: src/prefs.c:428
 msgid "HTTP"
 msgstr "HTTP"
 
-#: src/prefs.c:433
-msgid "Proxy Server"
-msgstr "Proxy ÓÅÒ×ÅÒ"
-
-#: src/prefs.c:451
+#: src/prefs.c:452
 msgid "Host"
 msgstr "èÏÓÔ"
 
-#: src/prefs.c:467
+#: src/prefs.c:468
 msgid "Port"
 msgstr "ðÏÒÔ"
 
-#: src/prefs.c:484
+#: src/prefs.c:485
 msgid "User"
 msgstr "ðÏÌØÚÏ×ÁÔÅÌØ"
 
-#: src/prefs.c:500
+#: src/prefs.c:501
 msgid "Password"
 msgstr "ðÁÒÏÌØ"
 
-#: src/prefs.c:530
+#: src/prefs.c:531
 msgid "Buddy List Options"
 msgstr "ðÁÒÁÍÅÔÒÙ ÓÐÉÓËÁ ÐÏÌØÚÏ×ÁÔÅÌÅÊ"
 
-#: src/prefs.c:542
+#: src/prefs.c:543
 msgid "Buddy List Window"
 msgstr "ïËÎÏ ÓÐÉÓËÁ ÐÏÌØÚÏ×ÁÔÅÌÅÊ"
 
-#: src/prefs.c:554
+#: src/prefs.c:555
 msgid "Hide IM/Info/Chat buttons"
 msgstr "óÐÒÑÔÁÔØ ËÎÏÐËÉ"
 
-#: src/prefs.c:556
+#: src/prefs.c:557
 msgid "Automatically show buddy list on sign on"
 msgstr "á×ÔÏÍÁÔÉÞÅÓËÉ ÐÏËÁÚÙ×ÁÔØ ÓÐÉÓÏË ÓÏÂÅÓÅÄÎÉËÏ× ÐÒÉ ÐÏÄËÌÀÞÅÎÉÉ"
 
-#: src/prefs.c:559
+#: src/prefs.c:560
 msgid "Save Window Size/Position"
 msgstr "óÏÈÒÁÎÑÔØ òÁÚÍÅÒ/ðÏÌÏÖÅÎÉÅ ÏËÎÁ"
 
-#: src/prefs.c:566
+#: src/prefs.c:567
 msgid "Show pictures on buttons"
 msgstr "ðÏËÁÚÙ×ÁÔØ ÒÉÓÕÎÏË ÎÁ ËÎÏÐËÁÈ"
 
-#: src/prefs.c:571
+#: src/prefs.c:572
 msgid "Display Buddy List near applet"
 msgstr "ïÔÏÂÒÁÖÁÔØ ÓÐÉÓÏË ÓÏÂÅÓÅÄÎÉËÏ× ÏËÏÌÏ ÁÐÐÌÅÔÁ"
 
-#: src/prefs.c:574
+#: src/prefs.c:575
 msgid "Group Displays"
 msgstr "çÒÕÐÐÙ"
 
-#: src/prefs.c:586
+#: src/prefs.c:587
 msgid "Hide groups with no online buddies"
 msgstr "îÅ ÐÏËÁÚÙ×ÁÔØ ÇÒÕÐÐÕ ( ×ÓÅ Ofline)"
 
-#: src/prefs.c:592
+#: src/prefs.c:593
 msgid "Show numbers in groups"
 msgstr "ðÏËÁÚÙ×ÁÔØ ËÏÌÉÞÅÓÔ×Ï ÐÏÌØÚÏ×ÁÔÅÌÅÊ"
 
-#: src/prefs.c:594
+#: src/prefs.c:595
 msgid "Buddy Displays"
 msgstr "ðÏÌØÚÏ×ÁÔÅÌÉ"
 
-#: src/prefs.c:606
-msgid "Show buddy type icons"
-msgstr "ðÏËÁÚÁÔØ ÉËÏÎËÉ ÓÔÁÔÕÓÁ"
-
 #: src/prefs.c:607
+msgid "Show buddy type icons"
+msgstr "ðÏËÁÚÁÔØ ÉËÏÎËÉ ÓÔÁÔÕÓÁ"
+
+#: src/prefs.c:608
 msgid "Show warning levels"
 msgstr "ðÏËÁÚÙ×ÁÔØ ÕÒÏ×ÅÎØ ÐÒÅÄÕÐÒÅÖÄÅÎÉÑ"
 
-#: src/prefs.c:613
+#: src/prefs.c:614
 msgid "Show idle times"
 msgstr "ðÏËÁÚÁÔØ ×ÒÅÍÑ ÂÅÚÄÅÊÓÔ×ÉÑ"
 
-#: src/prefs.c:614
+#: src/prefs.c:615
 msgid "Grey idle buddies"
 msgstr ""
 
-#: src/prefs.c:631
+#: src/prefs.c:632
 msgid "Conversation Options"
 msgstr "ðÁÒÁÍÅÔÒÙ ÏÂÝÅÎÉÑ"
 
-#: src/prefs.c:643
+#: src/prefs.c:644
 msgid "Keyboard Options"
 msgstr "ðÁÒÁÍÅÔÒÙ ËÌÁ×ÉÁÔÕÒÙ"
 
-#: src/prefs.c:655
+#: src/prefs.c:656
 msgid "Enter sends message"
 msgstr "Enter ÐÅÒÅÄÁÔØ ÓÏÂÝÅÎÉÅ"
 
-#: src/prefs.c:656
+#: src/prefs.c:657
 msgid "Control-Enter sends message"
 msgstr "Ctrl-Enter ÐÅÒÅÄÁÔØ ÓÏÏÂÝÅÎÉÅ"
 
-#: src/prefs.c:657
+#: src/prefs.c:658
 msgid "Escape closes window"
 msgstr "Esc ÚÁËÒÙÔØ ÏËÎÏ"
 
-#: src/prefs.c:663
+#: src/prefs.c:664
 msgid "Control-{B/I/U/S} inserts HTML tags"
 msgstr "Ctrl-{B/I/U/S} ×ÓÔÁ×ÉÔØ ÔÜÇÉ HTML "
 
-#: src/prefs.c:664
-msgid "Control-(number) inserts smileys"
-msgstr "Ctrl-(ÃÉÆÒÁ) ×ÓÔÁ×ÉÔØ ÓÍÁÊÌÉË"
-
 #: src/prefs.c:665
+msgid "Control-(number) inserts smileys"
+msgstr "Ctrl-(ÃÉÆÒÁ) ×ÓÔÁ×ÉÔØ ÓÍÁÊÌÉË"
+
+#: src/prefs.c:666
 msgid "F2 toggles timestamp display"
 msgstr "ïÔÏÂÒÁÖÁÔØ ÉÌÉ ÎÅ ÏÔÏÂÒÁÖÁÔØ ×ÒÅÍÑ ÓÏÏÂÝÅÎÉÑ ÐÏ ËÎÏÐËÅ F2"
 
-#: src/prefs.c:667
+#: src/prefs.c:668
 msgid "Display and General Options"
 msgstr "÷ÉÄ É ÏÓÎÏ×ÎÙÅ ÐÁÒÁÍÅÔÒÙ"
 
-#: src/prefs.c:679
+#: src/prefs.c:680
 msgid "Show graphical smileys"
 msgstr "ðÏËÁÚÙ×ÁÔØ ÇÒÁÆÉÞÅÓËÉÅ ÓÍÁÊÌÉËÉ"
 
-#: src/prefs.c:680
+#: src/prefs.c:681
 msgid "Show timestamp on messages"
 msgstr "ðÏËÁÚÙ×ÁÔØ ×ÒÅÍÑ ÓÏÏÂÝÅÎÉÊ"
 
-#: src/prefs.c:681
-msgid "Show URLs as links"
-msgstr "ðÏËÁÚÙ×ÁÔØ URL ËÁË ÓÓÙÌËÕ"
-
 #: src/prefs.c:682
-msgid "Highlight misspelled words"
-msgstr "ðÒÏ×ÅÒËÁ ÏÒÆÏÇÒÁÆÉÉ"
+msgid "Show URLs as links"
+msgstr "ðÏËÁÚÙ×ÁÔØ URL ËÁË ÓÓÙÌËÕ"
 
 #: src/prefs.c:683
-#: src/prefs.c:1818
+msgid "Highlight misspelled words"
+msgstr "ðÒÏ×ÅÒËÁ ÏÒÆÏÇÒÁÆÉÉ"
+
+#: src/prefs.c:684 src/prefs.c:1872
 msgid "Sending messages removes away status"
 msgstr "íÅÎÑÔØ ÓÔÁÔÕÓ ÏÔÓÕÔÓÔ×ÉÑ ÐÒÉ ÏÔÐÒÁ×ËÅ ÓÏÏÂÝÅÎÉÑ "
 
-#: src/prefs.c:684
-#: src/prefs.c:1826
+#: src/prefs.c:685 src/prefs.c:1885
 msgid "Queue new messages when away"
 msgstr ""
 "ðÏËÁÚÁÔØ ÏËÎÏ ËÏÌÌÉÞÅÓÔ×Á ÓÏÏÂÝÅÎÉÊ\n"
 "ÐÒÉ ÏÔÓÕÔÓÔ×ÉÉ"
 
-#: src/prefs.c:690
+#: src/prefs.c:691
 msgid "Ignore colors"
 msgstr "éÇÎÏÒÉÒÏ×ÁÔØ Ã×ÅÔ"
 
-#: src/prefs.c:691
-msgid "Ignore font faces"
-msgstr "éÇÎÏÒÉÒÏ×ÁÔØ ÔÉÐ ÛÒÉÆÔÁ"
-
 #: src/prefs.c:692
-msgid "Ignore font sizes"
-msgstr "éÇÎÏÒÉÒÏ×ÁÔØ ÒÁÚÍÅÒ ÛÒÉÆÔÁ"
+msgid "Ignore font faces"
+msgstr "éÇÎÏÒÉÒÏ×ÁÔØ ÔÉÐ ÛÒÉÆÔÁ"
 
 #: src/prefs.c:693
+msgid "Ignore font sizes"
+msgstr "éÇÎÏÒÉÒÏ×ÁÔØ ÒÁÚÍÅÒ ÛÒÉÆÔÁ"
+
+#: src/prefs.c:694
 msgid "Ignore TiK Automated Messages"
 msgstr "éÇÎÏÒÉÒÏ×ÁÔØ Á×ÔÏÍÁÔÉÞÅÓËÉÅ ÓÏÏÂÝÅÎÉÑ"
 
-#: src/prefs.c:694
-#: src/prefs.c:1816
+#: src/prefs.c:695 src/prefs.c:1870
 msgid "Ignore new conversations when away"
 msgstr ""
 "éÇÎÏÒÉÒÏ×ÁÔØ ÚÁÐÒÏÓ ÎÁ ÂÅÓÅÄÕ ×Ï ×ÒÅÍÑ\n"
 "ÏÔÓÕÔÓÔ×ÉÑ"
 
-#: src/prefs.c:860
+#: src/prefs.c:884
 msgid "IM Options"
 msgstr "ðÁÒÁÍÅÔÒÙ ÓÏÏÂÝÅÎÉÑ"
 
-#: src/prefs.c:872
-#: src/prefs.c:2736
+#: src/prefs.c:897 src/prefs.c:2832
 msgid "IM Window"
 msgstr "ïËÎÏ ÓÏÏÂÝÅÎÉÑ"
 
-#: src/prefs.c:888
-#: src/prefs.c:1023
+#: src/prefs.c:913 src/prefs.c:1057
 msgid "Show buttons as: "
 msgstr "ðÏËÁÚÙ×ÁÔØ ËÎÏÐËÉ ËÁË:"
 
-#: src/prefs.c:892
-#: src/prefs.c:1028
+#: src/prefs.c:917 src/prefs.c:1062
 msgid "Pictures And Text"
 msgstr "ëÁÒÔÉÎËÉ É ÔÅËÓÔ"
 
-#: src/prefs.c:893
-#: src/prefs.c:1030
+#: src/prefs.c:918 src/prefs.c:1064
 msgid "Pictures"
 msgstr "ëÁÒÔÉÎËÉ"
 
-#: src/prefs.c:894
-#: src/prefs.c:1031
+#: src/prefs.c:919 src/prefs.c:1065
 msgid "Text"
 msgstr "ôÅËÓÔ"
 
-#: src/prefs.c:905
+#: src/prefs.c:930
 msgid "Show all conversations in one tabbed window"
 msgstr "ðÏËÁÚÙ×ÁÔØ ×ÓÅ ÒÁÚÇÏ×ÏÒÙ × ÏÄÎÏÍ ÏËÎÅ c ÚÁËÌÁÄËÁÍÉ"
 
-#: src/prefs.c:907
-#: src/prefs.c:1044
+#: src/prefs.c:932
+#, fuzzy
+msgid "Show chats in the same tabbed window"
+msgstr "ðÏËÁÚÙ×ÁÔØ ×ÓÅ ÞÁÔÙ × ÏÄÎÏÍ ÏËÎÅ Ó ÚÁËÌÁÄËÁÍÉ"
+
+#: src/prefs.c:939 src/prefs.c:1085
 msgid "Raise windows on events"
 msgstr "á×ÔÏ-×ÓÐÌÙÔÉÅ ÏËÎÁ ÐÒÉ ÓÏÂÙÔÉÑÈ"
 
-#: src/prefs.c:908
+#: src/prefs.c:940
 msgid "Show logins in window"
 msgstr "ðÏËÁÚÙ×ÁÔØ ÐÏÄËÌÀÞÅÎÉÑ"
 
-#: src/prefs.c:909
-msgid "Use aliases instead screen name"
-msgstr "÷ ÚÁËÌÁÄËÁÈ ÉÓÐÏÌØÚÀÔÓÑ ÐÓÅ×ÄÏÎÉÍÙ"
-
-#: src/prefs.c:910
-#: src/prefs.c:1047
+#: src/prefs.c:941
+msgid "Show aliases in tabs/titles"
+msgstr ""
+
+#: src/prefs.c:942
+#, fuzzy
+msgid "Hide window on send"
+msgstr "á×ÔÏ-×ÓÐÌÙÔÉÅ ÏËÎÁ ÐÒÉ ÓÏÂÙÔÉÑÈ"
+
+#: src/prefs.c:944 src/prefs.c:1088
 msgid "Window Sizes"
 msgstr "òÁÚÍÅÒÙ ÏËÎÁ"
 
-#: src/prefs.c:918
-#: src/prefs.c:1055
+#: src/prefs.c:952 src/prefs.c:1096
 msgid "New window width:"
 msgstr "îÏ×ÁÑ ÛÉÒÉÎÁ ÏËÎÁ"
 
-#: src/prefs.c:919
-#: src/prefs.c:1056
+#: src/prefs.c:953 src/prefs.c:1097
 msgid "New window height:"
 msgstr "îÏ×ÁÑ ×ÙÓÏÔÁ ÏËÎÁ"
 
-#: src/prefs.c:920
-#: src/prefs.c:1057
+#: src/prefs.c:954 src/prefs.c:1098
 msgid "Entry widget height:"
 msgstr "÷ÙÓÏÔÁ ÏËÎÁ ××ÏÄÁ"
 
-#: src/prefs.c:922
-#: src/prefs.c:1059
+#: src/prefs.c:956 src/prefs.c:1100
 msgid "Tab Placement"
 msgstr "òÁÓÐÏÌÏÖÅÎÉÅ ÚÁËÌÁÄÏË ÓÏÏÂÝÅÎÉÊ"
 
-#: src/prefs.c:942
-#: src/prefs.c:1079
+#: src/prefs.c:976 src/prefs.c:1120
 msgid "Top"
 msgstr "÷×ÅÒÈÕ"
 
-#: src/prefs.c:944
-#: src/prefs.c:1081
+#: src/prefs.c:978 src/prefs.c:1122
 msgid "Bottom"
 msgstr "÷ÎÉÚÕ"
 
-#: src/prefs.c:951
-#: src/prefs.c:1088
+#: src/prefs.c:985 src/prefs.c:1129
 msgid "Left"
 msgstr "óÌÅ×Á"
 
-#: src/prefs.c:953
-#: src/prefs.c:1090
+#: src/prefs.c:987 src/prefs.c:1131
 msgid "Right"
 msgstr "óÐÒÁ×Á"
 
-#: src/prefs.c:957
+#: src/prefs.c:991
 msgid "Buddy Icons"
 msgstr "éËÏÎËÉ ÐÏÌØÚÏ×ÁÔÅÌÅÊ"
 
-#: src/prefs.c:969
+#: src/prefs.c:1003
 msgid "Hide Buddy Icons"
 msgstr "óËÒÙÔØ ÉËÏÎËÉ ÐÏÌØÚÏ×ÁÔÅÌÅÊ"
 
-#: src/prefs.c:995
+#: src/prefs.c:1029
 msgid "Chat Options"
 msgstr "ó×ÏÊÓÔ×Á ÞÁÔÁ"
 
-#: src/prefs.c:1007
+#: src/prefs.c:1041
 msgid "Group Chat Window"
 msgstr "ïËÎÏ ÞÁÔÁ"
 
-#: src/prefs.c:1042
+#: src/prefs.c:1076
 msgid "Show all chats in one tabbed window"
 msgstr "ðÏËÁÚÙ×ÁÔØ ×ÓÅ ÞÁÔÙ × ÏÄÎÏÍ ÏËÎÅ Ó ÚÁËÌÁÄËÁÍÉ"
 
-#: src/prefs.c:1045
+#: src/prefs.c:1078
+#, fuzzy
+msgid "Show conversations in the same tabbed window"
+msgstr "ðÏËÁÚÙ×ÁÔØ ×ÓÅ ÒÁÚÇÏ×ÏÒÙ × ÏÄÎÏÍ ÏËÎÅ c ÚÁËÌÁÄËÁÍÉ"
+
+#: src/prefs.c:1086
 msgid "Show people joining/leaving in window"
 msgstr "ðÏËÁÚÙ×ÁÔØ ×ÏÛÅÄÛÉÈ/×ÙÛÅÄÛÉÈ × ÏËÎÅ "
 
-#: src/prefs.c:1093
+#: src/prefs.c:1134
 msgid "Tab Completion"
 msgstr "òÅÖÉÍ ÄÏÐÏÌÎÅÎÉÊ"
 
-#: src/prefs.c:1105
+#: src/prefs.c:1146
 msgid "Tab-Complete Nicks"
 msgstr "Tab - äÏÐÏÌÎÉÔØ ÐÓÅ×ÄÏÎÉÍ"
 
-#: src/prefs.c:1111
+#: src/prefs.c:1152
 msgid "Old-Style Tab Completion"
 msgstr "óÔÁÒÙÊ ÓÔÉÌØ ÄÏÐÏÌÎÅÎÉÑ"
 
-#: src/prefs.c:1213
-#: src/prefs.c:2746
+#: src/prefs.c:1254 src/prefs.c:2842
 msgid "Font Options"
 msgstr "ûÒÉÆÔ"
 
-#: src/prefs.c:1239
+#: src/prefs.c:1280
 msgid "Italic Text"
 msgstr "îÁËÌÏÎÎÙÊ ÔÅËÓÔ"
 
-#: src/prefs.c:1283
-#: src/prefs.c:1301
-#: src/prefs.c:1323
+#: src/prefs.c:1324 src/prefs.c:1342 src/prefs.c:1364
 msgid "Select"
 msgstr "÷ÙÂÏÒ"
 
-#: src/prefs.c:1321
+#: src/prefs.c:1362
 msgid "Font Face for Text"
 msgstr "÷ÙÂÏÒ ÛÒÉÆÔÁ"
 
-#: src/prefs.c:1336
+#: src/prefs.c:1377
 msgid "Font Size for Text"
 msgstr "òÁÚÍÅÒ ÛÒÉÆÔÁ"
 
-#: src/prefs.c:1422
+#: src/prefs.c:1472
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim - ÷ÙÂÏÒ Ú×ÕËÁ"
 
-#: src/prefs.c:1462
+#: src/prefs.c:1507
+msgid "Play"
+msgstr ""
+
+#: src/prefs.c:1517
 msgid "Choose..."
 msgstr "÷ÙÂÒÁÔØ"
 
-#: src/prefs.c:1513
+#: src/prefs.c:1568
 msgid "Sound Options"
 msgstr "îÁÓÔÒÏÊËÉ Ú×ÕËÁ"
 
-#: src/prefs.c:1541
+#: src/prefs.c:1596
 msgid "No sounds when you log in"
 msgstr "ïÔËÌÀÞÉÔØ Ú×ÕË ÐÒÉ ÐÏÄËÌÀÞÅÎÉÉ"
 
-#: src/prefs.c:1547
-#: src/prefs.c:1817
+#: src/prefs.c:1602 src/prefs.c:1871
 msgid "Sounds while away"
 msgstr "ú×ÕËÉ ×Ï ×ÒÅÍÑ ÏÔÓÕÔÓÔ×ÉÑ"
 
-#: src/prefs.c:1557
+#: src/prefs.c:1612
 msgid "Sound Player:"
 msgstr "ðÒÏÉÇÒÙ×ÁÔÅÌØ Ú×ÕËÏ×:"
 
-#: src/prefs.c:1626
+#: src/prefs.c:1681
 #, c-format
 msgid ""
 "Command to play sound files\n"
@@ -2636,142 +2632,157 @@
 "ðÒÏÇÒÁÍÍÁ ÐÒÏÉÇÒÙ×ÁÎÉÑ Ú×ÕËÏ×ÙÈ ÆÁÊÌÏ×\n"
 "(×ÓÔÒÏÅÎÎÁÑ ÐÒÉ ÎÅ ÚÁÐÏÌÎÅÎÎÏÍ ÏËÎÅ ××ÏÄÁ)"
 
-#: src/prefs.c:1637
+#: src/prefs.c:1692
 msgid "Events"
 msgstr "óÏÂÙÔÉÑ"
 
-#: src/prefs.c:1645
+#: src/prefs.c:1700
 msgid "Sound when buddy logs in"
 msgstr "ú×ÕË ÐÒÉ ÐÏÄËÌÀÞÅÎÉÉ ÐÏÌØÚÏ×ÁÔÅÌÑ"
 
-#: src/prefs.c:1646
+#: src/prefs.c:1701
 msgid "Sound when buddy logs out"
 msgstr "ú×ÕË ÐÒÉ ÏÔËÌÀÞÅÎÉÉ ÐÏÌØÚÏ×ÁÔÅÌÑ"
 
-#: src/prefs.c:1652
+#: src/prefs.c:1707
 msgid "Sound when received message begins conversation"
 msgstr "ú×ÕË ÐÒÉ ÓÏÅÄÉÎÅÎÉÉ"
 
-#: src/prefs.c:1654
+#: src/prefs.c:1709
 msgid "Sound when message is received"
 msgstr "ú×ÕË ÐÒÉ ÐÏÌÕÞÅÎÉÉ ÓÏÏÂÝÅÎÉÑ"
 
-#: src/prefs.c:1655
+#: src/prefs.c:1710
 msgid "Sound when message is sent"
 msgstr "ú×ÕË ÐÒÉ ÏÔÐÒÁ×ËÉ ÓÏÏÂÝÅÎÉÑ"
 
-#: src/prefs.c:1661
+#: src/prefs.c:1716
 msgid "Sound in chat rooms when people enter"
 msgstr "ú×ÕË ÐÒÉ ×ÈÏÄÅ ÐÏÌØÚÏ×ÁÔÅÌÑ × ÞÁÔ"
 
-#: src/prefs.c:1662
+#: src/prefs.c:1717
 msgid "Sound in chat rooms when people leave"
 msgstr "ú×ÕË ÐÒÉ ×ÙÈÏÄÅ ÐÏÌØÚÏ×ÁÔÅÌÑ ÉÚ ÞÁÔÁ"
 
-#: src/prefs.c:1663
+#: src/prefs.c:1718
 msgid "Sound in chat rooms when you talk"
 msgstr "ú×ÕË ÐÒÉ ÐÏÓÙÌËÅ ÓÏÏÂÝÅÎÉÑ × ÞÁÔ"
 
-#: src/prefs.c:1664
+#: src/prefs.c:1719
 msgid "Sound in chat rooms when others talk"
 msgstr "ú×ÕË ÐÒÉ ÐÒÉÈÏÄÅ ÓÏÏÂÝÅÎÉÑ × ÞÁÔ"
 
-#: src/prefs.c:1788
-#: src/prefs.c:2768
+#: src/prefs.c:1842 src/prefs.c:2864
 msgid "Away Messages"
 msgstr "óÏÏÂÝÅÎÉÅ Ï ÏÔÓÕÔÓÔ×ÉÉ(Away)"
 
-#: src/prefs.c:1825
+#: src/prefs.c:1879
 msgid "Don't send auto-response"
 msgstr "îÅ ÐÅÒÅÄÁ×ÁÔØ Á×ÔÏÏÔ×ÅÔ"
 
-#: src/prefs.c:1836
+#: src/prefs.c:1880
+#, fuzzy
+msgid "Only send auto-response when idle"
+msgstr "îÅ ÐÅÒÅÄÁ×ÁÔØ Á×ÔÏÏÔ×ÅÔ"
+
+#: src/prefs.c:1895
+msgid "Time between sending auto-responses (in seconds):"
+msgstr ""
+
+#: src/prefs.c:1910
 msgid "Auto Away after"
 msgstr "á×ÔÏ Away ÐÏÓÌÅ"
 
-#: src/prefs.c:1850
+#: src/prefs.c:1924
 msgid "minutes using"
 msgstr "ÍÉÎÕÔ ÉÓÐÏÌØÚÕÑ"
 
-#: src/prefs.c:1863
+#: src/prefs.c:1937
 msgid "Messages"
 msgstr "óÏÏÂÝÅÎÉÑ"
 
-#: src/prefs.c:1875
+#: src/prefs.c:1949
 msgid "Title"
 msgstr "úÁÇÏÌÏ×ÏË"
 
-#: src/prefs.c:1918
+#: src/prefs.c:1994
 msgid "Edit"
 msgstr "òÅÄÁËÔÉÒÏ×ÁÔØ"
 
-#: src/prefs.c:1922
+#: src/prefs.c:1998
 msgid "Make Away"
 msgstr "ðÒÉÍÅÎÉÔØ"
 
-#: src/prefs.c:2199
+#: src/prefs.c:2275
 msgid "Privacy Options"
 msgstr "ìÉÞÎÙÅ ÐÒÅÄÐÏÞÔÅÎÉÑ"
 
-#: src/prefs.c:2215
+#: src/prefs.c:2291
 msgid "Set privacy for:"
 msgstr "õÓÔÁÎÏ×ÉÔØ ÐÒÉ×ÁÔ ÄÌÑ:"
 
-#: src/prefs.c:2234
+#: src/prefs.c:2310
 msgid "Allow all users to contact me"
 msgstr "òÁÚÒÅÛÉÔØ ÄÏÓÔÕÐ ×ÓÅÍ ÐÏÌØÚÏ×ÁÔÅÌÑÍ"
 
-#: src/prefs.c:2235
+#: src/prefs.c:2311
 msgid "Allow only the users below"
 msgstr "òÁÚÒÅÛÉÔØ ÄÏÓÔÕÐ ×ÙÂÒÁÎÎÙÍ ÐÏÌØÚÏ×ÁÔÅÌÑÍ"
 
-#: src/prefs.c:2237
+#: src/prefs.c:2313
 msgid "Allow List"
 msgstr "÷ÙÂÒÁÎÎÙÅ ÐÏÌØÚÏ×ÁÔÅÌÉ"
 
-#: src/prefs.c:2268
+#: src/prefs.c:2344
 msgid "Deny all users"
 msgstr "úÁÐÒÅÔÉÔØ ÄÏÓÔÕÐ ×ÓÅÍ ÐÏÌØÚÏ×ÁÔÅÌÑÍ"
 
-#: src/prefs.c:2269
+#: src/prefs.c:2345
 msgid "Block the users below"
 msgstr "úÁÐÒÅÔÉÔØ  ÄÏÓÔÕÐ ÉÚ 'ÞÅÒÎÏÇÏ ÓÐÉÓËÁ'"
 
-#: src/prefs.c:2271
+#: src/prefs.c:2347
 msgid "Block List"
 msgstr "'þÅÒÎÙÊ ÓÐÉÓÏË'"
 
-#: src/prefs.c:2366
+#: src/prefs.c:2442
 msgid "Gaim - Preferences"
 msgstr "Gaim - îÁÓÔÒÏÊËÉ"
 
-#: src/prefs.c:2445
+#: src/prefs.c:2525
 msgid "Gaim debug output window"
 msgstr "ÏËÎÏ ÏÔÌÁÄËÉ Gaim"
 
-#: src/prefs.c:2702
+#: src/prefs.c:2798
 msgid "General"
 msgstr "ïÂÝÉÅ"
 
-#: src/prefs.c:2707
+#: src/prefs.c:2803
 msgid "Proxy"
 msgstr "ðÒÏËÓÉ"
 
-#: src/prefs.c:2731
+#: src/prefs.c:2827
 msgid "Conversations"
 msgstr "âÅÓÅÄÁ"
 
-#: src/prefs.c:2757
+#: src/prefs.c:2853
 msgid "Sounds"
 msgstr "ú×ÕËÉ"
 
-#: src/prefs.c:2779
+#: src/prefs.c:2875
 msgid "Privacy"
 msgstr "ìÉÞÎÏÅ"
 
 #: src/prpl.c:70
-msgid "You have attempted to load a protocol which was not compiled from the same version of the source as this application was. Unfortunately, because it is not the same version I cannot safely tell you which one it was. Needless to say, it was not successfully loaded."
-msgstr "÷Ù ÐÏÐÙÔÁÌÉÓØ ÚÁÇÒÕÚÉÔØ ÍÏÄÕÌØ ÐÒÏÔÏËÏÌÁ, ËÏÔÏÒÙÊ ÂÙÌ ÓÏÂÒÁÎ ÉÚ ÉÓÈÏÄÎÙÈ ËÏÄÏ× ÄÒÕÇÏÊ ×ÅÒÓÉÉ. ë ÓÏÖÁÌÅÎÉÀ, ÉÚ-ÚÁ ÒÁÚÌÉÞÉÑ ×ÅÒÓÉÊ ÍÏÄÕÌØ ÎÅ ÍÏÖÅÔ ÂÙÔØ ÉÓÐÏÌØÚÏ×ÁÎ."
+msgid ""
+"You have attempted to load a protocol which was not compiled from the same "
+"version of the source as this application was. Unfortunately, because it is "
+"not the same version I cannot safely tell you which one it was. Needless to "
+"say, it was not successfully loaded."
+msgstr ""
+"÷Ù ÐÏÐÙÔÁÌÉÓØ ÚÁÇÒÕÚÉÔØ ÍÏÄÕÌØ ÐÒÏÔÏËÏÌÁ, ËÏÔÏÒÙÊ ÂÙÌ ÓÏÂÒÁÎ ÉÚ ÉÓÈÏÄÎÙÈ "
+"ËÏÄÏ× ÄÒÕÇÏÊ ×ÅÒÓÉÉ. ë ÓÏÖÁÌÅÎÉÀ, ÉÚ-ÚÁ ÒÁÚÌÉÞÉÑ ×ÅÒÓÉÊ ÍÏÄÕÌØ ÎÅ ÍÏÖÅÔ ÂÙÔØ "
+"ÉÓÐÏÌØÚÏ×ÁÎ."
 
 #: src/prpl.c:74
 msgid "Protocol Error"
@@ -2790,11 +2801,6 @@
 msgid "Accept?"
 msgstr "óÏÇÌÁÓÎÙ?"
 
-#: src/prpl.c:154
-#: src/prpl.c:228
-msgid "Accept"
-msgstr "óÏÇÌÁÓÅÎ"
-
 #: src/prpl.c:199
 msgid "Gaim - Prompt"
 msgstr "Gaim - óÒÏÞÎÏ"
@@ -2819,38 +2825,110 @@
 "Do you wish to add them to your buddy list?"
 msgstr ""
 
-#: src/server.c:53
+#: src/prpl.c:615
+msgid ""
+"You do not currently have any protocols available that are able to register "
+"new accounts."
+msgstr ""
+
+#: src/prpl.c:652
+#, fuzzy
+msgid "Gaim - Registration"
+msgstr "Gaim - òÁÚÇÏ×ÏÒ"
+
+#: src/prpl.c:667
+msgid "Registration Information"
+msgstr ""
+
+#: src/prpl.c:684
+#, fuzzy
+msgid "Register"
+msgstr "óÂÒÏÓ"
+
+#: src/server.c:55
 msgid "Please enter your password"
 msgstr "ðÏÖÁÌÕÊÓÔÁ, ××ÅÄÉÔÅ ÐÁÒÏÌØ"
 
-#: src/server.c:60
-msgid "You cannot log this account in; you do not have the protocol it uses loaded, or the protocol does not have a login function."
+#: src/server.c:62
+msgid ""
+"You cannot log this account in; you do not have the protocol it uses loaded, "
+"or the protocol does not have a login function."
 msgstr ""
-"÷Ù ÎÅ ÍÏÖÅÔÅ ÐÏÄËÌÀÞÉÔØÓÑ ÉÓÐÏÌØÀÕÑ ÜÔÕ ÕÞÅÔÎÕÀ ÚÁÐÉÓØ ÐÏÔÏÍÕ ÞÔÏ ÉÓÐÏÌØÚÕÅÍÙÊ ÅÊ ÐÒÏÔÏËÏÌ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ,\n"
+"÷Ù ÎÅ ÍÏÖÅÔÅ ÐÏÄËÌÀÞÉÔØÓÑ ÉÓÐÏÌØÀÕÑ ÜÔÕ ÕÞÅÔÎÕÀ ÚÁÐÉÓØ ÐÏÔÏÍÕ ÞÔÏ "
+"ÉÓÐÏÌØÚÕÅÍÙÊ ÅÊ ÐÒÏÔÏËÏÌ ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ,\n"
 "ÉÌÉ ÐÒÏÔÏËÏÌ ÎÅ ÉÍÅÅÔ ÆÕÎËÃÉÉ ÐÏÄËÌÀÞÅÎÉÑ."
 
-#: src/server.c:62
+#: src/server.c:64
 msgid "Login Error"
 msgstr "ïÛÉÂËÁ ×ÈÏÄÁ"
 
-#: src/server.c:535
+#: src/server.c:550
 #, c-format
 msgid "(%d messages)"
 msgstr "(%d ÓÏÏÂÝÅÎÉÊ)"
 
-#: src/server.c:541
+#: src/server.c:556
 msgid "(1 message)"
 msgstr "(1 ÓÏÏÂÝÅÎÉÅ)"
 
-#: src/server.c:756
+#: src/server.c:747
 msgid "Warned"
 msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ"
 
-#: src/server.c:827
+#: src/server.c:818
 msgid "Yes"
 msgstr "äÁ"
 
-#: src/server.c:828
+#: src/server.c:819
 msgid "No"
 msgstr "îÅÔ"
 
+#: src/server.c:995
+#, fuzzy
+msgid "More Info"
+msgstr "ðÏÌÕÞÉÔØ ÉÎÆÏÒÍÁÃÉÀ"
+
+#~ msgid "Available"
+#~ msgstr "äÏÓÔÕÐÅÎ"
+
+#~ msgid "Available for friends only"
+#~ msgstr "äÏÓÔÕÐÅÎ ÔÏÌØËÏ ÄÌÑ ÄÒÕÚÅÊ"
+
+#~ msgid "Away for friends only"
+#~ msgstr "ïÔÏÛÅÌ ÔÏÌØËÏ ÄÌÑ ÄÒÕÚÅÊ"
+
+#~ msgid "Invisible"
+#~ msgstr "îÅ×ÉÄÉÍÙÊ"
+
+#~ msgid "Invisible for friends only"
+#~ msgstr "îÅ×ÉÄÉÍ ÔÏÌØËÏ ÄÌÑ ÄÒÕÚÅÊ"
+
+#~ msgid "Unavailable"
+#~ msgstr "îÅÄÏÓÔÕÐÅÎ"
+
+#~ msgid "Connecting to GG server"
+#~ msgstr "óÏÅÄÉÎÅÎÉÅ Ë GG ÓÅÒ×ÅÒÕ"
+
+#~ msgid "Sending key"
+#~ msgstr "ïÔÐÒÁ×ÉÔØ ËÌÀÞ"
+
+#~ msgid "Logging in %s\n"
+#~ msgstr "ðÒÉÓÏÅÄÉÎÅÎÉÅ Ë %s\n"
+
+#~ msgid "Send offline message"
+#~ msgstr "ïÔÐÒÁ×ÉÔØ ÓÏÏÂÝÅÎÉÅ ÞÅÒÅÚ ÓÅÒ×ÅÒ"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "IRC: #gaim on irc.openprojects.net"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "IRC: #gaim on irc.openprojects.net"
+
+#~ msgid "Help!"
+#~ msgstr "ðÏÍÏÝØ!"
+
+#~ msgid "Use aliases instead screen name"
+#~ msgstr "÷ ÚÁËÌÁÄËÁÈ ÉÓÐÏÌØÚÀÔÓÑ ÐÓÅ×ÄÏÎÉÍÙ"
--- a/po/sv.po	Fri Feb 22 23:47:55 2002 +0000
+++ b/po/sv.po	Fri Feb 22 23:48:23 2002 +0000
@@ -2,12 +2,12 @@
 # Copyright (C) 2001 Free Software Foundation, Inc.
 # Christian Rose <menthos@menthos.com>, 2001.
 #
-# $Id: sv.po 2850 2001-12-03 06:25:29Z robflynn $
+# $Id: sv.po 2989 2002-02-22 23:48:23Z robflynn $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gaim\n"
-"POT-Creation-Date: 2001-11-15 02:19-0800\n"
+"POT-Creation-Date: 2002-02-17 12:41-0800\n"
 "PO-Revision-Date: 2001-12-02 19:44+0100\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -15,364 +15,443 @@
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/protocols/gg/gg.c:68
-msgid "Available"
-msgstr "Tillgänglig"
-
-#: src/protocols/gg/gg.c:69
-msgid "Available for friends only"
-msgstr "Tillgänglig endast för vänner"
-
-#: src/applet.c:291 src/buddy.c:478 src/buddy.c:2283 src/buddy.c:2419
-#: src/protocols/gg/gg.c:70
-msgid "Away"
-msgstr "Frånvarande"
-
-#: src/protocols/gg/gg.c:71
-msgid "Away for friends only"
-msgstr "Frånvarande endast för vänner"
-
-#: src/protocols/gg/gg.c:72
-msgid "Invisible"
-msgstr "Osynlig"
-
-#: src/protocols/gg/gg.c:73
-msgid "Invisible for friends only"
-msgstr "Osynlig endast för vänner"
-
-#: src/protocols/gg/gg.c:74
-msgid "Unavailable"
-msgstr "Otillgänglig"
-
-#: src/protocols/gg/gg.c:168
+#: src/protocols/gg/gg.c:182
 msgid "Unable to resolve hostname."
 msgstr "Kan inte slå upp värdnamnet."
 
-#: src/protocols/gg/gg.c:171
+#: src/protocols/gg/gg.c:185
 msgid "Unable to connect to server."
 msgstr "Kan inte ansluta till servern."
 
-#: src/protocols/gg/gg.c:174
+#: src/protocols/gg/gg.c:188
 msgid "Invalid response from server."
 msgstr "Ogiltigt svar från servern."
 
-#: src/protocols/gg/gg.c:177
+#: src/protocols/gg/gg.c:191
 msgid "Error while reading from socket."
 msgstr "Fel vid läsning från uttag (socket)."
 
-#: src/protocols/gg/gg.c:180
+#: src/protocols/gg/gg.c:194
 msgid "Error while writting to socket."
 msgstr "Fel vid skrivning till uttag (socket)."
 
-#: src/protocols/gg/gg.c:183
+#: src/protocols/gg/gg.c:197
 msgid "Authentification failed."
 msgstr "Autentisering misslyckades."
 
-#: src/protocols/gg/gg.c:186
+#: src/protocols/gg/gg.c:200
 msgid "Unknown Error Code."
 msgstr "Okänd felkod."
 
-#: src/protocols/gg/gg.c:191 src/protocols/gg/gg.c:599
-#: src/protocols/gg/gg.c:698 src/protocols/gg/gg.c:840
-#: src/protocols/gg/gg.c:877 src/protocols/gg/gg.c:921
-msgid "Gadu-Gadu Error"
-msgstr "Gadu-Gadu-fel"
-
-#: src/protocols/gg/gg.c:311
+#: src/protocols/gg/gg.c:302
 #, c-format
 msgid "Status: %s"
 msgstr "Status: %s"
 
-#: src/protocols/gg/gg.c:326
+#: src/protocols/gg/gg.c:317
 msgid "Nick:"
 msgstr "Smeknamn:"
 
-#: src/protocols/gg/gg.c:327
+#: src/protocols/gg/gg.c:318
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu-användare"
 
-#: src/protocols/gg/gg.c:462
+#: src/protocols/gg/gg.c:337
+#, fuzzy
+msgid "Could not connect"
+msgstr "Kunde inte ansluta"
+
+#: src/protocols/gg/gg.c:344
+#, fuzzy
+msgid "Unable to read socket"
+msgstr "Kan inte läsa filen %s."
+
+#: src/protocols/gg/gg.c:455
 msgid "Unable to connect."
 msgstr "Kan inte ansluta."
 
-#: src/protocols/gg/gg.c:473
-msgid "Handshake"
-msgstr "Handskakning"
-
-#: src/protocols/gg/gg.c:475
-msgid "Connecting to GG server"
-msgstr "Ansluter till GG-servern"
-
-#: src/protocols/gg/gg.c:478
-msgid "Waiting for server key"
+#: src/protocols/gg/gg.c:465
+msgid "Reading data"
+msgstr ""
+
+#: src/protocols/gg/gg.c:468
+msgid "Balancer handshake"
+msgstr ""
+
+#: src/protocols/gg/gg.c:471
+#, fuzzy
+msgid "Reading server key"
 msgstr "Väntar på servernyckeln"
 
-#: src/protocols/gg/gg.c:480
-msgid "Sending key"
-msgstr "Skickar nyckel"
-
-#: src/protocols/gg/gg.c:537
+#: src/protocols/gg/gg.c:474
+msgid "Exchanging key hash"
+msgstr ""
+
+#: src/protocols/gg/gg.c:482
+msgid "Critical error in GG library\n"
+msgstr ""
+
+#: src/protocols/gg/gg.c:521
+#, fuzzy
+msgid "Unable to ping server"
+msgstr "Kan inte ansluta till servern."
+
+#: src/protocols/gg/gg.c:533
 msgid "Send as message"
 msgstr "Skicka som meddelande"
 
-#: src/protocols/gg/gg.c:545
+#: src/protocols/gg/gg.c:541
 msgid "Looking up GG server"
 msgstr "Slår upp GG-server"
 
-#: src/protocols/gg/gg.c:548
+#: src/protocols/gg/gg.c:544
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr "Ogiltigt Gadu-Gadu-UIN angivet"
 
-#: src/protocols/gg/gg.c:575
+#: src/protocols/gg/gg.c:570
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Anslutning till %s misslyckades"
 
-#: src/protocols/gg/gg.c:598
+#: src/protocols/gg/gg.c:594
 msgid "You are trying to send message to invalid Gadu-Gadu UIN!"
 msgstr "Du försöker att skicka ett meddelande till ett ogiltigt Gadu-Gadu-UIN!"
 
+#: src/protocols/gg/gg.c:595 src/protocols/gg/gg.c:657
+#: src/protocols/gg/gg.c:762 src/protocols/gg/gg.c:768
+#: src/protocols/gg/gg.c:821 src/protocols/gg/gg.c:833
+#: src/protocols/gg/gg.c:845 src/protocols/gg/gg.c:956
+#: src/protocols/gg/gg.c:984 src/protocols/gg/gg.c:1043
+#: src/protocols/gg/gg.c:1066 src/protocols/gg/gg.c:1116
+#: src/protocols/gg/gg.c:1149 src/protocols/gg/gg.c:1214
+msgid "Gadu-Gadu Error"
+msgstr "Gadu-Gadu-fel"
+
 # src/message.c:76
-#: src/protocols/gg/gg.c:698
+#: src/protocols/gg/gg.c:657
 msgid "Couldn't get search results"
 msgstr "Kunde inte få tag i sökresultat"
 
-#: src/protocols/gg/gg.c:703
+#: src/protocols/gg/gg.c:662
 msgid "Gadu-Gadu Search Engine"
 msgstr "Gadu-Gadu-sökmotor"
 
-#: src/protocols/gg/gg.c:730
+#: src/protocols/gg/gg.c:687
 msgid "Active"
 msgstr "Aktiv"
 
-#: src/protocols/gg/gg.c:731
+#: src/protocols/gg/gg.c:688
 msgid "yes"
 msgstr "ja"
 
-#: src/protocols/gg/gg.c:731
+#: src/protocols/gg/gg.c:688
 msgid "no"
 msgstr "nej"
 
-#: src/protocols/gg/gg.c:735
+#: src/protocols/gg/gg.c:692
 msgid "UIN"
 msgstr "UIN"
 
-#: src/protocols/gg/gg.c:739
+#: src/protocols/gg/gg.c:696
 msgid "First name"
 msgstr "Förnamn"
 
-#: src/protocols/gg/gg.c:744
+#: src/protocols/gg/gg.c:701
 msgid "Second Name"
 msgstr "Efternamn"
 
-#: src/protocols/gg/gg.c:748
+#: src/protocols/gg/gg.c:705
 msgid "Nick"
 msgstr "Smeknamn"
 
-#: src/protocols/gg/gg.c:755 src/protocols/gg/gg.c:758
+#: src/protocols/gg/gg.c:712 src/protocols/gg/gg.c:715
 msgid "Birth year"
 msgstr "Födelseår"
 
-#: src/protocols/gg/gg.c:764 src/protocols/gg/gg.c:766
-#: src/protocols/gg/gg.c:768
+#: src/protocols/gg/gg.c:721 src/protocols/gg/gg.c:723
+#: src/protocols/gg/gg.c:725
 msgid "Sex"
 msgstr "Kön"
 
 #. Line 5
-#: src/dialogs.c:1385 src/dialogs.c:2068 src/protocols/gg/gg.c:772
+#: src/dialogs.c:1501 src/dialogs.c:2205 src/protocols/gg/gg.c:729
 msgid "City"
 msgstr "Ort"
 
+#: src/protocols/gg/gg.c:761
+msgid "There is no Buddy List stored on server. Sorry!"
+msgstr ""
+
+#: src/protocols/gg/gg.c:768
+msgid "Couldn't Import Buddies List from Server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:815
+msgid "Buddies List sucessfully transfered into Server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:816 src/protocols/gg/gg.c:828
 #: src/protocols/gg/gg.c:840
-msgid "Couldn't send search request"
+#, fuzzy
+msgid "Gadu-Gadu Information"
+msgstr "Gadu-Gadu-fel"
+
+#: src/protocols/gg/gg.c:821
+msgid "Couldn't transfer Buddies List into Server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:827
+msgid "Buddies List sucessfully deleted from Server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:833
+msgid "Couldn't delete Buddies List from Server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:839
+#, fuzzy
+msgid "Password changed sucessfully"
+msgstr "Lösenordsändring lyckades"
+
+#: src/protocols/gg/gg.c:845
+msgid "Password couldn't be changed"
+msgstr ""
+
+#: src/protocols/gg/gg.c:956
+#, fuzzy
+msgid "Couldn't send http request"
 msgstr "Kunde inte skicka sökförfrågan"
 
-#: src/protocols/gg/gg.c:876 src/protocols/gg/gg.c:920
+#: src/protocols/gg/gg.c:982
+#, c-format
+msgid "Buddies List import from Server failed (%s)"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1041
+#, c-format
+msgid "Buddies List export to Server failed (%s)"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1064
+#, c-format
+msgid "Deletion of Buddies List from Server failed (%s)"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1114 src/protocols/gg/gg.c:1212
 #, c-format
 msgid "Connect to search service failed (%s)"
 msgstr "Anslutning till söktjänsten misslyckades (%s)"
 
-#: src/protocols/gg/gg.c:886 src/protocols/gg/gg.c:895
+#: src/protocols/gg/gg.c:1147
+#, fuzzy, c-format
+msgid "Changing Password failed (%s)"
+msgstr "Byt lösenord"
+
+#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1175
 msgid "Directory Search"
 msgstr "Katalogsökning"
 
-#: src/protocols/icq/gaim_icq.c:305
+#: src/dialogs.c:1618 src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
+msgid "Change Password"
+msgstr "Byt lösenord"
+
+#: src/protocols/gg/gg.c:1162 src/protocols/gg/gg.c:1179
+#, fuzzy
+msgid "Import Buddies List from Server"
+msgstr "Importera kompislista"
+
+#: src/protocols/gg/gg.c:1164 src/protocols/gg/gg.c:1180
+#, fuzzy
+msgid "Export Buddies List to Server"
+msgstr "Importera kompislista"
+
+#: src/protocols/gg/gg.c:1166 src/protocols/gg/gg.c:1181
+msgid "Delete Buddies List from Server"
+msgstr ""
+
+#: src/protocols/icq/gaim_icq.c:308
 msgid "Send message through server"
 msgstr "Skicka meddelande genom servern"
 
-#: src/protocols/icq/gaim_icq.c:466 src/protocols/irc/irc.c:1493
-#: src/protocols/jabber/jabber.c:1644 src/protocols/oscar/oscar.c:2621
-#: src/protocols/toc/toc.c:1200
+#: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1538
+#: src/protocols/jabber/jabber.c:2021 src/protocols/oscar/oscar.c:2847
+#: src/protocols/toc/toc.c:1201
 msgid "Get Info"
 msgstr "Hämta information"
 
-#: src/protocols/irc/irc.c:428 src/protocols/irc/irc.c:920
+#: src/protocols/irc/irc.c:429 src/protocols/irc/irc.c:962
 #, c-format
 msgid "<B>%s has changed the topic to: %s</B>"
 msgstr "<B>%s har bytt ämne till: %s</B>"
 
-#: src/protocols/irc/irc.c:662
+#: src/protocols/irc/irc.c:682
 msgid "No such nick/channel"
 msgstr "Inget sådant smeknamn/kanal"
 
-#: src/protocols/irc/irc.c:662 src/protocols/irc/irc.c:665
-#: src/protocols/irc/irc.c:667 src/protocols/irc/irc.c:856
+#: src/protocols/irc/irc.c:682 src/protocols/irc/irc.c:685
+#: src/protocols/irc/irc.c:687 src/protocols/irc/irc.c:891
 msgid "IRC Error"
 msgstr "IRC-fel"
 
-#: src/protocols/irc/irc.c:665
+#: src/protocols/irc/irc.c:685
 msgid "No such server"
 msgstr "Ingen sådan server"
 
-#: src/protocols/irc/irc.c:667
+#: src/protocols/irc/irc.c:687
 msgid "No nickname given"
 msgstr "Inget smeknamn är angivet"
 
-#: src/protocols/irc/irc.c:799
+#: src/protocols/irc/irc.c:819
 msgid "Unable to write"
 msgstr "Kan inte skriva"
 
-#: src/protocols/irc/irc.c:854
+#: src/protocols/irc/irc.c:889
 #, c-format
 msgid "You have been kicked from %s: %s"
 msgstr "Du har sparkats ut från %s: %s"
 
-#: src/protocols/irc/irc.c:1324
+#: src/protocols/irc/irc.c:894
+#, c-format
+msgid "Kicked by %s: %s"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1357
 #, c-format
 msgid "You have left %s"
 msgstr "Du har lämnat %s"
 
-#: src/protocols/irc/irc.c:1325
+#: src/protocols/irc/irc.c:1358
 msgid "IRC Part"
 msgstr "IRC-lämnande"
 
-#: src/protocols/irc/irc.c:1398
+#: src/protocols/irc/irc.c:1443
 msgid "Channel:"
 msgstr "Kanal:"
 
-#: src/multi.c:506 src/protocols/irc/irc.c:1402
+#: src/multi.c:522 src/protocols/irc/irc.c:1447
 msgid "Password:"
 msgstr "Lösenord:"
 
-#: src/protocols/jabber/jabber.c:1352
+#: src/protocols/jabber/jabber.c:1692
 msgid "Room:"
 msgstr "Rum:"
 
-#: src/protocols/jabber/jabber.c:1356
+#: src/protocols/jabber/jabber.c:1696
 msgid "Server:"
 msgstr "Server:"
 
-#: src/protocols/jabber/jabber.c:1361
+#: src/protocols/jabber/jabber.c:1701
 msgid "Handle:"
 msgstr "Handtag:"
 
-#: src/protocols/msn/msn.c:566 src/protocols/msn/msn.c:1689
-#: src/protocols/msn/msn.c:1722
+#: src/buddy_chat.c:875 src/protocols/jabber/jabber.c:2026
+#: src/protocols/oscar/oscar.c:2854
+msgid "Get Away Msg"
+msgstr "Frånvaromeddelande"
+
+#: src/protocols/msn/msn.c:653 src/protocols/msn/msn.c:1909
+#: src/protocols/msn/msn.c:1942
 msgid "MSN Error"
 msgstr "MSN-fel"
 
-#: src/protocols/msn/msn.c:566
+#: src/protocols/msn/msn.c:653
 msgid "Gaim was unable to send a message"
 msgstr "Gaim kunde inte skicka ett meddelande"
 
-#: src/protocols/msn/msn.c:1689 src/protocols/msn/msn.c:1722
+#: src/protocols/msn/msn.c:960
+#, fuzzy
+msgid "You have been disconnected. You have signed on from another location."
+msgstr "Du har blivit frånkopplad från chattrummet %s."
+
+#: src/protocols/msn/msn.c:1909 src/protocols/msn/msn.c:1942
 msgid "Invalid name"
 msgstr "Ogiltigt namn"
 
-#: src/protocols/napster/napster.c:450 src/protocols/oscar/oscar.c:2319
-#: src/protocols/toc/toc.c:1087
+#: src/protocols/napster/napster.c:450 src/protocols/oscar/oscar.c:2536
+#: src/protocols/toc/toc.c:1088
 msgid "Join what group:"
 msgstr "Gå in i vilken grupp:"
 
-#: src/protocols/oscar/oscar.c:295
+#: src/protocols/oscar/oscar.c:305
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "Direktmeddelande med %s stängd"
 
-#: src/protocols/oscar/oscar.c:331
+#: src/protocols/oscar/oscar.c:341
 msgid "connection error (rend)\n"
 msgstr "anslutningssfel (rend)\n"
 
-#: src/protocols/oscar/oscar.c:342
+#: src/protocols/oscar/oscar.c:352
 msgid "major connection error\n"
 msgstr "stort anslutningsfel\n"
 
-#: src/protocols/oscar/oscar.c:343 src/protocols/toc/toc.c:511
-#: src/protocols/toc/toc.c:521 src/protocols/toc/toc.c:587
+#: src/protocols/oscar/oscar.c:353 src/protocols/toc/toc.c:509
+#: src/protocols/toc/toc.c:522 src/protocols/toc/toc.c:588
 msgid "Disconnected."
 msgstr "Frånkopplad."
 
-#: src/protocols/oscar/oscar.c:355 src/protocols/toc/toc.c:755
+#: src/protocols/oscar/oscar.c:365 src/protocols/toc/toc.c:756
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Du har blivit frånkopplad från chattrummet %s."
 
-#: src/protocols/oscar/oscar.c:356
+#: src/protocols/oscar/oscar.c:366
 msgid "Chat Error!"
 msgstr "Chattfel!"
 
-#: src/protocols/oscar/oscar.c:366
+#: src/protocols/oscar/oscar.c:378
 msgid "Chat is currently unavailable"
 msgstr "Chatt är inte tillgängligt för tillfället"
 
-#: src/protocols/oscar/oscar.c:367
+#: src/protocols/oscar/oscar.c:379
 msgid "Gaim - Chat"
 msgstr "Gaim - Chatt"
 
-#: src/protocols/oscar/oscar.c:426 src/protocols/oscar/oscar.c:488
+#: src/protocols/oscar/oscar.c:438 src/protocols/oscar/oscar.c:498
 msgid "Couldn't connect to host"
 msgstr "Kunde inte ansluta till värden"
 
-#: src/protocols/oscar/oscar.c:434
+#: src/protocols/oscar/oscar.c:446
 msgid "Password sent, waiting for response\n"
 msgstr "Lösenord skickat, väntar på svar\n"
 
-#: src/protocols/oscar/oscar.c:445
-#, c-format
-msgid "Logging in %s\n"
-msgstr "Loggar in %s\n"
-
-#: src/protocols/oscar/oscar.c:450
-msgid "Send offline message"
-msgstr "Skickar frånkopplat meddelande"
-
-#: src/protocols/oscar/oscar.c:469
+#: src/protocols/oscar/oscar.c:479
 msgid "internal connection error\n"
 msgstr "internt anslutningsfel\n"
 
-#: src/protocols/oscar/oscar.c:470
+#: src/protocols/oscar/oscar.c:480
 msgid "Unable to login to AIM"
 msgstr "Kan inte logga in till AIM"
 
-#: src/protocols/oscar/oscar.c:475
+#: src/protocols/oscar/oscar.c:485
 #, c-format
 msgid "Signon: %s"
 msgstr "Inloggning: %s"
 
-#: src/protocols/oscar/oscar.c:531
+#: src/protocols/oscar/oscar.c:557
 msgid "Signed off.\n"
 msgstr "Loggade ut.\n"
 
-#: src/protocols/oscar/oscar.c:550 src/protocols/oscar/oscar.c:668
+#: src/protocols/oscar/oscar.c:576 src/protocols/oscar/oscar.c:696
 msgid "Could Not Connect"
 msgstr "Kunde inte ansluta"
 
-#: src/protocols/oscar/oscar.c:558
+#: src/protocols/oscar/oscar.c:584
 msgid "Connection established, cookie sent"
 msgstr "Anslutning etablerad, kaka skickad"
 
 #. Incorrect nick/password
-#: src/protocols/oscar/oscar.c:584 src/protocols/toc/toc.c:459
+#: src/protocols/oscar/oscar.c:610 src/protocols/toc/toc.c:457
 msgid "Incorrect nickname or password."
 msgstr "Felaktigt smeknamn eller lösenord."
 
 #. Suspended account
-#: src/protocols/oscar/oscar.c:589
+#: src/protocols/oscar/oscar.c:615
 msgid "Your account is currently suspended."
 msgstr "Ditt konto är avstängt för tillfället."
 
 #. connecting too frequently
-#: src/protocols/oscar/oscar.c:593
+#: src/protocols/oscar/oscar.c:619
 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."
@@ -381,79 +460,200 @@
 "prova igen. Om du fortsätter att försöka kommer du att få vänta ännu längre."
 
 #. client too old
-#: src/protocols/oscar/oscar.c:598
+#: src/protocols/oscar/oscar.c:624
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr "Versionen av klienten du använder är för gammal. Uppgradera på "
 
-#: src/protocols/oscar/oscar.c:602 src/protocols/toc/toc.c:539
+#: src/protocols/oscar/oscar.c:628 src/protocols/toc/toc.c:540
 msgid "Authentication Failed"
 msgstr "Autentisering misslyckades"
 
-#: src/protocols/oscar/oscar.c:624
+#: src/protocols/oscar/oscar.c:650
 msgid "Internal Error"
 msgstr "Internt fel"
 
-#: src/protocols/oscar/oscar.c:1184 src/protocols/oscar/oscar.c:2525
+#: src/protocols/oscar/oscar.c:1204 src/protocols/oscar/oscar.c:2744
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "Direktmeddelande med %s etablerat"
 
 # Detta är felrapporterat
-#: src/protocols/oscar/oscar.c:1423
-#, c-format
-msgid "You missed %d message%s from %s because %s invalid."
+#: src/protocols/oscar/oscar.c:1454
+#, fuzzy, c-format
+msgid "You missed %d message from %s because it was invalid."
+msgstr "Du missade %d meddelanden%.0s från %s eftersom %s är ogiltig."
+
+# Detta är felrapporterat
+#: src/protocols/oscar/oscar.c:1455
+#, fuzzy, c-format
+msgid "You missed %d messages from %s because they were invalid."
 msgstr "Du missade %d meddelanden%.0s från %s eftersom %s är ogiltig."
 
-#: src/protocols/oscar/oscar.c:1433
-#, c-format
-msgid "You missed %d message%s from %s because %s too large."
+#: src/protocols/oscar/oscar.c:1464
+#, fuzzy, c-format
+msgid "You missed %d message from %s because it was too large."
 msgstr "Du missade %d meddelanden%.0s från %s eftersom %s är för stor."
 
-#: src/protocols/oscar/oscar.c:1443
-#, c-format
+#: src/protocols/oscar/oscar.c:1465
+#, fuzzy, c-format
+msgid "You missed %d messages from %s because they were too large."
+msgstr "Du missade %d meddelanden%.0s från %s eftersom de är för hemska."
+
+#: src/protocols/oscar/oscar.c:1474
+#, fuzzy, c-format
+msgid "You missed %d message from %s because the rate limit has been exceeded."
+msgstr ""
+"Du missade %d meddelanden%.0s från %s eftersom frekvensgränsen har "
+"överskridits."
+
+#: src/protocols/oscar/oscar.c:1475
+#, fuzzy, c-format
 msgid ""
-"You missed %d message%s from %s because the rate limit has been exceeded."
+"You missed %d messages from %s because the rate limit has been exceeded."
 msgstr ""
 "Du missade %d meddelanden%.0s från %s eftersom frekvensgränsen har "
 "överskridits."
 
-#: src/protocols/oscar/oscar.c:1452
-#, c-format
-msgid "You missed %d message%s from %s because they are too evil."
+#: src/protocols/oscar/oscar.c:1484
+#, fuzzy, c-format
+msgid "You missed %d message from %s because it was too evil."
 msgstr "Du missade %d meddelanden%.0s från %s eftersom de är för hemska."
 
-#: src/protocols/oscar/oscar.c:1461
-#, c-format
-msgid "You missed %d message%s from %s because you are too evil."
+#: src/protocols/oscar/oscar.c:1485
+#, fuzzy, c-format
+msgid "You missed %d messages from %s because they are too evil."
+msgstr "Du missade %d meddelanden%.0s från %s eftersom de är för hemska."
+
+#: src/protocols/oscar/oscar.c:1494
+#, fuzzy, c-format
+msgid "You missed %d message from %s because you are too evil."
 msgstr "Du missade %d meddelanden%0.s från %s eftersom du är för hemsk."
 
-#: src/protocols/oscar/oscar.c:1469
-#, c-format
-msgid "You missed %d message%s from %s for unknown reasons."
+#: src/protocols/oscar/oscar.c:1495
+#, fuzzy, c-format
+msgid "You missed %d messages from %s because you are too evil."
+msgstr "Du missade %d meddelanden%0.s från %s eftersom du är för hemsk."
+
+#: src/protocols/oscar/oscar.c:1503
+#, fuzzy, c-format
+msgid "You missed %d message from %s for unknown reasons."
 msgstr "Du missade %d meddelanden%0.s från %s på grund av okända orsaker."
 
-#: src/dialogs.c:2808 src/dialogs.c:2814 src/protocols/oscar/oscar.c:1475
-#: src/protocols/oscar/oscar.c:1507 src/protocols/oscar/oscar.c:1525
-#: src/protocols/yahoo/yahoo.c:500
+#: src/protocols/oscar/oscar.c:1504
+#, fuzzy, c-format
+msgid "You missed %d messages from %s for unknown reasons."
+msgstr "Du missade %d meddelanden%0.s från %s på grund av okända orsaker."
+
+#: src/dialogs.c:2949 src/dialogs.c:2955 src/protocols/oscar/oscar.c:1509
+#: src/protocols/oscar/oscar.c:1547 src/protocols/oscar/oscar.c:1565
+#: src/protocols/oscar/oscar.c:1994 src/protocols/yahoo/yahoo.c:501
 msgid "Gaim - Error"
 msgstr "Gaim - Fel"
 
-#: src/protocols/oscar/oscar.c:1505
+#: src/protocols/oscar/oscar.c:1526
+#, c-format
+msgid "SNAC threw error: %s\n"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1528
+#, fuzzy
+msgid "Gaim - Oscar SNAC Error"
+msgstr "Gaim - Fel"
+
+#: src/protocols/oscar/oscar.c:1545
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr "Ditt meddelande till %s skickades inte: %s"
 
-#: src/protocols/oscar/oscar.c:1506 src/protocols/oscar/oscar.c:1524
+#: src/protocols/oscar/oscar.c:1546 src/protocols/oscar/oscar.c:1564
 msgid "Reason unknown"
 msgstr "Okänd orsak"
 
-#: src/protocols/oscar/oscar.c:1523
+#: src/protocols/oscar/oscar.c:1563
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr "Användarinformation för %s är inte tillgänglig: %s"
 
-#: src/protocols/oscar/oscar.c:1565
-#, c-format
+#: src/buddy.c:1906 src/protocols/oscar/oscar.c:1591
+msgid "Buddy Icon"
+msgstr "Kompisikon"
+
+#: src/buddy.c:1909 src/protocols/oscar/oscar.c:1594
+msgid "Voice"
+msgstr "Röst"
+
+#: src/buddy.c:1912 src/protocols/oscar/oscar.c:1597
+msgid "IM Image"
+msgstr "Snabbmeddelandebild"
+
+#: src/buddy.c:488 src/buddy.c:1915 src/buddy.c:2343 src/prefs.c:2837
+#: src/protocols/oscar/oscar.c:1600
+msgid "Chat"
+msgstr "Chatt"
+
+#: src/buddy.c:1918 src/protocols/oscar/oscar.c:1603
+msgid "Get File"
+msgstr "Hämta fil"
+
+#: src/buddy.c:1921 src/protocols/oscar/oscar.c:1606
+msgid "Send File"
+msgstr "Skicka fil"
+
+#: src/buddy.c:1925 src/protocols/oscar/oscar.c:1610
+msgid "Games"
+msgstr "Spel"
+
+#: src/buddy.c:1928 src/protocols/oscar/oscar.c:1613
+msgid "Stocks"
+msgstr "Aktier"
+
+#: src/buddy.c:1931 src/protocols/oscar/oscar.c:1616
+#, fuzzy
+msgid "Send Buddy List"
+msgstr "Kompislista"
+
+#: src/buddy.c:1934 src/protocols/oscar/oscar.c:1619
+msgid "EveryBuddy Bug"
+msgstr "EveryBuddy-fel"
+
+#: src/buddy.c:1937 src/protocols/oscar/oscar.c:1622
+#, fuzzy
+msgid "AP User"
+msgstr "Användare"
+
+#: src/buddy.c:1940 src/protocols/oscar/oscar.c:1625
+msgid "ICQ RTF"
+msgstr ""
+
+#: src/buddy.c:1943 src/protocols/oscar/oscar.c:1628
+msgid "Nihilist"
+msgstr ""
+
+#: src/buddy.c:1946 src/protocols/oscar/oscar.c:1631
+msgid "ICQ Server Relay"
+msgstr ""
+
+#: src/buddy.c:1949 src/protocols/oscar/oscar.c:1634
+msgid "ICQ Unknown"
+msgstr ""
+
+#: src/buddy.c:1952 src/protocols/oscar/oscar.c:1637
+msgid "Trillian Encryption"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1674
+msgid ""
+"<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG "
+"SRC=\"free_icon.gif\"> : Normal AIM User<br><IMG SRC=\"aol_icon.gif\"> : AOL "
+"User <br><IMG SRC=\"dt_icon.gif\"> : Trial AIM User <br><IMG "
+"SRC=\"admin_icon.gif\"> : Administrator"
+msgstr ""
+"<br><BODY BGCOLOR=WHITE><hr><I>Förklaring:</I><br><br><IMG "
+"SRC=\"free_icon.gif\"> : Vanlig AIM-användare<br><IMG SRC=\"aol_icon.gif\"> "
+": AOL-användare <br><IMG SRC=\"dt_icon.gif\"> : AIM-försöksanvändare "
+"<br><IMG SRC=\"admin_icon.gif\"> : Administratör"
+
+#: src/protocols/oscar/oscar.c:1686
 msgid ""
 "Username : <B>%s</B>  %s <BR>\n"
 "%sWarning Level : <B>%d %%</B><BR>\n"
@@ -469,51 +669,50 @@
 "<BR>\n"
 "<HR><BR>\n"
 
-#: src/protocols/oscar/oscar.c:1576
-msgid ""
-"<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG SRC=\"free_icon.gif"
-"\"> : Normal AIM User<br><IMG SRC=\"aol_icon.gif\"> : AOL User <br><IMG SRC="
-"\"dt_icon.gif\"> : Trial AIM User <br><IMG SRC=\"admin_icon.gif\"> : "
-"Administrator"
-msgstr ""
-"<br><BODY BGCOLOR=WHITE><hr><I>Förklaring:</I><br><br><IMG SRC=\"free_icon."
-"gif\"> : Vanlig AIM-användare<br><IMG SRC=\"aol_icon.gif\"> : AOL-användare "
-"<br><IMG SRC=\"dt_icon.gif\"> : AIM-försöksanvändare <br><IMG SRC="
-"\"admin_icon.gif\"> : Administratör"
-
-#: src/protocols/oscar/oscar.c:1586
+#: src/protocols/oscar/oscar.c:1714
+msgid "<i>User has no away message</i>"
+msgstr "<i>Användaren har inget frånvaromeddelande</i>"
+
+#: src/protocols/oscar/oscar.c:1726
+#, fuzzy
+msgid "Client Capabilities: "
+msgstr "Kapabiliteter: %s\n"
+
+#: src/protocols/oscar/oscar.c:1734
 msgid "<i>No Information Provided</i>"
 msgstr "<i>Ingen information tillhandahållen</i>"
 
-#: src/protocols/oscar/oscar.c:1587
-msgid "<i>User has no away message</i>"
-msgstr "<i>Användaren har inget frånvaromeddelande</i>"
-
-#: src/protocols/oscar/oscar.c:1612
+#: src/protocols/oscar/oscar.c:1757
 msgid "Your connection may be lost."
 msgstr "Din anslutning kan vara borta."
 
-#: src/protocols/oscar/oscar.c:1613
+#: src/protocols/oscar/oscar.c:1758
 msgid "AOL error"
 msgstr "AOL-fel"
 
-#: src/dialogs.c:3341 src/protocols/oscar/oscar.c:2062
-#: src/protocols/oscar/oscar.c:2599 src/protocols/toc/toc.c:1545
-#: src/protocols/toc/toc.c:1562 src/protocols/toc/toc.c:1622
-#: src/protocols/toc/toc.c:1664 src/protocols/toc/toc.c:1783
-#: src/protocols/toc/toc.c:1813 src/protocols/toc/toc.c:1869
+#: src/protocols/oscar/oscar.c:1993
+msgid ""
+"The last message was not sent because you are over the rate limit. Please "
+"wait 10 seconds and try again."
+msgstr ""
+
+#: src/dialogs.c:3482 src/protocols/oscar/oscar.c:2267
+#: src/protocols/oscar/oscar.c:2818 src/protocols/toc/toc.c:1546
+#: src/protocols/toc/toc.c:1563 src/protocols/toc/toc.c:1623
+#: src/protocols/toc/toc.c:1665 src/protocols/toc/toc.c:1784
+#: src/protocols/toc/toc.c:1814 src/protocols/toc/toc.c:1870
 msgid "Error"
 msgstr "Fel"
 
-#: src/protocols/oscar/oscar.c:2323 src/protocols/toc/toc.c:1091
+#: src/protocols/oscar/oscar.c:2540 src/protocols/toc/toc.c:1092
 msgid "Exchange:"
 msgstr "Växel:"
 
-#: src/protocols/oscar/oscar.c:2599
+#: src/protocols/oscar/oscar.c:2818
 msgid "Unable to open Direct IM"
 msgstr "Kan inte öppna direktmeddelande"
 
-#: src/protocols/oscar/oscar.c:2609
+#: src/protocols/oscar/oscar.c:2828
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
@@ -524,114 +723,115 @@
 "kommer att låta dem se din IP-adress, och kan vara en säkerhetsrisk. Vill du "
 "fortsätta?"
 
-#: src/protocols/oscar/oscar.c:2627
-msgid "Get Away Msg"
-msgstr "Frånvaromeddelande"
-
-#: src/protocols/oscar/oscar.c:2634
+#: src/protocols/oscar/oscar.c:2861
 msgid "Direct IM"
 msgstr "Direktmeddelande"
 
-#: src/protocols/toc/toc.c:398
+#: src/protocols/oscar/oscar.c:2869
+#, fuzzy
+msgid "Get Capabilities"
+msgstr "Kapabiliteter: %s\n"
+
+#: src/protocols/toc/toc.c:396
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Kan inte skriva filen %s."
 
-#: src/protocols/toc/toc.c:401
+#: src/protocols/toc/toc.c:399
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Kan inte läsa filen %s."
 
-#: src/protocols/toc/toc.c:404
+#: src/protocols/toc/toc.c:402
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Meddelandet är för långt, de sista %s byten klipptes bort."
 
-#: src/protocols/toc/toc.c:407
+#: src/protocols/toc/toc.c:405
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s är inte inloggad för tillfället."
 
-#: src/protocols/toc/toc.c:410
+#: src/protocols/toc/toc.c:408
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Varning för %s är inte tillåten."
 
-#: src/protocols/toc/toc.c:413
+#: src/protocols/toc/toc.c:411
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "Ett meddelande har kastats, du överskrider serverns hastighetsgräns."
 
-#: src/protocols/toc/toc.c:416
+#: src/protocols/toc/toc.c:414
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Chatt i %s är inte tillgänglig."
 
-#: src/protocols/toc/toc.c:419
+#: src/protocols/toc/toc.c:417
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Du skickar meddelanden för snabbt till %s."
 
-#: src/protocols/toc/toc.c:422
+#: src/protocols/toc/toc.c:420
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "Du missade ett snabbmeddelande från %s eftersom det var för stort."
 
-#: src/protocols/toc/toc.c:425
+#: src/protocols/toc/toc.c:423
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr ""
 "Du missade ett snabbmeddelande från %s eftersom det skickades för snabbt."
 
-#: src/protocols/toc/toc.c:428
+#: src/protocols/toc/toc.c:426
 msgid "Failure."
 msgstr "Misslyckande."
 
-#: src/protocols/toc/toc.c:431
+#: src/protocols/toc/toc.c:429
 msgid "Too many matches."
 msgstr "För många träffar."
 
-#: src/protocols/toc/toc.c:434
+#: src/protocols/toc/toc.c:432
 msgid "Need more qualifiers."
 msgstr "Behöver fler kvalificerare."
 
-#: src/protocols/toc/toc.c:437
+#: src/protocols/toc/toc.c:435
 msgid "Dir service temporarily unavailable."
 msgstr "Katalogtjänsten är tillfälligt onåbar."
 
-#: src/protocols/toc/toc.c:440
+#: src/protocols/toc/toc.c:438
 msgid "Email lookup restricted."
 msgstr "E-postuppslagning är begränsad."
 
-#: src/protocols/toc/toc.c:443
+#: src/protocols/toc/toc.c:441
 msgid "Keyword ignored."
 msgstr "Nyckelordet ignorerades."
 
-#: src/protocols/toc/toc.c:446
+#: src/protocols/toc/toc.c:444
 msgid "No keywords."
 msgstr "Inga nyckelord."
 
-#: src/protocols/toc/toc.c:449
+#: src/protocols/toc/toc.c:447
 msgid "User has no directory information."
 msgstr "Användaren har ingen kataloginformation."
 
-#: src/protocols/toc/toc.c:453
+#: src/protocols/toc/toc.c:451
 msgid "Country not supported."
 msgstr "Landet stöds inte."
 
-#: src/protocols/toc/toc.c:456
+#: src/protocols/toc/toc.c:454
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Okänt misslyckande: %s."
 
-#: src/protocols/toc/toc.c:462
+#: src/protocols/toc/toc.c:460
 msgid "The service is temporarily unavailable."
 msgstr "Tjänsten är tillfälligt onåbar."
 
-#: src/protocols/toc/toc.c:465
+#: src/protocols/toc/toc.c:463
 msgid "Your warning level is currently too high to log in."
 msgstr "Din varningsnivå är för tillfället för hög för att logga in."
 
-#: src/protocols/toc/toc.c:468
+#: src/protocols/toc/toc.c:466
 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."
@@ -639,46 +839,46 @@
 "Du har anslutit och kopplat ifrån för många gånger. Vänta tio minuter och "
 "prova igen. Om du fortsätter att försöka kommer du att få vänta ännu längre."
 
-#: src/protocols/toc/toc.c:471
+#: src/protocols/toc/toc.c:469
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Ett okänt inloggningsfel har inträffat: %s."
 
-#: src/protocols/toc/toc.c:474
+#: src/protocols/toc/toc.c:472
 #, c-format
 msgid "An unknown error, %d, has occured.  Info: %s"
 msgstr "Ett okänt fel, %d, har inträffat. Information: %s"
 
-#: src/protocols/toc/toc.c:491
+#: src/protocols/toc/toc.c:489
 msgid "Connection Closed"
 msgstr "Anslutningen stängd"
 
-#: src/protocols/toc/toc.c:526
+#: src/protocols/toc/toc.c:527
 msgid "Waiting for reply..."
 msgstr "Väntar på svar..."
 
-#: src/protocols/toc/toc.c:595
+#: src/protocols/toc/toc.c:596
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr ""
 "TOC har kommit tillbaka från dess paus. Du kan nu skicka meddelanden igen."
 
-#: src/protocols/toc/toc.c:596
+#: src/protocols/toc/toc.c:597
 msgid "TOC Resume"
 msgstr "TOC-återupptagning"
 
-#: src/protocols/toc/toc.c:757
+#: src/protocols/toc/toc.c:758
 msgid "Chat Error"
 msgstr "Chattfel"
 
-#: src/protocols/toc/toc.c:776
+#: src/protocols/toc/toc.c:777
 msgid "Password Change Successeful"
 msgstr "Lösenordsändring lyckades"
 
-#: src/dialogs.c:1491 src/protocols/toc/toc.c:776
+#: src/dialogs.c:1607 src/protocols/toc/toc.c:777
 msgid "Gaim - Password Change"
 msgstr "Gaim - Lösenordsändring"
 
-#: src/protocols/toc/toc.c:779
+#: src/protocols/toc/toc.c:780
 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 "
@@ -689,63 +889,68 @@
 "meddelande. Gaim kommer att förhindra att något går igenom. Detta är endast "
 "tillfälligt, håll ut."
 
-#: src/protocols/toc/toc.c:782
+#: src/protocols/toc/toc.c:783
 msgid "TOC Pause"
 msgstr "TOC-paus"
 
-#: src/protocols/toc/toc.c:1206
+#: src/protocols/toc/toc.c:1207
 msgid "Get Dir Info"
 msgstr "Hämta kataloginformation"
 
-#: src/protocols/toc/toc.c:1622 src/protocols/toc/toc.c:1664
-#: src/protocols/toc/toc.c:1783 src/protocols/toc/toc.c:1869
+#: src/protocols/toc/toc.c:1623 src/protocols/toc/toc.c:1665
+#: src/protocols/toc/toc.c:1784 src/protocols/toc/toc.c:1870
 msgid "Could not connect for transfer!"
 msgstr "Kunde inte ansluta för överföring!"
 
-#: src/protocols/toc/toc.c:1813
+#: src/protocols/toc/toc.c:1814
 msgid "Could not write file header!"
 msgstr "Kunde inte skriva filhuvud!"
 
-#: src/protocols/toc/toc.c:1902
+#: src/protocols/toc/toc.c:1903
 msgid "Gaim - Save As..."
 msgstr "Gaim - Spara som..."
 
-#: src/protocols/toc/toc.c:1941
-#, c-format
-msgid "%s requests %s to accept %d file%s: %s (%.2f %s)%s%s"
+#: src/protocols/toc/toc.c:1944
+#, fuzzy, c-format
+msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgstr "%s ber %s att acceptera %d filer%.0s: %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:1946
+#: src/protocols/toc/toc.c:1945
+#, fuzzy, c-format
+msgid "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+msgstr "%s ber %s att acceptera %d filer%.0s: %s (%.2f %s)%s%s"
+
+#: src/protocols/toc/toc.c:1950
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s ber att du ska skicka dem en fil"
 
-#: src/protocols/yahoo/yahoo.c:500
+#: src/protocols/yahoo/yahoo.c:501
 msgid "Your message did not get sent."
 msgstr "Ditt meddelande skickades inte."
 
-#: src/protocols/zephyr/zephyr.c:778
+#: src/protocols/zephyr/zephyr.c:802
 msgid "ZLocate"
 msgstr "ZLocate"
 
-#: src/protocols/zephyr/zephyr.c:815
+#: src/protocols/zephyr/zephyr.c:839
 msgid "Class:"
 msgstr "Klass:"
 
-#: src/protocols/zephyr/zephyr.c:819
+#: src/protocols/zephyr/zephyr.c:843
 msgid "Instance:"
 msgstr "Instans:"
 
-#: src/protocols/zephyr/zephyr.c:823
+#: src/protocols/zephyr/zephyr.c:847
 msgid "Recipient:"
 msgstr "Mottagare:"
 
-#: src/about.c:94
+#: src/about.c:93
 #, c-format
 msgid "About Gaim v%s"
 msgstr "Om Gaim v%s"
 
-#: src/about.c:127
+#: src/about.c:126
 msgid ""
 "Gaim is a client that supports AOL's Instant Messenger protocol. It is "
 "written\n"
@@ -758,157 +963,124 @@
 "\n"
 "URL: "
 
-#: src/about.c:128
-msgid ""
-"\n"
-"\n"
-"IRC: #gaim on irc.openprojects.net"
-msgstr ""
-"\n"
-"\n"
-"IRC: #gaim på irc.openprojects.net"
-
 #: src/about.c:137
 msgid ""
-"Rob Flynn (maintainer)               rob@marko.net\n"
-"Eric Warmenhoven (lead coder)  warmenhoven@yahoo.com\n"
+"Active Developers\n"
+"====================\n"
+"Rob Flynn (maintainer) [ rob@marko.net ]\n"
+"Sean Egan (coder)      [ bj91704@binghamton.edu ]\n"
 "\n"
+"Crazy Patch Writers\n"
+"===================\n"
 "Benjamin Miller\n"
 "Decklin Foster\n"
-"Sean Egan\n"
+"\n"
+"Retired Developers\n"
+"===================\n"
 "Jim Duchek\n"
-"Mark Spencer (original author)   markster@marko.net"
+"Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
+"Mark Spencer (original author)   [ markster@marko.net ]"
 msgstr ""
-"Rob Flynn (ansvarig)                  rob@marko.net\n"
-"Eric Warmenhoven (huvudprogrammerare) warmenhoven@yahoo.com\n"
-"\n"
-"Benjamin Miller\n"
-"Decklin Foster\n"
-"Sean Egan\n"
-"Jim Duchek\n"
-"Mark Spencer (ursprunglig författare) markster@marko.net"
-
-#: src/about.c:148 src/about.c:213 src/aim.c:295 src/buddy.c:2408
-#: src/buddy_chat.c:1301 src/buddy_chat.c:1398 src/buddy_chat.c:1428
-#: src/conversation.c:2293 src/dialogs.c:447 src/dialogs.c:3634
-#: src/multi.c:1002 src/plugins.c:277 src/prefs.c:2416 src/prpl.c:438
+
+#: src/about.c:155 src/aim.c:296 src/buddy.c:2469 src/buddy_chat.c:1311
+#: src/buddy_chat.c:1408 src/buddy_chat.c:1438 src/conversation.c:2417
+#: src/dialogs.c:563 src/dialogs.c:3777 src/multi.c:1026 src/plugins.c:277
+#: src/prefs.c:2496 src/prpl.c:438 src/prpl.c:679 src/server.c:991
 msgid "Close"
 msgstr "Stäng"
 
 #. this makes the sizes not work.
 #. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
 #. gtk_widget_grab_default(button);
-#: src/about.c:168
+#: src/about.c:175
 msgid "Web Site"
 msgstr "Webbplats"
 
-#: src/about.c:223
-msgid ""
-"Relax, help is just around the corner. The first thing you'll need to do is "
-"get an AIM account; you can get one from http://aim.aol.com/. Just click the "
-"button that says \"New Users\" and you can create an account that way. Once "
-"you have your account, enter the username and password into the login window "
-"that comes up when you start Gaim, and click the Signon button. Once you're "
-"online, you can talk to one of the Gaim developers for more assistance; "
-"their contact information is in the AUTHORS file in the Gaim source, or at "
-msgstr ""
-"Slappna av, hjälp finns runt hörnet. Det första som du måste göra är att "
-"skaffa ett AIM-konto. Du kan skaffa ett från http://aim.aol.com/. Klicka "
-"bara på knappen som säger \"Nya användare\" så kan du skapa ett konto på det "
-"sättet. När du väl har ett konto anger du användarnamnet och lösenordet i "
-"inloggningsfönstret som kommer upp när du startar Gaim, och klickar på "
-"inloggningsknappen. När du väl är ansluten kan du prata med en av Gaim-"
-"utvecklarna för mer hjälp. Deras kontaktinformation finns i filen AUTHORS i "
-"Gaim-källkoden, eller på "
-
-#: src/about.c:234
-msgid ""
-"contactinfo.php. If you can't get online and still need more assistance, "
-"feel free to email us at gaim@marko.net. Thanks for using Gaim!"
-msgstr ""
-"contactinfo.php. Om du inte kan ansluta och behöver mer hjälp, kan du skicka "
-"e-post till oss på gaim@marko.net. Tack för att du använder Gaim!"
-
-#: src/aim.c:128 src/buddy.c:2401
+#: src/aim.c:129 src/buddy.c:2462
 msgid "Signoff"
 msgstr "Logga ut"
 
-#: src/aim.c:140
+#: src/aim.c:141
 msgid "Please enter your logon"
 msgstr "Ange ditt inloggningsnamn"
 
-#: src/aim.c:140 src/multi.c:1231 src/server.c:53
+#: src/aim.c:141 src/multi.c:1276 src/server.c:55
 msgid "Signon Error"
 msgstr "Inloggningsfel"
 
-#: src/aim.c:238
+#: src/aim.c:239
 msgid "Gaim - Login"
 msgstr "Gaim - Inloggning"
 
-#: src/aim.c:256
+#: src/aim.c:257
 msgid "Screen Name: "
 msgstr "Skärmnamn: "
 
-#: src/aim.c:272
+#: src/aim.c:273
 msgid "Password: "
 msgstr "Lösenord: "
 
-#: src/aim.c:293 src/buddy.c:2405
+#: src/aim.c:294 src/buddy.c:2466
 msgid "Quit"
 msgstr "Avsluta"
 
-#: src/aim.c:298 src/aim.c:745 src/buddy.c:2431
+#: src/aim.c:299 src/aim.c:755 src/buddy.c:2492
 msgid "Accounts"
 msgstr "Konton"
 
-#: src/aim.c:300 src/multi.c:854
+#: src/aim.c:301 src/multi.c:878
 msgid "Signon"
 msgstr "Inloggning"
 
-#: src/aim.c:332
-msgid "Help!"
-msgstr "Hjälp!"
+#: src/aim.c:333
+#, fuzzy
+msgid "About"
+msgstr "Om..."
 
 # src/menus.c:311
-#: src/aim.c:333 src/prefs.c:1525 src/prefs.c:1800
+#: src/aim.c:334 src/prefs.c:1580 src/prefs.c:1854
 msgid "Options"
 msgstr "Alternativ"
 
 #. Left side: frame with list of plugin file names
-#: src/aim.c:335 src/aim.c:748 src/buddy.c:2449 src/plugins.c:192
+#: src/aim.c:336 src/aim.c:758 src/buddy.c:2510 src/plugins.c:192
 msgid "Plugins"
 msgstr "Insticksmoduler"
 
-#: src/aim.c:742 src/buddy.c:2441
+#: src/aim.c:752 src/buddy.c:2502
 msgid "Preferences"
 msgstr "Inställningar"
 
-#: src/applet.c:197
+#: src/applet.c:199
 msgid "Attempting to sign on...."
 msgstr "Försöker att logga in..."
 
-#: src/applet.c:200
+#: src/applet.c:202
 msgid "Offline. Click to bring up login box."
 msgstr "Frånkopplad. Klicka för att ta fram inloggningsrutan."
 
-#: src/applet.c:216
+#: src/applet.c:218
 #, c-format
 msgid "Away: %d pending."
 msgstr "Frånvarande: %d väntar."
 
-#: src/applet.c:219
+#: src/applet.c:221
 msgid "Away."
 msgstr "Frånvarande."
 
-#: src/applet.c:294 src/away.c:387
+#: src/applet.c:293 src/buddy.c:487 src/buddy.c:2344 src/buddy.c:2480
+msgid "Away"
+msgstr "Frånvarande"
+
+#: src/applet.c:296 src/away.c:389
 msgid "New Away Message"
 msgstr "Nytt frånvaromeddelande:"
 
-#: src/applet.c:441
+#: src/applet.c:443
 msgid "Can't create Gaim applet!"
 msgstr "Kan inte skapa Gaim-panelprogram!"
 
-#: src/applet.c:462
+#: src/applet.c:464
 msgid "About..."
 msgstr "Om..."
 
@@ -916,137 +1088,100 @@
 msgid "Gaim - Away!"
 msgstr "Gaim - Frånvarande!"
 
-#: src/away.c:249
+#: src/away.c:251
 msgid "I'm Back!"
 msgstr "Jag är tillbaka!"
 
 # src/menus.c:327
-#: src/away.c:265 src/away.c:345 src/away.c:519
+#: src/away.c:267 src/away.c:347 src/away.c:521
 msgid "Back"
 msgstr "Bakåt"
 
-#: src/away.c:407
+#: src/away.c:409
 msgid "Remove Away Message"
 msgstr "Ta bort frånvaromeddelande"
 
-#: src/away.c:595
+#: src/away.c:597
 msgid "Set All Away"
 msgstr "Ställ in alla frånvarande"
 
 #. Put the buttons in the box
-#: src/buddy.c:473 src/buddy.c:2518 src/buddy_chat.c:1433
-#: src/conversation.c:1934 src/conversation.c:2308 src/dialogs.c:765
-#: src/dialogs.c:949 src/dialogs.c:1831 src/multi.c:986 src/prefs.c:1914
-#: src/prefs.c:2256 src/prefs.c:2290
+#: src/buddy.c:482 src/buddy.c:2579 src/buddy_chat.c:1443
+#: src/conversation.c:2043 src/conversation.c:2432 src/dialogs.c:881
+#: src/dialogs.c:1065 src/dialogs.c:1968 src/multi.c:1010 src/prefs.c:1990
+#: src/prefs.c:2332 src/prefs.c:2366
 msgid "Add"
 msgstr "Lägg till"
 
-#: src/buddy.c:474 src/buddy.c:2519 src/dialogs.c:775 src/dialogs.c:922
+#: src/buddy.c:483 src/buddy.c:2580 src/dialogs.c:891 src/dialogs.c:1038
 msgid "Group"
 msgstr "Grupp"
 
-#: src/buddy.c:475 src/buddy.c:2520 src/buddy_chat.c:1435
-#: src/conversation.c:1920 src/conversation.c:2305 src/prefs.c:1928
-#: src/prefs.c:2260 src/prefs.c:2294
+#: src/buddy.c:484 src/buddy.c:2581 src/buddy_chat.c:1445
+#: src/conversation.c:2029 src/conversation.c:2429 src/prefs.c:2004
+#: src/prefs.c:2336 src/prefs.c:2370
 msgid "Remove"
 msgstr "Ta bort"
 
-#: src/buddy.c:479 src/buddy.c:1898 src/buddy.c:2282 src/prefs.c:2741
-msgid "Chat"
-msgstr "Chatt"
-
-#: src/buddy.c:480 src/buddy.c:616 src/buddy.c:759 src/buddy.c:2280
-#: src/buddy_chat.c:820 src/buddy_chat.c:1257
+#: src/buddy.c:489 src/buddy.c:627 src/buddy.c:774 src/buddy.c:2341
+#: src/buddy_chat.c:850 src/buddy_chat.c:1267
 msgid "IM"
 msgstr "Snabbmeddelande"
 
-#: src/buddy.c:481 src/buddy.c:2281 src/buddy_chat.c:836 src/buddy_chat.c:1265
-#: src/buddy_chat.c:1441 src/conversation.c:2326
+#: src/buddy.c:490 src/buddy.c:2342 src/buddy_chat.c:866 src/buddy_chat.c:1275
+#: src/buddy_chat.c:1451 src/conversation.c:2450
 msgid "Info"
 msgstr "Information"
 
 #. Put the buttons in the box
-#: src/buddy.c:621 src/buddy.c:764 src/dialogs.c:914 src/dialogs.c:3195
-#: src/dialogs.c:3210
+#: src/buddy.c:632 src/buddy.c:779 src/dialogs.c:1030 src/dialogs.c:3336
+#: src/dialogs.c:3351
 msgid "Alias"
 msgstr "Alias"
 
-#: src/buddy.c:626 src/buddy.c:783
+#: src/buddy.c:637 src/buddy.c:798
 msgid "Add Buddy Pounce"
 msgstr "Lägg till kompisanfall"
 
-#: src/buddy.c:633 src/buddy.c:789
+#: src/buddy.c:644 src/buddy.c:804
 msgid "View Log"
 msgstr "Visa logg"
 
-#: src/buddy.c:748 src/buddy.c:777
+#: src/buddy.c:761 src/buddy.c:792
 msgid "Rename"
 msgstr "Byt namn"
 
-#: src/buddy.c:771
+#: src/buddy.c:786
 msgid "Un-Alias"
 msgstr "Avaliasera"
 
-#: src/buddy.c:1476 src/buddy.c:2424
+#: src/buddy.c:1493 src/buddy.c:2485
 msgid "Buddy Pounce"
 msgstr "Kompisanfall"
 
-#: src/buddy.c:1548
+#: src/buddy.c:1565
 msgid "New Buddy Pounce"
 msgstr "Nytt kompisanfall"
 
-#: src/buddy.c:1566
+#: src/buddy.c:1583
 msgid "Remove Buddy Pounce"
 msgstr "Ta bort kompisanfall"
 
-#: src/buddy.c:1889
-msgid "Buddy Icon"
-msgstr "Kompisikon"
-
-#: src/buddy.c:1892
-msgid "Voice"
-msgstr "Röst"
-
-#: src/buddy.c:1895
-msgid "IM Image"
-msgstr "Snabbmeddelandebild"
-
-#: src/buddy.c:1901
-msgid "Get File"
-msgstr "Hämta fil"
-
-#: src/buddy.c:1904
-msgid "Send File"
-msgstr "Skicka fil"
-
-#: src/buddy.c:1908
-msgid "Games"
-msgstr "Spel"
-
-#: src/buddy.c:1911
-msgid "Stocks"
-msgstr "Aktier"
-
-#: src/buddy.c:1914
-msgid "EveryBuddy Bug"
-msgstr "EveryBuddy-fel"
-
-#: src/buddy.c:1985
+#: src/buddy.c:2029
 #, c-format
 msgid "Logged in: %s\n"
 msgstr "Inloggad: %s\n"
 
-#: src/buddy.c:1997
-#, c-format
+#: src/buddy.c:2041
 msgid "Warnings: %d%%\n"
 msgstr "Varningar: %d%%\n"
 
-#: src/buddy.c:2009
+#: src/buddy.c:2053
 #, c-format
 msgid "Capabilities: %s\n"
 msgstr "Kapabiliteter: %s\n"
 
-#: src/buddy.c:2013
+#: src/buddy.c:2057
 #, c-format
 msgid ""
 "Alias: %s               \n"
@@ -1057,121 +1192,121 @@
 "Skärmnamn: %s\n"
 "%s%s%s%s%s%s"
 
-#: src/buddy.c:2017
+#: src/buddy.c:2061
 msgid "Idle: "
 msgstr "Inaktivitet: "
 
-#: src/buddy.c:2087
+#: src/buddy.c:2132 src/buddy.c:2136
 #, c-format
 msgid "%s logged in."
 msgstr "%s loggade in."
 
-#: src/buddy.c:2142
+#: src/buddy.c:2195 src/buddy.c:2199
 #, c-format
 msgid "%s logged out."
 msgstr "%s loggade ut."
 
-#: src/buddy.c:2315
+#: src/buddy.c:2376
 msgid "Information on selected Buddy"
 msgstr "Information om vald kompis"
 
-#: src/buddy.c:2316 src/dialogs.c:572
+#: src/buddy.c:2377 src/dialogs.c:688
 msgid "Send Instant Message"
 msgstr "Skicka snabbmeddelande"
 
-#: src/buddy.c:2317
+#: src/buddy.c:2378
 msgid "Start/join a Buddy Chat"
 msgstr "Starta/gå in i en kompischatt"
 
-#: src/buddy.c:2318
+#: src/buddy.c:2379
 msgid "Activate Away Message"
 msgstr "Aktivera frånvaromeddelande"
 
-#: src/buddy.c:2381
+#: src/buddy.c:2442
 msgid "File"
 msgstr "Arkiv"
 
-#: src/buddy.c:2385
+#: src/buddy.c:2446
 msgid "Add A Buddy"
 msgstr "Lägg till en kompis"
 
-#: src/buddy.c:2387
+#: src/buddy.c:2448
 msgid "Join A Chat"
 msgstr "Gå in i en chatt"
 
-#: src/buddy.c:2389
+#: src/buddy.c:2450
 msgid "New Instant Message"
 msgstr "Nytt snabbmeddelande"
 
-#: src/buddy.c:2391 src/dialogs.c:624
+#: src/buddy.c:2452 src/dialogs.c:740
 msgid "Get User Info"
 msgstr "Hämta användarinformation"
 
-#: src/buddy.c:2396
+#: src/buddy.c:2457
 msgid "Import Buddy List"
 msgstr "Importera kompislista"
 
-#: src/buddy.c:2414
+#: src/buddy.c:2475
 msgid "Tools"
 msgstr "Verktyg"
 
-#: src/buddy.c:2437
+#: src/buddy.c:2498
 msgid "Protocol Actions"
 msgstr "Protokollåtgärder"
 
-#: src/buddy.c:2443
+#: src/buddy.c:2504
 msgid "View System Log"
 msgstr "Visa systemlogg"
 
-#: src/buddy.c:2455
+#: src/buddy.c:2516
 msgid "Perl"
 msgstr "Perl"
 
-#: src/buddy.c:2458
+#: src/buddy.c:2519
 msgid "Load Script"
 msgstr "Läs in skript"
 
-#: src/buddy.c:2462
+#: src/buddy.c:2523
 msgid "Unload All Scripts"
 msgstr "Glöm alla skript"
 
-#: src/buddy.c:2466
+#: src/buddy.c:2527
 msgid "List Scripts"
 msgstr "Lista skript"
 
-#: src/buddy.c:2474
+#: src/buddy.c:2535
 msgid "Help"
 msgstr "Hjälp"
 
-#: src/buddy.c:2479
+#: src/buddy.c:2540
 msgid "About Gaim"
 msgstr "Om Gaim"
 
-#: src/buddy.c:2498 src/prefs.c:2720
+#: src/buddy.c:2559 src/prefs.c:2816
 msgid "Buddy List"
 msgstr "Kompislista"
 
-#: src/buddy.c:2551
+#: src/buddy.c:2612
 msgid "Add a new Buddy"
 msgstr "Lägg till en ny kompis"
 
-#: src/buddy.c:2552
+#: src/buddy.c:2613
 msgid "Add a new Group"
 msgstr "Lägg till en ny grupp"
 
-#: src/buddy.c:2553
+#: src/buddy.c:2614
 msgid "Remove selected Buddy/Group"
 msgstr "Ta bort vald kompis/grupp"
 
-#: src/buddy.c:2578
+#: src/buddy.c:2639
 msgid "Online"
 msgstr "Ansluten"
 
-#: src/buddy.c:2580
+#: src/buddy.c:2641
 msgid "Edit Buddies"
 msgstr "Redigera kompisar"
 
-#: src/buddy.c:2620
+#: src/buddy.c:2681
 msgid "Gaim - Buddy List"
 msgstr "Gaim - Kompislista"
 
@@ -1187,13 +1322,13 @@
 msgid "Join Chat As:"
 msgstr "Gå in i chatt som:"
 
-#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:420
-#: src/dialogs.c:590 src/dialogs.c:648 src/dialogs.c:767 src/dialogs.c:945
-#: src/dialogs.c:1234 src/dialogs.c:1439 src/dialogs.c:1563 src/dialogs.c:1623
-#: src/dialogs.c:1820 src/dialogs.c:2002 src/dialogs.c:2177 src/dialogs.c:2248
-#: src/dialogs.c:2940 src/dialogs.c:3197 src/dialogs.c:3378 src/dialogs.c:3747
-#: src/dialogs.c:3852 src/multi.c:720 src/multi.c:850 src/multi.c:1184
-#: src/prpl.c:150 src/prpl.c:224
+#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:444
+#: src/dialogs.c:535 src/dialogs.c:706 src/dialogs.c:764 src/dialogs.c:883
+#: src/dialogs.c:1061 src/dialogs.c:1350 src/dialogs.c:1555 src/dialogs.c:1679
+#: src/dialogs.c:1739 src/dialogs.c:1957 src/dialogs.c:2139 src/dialogs.c:2314
+#: src/dialogs.c:2385 src/dialogs.c:3081 src/dialogs.c:3338 src/dialogs.c:3519
+#: src/dialogs.c:3890 src/dialogs.c:3996 src/dialogs.c:4642 src/multi.c:744
+#: src/multi.c:874 src/multi.c:1208 src/prpl.c:150 src/prpl.c:224
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -1201,17 +1336,17 @@
 msgid "Join"
 msgstr "Anslut"
 
-#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1307
-#: src/buddy_chat.c:1397
+#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1317
+#: src/buddy_chat.c:1407
 msgid "Invite"
 msgstr "Bjud in"
 
-#: src/buddy_chat.c:412 src/dialogs.c:1114 src/dialogs.c:3205
+#: src/buddy_chat.c:412 src/dialogs.c:1230 src/dialogs.c:3346
 msgid "Buddy"
 msgstr "Kompis"
 
 # src/sidebar.c:103
-#: src/buddy_chat.c:417 src/prefs.c:1879
+#: src/buddy_chat.c:417 src/prefs.c:1953
 msgid "Message"
 msgstr "Meddelande"
 
@@ -1219,628 +1354,651 @@
 msgid "Gaim - Invite Buddy Into Chat Room"
 msgstr "Gaim - Bjud in kompis till chattrum"
 
-#: src/buddy_chat.c:827
+#: src/buddy_chat.c:857
 msgid "Un-Ignore"
 msgstr "Avignorera"
 
-#: src/buddy_chat.c:829 src/buddy_chat.c:1261
+#: src/buddy_chat.c:859 src/buddy_chat.c:1271
 msgid "Ignore"
 msgstr "Ignorera"
 
 #. don't remove them from ignored in case they re-enter
-#: src/buddy_chat.c:873 src/buddy_chat.c:993
+#: src/buddy_chat.c:922 src/buddy_chat.c:1034 src/buddy_chat.c:1497
+#: src/buddy_chat.c:1530
 #, c-format
 msgid "%d %s in room"
 msgstr "%d %s i rummet"
 
-#: src/buddy_chat.c:881
+#: src/buddy_chat.c:930
 #, c-format
 msgid "%s entered the room."
 msgstr "%s kom in i rummet."
 
-#: src/buddy_chat.c:955
+#: src/buddy_chat.c:996
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s är nu känd som %s"
 
-#: src/buddy_chat.c:1001
+#: src/buddy_chat.c:1043
+#, fuzzy, c-format
+msgid "%s left the room (%s)."
+msgstr "%s lämnade rummet."
+
+#: src/buddy_chat.c:1045
 #, c-format
 msgid "%s left the room."
 msgstr "%s lämnade rummet."
 
-#: src/buddy_chat.c:1136
+#: src/buddy_chat.c:1144
 msgid "Gaim - Group Chats"
 msgstr "Gaim - Gruppchatter"
 
-#: src/buddy_chat.c:1197
+#: src/buddy_chat.c:1207
 msgid "Topic:"
 msgstr "Ämne:"
 
-#: src/buddy_chat.c:1238
+#: src/buddy_chat.c:1248
 msgid "0 people in room"
 msgstr "0 personer i rummet"
 
-#: src/buddy_chat.c:1312 src/buddy_chat.c:1396
+#: src/buddy_chat.c:1322 src/buddy_chat.c:1406
 msgid "Whisper"
 msgstr "Viska"
 
-#: src/buddy_chat.c:1317 src/buddy_chat.c:1394 src/buddy_chat.c:1443
-#: src/conversation.c:2337
+#: src/buddy_chat.c:1327 src/buddy_chat.c:1404 src/buddy_chat.c:1453
+#: src/conversation.c:2461
 msgid "Send"
 msgstr "Skicka"
 
-#: src/buddy_chat.c:1437 src/conversation.c:2314
+#: src/buddy_chat.c:1447 src/conversation.c:2438
 msgid "Block"
 msgstr "Blockera"
 
-#: src/buddy_chat.c:1439 src/conversation.c:2320 src/dialogs.c:391
-#: src/dialogs.c:416
+#: src/buddy_chat.c:1449 src/conversation.c:2444 src/dialogs.c:419
+#: src/dialogs.c:448
 msgid "Warn"
 msgstr "Varna"
 
-#: src/conversation.c:387
+#: src/conversation.c:392
 msgid "Gaim - Save Conversation"
 msgstr "Gaim - Spara konversation"
 
-#: src/conversation.c:544
-#, c-format
-msgid "Removing '%s' from buddylist.\n"
-msgstr "Ta bort \"%s\" från kompislistan.\n"
-
-#: src/conversation.c:925
+#: src/conversation.c:1037
 msgid "Unable to send message: too large"
 msgstr "Kan inte skicka meddelande: för stort"
 
-#: src/conversation.c:925 src/conversation.c:927
+#: src/conversation.c:1037 src/conversation.c:1039
 msgid "Message Error"
 msgstr "Meddelandefel"
 
-#: src/conversation.c:927
+#: src/conversation.c:1039
 msgid "Unable to send message: Unknown reason"
 msgstr "Kan inte skicka meddelande: Okänd orsak"
 
-#: src/conversation.c:1146
+#: src/conversation.c:1258
 #, c-format
 msgid "Currently at %d, "
 msgstr "För närvarande %d, "
 
-#: src/conversation.c:1154
+#: src/conversation.c:1266
 #, c-format
 msgid "Setting position to %d\n"
 msgstr "Ställer in positionen till %d\n"
 
-#: src/conversation.c:1725 src/prefs.c:1233
+#: src/conversation.c:1832 src/prefs.c:1274
 msgid "Bold Text"
 msgstr "Gör texten fet"
 
-#: src/conversation.c:1725
+#: src/conversation.c:1832
 msgid "Bold"
 msgstr "Fet"
 
-#: src/conversation.c:1729
+#: src/conversation.c:1836
 msgid "Italics Text"
 msgstr "Gör texten kursiv"
 
-#: src/conversation.c:1730
+#: src/conversation.c:1837
 msgid "Italics"
 msgstr "Kursiv"
 
-#: src/conversation.c:1733 src/prefs.c:1245
+#: src/conversation.c:1840 src/prefs.c:1286
 msgid "Underline Text"
 msgstr "Understryk text"
 
-#: src/conversation.c:1734
+#: src/conversation.c:1841
 msgid "Underline"
 msgstr "Understrykning"
 
-#: src/conversation.c:1738 src/prefs.c:1251
+#: src/conversation.c:1845 src/prefs.c:1292
 msgid "Strike through Text"
 msgstr "Genomstryk text"
 
-#: src/conversation.c:1738
+#: src/conversation.c:1845
 msgid "Strike"
 msgstr "Genomstrykning"
 
-#: src/conversation.c:1744
+#: src/conversation.c:1851
 msgid "Decrease font size"
 msgstr "Minska typsnittsstorleken"
 
-#: src/conversation.c:1744
+#: src/conversation.c:1851
 msgid "Small"
 msgstr "Liten"
 
-#: src/conversation.c:1747
+#: src/conversation.c:1854
 msgid "Normal font size"
 msgstr "Normal typsnittsstorlek"
 
-#: src/conversation.c:1747
+#: src/conversation.c:1854
 msgid "Normal"
 msgstr "Normal"
 
-#: src/conversation.c:1750
+#: src/conversation.c:1857
 msgid "Increase font size"
 msgstr "Öka typsnittsstorleken"
 
-#: src/conversation.c:1750
+#: src/conversation.c:1857
 msgid "Big"
 msgstr "Stor"
 
-#: src/conversation.c:1757 src/dialogs.c:2628 src/dialogs.c:2647
+#: src/conversation.c:1864 src/dialogs.c:2756 src/dialogs.c:2780
 msgid "Select Font"
 msgstr "Välj typsnitt"
 
-#: src/conversation.c:1758
+#: src/conversation.c:1865
 msgid "Font"
 msgstr "Typsnitt"
 
-#: src/conversation.c:1761 src/prefs.c:1281
+#: src/conversation.c:1868 src/prefs.c:1322
 msgid "Text Color"
 msgstr "Textfärg"
 
-#: src/conversation.c:1762 src/conversation.c:1766
+#: src/conversation.c:1869 src/conversation.c:1873
 msgid "Color"
 msgstr "Färg"
 
-#: src/conversation.c:1766 src/prefs.c:1299
+#: src/conversation.c:1873 src/prefs.c:1340
 msgid "Background Color"
 msgstr "Bakgrundsfärg"
 
-#: src/conversation.c:1773 src/dialogs.c:2242
+#: src/conversation.c:1880 src/dialogs.c:2379
 msgid "Insert Link"
 msgstr "Infoga länk"
 
-#: src/conversation.c:1774
+#: src/conversation.c:1881
 msgid "Link"
 msgstr "Länk"
 
-#: src/conversation.c:1777
+#: src/conversation.c:1884
 msgid "Insert smiley face"
 msgstr "Infoga smiley"
 
-#: src/conversation.c:1777
+#: src/conversation.c:1884
 msgid "Smiley"
 msgstr "Smiley"
 
-#: src/conversation.c:1784
+#: src/conversation.c:1891
 msgid "Enable logging"
 msgstr "Använd loggning"
 
-#: src/conversation.c:1785 src/prefs.c:244
+#: src/conversation.c:1892 src/prefs.c:244
 msgid "Logging"
 msgstr "Loggning"
 
-#: src/conversation.c:1794
+#: src/conversation.c:1901
 msgid "Save Conversation"
 msgstr "Spara konversation"
 
 # src/menus.c:280
-#: src/conversation.c:1795 src/dialogs.c:1443 src/dialogs.c:1627
-#: src/dialogs.c:2952 src/dialogs.c:3643
+#: src/conversation.c:1902 src/dialogs.c:1559 src/dialogs.c:1743
+#: src/dialogs.c:3093 src/dialogs.c:3786 src/dialogs.c:4649
 msgid "Save"
 msgstr "Spara"
 
-#: src/conversation.c:1799
+#: src/conversation.c:1906
 msgid "Enable sounds"
 msgstr "Använd ljud"
 
-#: src/conversation.c:1800
+#: src/conversation.c:1907
 msgid "Sound"
 msgstr "Ljud"
 
-#: src/conversation.c:2166
+#: src/conversation.c:2290
 msgid "Gaim - Conversations"
 msgstr "Gaim - Konversationer"
 
-#: src/conversation.c:2253
+#: src/conversation.c:2377
 msgid "Send message as: "
 msgstr "Skicka meddelande som: "
 
-#: src/conversation.c:2742
+#: src/conversation.c:2986
 msgid "Gaim - Save Icon"
 msgstr "Gaim - Spara ikon"
 
-#: src/conversation.c:2769
+#: src/conversation.c:3013
 msgid "Disable Animation"
 msgstr "Använd inte animering"
 
-#: src/conversation.c:2774
+#: src/conversation.c:3018
 msgid "Enable Animation"
 msgstr "Använd animation"
 
-#: src/conversation.c:2780
+#: src/conversation.c:3024
 msgid "Hide Icon"
 msgstr "Dölj ikon"
 
-#: src/conversation.c:2786
+#: src/conversation.c:3030
 msgid "Save Icon As..."
 msgstr "Spara ikon som..."
 
-#: src/dialogs.c:379
+#: src/dialogs.c:407
 msgid "Gaim - Warn user?"
 msgstr "Gaim - Varna användare?"
 
-#: src/dialogs.c:399
+#: src/dialogs.c:427
 #, c-format
 msgid "Do you really want to warn %s?"
 msgstr "Vill du verkligen varna %s?"
 
-#: src/dialogs.c:404
+#: src/dialogs.c:432
 msgid "Warn anonymously?"
 msgstr "Varna anonymt?"
 
-#: src/dialogs.c:408
+#: src/dialogs.c:436
 msgid "Anonymous warnings are less harsh."
 msgstr "Anonyma varningar är mindre barska."
 
+#: src/dialogs.c:464
+#, c-format
+msgid "Removing '%s' from buddylist.\n"
+msgstr "Ta bort \"%s\" från kompislistan.\n"
+
+#: src/dialogs.c:490
+#, fuzzy, c-format
+msgid "Gaim - Remove %s?"
+msgstr "Gaim - Byt namn på gruppen"
+
+#: src/dialogs.c:503
+#, fuzzy
+msgid "Remove Buddy"
+msgstr "Byt namn på kompis"
+
+#: src/dialogs.c:513
+#, c-format
+msgid ""
+"You are about to remove '%s' from\n"
+"your buddylist. Do you want to continue?"
+msgstr ""
+
+#: src/dialogs.c:525 src/prpl.c:154 src/prpl.c:228
+msgid "Accept"
+msgstr "Acceptera"
+
 #. Build OK Button
-#: src/dialogs.c:516 src/dialogs.c:595 src/dialogs.c:653 src/dialogs.c:1238
-#: src/dialogs.c:1567 src/dialogs.c:1680 src/dialogs.c:2001 src/dialogs.c:2181
-#: src/dialogs.c:2247 src/dialogs.c:3752 src/dialogs.c:3857 src/multi.c:725
+#: src/dialogs.c:632 src/dialogs.c:711 src/dialogs.c:769 src/dialogs.c:1354
+#: src/dialogs.c:1683 src/dialogs.c:1830 src/dialogs.c:2138 src/dialogs.c:2318
+#: src/dialogs.c:2384 src/dialogs.c:3895 src/dialogs.c:4001 src/multi.c:749
 msgid "OK"
 msgstr "OK"
 
-#: src/dialogs.c:562
+#: src/dialogs.c:678
 msgid "Gaim - IM user"
 msgstr "Gaim - Snabbmeddelandeanvändare"
 
-#: src/dialogs.c:579
+#: src/dialogs.c:695
 msgid "IM who:"
 msgstr "Snabbmeddelande till vem:"
 
-#: src/dialogs.c:631
+#: src/dialogs.c:747
 msgid "User:"
 msgstr "Användare:"
 
 #. Finish up
-#: src/dialogs.c:658
+#: src/dialogs.c:774
 msgid "Gaim - Get User Info"
 msgstr "Gaim - Hämta användarinformation"
 
-#: src/dialogs.c:720
+#: src/dialogs.c:836
 msgid "Buddies"
 msgstr "Kompisar"
 
-#: src/dialogs.c:773
+#: src/dialogs.c:889
 msgid "Add Group"
 msgstr "Lägg till grupp"
 
-#: src/dialogs.c:798
+#: src/dialogs.c:914
 msgid "Gaim - Add Group"
 msgstr "Gaim - Lägg till grupp"
 
-#: src/dialogs.c:882
+#: src/dialogs.c:998
 msgid "Gaim - Add Buddy"
 msgstr "Gaim - Lägg till kompis"
 
-#: src/dialogs.c:894
+#: src/dialogs.c:1010
 msgid "Add Buddy"
 msgstr "Lägg till kompis"
 
-#: src/dialogs.c:904
+#: src/dialogs.c:1020
 msgid "Contact"
 msgstr "Kontakt"
 
 #. Set up stuff for the account box
-#: src/dialogs.c:932
+#: src/dialogs.c:1048
 msgid "Add To"
 msgstr "Lägg till i"
 
-#: src/dialogs.c:967
+#: src/dialogs.c:1083
 msgid "Please enter a buddy to pounce."
 msgstr "Ange en kompis att anfalla."
 
-#: src/dialogs.c:967
+#: src/dialogs.c:1083
 msgid "Buddy Pounce Error"
 msgstr "Kompisanfallsfel"
 
-#: src/dialogs.c:1083
+#: src/dialogs.c:1199
 msgid "Gaim - New Buddy Pounce"
 msgstr "Gaim - Nytt kompisanfall"
 
 #. <pounce type="who">
-#: src/dialogs.c:1094
+#: src/dialogs.c:1210
 msgid "Pounce Who"
 msgstr "Anfall vem"
 
-#: src/dialogs.c:1105
+#: src/dialogs.c:1221
 msgid "Account"
 msgstr "Konto"
 
 #. </pounce type="who">
 #. <pounce type="when">
-#: src/dialogs.c:1129
+#: src/dialogs.c:1245
 msgid "Pounce When"
 msgstr "Anfall när"
 
-#: src/dialogs.c:1139
+#: src/dialogs.c:1255
 msgid "Pounce on sign on"
 msgstr "Anfall vid inloggning"
 
-#: src/dialogs.c:1144
+#: src/dialogs.c:1260
 msgid "Pounce on return from away"
 msgstr "Anfall vid återkomst från frånvaro"
 
-#: src/dialogs.c:1150
+#: src/dialogs.c:1266
 msgid "Pounce on return from idle"
 msgstr "Anfall vid återkomst från inaktivitet"
 
 #. </pounce type="when">
 #. <pounce type="action">
-#: src/dialogs.c:1162
+#: src/dialogs.c:1278
 msgid "Pounce Action"
 msgstr "Anfallsåtgärd"
 
-#: src/dialogs.c:1173
+#: src/dialogs.c:1289
 msgid "Open IM Window"
 msgstr "Öppna snabbmeddelandefönster"
 
-#: src/dialogs.c:1178
+#: src/dialogs.c:1294
 msgid "Popup Notification"
 msgstr "Visa notifiering"
 
-#: src/dialogs.c:1183
+#: src/dialogs.c:1299
 msgid "Send Message"
 msgstr "Skicka meddelande"
 
-#: src/dialogs.c:1196
+#: src/dialogs.c:1312
 msgid "Execute command on pounce"
 msgstr "Kör kommando vid anfall"
 
-#: src/dialogs.c:1209
+#: src/dialogs.c:1325
 msgid "Play sound on pounce"
 msgstr "Spela ljud vid anfall"
 
 #. </pounce type="action">
-#: src/dialogs.c:1224
+#: src/dialogs.c:1340
 msgid "Save this pounce after activation"
 msgstr "Spara detta anfall efter aktivering"
 
-#: src/dialogs.c:1306
+#: src/dialogs.c:1422
 msgid "Gaim - Set Dir Info"
 msgstr "Gaim - Ställ in kataloginformation"
 
-#: src/dialogs.c:1315
+#: src/dialogs.c:1431
 msgid "Directory Info"
 msgstr "Kataloginformation"
 
-#: src/dialogs.c:1337
+#: src/dialogs.c:1453
 msgid "Allow Web Searches To Find Your Info"
 msgstr "Tillåt webbtjänster att hitta din information"
 
 #. Line 1
-#: src/dialogs.c:1340 src/dialogs.c:2020
+#: src/dialogs.c:1456 src/dialogs.c:2157
 msgid "First Name"
 msgstr "Förnamn"
 
 #. Line 2
-#: src/dialogs.c:1351 src/dialogs.c:2032
+#: src/dialogs.c:1467 src/dialogs.c:2169
 msgid "Middle Name"
 msgstr "Andranamn"
 
 #. Line 3
-#: src/dialogs.c:1363 src/dialogs.c:2044
+#: src/dialogs.c:1479 src/dialogs.c:2181
 msgid "Last Name"
 msgstr "Efternamn"
 
 #. Line 4
-#: src/dialogs.c:1374 src/dialogs.c:2056
+#: src/dialogs.c:1490 src/dialogs.c:2193
 msgid "Maiden Name"
 msgstr "Flicknamn"
 
 #. Line 6
-#: src/dialogs.c:1396 src/dialogs.c:2079
+#: src/dialogs.c:1512 src/dialogs.c:2216
 msgid "State"
 msgstr "Delstat"
 
 #. Line 7
-#: src/dialogs.c:1407 src/dialogs.c:2090
+#: src/dialogs.c:1523 src/dialogs.c:2227
 msgid "Country"
 msgstr "Land"
 
-#: src/dialogs.c:1461
+#: src/dialogs.c:1577
 msgid "New Passwords Do Not Match"
 msgstr "Nya lösenorden stämmer inte överens"
 
-#: src/dialogs.c:1461 src/dialogs.c:1466
+#: src/dialogs.c:1577 src/dialogs.c:1582
 msgid "Gaim - Change Password Error"
 msgstr "Gaim - Fel vid lösenordsbyte"
 
-#: src/dialogs.c:1466
+#: src/dialogs.c:1582
 msgid "Fill out all fields completely"
 msgstr "Fyll i alla fält helt"
 
-#: src/dialogs.c:1502
-msgid "Change Password"
-msgstr "Byt lösenord"
-
-#: src/dialogs.c:1521
+#: src/dialogs.c:1637
 msgid "Original Password"
 msgstr "Gammalt lösenord"
 
-#: src/dialogs.c:1535
+#: src/dialogs.c:1651
 msgid "New Password"
 msgstr "Nytt lösenord"
 
-#: src/dialogs.c:1549
+#: src/dialogs.c:1665
 msgid "New Password (again)"
 msgstr "Nytt lösenord (igen)"
 
-#: src/dialogs.c:1590
+#: src/dialogs.c:1706
 msgid "Gaim - Set User Info"
 msgstr "Gaim - Ställ in användarinformation"
 
-#: src/dialogs.c:1685
+#: src/dialogs.c:1814
 msgid "Below are the results of your search: "
 msgstr "Nedan är resultaten från din sökning: "
 
-#: src/dialogs.c:1810 src/dialogs.c:1817
+#: src/dialogs.c:1947 src/dialogs.c:1954
 msgid "Permit"
 msgstr "Tillåt"
 
-#: src/dialogs.c:1812 src/dialogs.c:1819
+#: src/dialogs.c:1949 src/dialogs.c:1956
 msgid "Deny"
 msgstr "Neka"
 
-#: src/dialogs.c:1856
+#: src/dialogs.c:1993
 msgid "Gaim - Add Permit"
 msgstr "Gaim - Lägg till tillåtelse"
 
-#: src/dialogs.c:1858
+#: src/dialogs.c:1995
 msgid "Gaim - Add Deny"
 msgstr "Gaim - Lägg till nekan"
 
-#: src/dialogs.c:1918
+#: src/dialogs.c:2055
 msgid "Gaim - Log Conversation"
 msgstr "Gaim - Logga konversation"
 
-#: src/dialogs.c:1996 src/dialogs.c:2159
+#: src/dialogs.c:2133 src/dialogs.c:2296
 msgid "Search for Buddy"
 msgstr "Sök efter kompis"
 
-#: src/dialogs.c:2124
+#: src/dialogs.c:2261
 msgid "Gaim - Find Buddy By Info"
 msgstr "Gaim - Sök kompis efter information"
 
-#: src/dialogs.c:2153
+#: src/dialogs.c:2290
 msgid "Gaim - Find Buddy By Email"
 msgstr "Gaim - Sök kompis efter e-post"
 
-#: src/dialogs.c:2166
+#: src/dialogs.c:2303
 msgid "Email"
 msgstr "E-post"
 
-#: src/dialogs.c:2261
+#: src/dialogs.c:2398
 msgid "URL"
 msgstr "URL"
 
 #. Right side: frame with description and the filepath of plugin
-#: src/dialogs.c:2269 src/plugins.c:211
+#: src/dialogs.c:2406 src/plugins.c:211
 msgid "Description"
 msgstr "Beskrivning"
 
-#: src/dialogs.c:2293
+#: src/dialogs.c:2430
 msgid "Gaim - Add URL"
 msgstr "Gaim - Lägg till URL"
 
-#: src/dialogs.c:2444 src/dialogs.c:2465 src/dialogs.c:2519
+#: src/dialogs.c:2581 src/dialogs.c:2602 src/dialogs.c:2656
 msgid "Select Text Color"
 msgstr "Välj textfärg"
 
-#: src/dialogs.c:2498
+#: src/dialogs.c:2635
 msgid "Select Background Color"
 msgstr "Välj bakgrundsfärg"
 
-#: src/dialogs.c:2722
+#: src/dialogs.c:2857
 msgid "Import to:"
 msgstr "Importera till:"
 
-#: src/dialogs.c:2746
+#: src/dialogs.c:2881
 msgid "Gaim - Import Buddy List"
 msgstr "Gaim - Importera kompislista"
 
 #. We shouldn't allow a blank title
-#: src/dialogs.c:2807
+#: src/dialogs.c:2948
 msgid "You cannot create an away message with a blank title"
 msgstr "Du kan inte skapa ett frånvaromeddelande med en tom titel"
 
 #. We shouldn't allow a blank message
-#: src/dialogs.c:2814
+#: src/dialogs.c:2955
 msgid "You cannot create an empty away message"
 msgstr "Kunde inte skapa ett tomt frånvaromeddelande"
 
-#: src/dialogs.c:2882
+#: src/dialogs.c:3023
 msgid "Gaim - New away message"
 msgstr "Gaim - Nytt frånvaromeddelande"
 
-#: src/dialogs.c:2892
+#: src/dialogs.c:3033
 msgid "New away message"
 msgstr "Nytt frånvaromeddelande"
 
-#: src/dialogs.c:2905
+#: src/dialogs.c:3046
 msgid "Away title: "
 msgstr "Frånvarotitel: "
 
-#: src/dialogs.c:2944
+#: src/dialogs.c:3085
 msgid "Use"
 msgstr "Använd"
 
-#: src/dialogs.c:2948
+#: src/dialogs.c:3089
 msgid "Save & Use"
 msgstr "Spara och använd"
 
 #. show everything
-#: src/dialogs.c:3151
+#: src/dialogs.c:3292
 msgid "Smile!"
 msgstr "Le!"
 
-#: src/dialogs.c:3203
+#: src/dialogs.c:3344
 msgid "Alias Buddy"
 msgstr "Aliaskompis"
 
-#: src/dialogs.c:3236
+#: src/dialogs.c:3377
 msgid "Gaim - Alias Buddy"
 msgstr "Gaim - Aliaskompis"
 
-#: src/dialogs.c:3308
+#: src/dialogs.c:3449
 msgid "Gaim - Save Log File"
 msgstr "Gaim - Spara loggfil"
 
-#: src/dialogs.c:3340
+#: src/dialogs.c:3481
 #, c-format
 msgid "Unable to remove file %s - %s"
 msgstr "Kan inte ta bort filen %s - %s"
 
-#: src/dialogs.c:3368
+#: src/dialogs.c:3509
 msgid "Really clear log?"
 msgstr "Vill du verkligen tömma loggen?"
 
-#: src/dialogs.c:3383
+#: src/dialogs.c:3524
 msgid "Okay"
 msgstr "Okej"
 
-#: src/dialogs.c:3554
+#: src/dialogs.c:3695
 msgid "Date"
 msgstr "Datum"
 
-#: src/dialogs.c:3617
+#: src/dialogs.c:3758
 msgid "Conversation"
 msgstr "Konversation"
 
-#: src/dialogs.c:3638
+#: src/dialogs.c:3781
 msgid "Clear"
 msgstr "Töm"
 
-#: src/dialogs.c:3716
+#: src/dialogs.c:3859
 msgid "Gaim - Rename Group"
 msgstr "Gaim - Byt namn på gruppen"
 
-#: src/dialogs.c:3726
+#: src/dialogs.c:3869
 msgid "Rename Group"
 msgstr "Byt namn på gruppen"
 
-#: src/dialogs.c:3733 src/dialogs.c:3838
+#: src/dialogs.c:3876 src/dialogs.c:3982
 msgid "New name:"
 msgstr "Nytt namn:"
 
-#: src/dialogs.c:3821
+#: src/dialogs.c:3965
 msgid "Gaim - Rename Buddy"
 msgstr "Gaim - Byt namn på kompis"
 
-#: src/dialogs.c:3831
+#: src/dialogs.c:3975
 msgid "Rename Buddy"
 msgstr "Byt namn på kompis"
 
 #. Below is basically stolen from plugins.c
-#: src/dialogs.c:3915
+#: src/dialogs.c:4059
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - Välj Perlskript"
 
-#: src/gaimrc.c:1107
+#: src/gaimrc.c:1113
 #, c-format
 msgid "Could not open config file %s."
 msgstr "Kunde inte öppna konfigurationsfilen %s."
 
-#: src/gaimrc.c:1108
+#: src/gaimrc.c:1114
 msgid "Preferences Error"
 msgstr "Inställningsfel"
 
@@ -1853,92 +2011,102 @@
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Fel vid öppnande av anslutning.\n"
 
-#: src/multi.c:411
+#: src/multi.c:427
 msgid "Gaim - Load Buddy Icon"
 msgstr "Gaim - Läs in kompisikon"
 
-#: src/multi.c:454
+#: src/multi.c:470
 msgid "Buddy Icon File:"
 msgstr "Fil med kompisikon:"
 
-#: src/multi.c:465
+#: src/multi.c:481
 msgid "Browse"
 msgstr "Bläddra"
 
-#: src/multi.c:470 src/prefs.c:1457
+#: src/multi.c:486 src/prefs.c:1512
 msgid "Reset"
 msgstr "Återställ"
 
-#: src/multi.c:497
+#: src/multi.c:513
 msgid "Screenname:"
 msgstr "Skärmnamn:"
 
-#: src/multi.c:517
+#: src/multi.c:533
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: src/multi.c:522
+#: src/multi.c:538
 msgid "Remember Password"
 msgstr "Kom ihåg lösenord"
 
-#: src/multi.c:523
+#: src/multi.c:539
 msgid "Auto-Login"
 msgstr "Logga in automatiskt"
 
-#: src/multi.c:563
+#: src/multi.c:579
 msgid "New Mail Notifications"
 msgstr "Notifieringar vid ny e-post"
 
-#: src/multi.c:703
+#: src/multi.c:727
 msgid "Gaim - Modify Account"
 msgstr "Gaim - Ändra konto"
 
-#: src/multi.c:822
+#: src/multi.c:846
 msgid "Enter Password"
 msgstr "Ange lösenord"
 
-#: src/multi.c:911
+#: src/multi.c:935
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Är du säker på att du vill ta bort %s?"
 
-#: src/multi.c:948
+#: src/multi.c:972
 msgid "Gaim - Account Editor"
 msgstr "Gaim - Kontoredigerare"
 
-#: src/multi.c:967
+#: src/multi.c:991
 msgid "Select All"
 msgstr "Markera alla"
 
-#: src/multi.c:972
+#: src/multi.c:996
 msgid "Select Autos"
 msgstr "Markera automatiskt"
 
-#: src/multi.c:976
+#: src/multi.c:1000
 msgid "Select None"
 msgstr "Markera inga"
 
-#: src/multi.c:990
+#: src/multi.c:1014
 msgid "Modify"
 msgstr "Modifera"
 
-#: src/multi.c:994
+#: src/multi.c:1018
 msgid "Sign On/Off"
 msgstr "Logga in/ut"
 
-#: src/multi.c:998
+#: src/multi.c:1022
 msgid "Delete"
 msgstr "Ta bort"
 
-#: src/multi.c:1226
+#: src/multi.c:1256
 #, c-format
 msgid ""
 "%s\n"
-"%s was unable to sign on: %s"
+"%s: %s"
+msgstr ""
+
+#: src/multi.c:1275
+#, fuzzy, c-format
+msgid "%s was unable to sign on"
 msgstr ""
 "%s\n"
 "%s kunde inte logga in: %s"
 
+#: src/multi.c:1286
+#, fuzzy
+msgid "Notice"
+msgstr "Röst"
+
 #: src/perl.c:856
 msgid "Perl Scripts"
 msgstr "Perlskript"
@@ -1995,9 +2163,9 @@
 msgid "General Options"
 msgstr "Allmänna inställningar"
 
-#: src/prefs.c:198 src/prefs.c:372 src/prefs.c:538 src/prefs.c:639
-#: src/prefs.c:868 src/prefs.c:1003 src/prefs.c:1221 src/prefs.c:1521
-#: src/prefs.c:1796 src/prefs.c:2207
+#: src/prefs.c:198 src/prefs.c:373 src/prefs.c:539 src/prefs.c:640
+#: src/prefs.c:893 src/prefs.c:1037 src/prefs.c:1262 src/prefs.c:1576
+#: src/prefs.c:1850 src/prefs.c:2283
 msgid "All options take effect immediately unless otherwise noted."
 msgstr "Alla ändringar börjar gälla omedelbart såvida inte annat anges."
 
@@ -2087,14 +2255,18 @@
 msgstr "GNOME:s URL-hanterare"
 
 #: src/prefs.c:295
+msgid "Galeon"
+msgstr ""
+
+#: src/prefs.c:296
 msgid "Manual"
 msgstr "Manuell"
 
-#: src/prefs.c:364
+#: src/prefs.c:365
 msgid "Proxy Options"
 msgstr "Proxyalternativ"
 
-#: src/prefs.c:376
+#: src/prefs.c:377
 msgid ""
 "Not all protocols can use these proxy options. Please see the README file "
 "for details."
@@ -2102,339 +2274,362 @@
 "Inte alla protokoll kan använda dessa proxyalternativ. Se filen README för "
 "detaljer."
 
-#: src/prefs.c:381
+#: src/prefs.c:382
 msgid "Proxy Type"
 msgstr "Proxytyp"
 
-#: src/prefs.c:393
+#: src/prefs.c:394
+msgid "Proxy Server"
+msgstr "Proxyserver"
+
+#: src/prefs.c:397
 msgid "No Proxy"
 msgstr "Ingen proxy"
 
-#: src/prefs.c:405
+#: src/prefs.c:409
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: src/prefs.c:415
+#: src/prefs.c:419
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: src/prefs.c:424
+#: src/prefs.c:428
 msgid "HTTP"
 msgstr "HTTP"
 
-#: src/prefs.c:433
-msgid "Proxy Server"
-msgstr "Proxyserver"
-
-#: src/prefs.c:451
+#: src/prefs.c:452
 msgid "Host"
 msgstr "Värd"
 
-#: src/prefs.c:467
+#: src/prefs.c:468
 msgid "Port"
 msgstr "Port"
 
-#: src/prefs.c:484
+#: src/prefs.c:485
 msgid "User"
 msgstr "Användare"
 
-#: src/prefs.c:500
+#: src/prefs.c:501
 msgid "Password"
 msgstr "Lösenord"
 
-#: src/prefs.c:530
+#: src/prefs.c:531
 msgid "Buddy List Options"
 msgstr "Alternativ för kompislista"
 
-#: src/prefs.c:542
+#: src/prefs.c:543
 msgid "Buddy List Window"
 msgstr "Kompislistefönster"
 
-#: src/prefs.c:554
+#: src/prefs.c:555
 msgid "Hide IM/Info/Chat buttons"
 msgstr "Dölj snabbmeddelande-/info-/chattknappar"
 
-#: src/prefs.c:556
+#: src/prefs.c:557
 msgid "Automatically show buddy list on sign on"
 msgstr "Visa automatiskt kompislista vid inloggning"
 
-#: src/prefs.c:559
+#: src/prefs.c:560
 msgid "Save Window Size/Position"
 msgstr "Spara fönsterstorlek/position"
 
-#: src/prefs.c:566
+#: src/prefs.c:567
 msgid "Show pictures on buttons"
 msgstr "Visa bilder på knappar"
 
-#: src/prefs.c:571
+#: src/prefs.c:572
 msgid "Display Buddy List near applet"
 msgstr "Visa kompislista nära panelprogrammet"
 
-#: src/prefs.c:574
+#: src/prefs.c:575
 msgid "Group Displays"
 msgstr "Gruppvisningar"
 
-#: src/prefs.c:586
+#: src/prefs.c:587
 msgid "Hide groups with no online buddies"
 msgstr "Dölj grupper med inga anslutna kompisar"
 
-#: src/prefs.c:592
+#: src/prefs.c:593
 msgid "Show numbers in groups"
 msgstr "Visa nummer i grupper"
 
-#: src/prefs.c:594
+#: src/prefs.c:595
 msgid "Buddy Displays"
 msgstr "Kompisvisningar"
 
-#: src/prefs.c:606
+#: src/prefs.c:607
 msgid "Show buddy type icons"
 msgstr "Visa kompistypikoner"
 
-#: src/prefs.c:607
+#: src/prefs.c:608
 msgid "Show warning levels"
 msgstr "Visa varningsnivåer"
 
-#: src/prefs.c:613
+#: src/prefs.c:614
 msgid "Show idle times"
 msgstr "Visa inaktivitetstider"
 
-#: src/prefs.c:614
+#: src/prefs.c:615
 msgid "Grey idle buddies"
 msgstr "Färga inaktiva kompisar gråa"
 
-#: src/prefs.c:631
+#: src/prefs.c:632
 msgid "Conversation Options"
 msgstr "Konversationsalternativ"
 
-#: src/prefs.c:643
+#: src/prefs.c:644
 msgid "Keyboard Options"
 msgstr "Tangentbordsalternativ"
 
-#: src/prefs.c:655
-msgid "Enter sends message"
-msgstr "Retur skickar meddelande"
-
 #: src/prefs.c:656
-msgid "Control-Enter sends message"
-msgstr "Control-Retur skickar meddelande"
+msgid "Enter sends message"
+msgstr "Retur skickar meddelande"
 
 #: src/prefs.c:657
+msgid "Control-Enter sends message"
+msgstr "Control-Retur skickar meddelande"
+
+#: src/prefs.c:658
 msgid "Escape closes window"
 msgstr "Escape stänger fönster"
 
-#: src/prefs.c:663
-msgid "Control-{B/I/U/S} inserts HTML tags"
-msgstr "Control-{B/I/U/S} infogar HTML-taggar"
-
 #: src/prefs.c:664
+msgid "Control-{B/I/U/S} inserts HTML tags"
+msgstr "Control-{B/I/U/S} infogar HTML-taggar"
+
+#: src/prefs.c:665
 msgid "Control-(number) inserts smileys"
 msgstr "Control-(nummer) infogar smileys"
 
-#: src/prefs.c:665
+#: src/prefs.c:666
 msgid "F2 toggles timestamp display"
 msgstr "F2 slår på/av tidsstämpelvisningen"
 
-#: src/prefs.c:667
+#: src/prefs.c:668
 msgid "Display and General Options"
 msgstr "Visnings- och allmänna inställningar"
 
-#: src/prefs.c:679
+#: src/prefs.c:680
 msgid "Show graphical smileys"
 msgstr "Visa grafiska smileys"
 
-#: src/prefs.c:680
-msgid "Show timestamp on messages"
-msgstr "Visa tidsstämpel på meddelanden"
-
 #: src/prefs.c:681
-msgid "Show URLs as links"
-msgstr "Visa URL:er som länkar"
+msgid "Show timestamp on messages"
+msgstr "Visa tidsstämpel på meddelanden"
 
 #: src/prefs.c:682
+msgid "Show URLs as links"
+msgstr "Visa URL:er som länkar"
+
+#: src/prefs.c:683
 msgid "Highlight misspelled words"
 msgstr "Markera felstavade ord"
 
-#: src/prefs.c:683 src/prefs.c:1818
+#: src/prefs.c:684 src/prefs.c:1872
 msgid "Sending messages removes away status"
 msgstr "Att skicka meddelanden tar bort frånvarostatus"
 
-#: src/prefs.c:684 src/prefs.c:1826
+#: src/prefs.c:685 src/prefs.c:1885
 msgid "Queue new messages when away"
 msgstr "Kölägg nya meddelanden vid frånvaro"
 
-#: src/prefs.c:690
+#: src/prefs.c:691
 msgid "Ignore colors"
 msgstr "Ignorera färger"
 
-#: src/prefs.c:691
+#: src/prefs.c:692
 msgid "Ignore font faces"
 msgstr "Ignorera typsnittsvarianter"
 
-#: src/prefs.c:692
+#: src/prefs.c:693
 msgid "Ignore font sizes"
 msgstr "Ignorera typsnittsstorlekar"
 
-#: src/prefs.c:693
+#: src/prefs.c:694
 msgid "Ignore TiK Automated Messages"
 msgstr "Ignorera automatiserade TiK-meddelanden"
 
-#: src/prefs.c:694 src/prefs.c:1816
+#: src/prefs.c:695 src/prefs.c:1870
 msgid "Ignore new conversations when away"
 msgstr "Ignorera nya konversationer vid frånvaro"
 
-#: src/prefs.c:860
+#: src/prefs.c:884
 msgid "IM Options"
 msgstr "Snabbmeddelandealternativ"
 
-#: src/prefs.c:872 src/prefs.c:2736
+#: src/prefs.c:897 src/prefs.c:2832
 msgid "IM Window"
 msgstr "Snabbmeddelandefönster"
 
-#: src/prefs.c:888 src/prefs.c:1023
+#: src/prefs.c:913 src/prefs.c:1057
 msgid "Show buttons as: "
 msgstr "Visa knappar som: "
 
-#: src/prefs.c:892 src/prefs.c:1028
+#: src/prefs.c:917 src/prefs.c:1062
 msgid "Pictures And Text"
 msgstr "Bilder och text"
 
-#: src/prefs.c:893 src/prefs.c:1030
+#: src/prefs.c:918 src/prefs.c:1064
 msgid "Pictures"
 msgstr "Bilder"
 
-#: src/prefs.c:894 src/prefs.c:1031
+#: src/prefs.c:919 src/prefs.c:1065
 msgid "Text"
 msgstr "Text"
 
-#: src/prefs.c:905
+#: src/prefs.c:930
 msgid "Show all conversations in one tabbed window"
 msgstr "Visa alla konversationer i ett fönster med flikar"
 
-#: src/prefs.c:907 src/prefs.c:1044
+#: src/prefs.c:932
+#, fuzzy
+msgid "Show chats in the same tabbed window"
+msgstr "Visa alla chattar i ett fönster med flikar"
+
+#: src/prefs.c:939 src/prefs.c:1085
 msgid "Raise windows on events"
 msgstr "Höj fönster vid händelser"
 
-#: src/prefs.c:908
+#: src/prefs.c:940
 msgid "Show logins in window"
 msgstr "Visa inloggningar i fönster"
 
-#: src/prefs.c:910 src/prefs.c:1047
+#: src/prefs.c:941
+msgid "Show aliases in tabs/titles"
+msgstr ""
+
+#: src/prefs.c:942
+#, fuzzy
+msgid "Hide window on send"
+msgstr "Höj fönster vid händelser"
+
+#: src/prefs.c:944 src/prefs.c:1088
 msgid "Window Sizes"
 msgstr "Fönsterstorlekar"
 
-#: src/prefs.c:918 src/prefs.c:1055
+#: src/prefs.c:952 src/prefs.c:1096
 msgid "New window width:"
 msgstr "Ny fönsterbredd:"
 
-#: src/prefs.c:919 src/prefs.c:1056
+#: src/prefs.c:953 src/prefs.c:1097
 msgid "New window height:"
 msgstr "Ny fönsterhöjd:"
 
-#: src/prefs.c:920 src/prefs.c:1057
+#: src/prefs.c:954 src/prefs.c:1098
 msgid "Entry widget height:"
 msgstr "Häjd på postwidget:"
 
-#: src/prefs.c:922 src/prefs.c:1059
+#: src/prefs.c:956 src/prefs.c:1100
 msgid "Tab Placement"
 msgstr "Flikplacering"
 
-#: src/prefs.c:942 src/prefs.c:1079
+#: src/prefs.c:976 src/prefs.c:1120
 msgid "Top"
 msgstr "Överst"
 
-#: src/prefs.c:944 src/prefs.c:1081
+#: src/prefs.c:978 src/prefs.c:1122
 msgid "Bottom"
 msgstr "Nederst"
 
-#: src/prefs.c:951 src/prefs.c:1088
+#: src/prefs.c:985 src/prefs.c:1129
 msgid "Left"
 msgstr "Vänster"
 
-#: src/prefs.c:953 src/prefs.c:1090
+#: src/prefs.c:987 src/prefs.c:1131
 msgid "Right"
 msgstr "Höger"
 
-#: src/prefs.c:957
+#: src/prefs.c:991
 msgid "Buddy Icons"
 msgstr "Kompisikoner"
 
-#: src/prefs.c:969
+#: src/prefs.c:1003
 msgid "Hide Buddy Icons"
 msgstr "Dölj kompisikoner"
 
-#: src/prefs.c:995
+#: src/prefs.c:1029
 msgid "Chat Options"
 msgstr "Chattalternativ"
 
-#: src/prefs.c:1007
+#: src/prefs.c:1041
 msgid "Group Chat Window"
 msgstr "Gruppchatfönster"
 
-#: src/prefs.c:1042
+#: src/prefs.c:1076
 msgid "Show all chats in one tabbed window"
 msgstr "Visa alla chattar i ett fönster med flikar"
 
-#: src/prefs.c:1045
+#: src/prefs.c:1078
+#, fuzzy
+msgid "Show conversations in the same tabbed window"
+msgstr "Visa alla konversationer i ett fönster med flikar"
+
+#: src/prefs.c:1086
 msgid "Show people joining/leaving in window"
 msgstr "Visa personer som går in/lämnar i fönstret"
 
-#: src/prefs.c:1093
+#: src/prefs.c:1134
 msgid "Tab Completion"
 msgstr "Tabbkomplettering"
 
-#: src/prefs.c:1105
+#: src/prefs.c:1146
 msgid "Tab-Complete Nicks"
 msgstr "Tabbkomplettera smeknamn"
 
-#: src/prefs.c:1111
+#: src/prefs.c:1152
 msgid "Old-Style Tab Completion"
 msgstr "Gammaldags tabbkomplettering"
 
-#: src/prefs.c:1213 src/prefs.c:2746
+#: src/prefs.c:1254 src/prefs.c:2842
 msgid "Font Options"
 msgstr "Typsnittsalternativ"
 
-#: src/prefs.c:1239
+#: src/prefs.c:1280
 msgid "Italic Text"
 msgstr "Kursiv text"
 
-#: src/prefs.c:1283 src/prefs.c:1301 src/prefs.c:1323
+#: src/prefs.c:1324 src/prefs.c:1342 src/prefs.c:1364
 msgid "Select"
 msgstr "Markera"
 
-#: src/prefs.c:1321
+#: src/prefs.c:1362
 msgid "Font Face for Text"
 msgstr "Typsnitt för text"
 
-#: src/prefs.c:1336
+#: src/prefs.c:1377
 msgid "Font Size for Text"
 msgstr "Typsnittsstorlek för text"
 
-#: src/prefs.c:1422
+#: src/prefs.c:1472
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim - Ljudkonfiguration"
 
-#: src/prefs.c:1462
+#: src/prefs.c:1507
+msgid "Play"
+msgstr ""
+
+#: src/prefs.c:1517
 msgid "Choose..."
 msgstr "Välj..."
 
-#: src/prefs.c:1513
+#: src/prefs.c:1568
 msgid "Sound Options"
 msgstr "Ljudalternativ"
 
-#: src/prefs.c:1541
+#: src/prefs.c:1596
 msgid "No sounds when you log in"
 msgstr "Inga ljud när du loggar in"
 
-#: src/prefs.c:1547 src/prefs.c:1817
+#: src/prefs.c:1602 src/prefs.c:1871
 msgid "Sounds while away"
 msgstr "Ljud då du är frånvarande"
 
-#: src/prefs.c:1557
+#: src/prefs.c:1612
 msgid "Sound Player:"
 msgstr "Ljudspelare:"
 
-#: src/prefs.c:1626
+#: src/prefs.c:1681
 #, c-format
 msgid ""
 "Command to play sound files\n"
@@ -2443,135 +2638,144 @@
 "Kommando för att spela ljudfiler\n"
 "(%s för filnamn; internt om tomt)"
 
-#: src/prefs.c:1637
+#: src/prefs.c:1692
 msgid "Events"
 msgstr "Händelser"
 
-#: src/prefs.c:1645
+#: src/prefs.c:1700
 msgid "Sound when buddy logs in"
 msgstr "Ljud då kompis loggar in"
 
-#: src/prefs.c:1646
+#: src/prefs.c:1701
 msgid "Sound when buddy logs out"
 msgstr "Ljud då kompis loggar ut"
 
-#: src/prefs.c:1652
+#: src/prefs.c:1707
 msgid "Sound when received message begins conversation"
 msgstr "Ljud då mottaget meddelande inleder konversationen"
 
-#: src/prefs.c:1654
+#: src/prefs.c:1709
 msgid "Sound when message is received"
 msgstr "Ljud då meddelande mottas"
 
-#: src/prefs.c:1655
+#: src/prefs.c:1710
 msgid "Sound when message is sent"
 msgstr "Ljud då meddelande skickas"
 
-#: src/prefs.c:1661
+#: src/prefs.c:1716
 msgid "Sound in chat rooms when people enter"
 msgstr "Ljud i chattrum då personer kommer in"
 
-#: src/prefs.c:1662
+#: src/prefs.c:1717
 msgid "Sound in chat rooms when people leave"
 msgstr "Ljud i chattrum då personer lämnar"
 
-#: src/prefs.c:1663
+#: src/prefs.c:1718
 msgid "Sound in chat rooms when you talk"
 msgstr "Ljud i chattrum då du pratar"
 
-#: src/prefs.c:1664
+#: src/prefs.c:1719
 msgid "Sound in chat rooms when others talk"
 msgstr "Ljud i chattrum då andra pratar"
 
-#: src/prefs.c:1788 src/prefs.c:2768
+#: src/prefs.c:1842 src/prefs.c:2864
 msgid "Away Messages"
 msgstr "Frånvaromeddelanden"
 
-#: src/prefs.c:1825
+#: src/prefs.c:1879
 msgid "Don't send auto-response"
 msgstr "Skicka inte automatiskt svar"
 
-#: src/prefs.c:1836
+#: src/prefs.c:1880
+#, fuzzy
+msgid "Only send auto-response when idle"
+msgstr "Skicka inte automatiskt svar"
+
+#: src/prefs.c:1895
+msgid "Time between sending auto-responses (in seconds):"
+msgstr ""
+
+#: src/prefs.c:1910
 msgid "Auto Away after"
 msgstr "Automatiskt frånvarande efter"
 
-#: src/prefs.c:1850
+#: src/prefs.c:1924
 msgid "minutes using"
 msgstr "minuters användning"
 
-#: src/prefs.c:1863
+#: src/prefs.c:1937
 msgid "Messages"
 msgstr "Meddelanden"
 
-#: src/prefs.c:1875
+#: src/prefs.c:1949
 msgid "Title"
 msgstr "Titel"
 
-#: src/prefs.c:1918
+#: src/prefs.c:1994
 msgid "Edit"
 msgstr "Redigera"
 
-#: src/prefs.c:1922
+#: src/prefs.c:1998
 msgid "Make Away"
 msgstr "Gör frånvarande"
 
-#: src/prefs.c:2199
+#: src/prefs.c:2275
 msgid "Privacy Options"
 msgstr "Ostördhetsalternativ"
 
-#: src/prefs.c:2215
+#: src/prefs.c:2291
 msgid "Set privacy for:"
 msgstr "Ställ in ostördhet för:"
 
-#: src/prefs.c:2234
+#: src/prefs.c:2310
 msgid "Allow all users to contact me"
 msgstr "Tillåt alla användare att kontakta mig"
 
-#: src/prefs.c:2235
+#: src/prefs.c:2311
 msgid "Allow only the users below"
 msgstr "Tillåt endast användarna nedan"
 
-#: src/prefs.c:2237
+#: src/prefs.c:2313
 msgid "Allow List"
 msgstr "Tillåtelselista"
 
-#: src/prefs.c:2268
+#: src/prefs.c:2344
 msgid "Deny all users"
 msgstr "Neka alla användare"
 
-#: src/prefs.c:2269
+#: src/prefs.c:2345
 msgid "Block the users below"
 msgstr "Blockera användarna nedan"
 
-#: src/prefs.c:2271
+#: src/prefs.c:2347
 msgid "Block List"
 msgstr "Blockera lista"
 
-#: src/prefs.c:2366
+#: src/prefs.c:2442
 msgid "Gaim - Preferences"
 msgstr "Gaim - Egenskaper"
 
-#: src/prefs.c:2445
+#: src/prefs.c:2525
 msgid "Gaim debug output window"
 msgstr "Gaim-felsökningsutdatafönster"
 
-#: src/prefs.c:2702
+#: src/prefs.c:2798
 msgid "General"
 msgstr "Allmänt"
 
-#: src/prefs.c:2707
+#: src/prefs.c:2803
 msgid "Proxy"
 msgstr "Proxyserver"
 
-#: src/prefs.c:2731
+#: src/prefs.c:2827
 msgid "Conversations"
 msgstr "Konversationer"
 
-#: src/prefs.c:2757
+#: src/prefs.c:2853
 msgid "Sounds"
 msgstr "Ljud"
 
-#: src/prefs.c:2779
+#: src/prefs.c:2875
 msgid "Privacy"
 msgstr "Persondataskydd"
 
@@ -2604,10 +2808,6 @@
 msgid "Accept?"
 msgstr "Acceptera?"
 
-#: src/prpl.c:154 src/prpl.c:228
-msgid "Accept"
-msgstr "Acceptera"
-
 #: src/prpl.c:199
 msgid "Gaim - Prompt"
 msgstr "Gaim - Prompt"
@@ -2635,11 +2835,31 @@
 "\n"
 "Vill du lägga till dem till din kompislista?"
 
-#: src/server.c:53
+#: src/prpl.c:615
+msgid ""
+"You do not currently have any protocols available that are able to register "
+"new accounts."
+msgstr ""
+
+#: src/prpl.c:652
+#, fuzzy
+msgid "Gaim - Registration"
+msgstr "Gaim - Konversationer"
+
+#: src/prpl.c:667
+msgid "Registration Information"
+msgstr ""
+
+#: src/prpl.c:684
+#, fuzzy
+msgid "Register"
+msgstr "Återställ"
+
+#: src/server.c:55
 msgid "Please enter your password"
 msgstr "Ange ditt lösenord"
 
-#: src/server.c:60
+#: src/server.c:62
 msgid ""
 "You cannot log this account in; you do not have the protocol it uses loaded, "
 "or the protocol does not have a login function."
@@ -2647,33 +2867,124 @@
 "Du kan inte logga in detta konto. Du har inte det protokoll som det använder "
 "inläst, eller protokollet har inte inloggningsfunktionen."
 
-#: src/server.c:62
+#: src/server.c:64
 msgid "Login Error"
 msgstr "Inloggningsfel"
 
-#: src/server.c:535
+#: src/server.c:550
 #, c-format
 msgid "(%d messages)"
 msgstr "(%d meddelanden)"
 
-#: src/server.c:541
+#: src/server.c:556
 msgid "(1 message)"
 msgstr "(1 meddelande)"
 
-#: src/server.c:756
+#: src/server.c:747
 msgid "Warned"
 msgstr "Varnad"
 
-#: src/server.c:827
+#: src/server.c:818
 msgid "Yes"
 msgstr "Ja"
 
-#: src/server.c:828
+#: src/server.c:819
 msgid "No"
 msgstr "Nej"
 
+#: src/server.c:995
+#, fuzzy
+msgid "More Info"
+msgstr "Hämta information"
+
+#~ msgid "Available"
+#~ msgstr "Tillgänglig"
+
+#~ msgid "Available for friends only"
+#~ msgstr "Tillgänglig endast för vänner"
+
+#~ msgid "Away for friends only"
+#~ msgstr "Frånvarande endast för vänner"
+
+#~ msgid "Invisible"
+#~ msgstr "Osynlig"
+
+#~ msgid "Invisible for friends only"
+#~ msgstr "Osynlig endast för vänner"
+
+#~ msgid "Unavailable"
+#~ msgstr "Otillgänglig"
+
+#~ msgid "Handshake"
+#~ msgstr "Handskakning"
+
+#~ msgid "Connecting to GG server"
+#~ msgstr "Ansluter till GG-servern"
+
+#~ msgid "Sending key"
+#~ msgstr "Skickar nyckel"
+
+#~ msgid "Logging in %s\n"
+#~ msgstr "Loggar in %s\n"
+
+#~ msgid "Send offline message"
+#~ msgstr "Skickar frånkopplat meddelande"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "IRC: #gaim on irc.openprojects.net"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "IRC: #gaim på irc.openprojects.net"
+
+#~ msgid ""
+#~ "Rob Flynn (maintainer)               rob@marko.net\n"
+#~ "Eric Warmenhoven (lead coder)  warmenhoven@yahoo.com\n"
+#~ "\n"
+#~ "Benjamin Miller\n"
+#~ "Decklin Foster\n"
+#~ "Sean Egan\n"
+#~ "Jim Duchek\n"
+#~ "Mark Spencer (original author)   markster@marko.net"
+#~ msgstr ""
+#~ "Rob Flynn (ansvarig)                  rob@marko.net\n"
+#~ "Eric Warmenhoven (huvudprogrammerare) warmenhoven@yahoo.com\n"
+#~ "\n"
+#~ "Benjamin Miller\n"
+#~ "Decklin Foster\n"
+#~ "Sean Egan\n"
+#~ "Jim Duchek\n"
+#~ "Mark Spencer (ursprunglig författare) markster@marko.net"
+
+#~ msgid ""
+#~ "Relax, help is just around the corner. The first thing you'll need to do is "
+#~ "get an AIM account; you can get one from http://aim.aol.com/. Just click the "
+#~ "button that says \"New Users\" and you can create an account that way. Once "
+#~ "you have your account, enter the username and password into the login window "
+#~ "that comes up when you start Gaim, and click the Signon button. Once you're "
+#~ "online, you can talk to one of the Gaim developers for more assistance; "
+#~ "their contact information is in the AUTHORS file in the Gaim source, or at "
+#~ msgstr ""
+#~ "Slappna av, hjälp finns runt hörnet. Det första som du måste göra är att "
+#~ "skaffa ett AIM-konto. Du kan skaffa ett från http://aim.aol.com/. Klicka "
+#~ "bara på knappen som säger \"Nya användare\" så kan du skapa ett konto på det "
+#~ "sättet. När du väl har ett konto anger du användarnamnet och lösenordet i "
+#~ "inloggningsfönstret som kommer upp när du startar Gaim, och klickar på "
+#~ "inloggningsknappen. När du väl är ansluten kan du prata med en av "
+#~ "Gaim-utvecklarna för mer hjälp. Deras kontaktinformation finns i filen "
+#~ "AUTHORS i Gaim-källkoden, eller på "
+
+#~ msgid ""
+#~ "contactinfo.php. If you can't get online and still need more assistance, "
+#~ "feel free to email us at gaim@marko.net. Thanks for using Gaim!"
+#~ msgstr ""
+#~ "contactinfo.php. Om du inte kan ansluta och behöver mer hjälp, kan du skicka "
+#~ "e-post till oss på gaim@marko.net. Tack för att du använder Gaim!"
+
+#~ msgid "Help!"
+#~ msgstr "Hjälp!"
+
 #~ msgid "Error while writing to socket."
 #~ msgstr "Fel vid skrivande till uttag (socket)."
-
-#~ msgid "Password Change Successful"
-#~ msgstr "Lösenordsändring lyckades"
--- a/po/zh_CN.po	Fri Feb 22 23:47:55 2002 +0000
+++ b/po/zh_CN.po	Fri Feb 22 23:48:23 2002 +0000
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.9.19\n"
-"POT-Creation-Date: 2001-06-17 23:52-0700\n"
+"POT-Creation-Date: 2002-02-17 12:41-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"
@@ -16,1336 +16,466 @@
 "Content-Type: text/plain; charset=gb2312\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: plugins/icq/gaim_icq.c:442 src/oscar.c:2895 src/toc.c:1031
-msgid "Get Info"
-msgstr "Óû§Ïêϸ×ÊÁÏ"
-
-#: plugins/yay/yay.c:183
-msgid "Your message did not get sent."
-msgstr "ÏûÏ¢ÎÞ·¨Ëͳö"
-
-#: plugins/yay/yay.c:183 src/dialogs.c:3066 src/dialogs.c:3073
-#: src/oscar.c:1869 src/oscar.c:1874 src/oscar.c:1910 src/oscar.c:1929
-msgid "Gaim - Error"
-msgstr "Gaim - ´íÎó"
-
-#: plugins/yay/yay.c:201
-#, c-format
-msgid "%s has made %s their buddy%s%s"
-msgstr "%s has made %s their buddy%s%s"
-
-#: plugins/yay/yay.c:203
-msgid "Gaim - Buddy"
-msgstr "Gaim - ÅóÓÑ"
-
-#: plugins/yay/yay.c:250 src/about.c:179 src/aim.c:303 src/buddy.c:2607
-#: src/buddy_chat.c:971 src/buddy_chat.c:1125 src/buddy_chat.c:1152
-#: src/conversation.c:2135 src/dialogs.c:440 src/dialogs.c:3719
-#: src/multi.c:744 src/plugins.c:374 src/prefs.c:2429 src/prpl.c:359
-msgid "Close"
-msgstr "¹Ø±Õ"
-
-#: plugins/napster.c:1042
-msgid "Napster registration is currently under development"
-msgstr "Napster ×¢²á¹¦ÄÜÕýÔÚ¿ª·¢ÖÐ, ÉÐδʵÏÖ"
-
-#: src/about.c:87
-#, c-format
-msgid "About Gaim v%s"
-msgstr "¹ØÓÚ Gaim µÚ %s °æ"
-
-#: src/about.c:124
-msgid ""
-"Gaim is a client that supports AOL's Instant Messenger protocol. It is "
-"written using Gtk+ and is licensed under the GPL.\n"
-"URL: "
+#: src/protocols/gg/gg.c:182
+#, fuzzy
+msgid "Unable to resolve hostname."
+msgstr "²»ÄܶÁÈëÎļþ %s¡£"
+
+#: src/protocols/gg/gg.c:185
+#, fuzzy
+msgid "Unable to connect to server."
+msgstr "²»ÄܵǼµ½ AIM"
+
+#: src/protocols/gg/gg.c:188
+msgid "Invalid response from server."
 msgstr ""
-"Gaim is a client that supports AOL's Instant Messenger protocol. It is "
-"written using Gtk+ and is licensed under the GPL.\n"
-"URL: "
-
-#. this makes the sizes not work.
-#. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
-#. gtk_widget_grab_default(button);
-#: src/about.c:199
-msgid "Web Site"
-msgstr "ÍøÖ·"
-
-#: src/aim.c:137 src/buddy.c:2600
-msgid "Signoff"
-msgstr "À뿪"
-
-#: src/aim.c:149
-msgid "Please enter your logon"
-msgstr "ÇëÊäÈëÄúµÄµÇ¼Ãû³Æ"
-
-#: src/aim.c:149 src/aim.c:154 src/multi.c:917
-msgid "Signon Error"
-msgstr "µÇ¼´íÎó"
-
-#: src/aim.c:154
-msgid "Please enter your password"
-msgstr "ÇëÊäÈëÄúµÄµÇ¼¿ÚÁî"
-
-#: src/aim.c:248
-msgid "Gaim - Login"
-msgstr "Gaim - 怬"
-
-#: src/aim.c:266
-msgid "Screen Name: "
-msgstr "µÇ¼Ãû£º"
-
-#: src/aim.c:280
-msgid "Password: "
-msgstr "ÃÜÂ룺"
-
-#: src/aim.c:301 src/buddy.c:2604
-msgid "Quit"
-msgstr "Í˳ö"
-
-#: src/aim.c:306 src/aim.c:647 src/buddy.c:2662
-msgid "Accounts"
-msgstr "ËùÓÐÕʺÅ"
-
-#: src/aim.c:308 src/multi.c:597
-msgid "Signon"
-msgstr "怬"
-
-#: src/aim.c:340 src/prpl.c:363
-msgid "Register"
-msgstr "×¢²á"
-
-#: src/aim.c:341 src/prefs.c:1632 src/prefs.c:1839
-msgid "Options"
-msgstr "Ñ¡  Ïî"
-
-#. Left side: frame with list of plugin file names
-#: src/aim.c:343 src/aim.c:650 src/buddy.c:2679 src/plugins.c:289
-msgid "Plugins"
-msgstr "²å    ¼þ"
-
-#: src/aim.c:644 src/buddy.c:2671
-msgid "Preferences"
-msgstr "ÊôÐÔÉèÖÃ"
-
-#: src/applet.c:88
+
+#: src/protocols/gg/gg.c:191
+#, fuzzy
+msgid "Error while reading from socket."
+msgstr "¶ÁÈ¡Îļþ %s ·¢Éú´íÎó"
+
+#: src/protocols/gg/gg.c:194
+#, fuzzy
+msgid "Error while writting to socket."
+msgstr "дÈëÎļþ %s ·¢Éú´íÎó"
+
+#: src/protocols/gg/gg.c:197
+#, fuzzy
+msgid "Authentification failed."
+msgstr "Éí·ÝÑé֤ʧ°Ü"
+
+#: src/protocols/gg/gg.c:200
+msgid "Unknown Error Code."
+msgstr ""
+
+#: src/protocols/gg/gg.c:302
 #, c-format
-msgid "file not found: %s\n"
-msgstr "ÕÒ²»µ½Îļþ£º %s\n"
-
-#: src/applet.c:111
-msgid "Attempting to sign on...."
-msgstr "ÕýÔڵǼ¡­¡­"
-
-#: src/applet.c:116
-msgid "Offline. Click to bring up login box."
-msgstr "ÀëÏß¡£µã»÷ÕâÀïÆô¶¯µÇ¼´°¿Ú"
-
-#: src/applet.c:169 src/buddy.c:445 src/buddy.c:2486 src/buddy.c:2618
-msgid "Away"
-msgstr "ÔÝʱÀ뿪"
-
-#: src/applet.c:172 src/away.c:333
-msgid "New Away Message"
-msgstr "еÄÔÝʱÀ뿪ÐÅÏ¢"
-
-#: src/applet.c:309
-msgid "Can't create Gaim applet!"
-msgstr "ÎÞ·¨´´½¨ Gaim С³ÌÐò!"
-
-#: src/applet.c:352
-msgid "About..."
-msgstr "¹ØÓÚ¡­¡­"
-
-msgid "About"
-msgstr "¹ØÓÚ"
-
-#: src/away.c:153
-msgid "Gaim - Away!"
-msgstr "Gaim - ÔÝʱÀ뿪"
-
-#: src/away.c:196
-msgid "I'm Back!"
-msgstr "ÎÒºúººÈýÓÖ»ØÀ´ÁË£¡"
-
-#: src/away.c:212 src/away.c:292 src/away.c:460
-msgid "Back"
-msgstr "·µ»Ø"
-
-#: src/away.c:353
-msgid "Remove Away Message"
-msgstr "ɾ³ýÀ뿪ÐÅÏ¢"
-
-#: src/away.c:529
-msgid "Set All Away"
-msgstr "½«ËùÓÐÕʺÅÉèΪÀ뿪"
-
-#. Put the buttons in the box
-#: src/buddy.c:440 src/buddy.c:2747 src/buddy_chat.c:1157
-#: src/conversation.c:1799 src/conversation.c:2150 src/dialogs.c:883
-#: src/dialogs.c:1007 src/dialogs.c:1893 src/multi.c:728 src/prefs.c:1198
-#: src/prefs.c:1952 src/prefs.c:2269 src/prefs.c:2303
-msgid "Add"
-msgstr "Ôö¼Ó"
-
-#: src/buddy.c:441 src/buddy.c:2748 src/dialogs.c:893 src/dialogs.c:989
-msgid "Group"
-msgstr "×éȺ"
-
-#: src/buddy.c:442 src/buddy.c:2749 src/buddy_chat.c:1159
-#: src/conversation.c:1785 src/conversation.c:2147 src/prefs.c:1199
-#: src/prefs.c:1966 src/prefs.c:2273 src/prefs.c:2307
-msgid "Remove"
-msgstr "ɾ³ý"
-
-#: src/buddy.c:446 src/buddy.c:2130 src/buddy.c:2485
-msgid "Chat"
-msgstr "ÁÄÌì"
-
-#: src/buddy.c:447 src/buddy.c:648 src/buddy.c:761 src/buddy.c:2483
-#: src/buddy_chat.c:507 src/buddy_chat.c:927
-msgid "IM"
-msgstr "¼´Ê±ÐÅÏ¢"
-
-#: src/buddy.c:448 src/buddy.c:2484 src/buddy_chat.c:520 src/buddy_chat.c:935
-#: src/buddy_chat.c:1165 src/conversation.c:2168
-msgid "Info"
+msgid "Status: %s"
+msgstr ""
+
+#: src/protocols/gg/gg.c:317
+msgid "Nick:"
+msgstr ""
+
+#: src/protocols/gg/gg.c:318
+msgid "Gadu-Gadu User"
+msgstr ""
+
+#: src/protocols/gg/gg.c:337
+#, fuzzy
+msgid "Could not connect"
+msgstr "ÎÞ·¨Á¬½Ó"
+
+#: src/protocols/gg/gg.c:344
+#, fuzzy
+msgid "Unable to read socket"
+msgstr "²»ÄܶÁÈëÎļþ %s¡£"
+
+#: src/protocols/gg/gg.c:455
+#, fuzzy
+msgid "Unable to connect."
+msgstr "²»Äܽ¨Á¢Ö±½ÓÁ¬½Ó"
+
+#: src/protocols/gg/gg.c:465
+#, fuzzy
+msgid "Reading data"
+msgstr "½ÓÊÕÊý¾Ý"
+
+#: src/protocols/gg/gg.c:468
+msgid "Balancer handshake"
+msgstr ""
+
+#: src/protocols/gg/gg.c:471
+msgid "Reading server key"
+msgstr ""
+
+#: src/protocols/gg/gg.c:474
+msgid "Exchanging key hash"
+msgstr ""
+
+#: src/protocols/gg/gg.c:482
+msgid "Critical error in GG library\n"
+msgstr ""
+
+#: src/protocols/gg/gg.c:521
+#, fuzzy
+msgid "Unable to ping server"
+msgstr "²»Äܽ¨Á¢Ö±½ÓÁ¬½Ó"
+
+#: src/protocols/gg/gg.c:533
+#, fuzzy
+msgid "Send as message"
+msgstr "·¢ËÍÐÅÏ¢"
+
+#: src/protocols/gg/gg.c:541
+#, fuzzy
+msgid "Looking up GG server"
+msgstr "Ñ°ÕÒ %s"
+
+#: src/protocols/gg/gg.c:544
+msgid "Invalid Gadu-Gadu UIN specified"
+msgstr ""
+
+#: src/protocols/gg/gg.c:570
+#, fuzzy, c-format
+msgid "Connect to %s failed"
+msgstr "Á¬½ÓÒѹرÕ"
+
+#: src/protocols/gg/gg.c:594
+msgid "You are trying to send message to invalid Gadu-Gadu UIN!"
+msgstr ""
+
+#: src/protocols/gg/gg.c:595 src/protocols/gg/gg.c:657
+#: src/protocols/gg/gg.c:762 src/protocols/gg/gg.c:768
+#: src/protocols/gg/gg.c:821 src/protocols/gg/gg.c:833
+#: src/protocols/gg/gg.c:845 src/protocols/gg/gg.c:956
+#: src/protocols/gg/gg.c:984 src/protocols/gg/gg.c:1043
+#: src/protocols/gg/gg.c:1066 src/protocols/gg/gg.c:1116
+#: src/protocols/gg/gg.c:1149 src/protocols/gg/gg.c:1214
+#, fuzzy
+msgid "Gadu-Gadu Error"
+msgstr "Gaim - ´íÎó"
+
+#: src/protocols/gg/gg.c:657
+msgid "Couldn't get search results"
+msgstr ""
+
+#: src/protocols/gg/gg.c:662
+msgid "Gadu-Gadu Search Engine"
+msgstr ""
+
+#: src/protocols/gg/gg.c:687
+msgid "Active"
+msgstr ""
+
+#: src/protocols/gg/gg.c:688
+#, fuzzy
+msgid "yes"
+msgstr "Yes"
+
+#: src/protocols/gg/gg.c:688
+#, fuzzy
+msgid "no"
 msgstr "Ïêϸ×ÊÁÏ"
 
-#. Put the buttons in the box
-#: src/buddy.c:654 src/buddy.c:767 src/dialogs.c:983 src/dialogs.c:3421
-#: src/dialogs.c:3436
-msgid "Alias"
-msgstr "ÍâºÅ¶ù"
-
-#: src/buddy.c:660 src/buddy.c:787
-msgid "Add Buddy Pounce"
-msgstr "Ôö¼Ó¼àÊÓÅóÓÑ"
-
-#: src/buddy.c:666 src/buddy.c:793
-msgid "View Log"
-msgstr "²é¿´¼Ç¼"
-
-#: src/buddy.c:749 src/buddy.c:781
-msgid "Rename"
-msgstr "ÖØÃüÃû"
-
-#: src/buddy.c:774
-msgid "Un-Alias"
-msgstr "È¥³ýÍâºÅ¶ù"
-
-#: src/buddy.c:1808
-msgid "New Buddy Pounce"
-msgstr "ÐÂÔö¼àÊÓÅóÓÑ"
-
-#: src/buddy.c:1826
-msgid "Remove Buddy Pounce"
-msgstr "È¡Ïû¼àÊÓÅóÓÑ"
-
-#: src/buddy.c:2121
-msgid "Buddy Icons"
-msgstr "ÅóÓÑͼ±ê"
-
-#: src/buddy.c:2121
-msgid "Hide Buddy Icons"
-msgstr "Òþ²Ø¸çÃǶùÃǵÄͼ±ê"
-
-#: src/buddy.c:2124
-msgid "Voice"
-msgstr "ÉùÒô"
-
-#: src/buddy.c:2127
-msgid "IM Image"
-msgstr "IM ͼ°¸"
-
-#: src/buddy.c:2133
-msgid "Get File"
-msgstr "½ÓÊÕÎļþ"
-
-#: src/buddy.c:2136
-msgid "Send File"
-msgstr "·¢ËÍÎļþ"
-
-#: src/buddy.c:2139
-msgid "Games"
-msgstr "ÓÎÏ·"
-
-#: src/buddy.c:2142
-msgid "Stocks"
-msgstr "¹ÉƱ"
-
-#: src/buddy.c:2194
-#, c-format
-msgid "Logged in: %s\n"
-msgstr "ÒѵǼÕʺţº %s\n"
-
-#: src/buddy.c:2205
-msgid "Warnings: %d%%\n"
-msgstr "¾¯¸æ£º%d%%\n"
-
-#: src/buddy.c:2217
-#, c-format
-msgid "Capabilities: %s\n"
-msgstr "¼æÈÝÐÔ£º%s\n"
-
-#: src/buddy.c:2221
-#, c-format
-msgid ""
-"Alias: %s               \n"
-"Screen Name: %s\n"
-"%s%s%s%s%s%s"
+#: src/protocols/gg/gg.c:692
+msgid "UIN"
+msgstr ""
+
+#: src/protocols/gg/gg.c:696
+#, fuzzy
+msgid "First name"
+msgstr "Ãû"
+
+#: src/protocols/gg/gg.c:701
+#, fuzzy
+msgid "Second Name"
+msgstr "µÇ¼Ãû£º"
+
+#: src/protocols/gg/gg.c:705
+msgid "Nick"
+msgstr ""
+
+#: src/protocols/gg/gg.c:712 src/protocols/gg/gg.c:715
+msgid "Birth year"
+msgstr ""
+
+#: src/protocols/gg/gg.c:721 src/protocols/gg/gg.c:723
+#: src/protocols/gg/gg.c:725
+msgid "Sex"
+msgstr ""
+
+#. Line 5
+#: src/dialogs.c:1501 src/dialogs.c:2205 src/protocols/gg/gg.c:729
+msgid "City"
+msgstr "ÊÐ"
+
+#: src/protocols/gg/gg.c:761
+msgid "There is no Buddy List stored on server. Sorry!"
+msgstr ""
+
+#: src/protocols/gg/gg.c:768
+msgid "Couldn't Import Buddies List from Server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:815
+msgid "Buddies List sucessfully transfered into Server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:816 src/protocols/gg/gg.c:828
+#: src/protocols/gg/gg.c:840
+msgid "Gadu-Gadu Information"
+msgstr ""
+
+#: src/protocols/gg/gg.c:821
+msgid "Couldn't transfer Buddies List into Server"
 msgstr ""
-"ÍâºÅ¶ù£º%s                \n"
-"µÇ¼Ãû£º%s\n"
-"%s%s%s"
-
-#: src/buddy.c:2225
-msgid "Idle: "
-msgstr "¿ÕÏÐʱ¼ä£º"
-
-#: src/buddy.c:2294
-#, c-format
-msgid "%s logged in."
-msgstr "<HR><B>%s ÒѵǼ¡£</B><BR><HR>"
-
-#: src/buddy.c:2346
+
+#: src/protocols/gg/gg.c:827
+msgid "Buddies List sucessfully deleted from Server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:833
+msgid "Couldn't delete Buddies List from Server"
+msgstr ""
+
+#: src/protocols/gg/gg.c:839
+#, fuzzy
+msgid "Password changed sucessfully"
+msgstr "Gaim - ¸ü¸ÄÃÜÂë"
+
+#: src/protocols/gg/gg.c:845
+msgid "Password couldn't be changed"
+msgstr ""
+
+#: src/protocols/gg/gg.c:956
+#, fuzzy
+msgid "Couldn't send http request"
+msgstr "²»ÄÜÁ¬½Óµ½Ö÷»ú"
+
+#: src/protocols/gg/gg.c:982
 #, c-format
-msgid "%s logged out."
-msgstr "<HR><B>%s À뿪ÁË %s%s ¡£</B><BR><HR>"
-
-#: src/buddy.c:2515
-msgid "Information on selected Buddy"
-msgstr "Ñ¡ÖеÄÅóÓѵÄ×ÊÁÏ"
-
-#: src/buddy.c:2516 src/dialogs.c:678
-msgid "Send Instant Message"
-msgstr "·¢³ö¼´Ê±ÐÅÏ¢"
-
-#: src/buddy.c:2517
-msgid "Start/join a Buddy Chat"
-msgstr "·¢Æð»ò¼ÓÈëÒ»¸öÁÄÌìÊÒ"
-
-#: src/buddy.c:2518
-msgid "Activate Away Message"
-msgstr "¼¤»îÔÝʱÀ뿪ÐÅÏ¢"
-
-#: src/buddy.c:2582
-msgid "File"
-msgstr "Îļþ"
-
-#: src/buddy.c:2586
-msgid "Add A Buddy"
-msgstr "¼ÓÈëÒ»¸ö¸çÃǶù"
-
-#: src/buddy.c:2588
-msgid "Join A Chat"
-msgstr "¼ÓÈëÁÄÌì"
-
-#: src/buddy.c:2590
-msgid "New Instant Message"
-msgstr "·¢³ö¼´Ê±ÐÅÏ¢"
-
-#: src/buddy.c:2595
-msgid "Import Buddy List"
-msgstr "µ¼ÈëÅóÓÑÁбí"
-
-#: src/buddy.c:2613
-msgid "Tools"
-msgstr "¹¤¾ß"
-
-#: src/buddy.c:2623
-msgid "Buddy Pounce"
-msgstr "¼àÊÓÅóÓÑ"
-
-#: src/buddy.c:2632 src/dialogs.c:2074 src/dialogs.c:2241
-msgid "Search for Buddy"
-msgstr "ËÑÑ°ÅóÓÑ"
-
-#: src/buddy.c:2636
-msgid "by Email"
-msgstr "ʹÓõç×ÓÓʼþ"
-
-#: src/buddy.c:2640
-msgid "by Dir Info"
-msgstr "ʹÓÃÐÕÃûµØַ¼"
-
-#: src/buddy.c:2647
-msgid "Settings"
-msgstr "É趨"
-
-#: src/buddy.c:2649
-msgid "User Info"
-msgstr "Óû§Ïêϸ×ÊÁÏ"
-
-#: src/buddy.c:2653 src/dialogs.c:1367
-msgid "Directory Info"
+msgid "Buddies List import from Server failed (%s)"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1041
+#, c-format
+msgid "Buddies List export to Server failed (%s)"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1064
+#, c-format
+msgid "Deletion of Buddies List from Server failed (%s)"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1114 src/protocols/gg/gg.c:1212
+#, c-format
+msgid "Connect to search service failed (%s)"
+msgstr ""
+
+#: src/protocols/gg/gg.c:1147
+#, fuzzy, c-format
+msgid "Changing Password failed (%s)"
+msgstr "¸ü¸ÄÃÜÂë"
+
+#: src/protocols/gg/gg.c:1158 src/protocols/gg/gg.c:1175
+#, fuzzy
+msgid "Directory Search"
 msgstr "ÐÕÃûµØַ¼"
 
-#: src/buddy.c:2657 src/dialogs.c:1558
+#: src/dialogs.c:1618 src/protocols/gg/gg.c:1160 src/protocols/gg/gg.c:1177
 msgid "Change Password"
 msgstr "¸ü¸ÄÃÜÂë"
 
-#: src/buddy.c:2666
-msgid "Protocol Actions"
-msgstr "ЭÒ鶯×÷"
-
-#: src/buddy.c:2673
-msgid "View System Log"
-msgstr "²é¿´ÏµÍ³¼Ç¼"
-
-#: src/buddy.c:2684
-msgid "Perl"
-msgstr "Perl ²å¼þ"
-
-#: src/buddy.c:2687
-msgid "Load Script"
-msgstr "¼ÓÔؽű¾"
-
-#: src/buddy.c:2691
-msgid "Unload All Scripts"
-msgstr "жÔؽű¾"
-
-#: src/buddy.c:2695
-msgid "List Scripts"
-msgstr "ÁгöÒѼÓÔؽű¾"
-
-#: src/buddy.c:2703
-msgid "Help"
-msgstr "°ïÖú"
-
-#: src/buddy.c:2708
-msgid "About Gaim"
-msgstr "¹ØÓÚ Gaim"
-
-#: src/buddy.c:2727 src/prefs.c:2671
-msgid "Buddy List"
-msgstr "ÅóÓÑÁбí"
-
-#: src/buddy.c:2781
-msgid "Add a new Buddy"
-msgstr "Ôö¼ÓÒ»¸öиçÃǶù"
-
-#: src/buddy.c:2782
-msgid "Add a new Group"
-msgstr "Ôö¼ÓÒ»¸öиçÃǶù"
-
-#: src/buddy.c:2783
-msgid "Remove selected Buddy"
-msgstr "ɾ³ýÑ¡ÖеĸçÃǶù"
-
-#: src/buddy.c:2808
-msgid "Online"
-msgstr "ÔÚÏß"
-
-#: src/buddy.c:2810
-msgid "Edit Buddies"
-msgstr "ÐÞ¸ÄÅóÓÑÁбí"
-
-#: src/buddy.c:2847
-msgid "Gaim - Buddy List"
-msgstr "Gaim - ÅóÓÑÁбí"
-
-#: src/buddy_chat.c:104 src/oscar.c:2590 src/toc.c:1001
-msgid "Join what group:"
-msgstr "Òª¼ÓÈëµÄ×飺"
-
-#: src/buddy_chat.c:202
-msgid "Join Chat"
-msgstr "¼ÓÈëÁÄÌì"
-
-#: src/buddy_chat.c:209 src/buddy_chat.c:1057 src/buddy_chat.c:1069
-msgid "Buddy Chat"
-msgstr "ÅóÓÑÁÄÌì"
-
-#: src/buddy_chat.c:220
-msgid "Join Chat As:"
-msgstr "É趨¼ÓÈëÁÄÌìʹÓõÄêdzƣº"
-
-#: src/buddy_chat.c:241 src/buddy_chat.c:286 src/dialogs.c:410
-#: src/dialogs.c:697 src/dialogs.c:757 src/dialogs.c:885 src/dialogs.c:1002
-#: src/dialogs.c:1281 src/dialogs.c:1491 src/dialogs.c:1619 src/dialogs.c:1684
-#: src/dialogs.c:1882 src/dialogs.c:2080 src/dialogs.c:2260 src/dialogs.c:2334
-#: src/dialogs.c:3199 src/dialogs.c:3423 src/dialogs.c:3619 src/dialogs.c:3852
-#: src/dialogs.c:3940 src/multi.c:479 src/multi.c:593 src/multi.c:893
-#: src/prpl.c:159 src/prpl.c:231
-msgid "Cancel"
-msgstr "È¡Ïû"
-
-#: src/buddy_chat.c:246
-msgid "Join"
-msgstr "¼ÓÈë"
-
-#: src/buddy_chat.c:287 src/buddy_chat.c:977 src/buddy_chat.c:1124
-msgid "Invite"
-msgstr "ÑûÇë"
-
-#: src/buddy_chat.c:303
-msgid "Invite who?"
-msgstr "ÏëÇëË­£¿"
-
-#: src/buddy_chat.c:307
-msgid "With message:"
-msgstr "ÑûÇëÐÅÏ¢£º"
-
-#: src/buddy_chat.c:331
-msgid "Invite to Buddy Chat"
-msgstr "ÇëÈËÁÄÌì"
-
-#: src/buddy_chat.c:513 src/buddy_chat.c:931
-msgid "Ignore"
-msgstr "²»ÀíËû"
-
-#: src/buddy_chat.c:565 src/buddy_chat.c:671
-#, c-format
-msgid "%d %s in room"
-msgstr "ÁÄÌìÊÒÓÐ %d ¼Ò»ï"
-
-#: src/buddy_chat.c:572
-#, c-format
-msgid "%s entered the room."
-msgstr "%s ½øÁËÁÄÌìÊÒ"
-
-#: src/buddy_chat.c:635
-#, c-format
-msgid "%s is now known as %s"
-msgstr "[%s] ÏÖÔÚʹÓû¯Ãû [%s]"
-
-#: src/buddy_chat.c:678
-#, c-format
-msgid "%s left the room."
-msgstr "%s »ÒÁïÁïµØÀ뿪ÁËÁÄÌìÊÒ"
-
-#: src/buddy_chat.c:805
-msgid "Gaim - Group Chats"
-msgstr "Gaim ȺÌåÁÄÌì"
-
-#: src/buddy_chat.c:866
-msgid "Topic:"
-msgstr "Ö÷Ì⣺"
-
-#: src/buddy_chat.c:908
-msgid "0 people in room"
-msgstr "ÁÄÌìÊÒÏÖÔÚûÓÐÈË£¬°®¸ÉÂï¸ÉÂïÈ¥"
-
-#: src/buddy_chat.c:982 src/buddy_chat.c:1123
-msgid "Whisper"
-msgstr "ÇÄÇÄ»°"
-
-#: src/buddy_chat.c:987 src/buddy_chat.c:1121 src/buddy_chat.c:1167
-#: src/conversation.c:2179
-msgid "Send"
-msgstr "Ëͳö"
-
-#: src/buddy_chat.c:1161 src/conversation.c:2156
-msgid "Block"
-msgstr "¶ÂסËûµÄ×죡"
-
-#: src/buddy_chat.c:1163 src/conversation.c:2162 src/dialogs.c:380
-#: src/dialogs.c:405
-msgid "Warn"
-msgstr "¾¯¸æ"
-
-#: src/conversation.c:372
-msgid "Gaim - Save Conversation"
-msgstr "Gaim - ¼Ç¼¶Ô»°ÄÚÈÝ"
-
-#: src/conversation.c:520
-msgid "Removing '%s' from buddylist.\n"
-msgstr "°Ñ ¡°%s¡±´ÓÅóÓѱíÉÏɾȥ\n"
-
-#: src/conversation.c:1085
-#, c-format
-msgid "Currently at %d, "
-msgstr "Ä¿Ç°ÔÚ %d£¬"
-
-#: src/conversation.c:1093
-#, c-format
-msgid "Setting position to %d\n"
-msgstr "°ÑλÖÃÉ趨µ½ %d\n"
-
-#: src/conversation.c:1619 src/prefs.c:1373
-msgid "Bold Text"
-msgstr "´ÖÌåÎÄ×Ö"
-
-#: src/conversation.c:1619
-msgid "Bold"
-msgstr "´ÖÌå"
-
-#: src/conversation.c:1623 src/prefs.c:1374
-msgid "Italics Text"
-msgstr "бÌåÎÄ×Ö"
-
-#: src/conversation.c:1624
-msgid "Italics"
-msgstr "бÌå"
-
-#: src/conversation.c:1627
-msgid "Underline Text"
-msgstr "ϼÓÏßÎÄ×Ö"
-
-#: src/conversation.c:1628
-msgid "Underline"
-msgstr "ϼÓÏß"
-
-#: src/conversation.c:1632
-msgid "Strike through Text"
-msgstr "»®µôµÄÎÄ×Ö"
-
-#: src/conversation.c:1632
-msgid "Strike"
-msgstr "»®µô"
-
-#: src/conversation.c:1638
-msgid "Decrease font size"
-msgstr "ËõС×ÖÌå"
-
-#: src/conversation.c:1638
-msgid "Small"
-msgstr "С"
-
-#: src/conversation.c:1641
-msgid "Normal font size"
-msgstr "Õý³£×ÖÌå´óС"
-
-#: src/conversation.c:1641
-msgid "Normal"
-msgstr "Õý³£"
-
-#: src/conversation.c:1644
-msgid "Increase font size"
-msgstr "Ôö´ó×ÖÌå"
-
-#: src/conversation.c:1644
-msgid "Big"
-msgstr "´ó"
-
-#: src/conversation.c:1651 src/dialogs.c:2686 src/dialogs.c:2702
-msgid "Select Font"
-msgstr "Ñ¡Ôñ×ÖÐÍ"
-
-#: src/conversation.c:1652
-msgid "Font"
-msgstr "×ÖÐÍ"
-
-#: src/conversation.c:1655 src/prefs.c:1404
-msgid "Text Color"
-msgstr "ÎÄ×ÖÑÕÉ«"
-
-#: src/conversation.c:1656 src/conversation.c:1660
-msgid "Color"
-msgstr "ÑÕÉ«"
-
-#: src/conversation.c:1660 src/prefs.c:1422
-msgid "Background Color"
-msgstr "±³¾°ÑÕÉ«"
-
-#: src/conversation.c:1667 src/dialogs.c:2328
-msgid "Insert Link"
-msgstr "²åÈ볬Á¬½Ó"
-
-#: src/conversation.c:1668
-msgid "Link"
-msgstr "³¬Á¬½Ó"
-
-#: src/conversation.c:1671
-msgid "Insert smiley face"
-msgstr "²åÈëЦÁ³Í¼ÐÎ"
-
-#: src/conversation.c:1671
-msgid "Smiley"
-msgstr "ЦÁ³·û"
-
-#: src/conversation.c:1678
-msgid "Enable logging"
-msgstr "¿ªÊ¼¼Ç¼"
-
-#: src/conversation.c:1679 src/prefs.c:246
-msgid "Logging"
-msgstr "¼Ç¼"
-
-#: src/conversation.c:1688
-msgid "Save Conversation"
-msgstr "±£´æ¶Ô»°ÄÚÈÝ"
-
-#: src/conversation.c:1689 src/dialogs.c:1496 src/dialogs.c:1689
-#: src/dialogs.c:3211 src/dialogs.c:3728
-msgid "Save"
-msgstr "´æÅÌ"
-
-#: src/conversation.c:1693
-msgid "Enable sounds"
-msgstr "´ò¿ªÉùÒô"
-
-#: src/conversation.c:1694
-msgid "Sound"
-msgstr "ÉùÒô"
-
-#: src/conversation.c:2008
-msgid "Gaim - Conversations"
-msgstr "Gaim - ËùÓжԻ°"
-
-#: src/conversation.c:2095
-msgid "Send message as: "
+#: src/protocols/gg/gg.c:1162 src/protocols/gg/gg.c:1179
+#, fuzzy
+msgid "Import Buddies List from Server"
+msgstr "µ¼ÈëÅóÓÑÁбí"
+
+#: src/protocols/gg/gg.c:1164 src/protocols/gg/gg.c:1180
+#, fuzzy
+msgid "Export Buddies List to Server"
+msgstr "µ¼³öÅóÓÑÁбí"
+
+#: src/protocols/gg/gg.c:1166 src/protocols/gg/gg.c:1181
+msgid "Delete Buddies List from Server"
+msgstr ""
+
+#: src/protocols/icq/gaim_icq.c:308
+#, fuzzy
+msgid "Send message through server"
 msgstr "·¢ËÍÐÅÏ¢"
 
-#: src/dialogs.c:367
-msgid "Gaim - Warn user?"
-msgstr "Gaim - ¾¯¸æÓû§£¿"
-
-#: src/dialogs.c:388
-#, c-format
-msgid "Do you really want to warn %s?"
-msgstr "ÄãÕæµÄÏ뾯¸æ %s£¿"
-
-#: src/dialogs.c:393
-msgid "Warn anonymously?"
-msgstr "·¢ÄäÃû¾¯¸æ£¿"
-
-#: src/dialogs.c:397
-msgid "Anonymous warnings are less harsh."
-msgstr "ÄäÃû¾¯¸æ²»ÄÇôÑÏÀ÷¡£"
-
-#: src/dialogs.c:474
-#, c-format
-msgid "Unable to write file %s."
-msgstr "²»ÄÜдÈëÎļþ %s¡£"
-
-#: src/dialogs.c:477
-#, c-format
-msgid "Unable to read file %s."
-msgstr "²»ÄܶÁÈëÎļþ %s¡£"
-
-#: src/dialogs.c:480
-#, c-format
-msgid "Message too long, last %s bytes truncated."
-msgstr "ÐÅϢ̫³¤£¬ºóÃæ %s ×ÖÔª±»¿³µôÁË¡£"
-
-#: src/dialogs.c:483
-#, c-format
-msgid "%s not currently logged in."
-msgstr "%s ÏÖÔÚÉÐδµÇ¼¡£"
-
-#: src/dialogs.c:486
-#, c-format
-msgid "Warning of %s not allowed."
-msgstr "²»ÔÊÐí¾¯¸æ %s ¡£"
-
-#: src/dialogs.c:489
-msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "È¡ÏûÁËÒ»¸öÐÅÏ¢£¬Ä㳬³öÁË·þÊÌÆ÷µÄËÙ¶ÈÏÞÖÆ¡£"
-
-#: src/dialogs.c:492
-#, c-format
-msgid "Chat in %s is not available."
-msgstr "ÔÚ %s ²»¿ÉÒÔÁÄÌì¡£"
-
-#: src/dialogs.c:495
-#, c-format
-msgid "You are sending messages too fast to %s."
-msgstr "Äã·¢Ë͸ø %s µÄËÙ¶ÈÌ«¿ìÁË¡£"
-
-#: src/dialogs.c:498
-#, c-format
-msgid "You missed an IM from %s because it was too big."
-msgstr "Äã´í¹ýÁËÒ»¸ö´Ó %s ·¢À´µÄ¼´Ê±ÐÅÏ¢£¬¸ÃÐÅϢ̫´óÁË¡£"
-
-#: src/dialogs.c:501
-#, c-format
-msgid "You missed an IM from %s because it was sent too fast."
-msgstr "Äã´í¹ýÁËÒ»¸ö´Ó %s ·¢À´µÄ¼´Ê±ÐÅÏ¢£¬¸ÃÐÅÏ¢·¢Ë͵ÄËÙ¶ÈÌ«¿ì¡£"
-
-#: src/dialogs.c:504
-msgid "Failure."
-msgstr "ʧ°ÜÁË¡£"
-
-#: src/dialogs.c:507
-msgid "Too many matches."
-msgstr "Æ¥ÅäÌ«¶à¡£"
-
-#: src/dialogs.c:510
-msgid "Need more qualifiers."
-msgstr "ÐèÒª¸ü¶àµÄ²ÎÊý¡£"
-
-#: src/dialogs.c:513
-msgid "Dir service temporarily unavailable."
-msgstr "ÐÕÃûµØַ¼·þÎñÆ÷ÔÝʱÁ¬²»ÉÏ¡£"
-
-#: src/dialogs.c:516
-msgid "Email lookup restricted."
-msgstr "µçÓʲéÕÒÏÞÖÆ¡£"
-
-#: src/dialogs.c:519
-msgid "Keyword ignored."
-msgstr "¹Ø¼ü×Ö±»ºöÂÔ¡£"
-
-#: src/dialogs.c:522
-msgid "No keywords."
-msgstr "ûÓйؼü×Ö¡£"
-
-#: src/dialogs.c:525
-msgid "User has no directory information."
-msgstr "¸ÃÓû§Ã»ÓÐÐÕÃûµØַ¼"
-
-#: src/dialogs.c:529
-msgid "Country not supported."
-msgstr "²»Ö§³ÖÕâ¸ö¹ú¼Ò¡£"
-
-#: src/dialogs.c:532
+#: src/protocols/icq/gaim_icq.c:469 src/protocols/irc/irc.c:1538
+#: src/protocols/jabber/jabber.c:2021 src/protocols/oscar/oscar.c:2847
+#: src/protocols/toc/toc.c:1201
+msgid "Get Info"
+msgstr "Óû§Ïêϸ×ÊÁÏ"
+
+#: src/protocols/irc/irc.c:429 src/protocols/irc/irc.c:962
 #, c-format
-msgid "Failure unknown: %s."
-msgstr "²»Ã÷´íÎó£º %s ¡£"
-
-#. Incorrect nick/password
-#: src/dialogs.c:535 src/oscar.c:627
-msgid "Incorrect nickname or password."
-msgstr "êÇÃû»òÕßÃÜÂë´íÎó¡£"
-
-#: src/dialogs.c:538
-msgid "The service is temporarily unavailable."
-msgstr "ÔÝʱûÓи÷þÎñ¡£"
-
-#: src/dialogs.c:541
-msgid "Your warning level is currently too high to log in."
-msgstr "ÄãÄ¿Ç°µÄ¾¯¸æ¼¶±ðÌ«¸ß£¬ÎÞ·¨µÇÈë¡£"
-
-#: src/dialogs.c:544
-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."
+msgid "<B>%s has changed the topic to: %s</B>"
+msgstr ""
+
+#: src/protocols/irc/irc.c:682
+msgid "No such nick/channel"
+msgstr ""
+
+#: src/protocols/irc/irc.c:682 src/protocols/irc/irc.c:685
+#: src/protocols/irc/irc.c:687 src/protocols/irc/irc.c:891
+#, fuzzy
+msgid "IRC Error"
+msgstr "ÁÄÌì´íÎó"
+
+#: src/protocols/irc/irc.c:685
+msgid "No such server"
 msgstr ""
-"ÄãÁ¬½Ó£¬¶Ï¿ªµÄƵÂÊÌ«¸ßÁË£¬µÈÊ®·ÖÖÓÔÙÊÔ¡£Èç¹ûÄã·ÇÒª½Ó×ÅÊÔ£¬µÈµÄʱ¼ä»á¸ü³¤¡£"
-
-#: src/dialogs.c:547
-#, c-format
-msgid "An unknown signon error has occurred: %s."
-msgstr "·¢Éú²»Ã÷µÄµÇ¼´íÎó£º %s¡£"
-
-#: src/dialogs.c:550
-#, c-format
-msgid "An unknown error, %d, has occured.  Info: %s"
-msgstr "²»Ã÷´íÎó %d ·¢ÉúÁË¡£¾ßÌåѶϢ£º %s"
-
-#: src/dialogs.c:553
+
+#: src/protocols/irc/irc.c:687
+msgid "No nickname given"
+msgstr ""
+
+#: src/protocols/irc/irc.c:819
+#, fuzzy
+msgid "Unable to write"
+msgstr "²»ÄÜдÈëÎļþ %s¡£"
+
+#: src/protocols/irc/irc.c:889
+#, fuzzy, c-format
+msgid "You have been kicked from %s: %s"
+msgstr "Äã±»´ÓÁÄÌìÊÒ (%s) Àï¸Ï³öÀ´ÁË£¡"
+
+#: src/protocols/irc/irc.c:894
 #, c-format
-msgid "Gaim - Error %d"
-msgstr "Gaim - ´íÎó %d"
-
-#. Build OK Button
-#: src/dialogs.c:612 src/dialogs.c:702 src/dialogs.c:762 src/dialogs.c:1286
-#: src/dialogs.c:1624 src/dialogs.c:1737 src/dialogs.c:2079 src/dialogs.c:2265
-#: src/dialogs.c:2333 src/dialogs.c:3857 src/dialogs.c:3945 src/multi.c:483
-msgid "OK"
-msgstr "È·ÈÏ"
-
-#: src/dialogs.c:668
-msgid "Gaim - IM user"
-msgstr "Gaim - ¼´Ê±ÐÅÏ¢Óû§"
-
-#: src/dialogs.c:685
-msgid "IM who:"
-msgstr "¸øÕâ¼Ò»ï¼´Ê±ÐÅÏ¢£º"
-
-#: src/dialogs.c:733
-msgid "Get User Info"
-msgstr "Óû§Ïêϸ×ÊÁÏ"
-
-#: src/dialogs.c:740
-msgid "User:"
-msgstr "Óû§£º"
-
-#. Finish up
-#: src/dialogs.c:768
-msgid "Gaim - Get User Info"
-msgstr "Gaim - È¡µÃÓû§×ÊÁÏ"
-
-#: src/dialogs.c:838
-msgid "Buddies"
-msgstr "¸çÃǶùÃÇ"
-
-#: src/dialogs.c:891
-msgid "Add Group"
-msgstr "Ìí¼Ó×é"
-
-#: src/dialogs.c:921
-msgid "Gaim - Add Group"
-msgstr "Gaim - Ìí¼Ó×é"
-
-#: src/dialogs.c:948
-msgid "Gaim - Add Buddy"
-msgstr "Gaim - Ôö¼ÓÅóÓÑ"
-
-#: src/dialogs.c:962
-msgid "Add Buddy"
-msgstr "Ôö¼ÓÅóÓÑ"
-
-#: src/dialogs.c:972 src/dialogs.c:3431
-msgid "Buddy"
-msgstr "ÅóÓÑ"
-
-#: src/dialogs.c:1026
-msgid "Please enter a buddy to pounce."
-msgstr "ÇëÊäÈëÄúÒª¼àÊӵģ»¡¯¸çÃǶù"
-
-#: src/dialogs.c:1026
-msgid "Buddy Pounce Error"
-msgstr "¼àÊÓÅóÓÑʱ³ö´í"
-
-#: src/dialogs.c:1095
-msgid "Pounce buddy as:"
-msgstr "¼àÊÓÅóÓÑʱʹÓÃÕʺÅ"
-
-#: src/dialogs.c:1145
-msgid "Gaim - New Buddy Pounce"
-msgstr "Gaim - ÐÂÔö¼àÊÓÅóÓÑ"
-
-#: src/dialogs.c:1162
-msgid "Buddy:"
-msgstr "ÅóÓÑ"
-
-#: src/dialogs.c:1177
-msgid "Pounce on sign on"
-msgstr "¼àÊÓºÎʱµÇ¼"
-
-#: src/dialogs.c:1182
-msgid "Pounce on return from away"
-msgstr "¼àÊÓºÎʱ»ØÀ´"
-
-#: src/dialogs.c:1186
-msgid "Pounce on return from idle"
-msgstr "¼àÊÓºÎʱÉñÖ¾»Ö¸´ÇåÐÑ"
-
-#: src/dialogs.c:1194
-msgid "Open IM window on pounce"
-msgstr "·¢ÏÖ¶¯¾²¾Í´ò¿ª¼´Ê±ÐÅÏ¢´°¿Ú"
-
-#: src/dialogs.c:1199
-msgid "Send IM on pounce"
-msgstr "·¢ÏÖ¶¯¾²¾Í·¢Ëͼ´Ê±ÐÅÏ¢"
-
-#: src/dialogs.c:1208
-msgid "Message:"
-msgstr "ÏûÏ¢£º"
-
-#: src/dialogs.c:1220
-msgid "Execute command on pounce"
-msgstr "·¢ÏÖ¶¯¾²¾ÍÖ´ÐÐÃüÁî"
-
-#: src/dialogs.c:1229
-msgid "Command:"
-msgstr "ÃüÁ"
-
-#: src/dialogs.c:1242
-msgid "Play sound on pounce"
-msgstr "·¢ÏÖ¶¯¾²¾Í²¥·ÅÉùÒô"
-
-#: src/dialogs.c:1251
-msgid "Sound:"
-msgstr "ÉùÒô"
-
-#: src/dialogs.c:1268
-msgid "Save this pounce after activation"
-msgstr "Ï´η¢ÏÖÈÔȻִÐÐ"
-
-#: src/dialogs.c:1357
-msgid "Gaim - Set Dir Info"
-msgstr "Gaim - É趨ÐÕÃûµØַ¼"
-
-#: src/dialogs.c:1389
-msgid "Allow Web Searches To Find Your Info"
-msgstr "ÔÊÐí´ÓÍøÒ³ËÑÑ°ÕÒµ½ÄãµÄ×ÊÁÏ"
-
-#. Line 1
-#: src/dialogs.c:1392 src/dialogs.c:2098
-msgid "First Name"
-msgstr "Ãû"
-
-#. Line 2
-#: src/dialogs.c:1403 src/dialogs.c:2110
-msgid "Middle Name"
-msgstr "×Ö"
-
-#. Line 3
-#: src/dialogs.c:1415 src/dialogs.c:2122
-msgid "Last Name"
-msgstr "ÐÕ"
-
-#. Line 4
-#: src/dialogs.c:1426 src/dialogs.c:2134
-msgid "Maiden Name"
-msgstr "Äï¼ÒÐÕ"
-
-#. Line 5
-#: src/dialogs.c:1437 src/dialogs.c:2146
-msgid "City"
-msgstr "ÊÐ"
-
-#. Line 6
-#: src/dialogs.c:1448 src/dialogs.c:2157
-msgid "State"
-msgstr "Ê¡"
-
-#. Line 7
-#: src/dialogs.c:1459 src/dialogs.c:2168
-msgid "Country"
-msgstr "¹ú"
-
-#: src/dialogs.c:1514
-msgid "New Passwords Do Not Match"
-msgstr "ÐÂÃÜÂë²»Ò»ÖÂ"
-
-#: src/dialogs.c:1514 src/dialogs.c:1519
-msgid "Gaim - Change Password Error"
-msgstr "Gaim - ¸ü¸ÄÃÜÂë´íÎó"
-
-#: src/dialogs.c:1519
-msgid "Fill out all fields completely"
-msgstr "°ÑËùÓеıí¸ñ¶¼ÌíÁË"
-
-#: src/dialogs.c:1546 src/toc.c:606
-msgid "Gaim - Password Change"
-msgstr "Gaim - ¸ü¸ÄÃÜÂë"
-
-#: src/dialogs.c:1577
-msgid "Original Password"
-msgstr "¾ÉÃÜÂë"
-
-#: src/dialogs.c:1591
-msgid "New Password"
-msgstr "ÐÂÃÜÂë"
-
-#: src/dialogs.c:1605
-msgid "New Password (again)"
-msgstr "ÐÂÃÜÂ루ȷ¶¨£©"
-
-#: src/dialogs.c:1650
-msgid "Gaim - Set User Info"
-msgstr "Gaim - É趨Óû§×ÊÁÏ"
-
-#: src/dialogs.c:1748
-msgid "Below are the results of your search: "
-msgstr "ÒÔÏÂÊÇÄãËÑË÷µÄ½á¹û£º"
-
-#: src/dialogs.c:1872 src/dialogs.c:1879
-msgid "Permit"
-msgstr "ÔÊÐí"
-
-#: src/dialogs.c:1874 src/dialogs.c:1881
-msgid "Deny"
-msgstr "¾Ü¾ø"
-
-#: src/dialogs.c:1922
-msgid "Gaim - Add Permit"
-msgstr "Gaim - Ôö¼ÓÔÊÐíÈË"
-
-#: src/dialogs.c:1924
-msgid "Gaim - Add Deny"
-msgstr "Gaim - Ôö¼Ó½ûÖ¹ÈË"
-
-#: src/dialogs.c:1995
-msgid "Gaim - Log Conversation"
-msgstr "Gaim - ¼Ç¼¶Ô»°ÄÚÈÝ"
-
-#: src/dialogs.c:2205
-msgid "Gaim - Find Buddy By Info"
-msgstr "Gaim - ¸ù¾ÝÓû§×ÊÁϲéÑ°ÅóÓÑ"
-
-#: src/dialogs.c:2235
-msgid "Gaim - Find Buddy By Email"
-msgstr "Gaim - ¸ù¾ÝµçÓʲéÑ°ÅóÓÑ"
-
-#: src/dialogs.c:2248
-msgid "Email"
-msgstr "µçÓÊ"
-
-#: src/dialogs.c:2347
-msgid "URL"
-msgstr "URL"
-
-#. Right side: frame with description and the filepath of plugin
-#: src/dialogs.c:2355 src/plugins.c:308
-msgid "Description"
-msgstr "ÃèÊö"
-
-#: src/dialogs.c:2381
-msgid "Gaim - Add URL"
-msgstr "Gaim - Ôö¼Ó URL"
-
-#: src/dialogs.c:2524 src/dialogs.c:2537 src/dialogs.c:2574
-msgid "Select Text Color"
-msgstr "É趨ÎÄ×ÖÑÕÉ«"
-
-#: src/dialogs.c:2561
-msgid "Select Background Color"
-msgstr "É趨±³¾°ÑÕÉ«"
-
-#: src/dialogs.c:2925
+msgid "Kicked by %s: %s"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1357
 #, c-format
-msgid "Error reading file %s"
-msgstr "¶ÁÈ¡Îļþ %s ·¢Éú´íÎó"
-
-#: src/dialogs.c:2926 src/dialogs.c:3580 src/oscar.c:2365 src/oscar.c:2875
-#: src/toc.c:1422 src/toc.c:1439 src/toc.c:1499 src/toc.c:1541 src/toc.c:1675
-#: src/toc.c:1705 src/toc.c:1761
-msgid "Error"
-msgstr "´íÎó"
-
-#: src/dialogs.c:3003
-msgid "Gaim - Import Buddy List"
-msgstr "Gaim - µ¼ÈëÅóÓÑÁбí"
-
-#. We shouldn't allow a blank title
-#: src/dialogs.c:3066
-msgid "You cannot create an away message with a blank title"
-msgstr "ÔÝʱÀ뿪ÏûÏ¢²»ÄÜûÓбêÌâ"
-
-#. We shouldn't allow a blank message
-#: src/dialogs.c:3073
-msgid "You cannot create an empty away message"
-msgstr "ÔÝʱÀ뿪ÏûÏ¢²»ÄÜΪ¿Õ"
-
-#: src/dialogs.c:3140
-msgid "Gaim - New away message"
-msgstr "Gaim - ¸üÐÂÔÝʱÀ뿪ÐÅÏ¢"
-
-#: src/dialogs.c:3150
-msgid "New away message"
-msgstr "еÄÔÝʱÀ뿪ÐÅÏ¢"
-
-#: src/dialogs.c:3163
-msgid "Away title: "
-msgstr "ÔÝʱÀ뿪±êÌ⣺"
-
-#: src/dialogs.c:3203
-msgid "Use"
-msgstr "ʹÓÃ"
-
-#: src/dialogs.c:3207
-msgid "Save & Use"
-msgstr "±£´æ²¢Ê¹ÓÃ"
-
-#. show everything
-#: src/dialogs.c:3376
-msgid "Smile!"
-msgstr "ЦÁ³"
-
-#: src/dialogs.c:3429
-msgid "Alias Buddy"
-msgstr "¸øÅóÓÑÈ¡Ò»¸öÍâºÅ¶ù"
-
-#: src/dialogs.c:3466
-msgid "Gaim - Alias Buddy"
-msgstr "Gaim - ¸øÅóÓÑÈ¡Ò»¸öÍâºÅ¶ù"
-
-#: src/dialogs.c:3543
-msgid "Gaim - Save Log File"
-msgstr "Gaim - ±£´æ¼Ç¼Ϊ¡­¡­"
-
-#: src/dialogs.c:3578
-#, c-format
-msgid "Unable to remove file %s - %s"
-msgstr "²»ÄÜɾ³ýÎļþ %s¡£"
-
-#: src/dialogs.c:3609
-msgid "Really clear log?"
-msgstr "ÕæµÃÒªÇå³þ¼Ç¼£¿"
-
-#: src/dialogs.c:3627
-msgid "Okay"
-msgstr "È·¶¨"
-
-#: src/dialogs.c:3723
-msgid "Clear"
-msgstr "Çå³ý"
-
-#: src/dialogs.c:3821
-msgid "Gaim - Rename Group"
-msgstr "Gaim - ÖØÃüÃû×é"
-
-#: src/dialogs.c:3831
-msgid "Rename Group"
-msgstr "ÖØÃüÃû×é"
-
-#: src/dialogs.c:3838 src/dialogs.c:3926
-msgid "New name:"
-msgstr "ÐÂÃû×Ö£º"
-
-#: src/dialogs.c:3909
-msgid "Gaim - Rename Buddy"
-msgstr "Gaim - ÖØÃüÃû¸çÃǶù"
-
-#: src/dialogs.c:3919
-msgid "Rename Buddy"
-msgstr "ÖØÃüÃû¸çÃǶù"
-
-#: src/gaimrc.c:980
-#, c-format
-msgid "Could not open config file %s."
-msgstr "ÎÞ·¨´ò¿ªÅäÖÃÎļþ"
-
-#: src/gaimrc.c:981
-msgid "Preferences Error"
-msgstr "Ñ¡Ïî´íÎó"
-
-#: src/html.c:167
-#, c-format
-msgid "Getting %d bytes from %s"
-msgstr "½ÓÊÕµ½ %d ×Ö½Ú£¬À´Ô´£º %s"
-
-#: src/html.c:181
-msgid "Getting Data"
-msgstr "½ÓÊÕÊý¾Ý"
-
-#: src/html.c:213
-#, c-format
-msgid "Receieved: '%s'\n"
-msgstr "ÊÕµ½ÁË£º¡°%s¡±\n"
-
-#: src/html.c:238
-msgid "g003: Error opening connection.\n"
-msgstr "g003: ´ò¿ªÁ¬½Ó´íÎó\n"
-
-#: src/multi.c:361 src/prefs.c:189
-msgid "General Options"
-msgstr "Ò»°ãÑ¡Ïî"
-
-#: src/multi.c:366
-msgid "Screenname:"
-msgstr "µÇ¼Ãû£º"
-
-#: src/multi.c:375
+msgid "You have left %s"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1358
+msgid "IRC Part"
+msgstr ""
+
+#: src/protocols/irc/irc.c:1443
+#, fuzzy
+msgid "Channel:"
+msgstr "È¡Ïû"
+
+#: src/multi.c:522 src/protocols/irc/irc.c:1447
 msgid "Password:"
 msgstr "ÃÜÂ룺"
 
-#: src/multi.c:386
-msgid "Protocol:"
-msgstr "ЭÒ飺"
-
-#: src/multi.c:391
-msgid "Remember Password"
-msgstr "¼ÇסÃÜÂë"
-
-#: src/multi.c:392
-msgid "Auto-Login"
-msgstr "×Ô¶¯µÇ¼"
-
-#: src/multi.c:458
-msgid "Gaim - Modify Account"
-msgstr "Gaim - ÐÞ¸ÄÕʺÅ"
-
-#: src/multi.c:565
-msgid "Enter Password"
-msgstr "ÊäÈëÃÜÂë"
-
-#: src/multi.c:653
-#, c-format
-msgid "Are you sure you want to delete %s?"
-msgstr "ÄãÕæµÄÏëɾ³ý %s£¿"
-
-#: src/multi.c:690
-msgid "Gaim - Account Editor"
-msgstr "Gaim - Õʺű༭Æ÷"
-
-#: src/multi.c:709
-msgid "Select All"
-msgstr "È«Ñ¡"
-
-#: src/multi.c:714
-msgid "Select Autos"
-msgstr "Ñ¡Ôñ×Ô¶¯»Ø¸´ÏûÏ¢"
-
-#: src/multi.c:718
-msgid "Select None"
-msgstr "È«²¿²»Ñ¡"
-
-#: src/multi.c:732
-msgid "Modify"
-msgstr "ÐÞ¸Ä"
-
-#: src/multi.c:736
-msgid "Sign On/Off"
-msgstr "µÇ¼/À뿪"
-
-#: src/multi.c:740
-msgid "Delete"
-msgstr "ɾ³ý"
-
-#: src/multi.c:914
-msgid ""
-"%s\n"
-"%s was unable to sign on: %s"
+#: src/protocols/jabber/jabber.c:1692
+msgid "Room:"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1696
+#, fuzzy
+msgid "Server:"
+msgstr "´úÀí·þÎñÆ÷ÉèÖÃ"
+
+#: src/protocols/jabber/jabber.c:1701
+#, fuzzy
+msgid "Handle:"
+msgstr "¿ÕÏÐʱ¼ä£º"
+
+#: src/buddy_chat.c:875 src/protocols/jabber/jabber.c:2026
+#: src/protocols/oscar/oscar.c:2854
+msgid "Get Away Msg"
+msgstr "ÊÕµ½ÔÝʱÀ뿪ÐÅÏ¢"
+
+#: src/protocols/msn/msn.c:653 src/protocols/msn/msn.c:1909
+#: src/protocols/msn/msn.c:1942
+#, fuzzy
+msgid "MSN Error"
+msgstr "´íÎó"
+
+#: src/protocols/msn/msn.c:653
+#, fuzzy
+msgid "Gaim was unable to send a message"
 msgstr ""
 "%s\n"
 "%s ÎÞ·¨µÇ¼£º %s"
 
-#: src/oscar.c:341 src/oscar.c:358 src/toc.c:351 src/toc.c:361 src/toc.c:422
-msgid "Disconnected."
-msgstr "ÒѶϿª¡£"
-
-#: src/oscar.c:349
+#: src/protocols/msn/msn.c:960
+#, fuzzy
+msgid "You have been disconnected. You have signed on from another location."
+msgstr "Äã±»´ÓÁÄÌìÊÒ (%s) Àï¸Ï³öÀ´ÁË£¡"
+
+#: src/protocols/msn/msn.c:1909 src/protocols/msn/msn.c:1942
+#, fuzzy
+msgid "Invalid name"
+msgstr "Äï¼ÒÐÕ"
+
+#: src/protocols/napster/napster.c:450 src/protocols/oscar/oscar.c:2536
+#: src/protocols/toc/toc.c:1088
+msgid "Join what group:"
+msgstr "Òª¼ÓÈëµÄ×飺"
+
+#: src/protocols/oscar/oscar.c:305
+#, c-format
+msgid "Direct IM with %s closed"
+msgstr "<HR><B>ºÍ %s Ö®¼äµÄÖ±½ÓÁ¬½ÓÒѾ­¹Ø±Õ¡£</B><BR><HR>"
+
+#: src/protocols/oscar/oscar.c:341
 msgid "connection error (rend)\n"
 msgstr "Á¬½Ó´íÎó£¡\n"
 
-#: src/oscar.c:357
+#: src/protocols/oscar/oscar.c:352
 msgid "major connection error\n"
 msgstr "ÖØ´óÁ¬½Ó´íÎó£¡\n"
 
-#: src/oscar.c:370 src/toc.c:585
+#: src/protocols/oscar/oscar.c:353 src/protocols/toc/toc.c:509
+#: src/protocols/toc/toc.c:522 src/protocols/toc/toc.c:588
+msgid "Disconnected."
+msgstr "ÒѶϿª¡£"
+
+#: src/protocols/oscar/oscar.c:365 src/protocols/toc/toc.c:756
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Äã±»´ÓÁÄÌìÊÒ (%s) Àï¸Ï³öÀ´ÁË£¡"
 
-#: src/oscar.c:371
+#: src/protocols/oscar/oscar.c:366
 msgid "Chat Error!"
 msgstr "ÁÄÌì´íÎó£¡"
 
-#: src/oscar.c:381
+#: src/protocols/oscar/oscar.c:378
 msgid "Chat is currently unavailable"
 msgstr "ÏÖÔÚûÓÐÁÄÌì¡£"
 
-#: src/oscar.c:382
+#: src/protocols/oscar/oscar.c:379
 msgid "Gaim - Chat"
 msgstr "Gaim ÁÄÌì"
 
-#: src/oscar.c:437 src/oscar.c:490
+#: src/protocols/oscar/oscar.c:438 src/protocols/oscar/oscar.c:498
 msgid "Couldn't connect to host"
 msgstr "²»ÄÜÁ¬½Óµ½Ö÷»ú"
 
-#: src/oscar.c:445
+#: src/protocols/oscar/oscar.c:446
 msgid "Password sent, waiting for response\n"
 msgstr "ÃÜÂëÒÑËͳö£¬µÈºò»ØÓ¦\n"
 
-#: src/oscar.c:456
-#, c-format
-msgid "Logging in %s\n"
-msgstr "ÕýÔÚ³¢ÊԵǼ£º %s\n"
-
-#: src/oscar.c:471
+#: src/protocols/oscar/oscar.c:479
 msgid "internal connection error\n"
 msgstr "ÄÚ²¿Á¬½Ó´íÎó\n"
 
-#: src/oscar.c:472
+#: src/protocols/oscar/oscar.c:480
 msgid "Unable to login to AIM"
 msgstr "²»ÄܵǼµ½ AIM"
 
-#: src/oscar.c:477
+#: src/protocols/oscar/oscar.c:485
 #, c-format
 msgid "Signon: %s"
 msgstr "µÇ¼£º %s"
 
-#: src/oscar.c:546
+#: src/protocols/oscar/oscar.c:557
 msgid "Signed off.\n"
 msgstr "µÇ³ö¡£\n"
 
-#: src/oscar.c:565 src/oscar.c:708
+#: src/protocols/oscar/oscar.c:576 src/protocols/oscar/oscar.c:696
 msgid "Could Not Connect"
 msgstr "ÎÞ·¨Á¬½Ó"
 
-#: src/oscar.c:573
+#: src/protocols/oscar/oscar.c:584
 msgid "Connection established, cookie sent"
 msgstr "Á¬½Ó³É¹¦£¬Ëͳö±ý¸É¡£¡£°¡£¡±ý¸É£¿£¡"
 
+#. Incorrect nick/password
+#: src/protocols/oscar/oscar.c:610 src/protocols/toc/toc.c:457
+msgid "Incorrect nickname or password."
+msgstr "êÇÃû»òÕßÃÜÂë´íÎó¡£"
+
+#. Suspended account
+#: src/protocols/oscar/oscar.c:615
+msgid "Your account is currently suspended."
+msgstr ""
+
 #. connecting too frequently
-#: src/oscar.c:622
+#: src/protocols/oscar/oscar.c:619
 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."
@@ -1353,57 +483,186 @@
 "ÄãÁ¬½Ó£¬¶Ï¿ªµÄƵÂÊÌ«¸ßÁË£¬µÈÊ®·ÖÖÓÔÙÊÔ¡£Èç¹ûÄã·ÇÒª½Ó×ÅÊÔ£¬µÈµÄʱ¼ä»á¸ü³¤¡£"
 
 #. client too old
-#: src/oscar.c:632
+#: src/protocols/oscar/oscar.c:624
 msgid "The client version you are using is too old. Please upgrade at "
 msgstr "ÄãËùʹÓõÄÈí¼þ°æ±¾Ì«¾ÉÁË¡£ÈÃÄãÂèÂè¸øÄãÂò¸öеİɣ¡"
 
-#: src/oscar.c:636 src/toc.c:375
+#: src/protocols/oscar/oscar.c:628 src/protocols/toc/toc.c:540
 msgid "Authentication Failed"
 msgstr "Éí·ÝÑé֤ʧ°Ü"
 
-#: src/oscar.c:665
+#: src/protocols/oscar/oscar.c:650
 msgid "Internal Error"
 msgstr "ÄÚ²¿´íÎó"
 
-#: src/oscar.c:1248 src/oscar.c:2759
+#: src/protocols/oscar/oscar.c:1204 src/protocols/oscar/oscar.c:2744
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "<HR><B>Òѽ¨Á¢ºÍ %s µÄÖ±½ÓÁ¬½Ó¡£</B><BR><HR>"
 
-#. message too large
-#: src/oscar.c:1868
-#, c-format
-msgid "You missed a message from %s because it was too large."
+#: src/protocols/oscar/oscar.c:1454
+#, fuzzy, c-format
+msgid "You missed %d message from %s because it was invalid."
+msgstr "Äã´í¹ýÁËÒ»¸ö´Ó %s ·¢À´µÄ¼´Ê±ÐÅÏ¢£¬¸ÃÐÅϢ̫´óÁË¡£"
+
+#: src/protocols/oscar/oscar.c:1455
+#, fuzzy, c-format
+msgid "You missed %d messages from %s because they were invalid."
+msgstr "Äã´í¹ýÁËÒ»¸ö´Ó %s ·¢À´µÄ¼´Ê±ÐÅÏ¢£¬¸ÃÐÅϢ̫´óÁË¡£"
+
+#: src/protocols/oscar/oscar.c:1464
+#, fuzzy, c-format
+msgid "You missed %d message from %s because it was too large."
+msgstr "Äã´í¹ýÁËÒ»¸ö´Ó %s ·¢À´µÄ¼´Ê±ÐÅÏ¢£¬¸ÃÐÅϢ̫´óÁË¡£"
+
+#: src/protocols/oscar/oscar.c:1465
+#, fuzzy, c-format
+msgid "You missed %d messages from %s because they were too large."
+msgstr "Äã´í¹ýÁËÒ»¸ö´Ó %s ·¢À´µÄ¼´Ê±ÐÅÏ¢£¬¸ÃÐÅϢ̫´óÁË¡£"
+
+#: src/protocols/oscar/oscar.c:1474
+#, fuzzy, c-format
+msgid "You missed %d message from %s because the rate limit has been exceeded."
+msgstr "Äã´í¹ýÁËÒ»¸ö´Ó %s ·¢À´µÄ¼´Ê±ÐÅÏ¢£¬¸ÃÐÅϢ̫´óÁË¡£"
+
+#: src/protocols/oscar/oscar.c:1475
+#, fuzzy, c-format
+msgid ""
+"You missed %d messages from %s because the rate limit has been exceeded."
+msgstr "Äã´í¹ýÁËÒ»¸ö´Ó %s ·¢À´µÄ¼´Ê±ÐÅÏ¢£¬¸ÃÐÅϢ̫´óÁË¡£"
+
+#: src/protocols/oscar/oscar.c:1484
+#, fuzzy, c-format
+msgid "You missed %d message from %s because it was too evil."
 msgstr "Äã´í¹ýÁËÒ»¸ö´Ó %s ·¢À´µÄ¼´Ê±ÐÅÏ¢£¬¸ÃÐÅϢ̫´óÁË¡£"
 
-#: src/oscar.c:1873
+#: src/protocols/oscar/oscar.c:1485
+#, fuzzy, c-format
+msgid "You missed %d messages from %s because they are too evil."
+msgstr "Äã´í¹ýÁËÒ»¸ö´Ó %s ·¢À´µÄ¼´Ê±ÐÅÏ¢£¬¸ÃÐÅϢ̫´óÁË¡£"
+
+#: src/protocols/oscar/oscar.c:1494
+#, fuzzy, c-format
+msgid "You missed %d message from %s because you are too evil."
+msgstr "Äã´í¹ýÁËÒ»¸ö´Ó %s ·¢À´µÄ¼´Ê±ÐÅÏ¢£¬¸ÃÐÅϢ̫´óÁË¡£"
+
+#: src/protocols/oscar/oscar.c:1495
+#, fuzzy, c-format
+msgid "You missed %d messages from %s because you are too evil."
+msgstr "Äã´í¹ýÁËÒ»¸ö´Ó %s ·¢À´µÄ¼´Ê±ÐÅÏ¢£¬¸ÃÐÅϢ̫´óÁË¡£"
+
+#: src/protocols/oscar/oscar.c:1503
+#, fuzzy, c-format
+msgid "You missed %d message from %s for unknown reasons."
+msgstr "ÄãĪÃûÆäÃîµØ¶ªÊ§ÁËÒ»Ìõ %s ·¢À´µÄÏûÏ¢"
+
+#: src/protocols/oscar/oscar.c:1504
+#, fuzzy, c-format
+msgid "You missed %d messages from %s for unknown reasons."
+msgstr "ÄãĪÃûÆäÃîµØ¶ªÊ§ÁËÒ»Ìõ %s ·¢À´µÄÏûÏ¢"
+
+#: src/dialogs.c:2949 src/dialogs.c:2955 src/protocols/oscar/oscar.c:1509
+#: src/protocols/oscar/oscar.c:1547 src/protocols/oscar/oscar.c:1565
+#: src/protocols/oscar/oscar.c:1994 src/protocols/yahoo/yahoo.c:501
+msgid "Gaim - Error"
+msgstr "Gaim - ´íÎó"
+
+#: src/protocols/oscar/oscar.c:1526
 #, c-format
-msgid "You missed a message from %s for unknown reasons."
-msgstr "ÄãĪÃûÆäÃîµØ¶ªÊ§ÁËÒ»Ìõ %s ·¢À´µÄÏûÏ¢"
-
-#: src/oscar.c:1908
+msgid "SNAC threw error: %s\n"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1528
+#, fuzzy
+msgid "Gaim - Oscar SNAC Error"
+msgstr "Gaim - ´íÎó"
+
+#: src/protocols/oscar/oscar.c:1545
 #, c-format
 msgid "Your message to %s did not get sent: %s"
 msgstr "Äã¸ø %s µÄÏûϢûÓб»·¢ËÍ"
 
-#: src/oscar.c:1909 src/oscar.c:1928
+#: src/protocols/oscar/oscar.c:1546 src/protocols/oscar/oscar.c:1564
 msgid "Reason unknown"
 msgstr "Ô­Òò²»Ã÷"
 
-#: src/oscar.c:1927
+#: src/protocols/oscar/oscar.c:1563
 #, c-format
 msgid "User information for %s unavailable: %s"
 msgstr "ÎÞ·¨²éµ½Óû§ %s µÄÐÅÏ¢"
 
-#: src/oscar.c:1968
+#: src/buddy.c:1906 src/protocols/oscar/oscar.c:1591
+#, fuzzy
+msgid "Buddy Icon"
+msgstr "ÅóÓÑͼ±ê"
+
+#: src/buddy.c:1909 src/protocols/oscar/oscar.c:1594
+msgid "Voice"
+msgstr "ÉùÒô"
+
+#: src/buddy.c:1912 src/protocols/oscar/oscar.c:1597
+msgid "IM Image"
+msgstr "IM ͼ°¸"
+
+#: src/buddy.c:488 src/buddy.c:1915 src/buddy.c:2343 src/prefs.c:2837
+#: src/protocols/oscar/oscar.c:1600
+msgid "Chat"
+msgstr "ÁÄÌì"
+
+#: src/buddy.c:1918 src/protocols/oscar/oscar.c:1603
+msgid "Get File"
+msgstr "½ÓÊÕÎļþ"
+
+#: src/buddy.c:1921 src/protocols/oscar/oscar.c:1606
+msgid "Send File"
+msgstr "·¢ËÍÎļþ"
+
+#: src/buddy.c:1925 src/protocols/oscar/oscar.c:1610
+msgid "Games"
+msgstr "ÓÎÏ·"
+
+#: src/buddy.c:1928 src/protocols/oscar/oscar.c:1613
+msgid "Stocks"
+msgstr "¹ÉƱ"
+
+#: src/buddy.c:1931 src/protocols/oscar/oscar.c:1616
+#, fuzzy
+msgid "Send Buddy List"
+msgstr "ÅóÓÑÁбí"
+
+#: src/buddy.c:1934 src/protocols/oscar/oscar.c:1619
+msgid "EveryBuddy Bug"
+msgstr ""
+
+#: src/buddy.c:1937 src/protocols/oscar/oscar.c:1622
+#, fuzzy
+msgid "AP User"
+msgstr "µÇ¼Óû§"
+
+#: src/buddy.c:1940 src/protocols/oscar/oscar.c:1625
+msgid "ICQ RTF"
+msgstr ""
+
+#: src/buddy.c:1943 src/protocols/oscar/oscar.c:1628
+msgid "Nihilist"
+msgstr ""
+
+#: src/buddy.c:1946 src/protocols/oscar/oscar.c:1631
+msgid "ICQ Server Relay"
+msgstr ""
+
+#: src/buddy.c:1949 src/protocols/oscar/oscar.c:1634
+msgid "ICQ Unknown"
+msgstr ""
+
+#: src/buddy.c:1952 src/protocols/oscar/oscar.c:1637
+msgid "Trillian Encryption"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1674
+#, fuzzy
 msgid ""
-"Username : <B>%s</B>  %s <BR>\n"
-"%sWarning Level : <B>%d %%</B><BR>\n"
-"Online Since : <B>%s</B><BR>\n"
-"Idle Minutes : <B>%d</B>\n"
-"<BR>\n"
-"<HR><BR>\n"
-"%s<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG "
+"<br><BODY BGCOLOR=WHITE><hr><I>Legend:</I><br><br><IMG "
 "SRC=\"free_icon.gif\"> : Normal AIM User<br><IMG SRC=\"aol_icon.gif\"> : AOL "
 "User <br><IMG SRC=\"dt_icon.gif\"> : Trial AIM User <br><IMG "
 "SRC=\"admin_icon.gif\"> : Administrator"
@@ -1419,134 +678,1535 @@
 "Óû§ <br><IMG SRC=\"dt_icon.gif\"> : AIM ÊÔÓÃÓû§ <br><IMG "
 "SRC=\"admin_icon.gif\"> : ¹ÜÀíÔ±"
 
-#: src/oscar.c:1990
-msgid "<i>No Information Provided</i>"
-msgstr "<i>δÌṩÈκÎÐÅÏ¢</i>"
-
-#: src/oscar.c:1991
+#: src/protocols/oscar/oscar.c:1686
+#, fuzzy
+msgid ""
+"Username : <B>%s</B>  %s <BR>\n"
+"%sWarning Level : <B>%d %%</B><BR>\n"
+"Online Since : <B>%s</B><BR>\n"
+"Idle Minutes : <B>%d</B>\n"
+"<BR>\n"
+"<HR><BR>\n"
+msgstr ""
+"Óû§Ãû³Æ£º <B>%s</B>\n"
+"<BR>¾¯¸æ¼¶±ð£º <B>%d %%</B>\n"
+"<BR>Á¬Ïßʱ¿Ì£º <B>%s</B><BR>¿Õתʱ¼ä£¨·ÖÖÓ£©£º <B>%d</B>\n"
+"<BR><HR><BR>%s\n"
+
+#: src/protocols/oscar/oscar.c:1714
 msgid "<i>User has no away message</i>"
 msgstr "<i>Óû§À뿪ʱûÓÐÁôÏ¿ÚÐÅ</i>"
 
-#: src/oscar.c:2017
+#: src/protocols/oscar/oscar.c:1726
+#, fuzzy
+msgid "Client Capabilities: "
+msgstr "¼æÈÝÐÔ£º%s\n"
+
+#: src/protocols/oscar/oscar.c:1734
+msgid "<i>No Information Provided</i>"
+msgstr "<i>δÌṩÈκÎÐÅÏ¢</i>"
+
+#: src/protocols/oscar/oscar.c:1757
 msgid "Your connection may be lost."
 msgstr "ÄãµÄÁ¬½Ó¿ÉÄÜÒѾ­¶Ï¿ªÁË"
 
-#: src/oscar.c:2018
+#: src/protocols/oscar/oscar.c:1758
 msgid "AOL error"
 msgstr "AOL ´íÎó"
 
-#: src/oscar.c:2605
+#: src/protocols/oscar/oscar.c:1993
+msgid ""
+"The last message was not sent because you are over the rate limit. Please "
+"wait 10 seconds and try again."
+msgstr ""
+
+#: src/dialogs.c:3482 src/protocols/oscar/oscar.c:2267
+#: src/protocols/oscar/oscar.c:2818 src/protocols/toc/toc.c:1546
+#: src/protocols/toc/toc.c:1563 src/protocols/toc/toc.c:1623
+#: src/protocols/toc/toc.c:1665 src/protocols/toc/toc.c:1784
+#: src/protocols/toc/toc.c:1814 src/protocols/toc/toc.c:1870
+msgid "Error"
+msgstr "´íÎó"
+
+#: src/protocols/oscar/oscar.c:2540 src/protocols/toc/toc.c:1092
 msgid "Exchange:"
 msgstr "½»»»£º"
 
-#: src/oscar.c:2816
-#, c-format
-msgid "Direct IM with %s closed"
-msgstr "<HR><B>ºÍ %s Ö®¼äµÄÖ±½ÓÁ¬½ÓÒѾ­¹Ø±Õ¡£</B><BR><HR>"
-
-#: src/oscar.c:2875
+#: src/protocols/oscar/oscar.c:2818
 msgid "Unable to open Direct IM"
 msgstr "²»Äܽ¨Á¢Ö±½ÓÁ¬½Ó"
 
-#: src/oscar.c:2885
+#: src/protocols/oscar/oscar.c:2828
 #, c-format
 msgid ""
 "You have selected to open a Direct IM connection with %s. Doing this will "
 "let them see your IP address, and may be a security risk. Do you wish to "
 "continue?"
-msgstr ""
-"ÄãÏë¸ú %s Ì×½üºõ¡£ÕâÑù»á¶³öÄãµÄºüÀêβ°Í£¬ÕâÓзçÏÕ¡£ÄãÏë¼ÌÐøÂð£¿"
-
-#: src/oscar.c:2902
-msgid "Get Away Msg"
-msgstr "ÊÕµ½ÔÝʱÀ뿪ÐÅÏ¢"
-
-#: src/oscar.c:2910
+msgstr "ÄãÏë¸ú %s Ì×½üºõ¡£ÕâÑù»á¶³öÄãµÄºüÀêβ°Í£¬ÕâÓзçÏÕ¡£ÄãÏë¼ÌÐøÂð£¿"
+
+#: src/protocols/oscar/oscar.c:2861
 msgid "Direct IM"
 msgstr "Ö±½ÓÏûÏ¢"
 
-#: src/oscar.c:3050
+#: src/protocols/oscar/oscar.c:2869
+#, fuzzy
+msgid "Get Capabilities"
+msgstr "¼æÈÝÐÔ£º%s\n"
+
+#: src/protocols/toc/toc.c:396
+#, c-format
+msgid "Unable to write file %s."
+msgstr "²»ÄÜдÈëÎļþ %s¡£"
+
+#: src/protocols/toc/toc.c:399
+#, c-format
+msgid "Unable to read file %s."
+msgstr "²»ÄܶÁÈëÎļþ %s¡£"
+
+#: src/protocols/toc/toc.c:402
+#, c-format
+msgid "Message too long, last %s bytes truncated."
+msgstr "ÐÅϢ̫³¤£¬ºóÃæ %s ×ÖÔª±»¿³µôÁË¡£"
+
+#: src/protocols/toc/toc.c:405
+#, c-format
+msgid "%s not currently logged in."
+msgstr "%s ÏÖÔÚÉÐδµÇ¼¡£"
+
+#: src/protocols/toc/toc.c:408
+#, c-format
+msgid "Warning of %s not allowed."
+msgstr "²»ÔÊÐí¾¯¸æ %s ¡£"
+
+#: src/protocols/toc/toc.c:411
+msgid "A message has been dropped, you are exceeding the server speed limit."
+msgstr "È¡ÏûÁËÒ»¸öÐÅÏ¢£¬Ä㳬³öÁË·þÊÌÆ÷µÄËÙ¶ÈÏÞÖÆ¡£"
+
+#: src/protocols/toc/toc.c:414
+#, c-format
+msgid "Chat in %s is not available."
+msgstr "ÔÚ %s ²»¿ÉÒÔÁÄÌì¡£"
+
+#: src/protocols/toc/toc.c:417
+#, c-format
+msgid "You are sending messages too fast to %s."
+msgstr "Äã·¢Ë͸ø %s µÄËÙ¶ÈÌ«¿ìÁË¡£"
+
+#: src/protocols/toc/toc.c:420
+#, c-format
+msgid "You missed an IM from %s because it was too big."
+msgstr "Äã´í¹ýÁËÒ»¸ö´Ó %s ·¢À´µÄ¼´Ê±ÐÅÏ¢£¬¸ÃÐÅϢ̫´óÁË¡£"
+
+#: src/protocols/toc/toc.c:423
+#, c-format
+msgid "You missed an IM from %s because it was sent too fast."
+msgstr "Äã´í¹ýÁËÒ»¸ö´Ó %s ·¢À´µÄ¼´Ê±ÐÅÏ¢£¬¸ÃÐÅÏ¢·¢Ë͵ÄËÙ¶ÈÌ«¿ì¡£"
+
+#: src/protocols/toc/toc.c:426
+msgid "Failure."
+msgstr "ʧ°ÜÁË¡£"
+
+#: src/protocols/toc/toc.c:429
+msgid "Too many matches."
+msgstr "Æ¥ÅäÌ«¶à¡£"
+
+#: src/protocols/toc/toc.c:432
+msgid "Need more qualifiers."
+msgstr "ÐèÒª¸ü¶àµÄ²ÎÊý¡£"
+
+#: src/protocols/toc/toc.c:435
+msgid "Dir service temporarily unavailable."
+msgstr "ÐÕÃûµØַ¼·þÎñÆ÷ÔÝʱÁ¬²»ÉÏ¡£"
+
+#: src/protocols/toc/toc.c:438
+msgid "Email lookup restricted."
+msgstr "µçÓʲéÕÒÏÞÖÆ¡£"
+
+#: src/protocols/toc/toc.c:441
+msgid "Keyword ignored."
+msgstr "¹Ø¼ü×Ö±»ºöÂÔ¡£"
+
+#: src/protocols/toc/toc.c:444
+msgid "No keywords."
+msgstr "ûÓйؼü×Ö¡£"
+
+#: src/protocols/toc/toc.c:447
+msgid "User has no directory information."
+msgstr "¸ÃÓû§Ã»ÓÐÐÕÃûµØַ¼"
+
+#: src/protocols/toc/toc.c:451
+msgid "Country not supported."
+msgstr "²»Ö§³ÖÕâ¸ö¹ú¼Ò¡£"
+
+#: src/protocols/toc/toc.c:454
+#, c-format
+msgid "Failure unknown: %s."
+msgstr "²»Ã÷´íÎó£º %s ¡£"
+
+#: src/protocols/toc/toc.c:460
+msgid "The service is temporarily unavailable."
+msgstr "ÔÝʱûÓи÷þÎñ¡£"
+
+#: src/protocols/toc/toc.c:463
+msgid "Your warning level is currently too high to log in."
+msgstr "ÄãÄ¿Ç°µÄ¾¯¸æ¼¶±ðÌ«¸ß£¬ÎÞ·¨µÇÈë¡£"
+
+#: src/protocols/toc/toc.c:466
+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/protocols/toc/toc.c:469
+#, c-format
+msgid "An unknown signon error has occurred: %s."
+msgstr "·¢Éú²»Ã÷µÄµÇ¼´íÎó£º %s¡£"
+
+#: src/protocols/toc/toc.c:472
+#, c-format
+msgid "An unknown error, %d, has occured.  Info: %s"
+msgstr "²»Ã÷´íÎó %d ·¢ÉúÁË¡£¾ßÌåѶϢ£º %s"
+
+#: src/protocols/toc/toc.c:489
+msgid "Connection Closed"
+msgstr "Á¬½ÓÒѹرÕ"
+
+#: src/protocols/toc/toc.c:527
+msgid "Waiting for reply..."
+msgstr "µÈ´ýÏìÓ¦"
+
+#: src/protocols/toc/toc.c:596
+msgid "TOC has come back from its pause. You may now send messages again."
+msgstr "TOC È¡ÏûÔÝÍ£¡£ÏÖÔÚÄã¿ÉÒÔ¼ÌÐø·¢ËÍÏûÏ¢ÁË¡£"
+
+#: src/protocols/toc/toc.c:597
+msgid "TOC Resume"
+msgstr "TOC »Ö¸´"
+
+#: src/protocols/toc/toc.c:758
+msgid "Chat Error"
+msgstr "ÁÄÌì´íÎó"
+
+#: src/protocols/toc/toc.c:777
+msgid "Password Change Successeful"
+msgstr "Gaim - ¸ü¸ÄÃÜÂë"
+
+#: src/dialogs.c:1607 src/protocols/toc/toc.c:777
+msgid "Gaim - Password Change"
+msgstr "Gaim - ¸ü¸ÄÃÜÂë"
+
+#: src/protocols/toc/toc.c:780
+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 ""
+"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."
+
+#: src/protocols/toc/toc.c:783
+msgid "TOC Pause"
+msgstr "TOC ÔÝÍ£"
+
+#: src/protocols/toc/toc.c:1207
+msgid "Get Dir Info"
+msgstr "ÐÕÃûµØַ¼"
+
+#: src/protocols/toc/toc.c:1623 src/protocols/toc/toc.c:1665
+#: src/protocols/toc/toc.c:1784 src/protocols/toc/toc.c:1870
+msgid "Could not connect for transfer!"
+msgstr "ÎÞ·¨½¨Á¢´«ÊäÁ¬½Ó¡£"
+
+#: src/protocols/toc/toc.c:1814
+msgid "Could not write file header!"
+msgstr "ÎÞ·¨Ð´ÎļþÍ·£¡"
+
+#: src/protocols/toc/toc.c:1903
+msgid "Gaim - Save As..."
+msgstr "Gaim - ´æÅÌΪ¡­¡­"
+
+#: src/protocols/toc/toc.c:1944
+#, fuzzy, c-format
+msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+msgstr "%s ÇëÇó %s ½ÓÊÜ %d ¸öÎļþ %s  %s (%.2f %s)%s%s"
+
+#: src/protocols/toc/toc.c:1945
+#, fuzzy, c-format
+msgid "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+msgstr "%s ÇëÇó %s ½ÓÊÜ %d ¸öÎļþ %s  %s (%.2f %s)%s%s"
+
+#: src/protocols/toc/toc.c:1950
+#, c-format
+msgid "%s requests you to send them a file"
+msgstr "%s ÇëÇóÄã¸øËûÃÇ·¢ËÍÒ»¸öÎļþ"
+
+#: src/protocols/yahoo/yahoo.c:501
+msgid "Your message did not get sent."
+msgstr "ÏûÏ¢ÎÞ·¨Ëͳö"
+
+#: src/protocols/zephyr/zephyr.c:802
+msgid "ZLocate"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:839
+msgid "Class:"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:843
+msgid "Instance:"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:847
+msgid "Recipient:"
+msgstr ""
+
+#: src/about.c:93
+#, c-format
+msgid "About Gaim v%s"
+msgstr "¹ØÓÚ Gaim µÚ %s °æ"
+
+#: src/about.c:126
+#, fuzzy
+msgid ""
+"Gaim is a client that supports AOL's Instant Messenger protocol. It is "
+"written\n"
+"using Gtk+ and is licensed under the GPL.\n"
+"\n"
+"URL: "
+msgstr ""
+"Gaim is a client that supports AOL's Instant Messenger protocol. It is "
+"written using Gtk+ and is licensed under the GPL.\n"
+"URL: "
+
+#: src/about.c:137
+msgid ""
+"Active Developers\n"
+"====================\n"
+"Rob Flynn (maintainer) [ rob@marko.net ]\n"
+"Sean Egan (coder)      [ bj91704@binghamton.edu ]\n"
+"\n"
+"Crazy Patch Writers\n"
+"===================\n"
+"Benjamin Miller\n"
+"Decklin Foster\n"
+"\n"
+"Retired Developers\n"
+"===================\n"
+"Jim Duchek\n"
+"Eric Warmenhoven                   [ warmenhoven@yahoo.com ]\n"
+"Mark Spencer (original author)   [ markster@marko.net ]"
+msgstr ""
+
+#: src/about.c:155 src/aim.c:296 src/buddy.c:2469 src/buddy_chat.c:1311
+#: src/buddy_chat.c:1408 src/buddy_chat.c:1438 src/conversation.c:2417
+#: src/dialogs.c:563 src/dialogs.c:3777 src/multi.c:1026 src/plugins.c:277
+#: src/prefs.c:2496 src/prpl.c:438 src/prpl.c:679 src/server.c:991
+msgid "Close"
+msgstr "¹Ø±Õ"
+
+#. this makes the sizes not work.
+#. GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
+#. gtk_widget_grab_default(button);
+#: src/about.c:175
+msgid "Web Site"
+msgstr "ÍøÖ·"
+
+#: src/aim.c:129 src/buddy.c:2462
+msgid "Signoff"
+msgstr "À뿪"
+
+#: src/aim.c:141
+msgid "Please enter your logon"
+msgstr "ÇëÊäÈëÄúµÄµÇ¼Ãû³Æ"
+
+#: src/aim.c:141 src/multi.c:1276 src/server.c:55
+msgid "Signon Error"
+msgstr "µÇ¼´íÎó"
+
+#: src/aim.c:239
+msgid "Gaim - Login"
+msgstr "Gaim - 怬"
+
+#: src/aim.c:257
+msgid "Screen Name: "
+msgstr "µÇ¼Ãû£º"
+
+#: src/aim.c:273
+msgid "Password: "
+msgstr "ÃÜÂ룺"
+
+#: src/aim.c:294 src/buddy.c:2466
+msgid "Quit"
+msgstr "Í˳ö"
+
+#: src/aim.c:299 src/aim.c:755 src/buddy.c:2492
+msgid "Accounts"
+msgstr "ËùÓÐÕʺÅ"
+
+#: src/aim.c:301 src/multi.c:878
+msgid "Signon"
+msgstr "怬"
+
+#: src/aim.c:333
+msgid "About"
+msgstr "¹ØÓÚ"
+
+#: src/aim.c:334 src/prefs.c:1580 src/prefs.c:1854
+msgid "Options"
+msgstr "Ñ¡  Ïî"
+
+#. Left side: frame with list of plugin file names
+#: src/aim.c:336 src/aim.c:758 src/buddy.c:2510 src/plugins.c:192
+msgid "Plugins"
+msgstr "²å    ¼þ"
+
+#: src/aim.c:752 src/buddy.c:2502
+msgid "Preferences"
+msgstr "ÊôÐÔÉèÖÃ"
+
+#: src/applet.c:199
+msgid "Attempting to sign on...."
+msgstr "ÕýÔڵǼ¡­¡­"
+
+#: src/applet.c:202
+msgid "Offline. Click to bring up login box."
+msgstr "ÀëÏß¡£µã»÷ÕâÀïÆô¶¯µÇ¼´°¿Ú"
+
+#: src/applet.c:218
+#, c-format
+msgid "Away: %d pending."
+msgstr ""
+
+#: src/applet.c:221
+#, fuzzy
+msgid "Away."
+msgstr "ÔÝʱÀ뿪"
+
+#: src/applet.c:293 src/buddy.c:487 src/buddy.c:2344 src/buddy.c:2480
+msgid "Away"
+msgstr "ÔÝʱÀ뿪"
+
+#: src/applet.c:296 src/away.c:389
+msgid "New Away Message"
+msgstr "еÄÔÝʱÀ뿪ÐÅÏ¢"
+
+#: src/applet.c:443
+msgid "Can't create Gaim applet!"
+msgstr "ÎÞ·¨´´½¨ Gaim С³ÌÐò!"
+
+#: src/applet.c:464
+msgid "About..."
+msgstr "¹ØÓÚ¡­¡­"
+
+#: src/away.c:203
+msgid "Gaim - Away!"
+msgstr "Gaim - ÔÝʱÀ뿪"
+
+#: src/away.c:251
+msgid "I'm Back!"
+msgstr "ÎÒºúººÈýÓÖ»ØÀ´ÁË£¡"
+
+#: src/away.c:267 src/away.c:347 src/away.c:521
+msgid "Back"
+msgstr "·µ»Ø"
+
+#: src/away.c:409
+msgid "Remove Away Message"
+msgstr "ɾ³ýÀ뿪ÐÅÏ¢"
+
+#: src/away.c:597
+msgid "Set All Away"
+msgstr "½«ËùÓÐÕʺÅÉèΪÀ뿪"
+
+#. Put the buttons in the box
+#: src/buddy.c:482 src/buddy.c:2579 src/buddy_chat.c:1443
+#: src/conversation.c:2043 src/conversation.c:2432 src/dialogs.c:881
+#: src/dialogs.c:1065 src/dialogs.c:1968 src/multi.c:1010 src/prefs.c:1990
+#: src/prefs.c:2332 src/prefs.c:2366
+msgid "Add"
+msgstr "Ôö¼Ó"
+
+#: src/buddy.c:483 src/buddy.c:2580 src/dialogs.c:891 src/dialogs.c:1038
+msgid "Group"
+msgstr "×éȺ"
+
+#: src/buddy.c:484 src/buddy.c:2581 src/buddy_chat.c:1445
+#: src/conversation.c:2029 src/conversation.c:2429 src/prefs.c:2004
+#: src/prefs.c:2336 src/prefs.c:2370
+msgid "Remove"
+msgstr "ɾ³ý"
+
+#: src/buddy.c:489 src/buddy.c:627 src/buddy.c:774 src/buddy.c:2341
+#: src/buddy_chat.c:850 src/buddy_chat.c:1267
+msgid "IM"
+msgstr "¼´Ê±ÐÅÏ¢"
+
+#: src/buddy.c:490 src/buddy.c:2342 src/buddy_chat.c:866 src/buddy_chat.c:1275
+#: src/buddy_chat.c:1451 src/conversation.c:2450
+msgid "Info"
+msgstr "Ïêϸ×ÊÁÏ"
+
+#. Put the buttons in the box
+#: src/buddy.c:632 src/buddy.c:779 src/dialogs.c:1030 src/dialogs.c:3336
+#: src/dialogs.c:3351
+msgid "Alias"
+msgstr "ÍâºÅ¶ù"
+
+#: src/buddy.c:637 src/buddy.c:798
+msgid "Add Buddy Pounce"
+msgstr "Ôö¼Ó¼àÊÓÅóÓÑ"
+
+#: src/buddy.c:644 src/buddy.c:804
+msgid "View Log"
+msgstr "²é¿´¼Ç¼"
+
+#: src/buddy.c:761 src/buddy.c:792
+msgid "Rename"
+msgstr "ÖØÃüÃû"
+
+#: src/buddy.c:786
+msgid "Un-Alias"
+msgstr "È¥³ýÍâºÅ¶ù"
+
+#: src/buddy.c:1493 src/buddy.c:2485
+msgid "Buddy Pounce"
+msgstr "¼àÊÓÅóÓÑ"
+
+#: src/buddy.c:1565
+msgid "New Buddy Pounce"
+msgstr "ÐÂÔö¼àÊÓÅóÓÑ"
+
+#: src/buddy.c:1583
+msgid "Remove Buddy Pounce"
+msgstr "È¡Ïû¼àÊÓÅóÓÑ"
+
+#: src/buddy.c:2029
+#, c-format
+msgid "Logged in: %s\n"
+msgstr "ÒѵǼÕʺţº %s\n"
+
+#: src/buddy.c:2041
+msgid "Warnings: %d%%\n"
+msgstr "¾¯¸æ£º%d%%\n"
+
+#: src/buddy.c:2053
+#, c-format
+msgid "Capabilities: %s\n"
+msgstr "¼æÈÝÐÔ£º%s\n"
+
+#: src/buddy.c:2057
+#, c-format
 msgid ""
-"Unfortunately, currently Oscar only allows new user registration by going to "
-"http://aim.aol.com/aimnew/Aim/register.adp?promo=106723&pageset=Aim&client=no"
-". Clicking the Register button will open the URL for you."
+"Alias: %s               \n"
+"Screen Name: %s\n"
+"%s%s%s%s%s%s"
+msgstr ""
+"ÍâºÅ¶ù£º%s                \n"
+"µÇ¼Ãû£º%s\n"
+"%s%s%s"
+
+#: src/buddy.c:2061
+msgid "Idle: "
+msgstr "¿ÕÏÐʱ¼ä£º"
+
+#: src/buddy.c:2132 src/buddy.c:2136
+#, c-format
+msgid "%s logged in."
+msgstr "<HR><B>%s ÒѵǼ¡£</B><BR><HR>"
+
+#: src/buddy.c:2195 src/buddy.c:2199
+#, c-format
+msgid "%s logged out."
+msgstr "<HR><B>%s À뿪ÁË %s%s ¡£</B><BR><HR>"
+
+#: src/buddy.c:2376
+msgid "Information on selected Buddy"
+msgstr "Ñ¡ÖеÄÅóÓѵÄ×ÊÁÏ"
+
+#: src/buddy.c:2377 src/dialogs.c:688
+msgid "Send Instant Message"
+msgstr "·¢³ö¼´Ê±ÐÅÏ¢"
+
+#: src/buddy.c:2378
+msgid "Start/join a Buddy Chat"
+msgstr "·¢Æð»ò¼ÓÈëÒ»¸öÁÄÌìÊÒ"
+
+#: src/buddy.c:2379
+msgid "Activate Away Message"
+msgstr "¼¤»îÔÝʱÀ뿪ÐÅÏ¢"
+
+#: src/buddy.c:2442
+msgid "File"
+msgstr "Îļþ"
+
+#: src/buddy.c:2446
+msgid "Add A Buddy"
+msgstr "¼ÓÈëÒ»¸ö¸çÃǶù"
+
+#: src/buddy.c:2448
+msgid "Join A Chat"
+msgstr "¼ÓÈëÁÄÌì"
+
+#: src/buddy.c:2450
+msgid "New Instant Message"
+msgstr "·¢³ö¼´Ê±ÐÅÏ¢"
+
+#: src/buddy.c:2452 src/dialogs.c:740
+msgid "Get User Info"
+msgstr "Óû§Ïêϸ×ÊÁÏ"
+
+#: src/buddy.c:2457
+msgid "Import Buddy List"
+msgstr "µ¼ÈëÅóÓÑÁбí"
+
+#: src/buddy.c:2475
+msgid "Tools"
+msgstr "¹¤¾ß"
+
+#: src/buddy.c:2498
+msgid "Protocol Actions"
+msgstr "ЭÒ鶯×÷"
+
+#: src/buddy.c:2504
+msgid "View System Log"
+msgstr "²é¿´ÏµÍ³¼Ç¼"
+
+#: src/buddy.c:2516
+msgid "Perl"
+msgstr "Perl ²å¼þ"
+
+#: src/buddy.c:2519
+msgid "Load Script"
+msgstr "¼ÓÔؽű¾"
+
+#: src/buddy.c:2523
+msgid "Unload All Scripts"
+msgstr "жÔؽű¾"
+
+#: src/buddy.c:2527
+msgid "List Scripts"
+msgstr "ÁгöÒѼÓÔؽű¾"
+
+#: src/buddy.c:2535
+msgid "Help"
+msgstr "°ïÖú"
+
+#: src/buddy.c:2540
+msgid "About Gaim"
+msgstr "¹ØÓÚ Gaim"
+
+#: src/buddy.c:2559 src/prefs.c:2816
+msgid "Buddy List"
+msgstr "ÅóÓÑÁбí"
+
+#: src/buddy.c:2612
+msgid "Add a new Buddy"
+msgstr "Ôö¼ÓÒ»¸öиçÃǶù"
+
+#: src/buddy.c:2613
+msgid "Add a new Group"
+msgstr "Ôö¼ÓÒ»¸öиçÃǶù"
+
+#: src/buddy.c:2614
+#, fuzzy
+msgid "Remove selected Buddy/Group"
+msgstr "ɾ³ýÑ¡ÖеĸçÃǶù"
+
+#: src/buddy.c:2639
+msgid "Online"
+msgstr "ÔÚÏß"
+
+#: src/buddy.c:2641
+msgid "Edit Buddies"
+msgstr "ÐÞ¸ÄÅóÓÑÁбí"
+
+#: src/buddy.c:2681
+msgid "Gaim - Buddy List"
+msgstr "Gaim - ÅóÓÑÁбí"
+
+#: src/buddy_chat.c:265
+msgid "Join Chat"
+msgstr "¼ÓÈëÁÄÌì"
+
+#: src/buddy_chat.c:272
+msgid "Buddy Chat"
+msgstr "ÅóÓÑÁÄÌì"
+
+#: src/buddy_chat.c:283
+msgid "Join Chat As:"
+msgstr "É趨¼ÓÈëÁÄÌìʹÓõÄêdzƣº"
+
+#: src/buddy_chat.c:304 src/buddy_chat.c:392 src/dialogs.c:444
+#: src/dialogs.c:535 src/dialogs.c:706 src/dialogs.c:764 src/dialogs.c:883
+#: src/dialogs.c:1061 src/dialogs.c:1350 src/dialogs.c:1555 src/dialogs.c:1679
+#: src/dialogs.c:1739 src/dialogs.c:1957 src/dialogs.c:2139 src/dialogs.c:2314
+#: src/dialogs.c:2385 src/dialogs.c:3081 src/dialogs.c:3338 src/dialogs.c:3519
+#: src/dialogs.c:3890 src/dialogs.c:3996 src/dialogs.c:4642 src/multi.c:744
+#: src/multi.c:874 src/multi.c:1208 src/prpl.c:150 src/prpl.c:224
+msgid "Cancel"
+msgstr "È¡Ïû"
+
+#: src/buddy_chat.c:309
+msgid "Join"
+msgstr "¼ÓÈë"
+
+#: src/buddy_chat.c:393 src/buddy_chat.c:396 src/buddy_chat.c:1317
+#: src/buddy_chat.c:1407
+msgid "Invite"
+msgstr "ÑûÇë"
+
+#: src/buddy_chat.c:412 src/dialogs.c:1230 src/dialogs.c:3346
+msgid "Buddy"
+msgstr "ÅóÓÑ"
+
+#: src/buddy_chat.c:417 src/prefs.c:1953
+msgid "Message"
+msgstr "ÏûÏ¢ÄÚÈÝ"
+
+#: src/buddy_chat.c:454
+#, fuzzy
+msgid "Gaim - Invite Buddy Into Chat Room"
+msgstr "ÇëÈËÁÄÌì"
+
+#: src/buddy_chat.c:857
+#, fuzzy
+msgid "Un-Ignore"
+msgstr "²»ÀíËû"
+
+#: src/buddy_chat.c:859 src/buddy_chat.c:1271
+msgid "Ignore"
+msgstr "²»ÀíËû"
+
+#. don't remove them from ignored in case they re-enter
+#: src/buddy_chat.c:922 src/buddy_chat.c:1034 src/buddy_chat.c:1497
+#: src/buddy_chat.c:1530
+#, c-format
+msgid "%d %s in room"
+msgstr "ÁÄÌìÊÒÓÐ %d ¼Ò»ï"
+
+#: src/buddy_chat.c:930
+#, c-format
+msgid "%s entered the room."
+msgstr "%s ½øÁËÁÄÌìÊÒ"
+
+#: src/buddy_chat.c:996
+#, c-format
+msgid "%s is now known as %s"
+msgstr "[%s] ÏÖÔÚʹÓû¯Ãû [%s]"
+
+#: src/buddy_chat.c:1043
+#, fuzzy, c-format
+msgid "%s left the room (%s)."
+msgstr "%s »ÒÁïÁïµØÀ뿪ÁËÁÄÌìÊÒ"
+
+#: src/buddy_chat.c:1045
+#, c-format
+msgid "%s left the room."
+msgstr "%s »ÒÁïÁïµØÀ뿪ÁËÁÄÌìÊÒ"
+
+#: src/buddy_chat.c:1144
+msgid "Gaim - Group Chats"
+msgstr "Gaim ȺÌåÁÄÌì"
+
+#: src/buddy_chat.c:1207
+msgid "Topic:"
+msgstr "Ö÷Ì⣺"
+
+#: src/buddy_chat.c:1248
+msgid "0 people in room"
+msgstr "ÁÄÌìÊÒÏÖÔÚûÓÐÈË£¬°®¸ÉÂï¸ÉÂïÈ¥"
+
+#: src/buddy_chat.c:1322 src/buddy_chat.c:1406
+msgid "Whisper"
+msgstr "ÇÄÇÄ»°"
+
+#: src/buddy_chat.c:1327 src/buddy_chat.c:1404 src/buddy_chat.c:1453
+#: src/conversation.c:2461
+msgid "Send"
+msgstr "Ëͳö"
+
+#: src/buddy_chat.c:1447 src/conversation.c:2438
+msgid "Block"
+msgstr "¶ÂסËûµÄ×죡"
+
+#: src/buddy_chat.c:1449 src/conversation.c:2444 src/dialogs.c:419
+#: src/dialogs.c:448
+msgid "Warn"
+msgstr "¾¯¸æ"
+
+#: src/conversation.c:392
+msgid "Gaim - Save Conversation"
+msgstr "Gaim - ¼Ç¼¶Ô»°ÄÚÈÝ"
+
+#: src/conversation.c:1037
+msgid "Unable to send message: too large"
+msgstr ""
+
+#: src/conversation.c:1037 src/conversation.c:1039
+#, fuzzy
+msgid "Message Error"
+msgstr "ÏûÏ¢ÄÚÈÝ"
+
+#: src/conversation.c:1039
+#, fuzzy
+msgid "Unable to send message: Unknown reason"
+msgstr "ÄãĪÃûÆäÃîµØ¶ªÊ§ÁËÒ»Ìõ %s ·¢À´µÄÏûÏ¢"
+
+#: src/conversation.c:1258
+#, c-format
+msgid "Currently at %d, "
+msgstr "Ä¿Ç°ÔÚ %d£¬"
+
+#: src/conversation.c:1266
+#, c-format
+msgid "Setting position to %d\n"
+msgstr "°ÑλÖÃÉ趨µ½ %d\n"
+
+#: src/conversation.c:1832 src/prefs.c:1274
+msgid "Bold Text"
+msgstr "´ÖÌåÎÄ×Ö"
+
+#: src/conversation.c:1832
+msgid "Bold"
+msgstr "´ÖÌå"
+
+#: src/conversation.c:1836
+msgid "Italics Text"
+msgstr "бÌåÎÄ×Ö"
+
+#: src/conversation.c:1837
+msgid "Italics"
+msgstr "бÌå"
+
+#: src/conversation.c:1840 src/prefs.c:1286
+msgid "Underline Text"
+msgstr "ϼÓÏßÎÄ×Ö"
+
+#: src/conversation.c:1841
+msgid "Underline"
+msgstr "ϼÓÏß"
+
+#: src/conversation.c:1845 src/prefs.c:1292
+msgid "Strike through Text"
+msgstr "»®µôµÄÎÄ×Ö"
+
+#: src/conversation.c:1845
+msgid "Strike"
+msgstr "»®µô"
+
+#: src/conversation.c:1851
+msgid "Decrease font size"
+msgstr "ËõС×ÖÌå"
+
+#: src/conversation.c:1851
+msgid "Small"
+msgstr "С"
+
+#: src/conversation.c:1854
+msgid "Normal font size"
+msgstr "Õý³£×ÖÌå´óС"
+
+#: src/conversation.c:1854
+msgid "Normal"
+msgstr "Õý³£"
+
+#: src/conversation.c:1857
+msgid "Increase font size"
+msgstr "Ôö´ó×ÖÌå"
+
+#: src/conversation.c:1857
+msgid "Big"
+msgstr "´ó"
+
+#: src/conversation.c:1864 src/dialogs.c:2756 src/dialogs.c:2780
+msgid "Select Font"
+msgstr "Ñ¡Ôñ×ÖÐÍ"
+
+#: src/conversation.c:1865
+msgid "Font"
+msgstr "×ÖÐÍ"
+
+#: src/conversation.c:1868 src/prefs.c:1322
+msgid "Text Color"
+msgstr "ÎÄ×ÖÑÕÉ«"
+
+#: src/conversation.c:1869 src/conversation.c:1873
+msgid "Color"
+msgstr "ÑÕÉ«"
+
+#: src/conversation.c:1873 src/prefs.c:1340
+msgid "Background Color"
+msgstr "±³¾°ÑÕÉ«"
+
+#: src/conversation.c:1880 src/dialogs.c:2379
+msgid "Insert Link"
+msgstr "²åÈ볬Á¬½Ó"
+
+#: src/conversation.c:1881
+msgid "Link"
+msgstr "³¬Á¬½Ó"
+
+#: src/conversation.c:1884
+msgid "Insert smiley face"
+msgstr "²åÈëЦÁ³Í¼ÐÎ"
+
+#: src/conversation.c:1884
+msgid "Smiley"
+msgstr "ЦÁ³·û"
+
+#: src/conversation.c:1891
+msgid "Enable logging"
+msgstr "¿ªÊ¼¼Ç¼"
+
+#: src/conversation.c:1892 src/prefs.c:244
+msgid "Logging"
+msgstr "¼Ç¼"
+
+#: src/conversation.c:1901
+msgid "Save Conversation"
+msgstr "±£´æ¶Ô»°ÄÚÈÝ"
+
+#: src/conversation.c:1902 src/dialogs.c:1559 src/dialogs.c:1743
+#: src/dialogs.c:3093 src/dialogs.c:3786 src/dialogs.c:4649
+msgid "Save"
+msgstr "´æÅÌ"
+
+#: src/conversation.c:1906
+msgid "Enable sounds"
+msgstr "´ò¿ªÉùÒô"
+
+#: src/conversation.c:1907
+msgid "Sound"
+msgstr "ÉùÒô"
+
+#: src/conversation.c:2290
+msgid "Gaim - Conversations"
+msgstr "Gaim - ËùÓжԻ°"
+
+#: src/conversation.c:2377
+msgid "Send message as: "
+msgstr "·¢ËÍÐÅÏ¢"
+
+#: src/conversation.c:2986
+#, fuzzy
+msgid "Gaim - Save Icon"
+msgstr "Gaim - ´æÅÌΪ¡­¡­"
+
+#: src/conversation.c:3013
+msgid "Disable Animation"
 msgstr ""
-"ºÜ²»ÐÒ£¬ÏÖÔÚ°Â˹¿¨Ö»ÔÊÐíͨ¹ý·ÃÎÊ WEB Ò³Ãæ½øÐÐÐÂÓû§×¢²á£¬Äã¿ÉÒÔ¿´¿´ÕâÀ "
-"http://aim.aol.com/aimnew/Aim/register.adp?promo=106723&pageset=Aim&client=no"
-"¡£µ¥»÷¡°×¢²á¡±°´Å¥½øÐÐ×¢²á¡£"
+
+#: src/conversation.c:3018
+#, fuzzy
+msgid "Enable Animation"
+msgstr "´ò¿ªÉùÒô"
+
+#: src/conversation.c:3024
+#, fuzzy
+msgid "Hide Icon"
+msgstr "Òþ²Ø¸çÃǶùÃǵÄͼ±ê"
+
+#: src/conversation.c:3030
+#, fuzzy
+msgid "Save Icon As..."
+msgstr "Gaim - ´æÅÌΪ¡­¡­"
+
+#: src/dialogs.c:407
+msgid "Gaim - Warn user?"
+msgstr "Gaim - ¾¯¸æÓû§£¿"
+
+#: src/dialogs.c:427
+#, c-format
+msgid "Do you really want to warn %s?"
+msgstr "ÄãÕæµÄÏ뾯¸æ %s£¿"
+
+#: src/dialogs.c:432
+msgid "Warn anonymously?"
+msgstr "·¢ÄäÃû¾¯¸æ£¿"
+
+#: src/dialogs.c:436
+msgid "Anonymous warnings are less harsh."
+msgstr "ÄäÃû¾¯¸æ²»ÄÇôÑÏÀ÷¡£"
+
+#: src/dialogs.c:464
+#, c-format
+msgid "Removing '%s' from buddylist.\n"
+msgstr "°Ñ ¡°%s¡±´ÓÅóÓѱíÉÏɾȥ\n"
+
+#: src/dialogs.c:490
+#, fuzzy, c-format
+msgid "Gaim - Remove %s?"
+msgstr "Gaim - ÖØÃüÃû×é"
+
+#: src/dialogs.c:503
+#, fuzzy
+msgid "Remove Buddy"
+msgstr "ÖØÃüÃû¸çÃǶù"
+
+#: src/dialogs.c:513
+#, c-format
+msgid ""
+"You are about to remove '%s' from\n"
+"your buddylist. Do you want to continue?"
+msgstr ""
+
+#: src/dialogs.c:525 src/prpl.c:154 src/prpl.c:228
+msgid "Accept"
+msgstr "½ÓÊÜ"
+
+#. Build OK Button
+#: src/dialogs.c:632 src/dialogs.c:711 src/dialogs.c:769 src/dialogs.c:1354
+#: src/dialogs.c:1683 src/dialogs.c:1830 src/dialogs.c:2138 src/dialogs.c:2318
+#: src/dialogs.c:2384 src/dialogs.c:3895 src/dialogs.c:4001 src/multi.c:749
+msgid "OK"
+msgstr "È·ÈÏ"
+
+#: src/dialogs.c:678
+msgid "Gaim - IM user"
+msgstr "Gaim - ¼´Ê±ÐÅÏ¢Óû§"
+
+#: src/dialogs.c:695
+msgid "IM who:"
+msgstr "¸øÕâ¼Ò»ï¼´Ê±ÐÅÏ¢£º"
+
+#: src/dialogs.c:747
+msgid "User:"
+msgstr "Óû§£º"
+
+#. Finish up
+#: src/dialogs.c:774
+msgid "Gaim - Get User Info"
+msgstr "Gaim - È¡µÃÓû§×ÊÁÏ"
+
+#: src/dialogs.c:836
+msgid "Buddies"
+msgstr "¸çÃǶùÃÇ"
+
+#: src/dialogs.c:889
+msgid "Add Group"
+msgstr "Ìí¼Ó×é"
+
+#: src/dialogs.c:914
+msgid "Gaim - Add Group"
+msgstr "Gaim - Ìí¼Ó×é"
+
+#: src/dialogs.c:998
+msgid "Gaim - Add Buddy"
+msgstr "Gaim - Ôö¼ÓÅóÓÑ"
+
+#: src/dialogs.c:1010
+msgid "Add Buddy"
+msgstr "Ôö¼ÓÅóÓÑ"
+
+#: src/dialogs.c:1020
+#, fuzzy
+msgid "Contact"
+msgstr "×ÖÌåÍâ¹Û"
+
+#. Set up stuff for the account box
+#: src/dialogs.c:1048
+#, fuzzy
+msgid "Add To"
+msgstr "Ôö¼Ó"
+
+#: src/dialogs.c:1083
+msgid "Please enter a buddy to pounce."
+msgstr "ÇëÊäÈëÄúÒª¼àÊӵģ»¡¯¸çÃǶù"
+
+#: src/dialogs.c:1083
+msgid "Buddy Pounce Error"
+msgstr "¼àÊÓÅóÓÑʱ³ö´í"
+
+#: src/dialogs.c:1199
+msgid "Gaim - New Buddy Pounce"
+msgstr "Gaim - ÐÂÔö¼àÊÓÅóÓÑ"
+
+#. <pounce type="who">
+#: src/dialogs.c:1210
+msgid "Pounce Who"
+msgstr ""
+
+#: src/dialogs.c:1221
+#, fuzzy
+msgid "Account"
+msgstr "ËùÓÐÕʺÅ"
+
+#. </pounce type="who">
+#. <pounce type="when">
+#: src/dialogs.c:1245
+msgid "Pounce When"
+msgstr ""
+
+#: src/dialogs.c:1255
+msgid "Pounce on sign on"
+msgstr "¼àÊÓºÎʱµÇ¼"
+
+#: src/dialogs.c:1260
+msgid "Pounce on return from away"
+msgstr "¼àÊÓºÎʱ»ØÀ´"
+
+#: src/dialogs.c:1266
+msgid "Pounce on return from idle"
+msgstr "¼àÊÓºÎʱÉñÖ¾»Ö¸´ÇåÐÑ"
+
+#. </pounce type="when">
+#. <pounce type="action">
+#: src/dialogs.c:1278
+#, fuzzy
+msgid "Pounce Action"
+msgstr "Á¬½Ó"
+
+#: src/dialogs.c:1289
+#, fuzzy
+msgid "Open IM Window"
+msgstr "¼´Ê±ÏûÏ¢´°¿Ú"
+
+#: src/dialogs.c:1294
+msgid "Popup Notification"
+msgstr ""
+
+#: src/dialogs.c:1299
+#, fuzzy
+msgid "Send Message"
+msgstr "·¢ËÍÐÅÏ¢"
+
+#: src/dialogs.c:1312
+msgid "Execute command on pounce"
+msgstr "·¢ÏÖ¶¯¾²¾ÍÖ´ÐÐÃüÁî"
+
+#: src/dialogs.c:1325
+msgid "Play sound on pounce"
+msgstr "·¢ÏÖ¶¯¾²¾Í²¥·ÅÉùÒô"
+
+#. </pounce type="action">
+#: src/dialogs.c:1340
+msgid "Save this pounce after activation"
+msgstr "Ï´η¢ÏÖÈÔȻִÐÐ"
+
+#: src/dialogs.c:1422
+msgid "Gaim - Set Dir Info"
+msgstr "Gaim - É趨ÐÕÃûµØַ¼"
+
+#: src/dialogs.c:1431
+msgid "Directory Info"
+msgstr "ÐÕÃûµØַ¼"
+
+#: src/dialogs.c:1453
+msgid "Allow Web Searches To Find Your Info"
+msgstr "ÔÊÐí´ÓÍøÒ³ËÑÑ°ÕÒµ½ÄãµÄ×ÊÁÏ"
+
+#. Line 1
+#: src/dialogs.c:1456 src/dialogs.c:2157
+msgid "First Name"
+msgstr "Ãû"
+
+#. Line 2
+#: src/dialogs.c:1467 src/dialogs.c:2169
+msgid "Middle Name"
+msgstr "×Ö"
+
+#. Line 3
+#: src/dialogs.c:1479 src/dialogs.c:2181
+msgid "Last Name"
+msgstr "ÐÕ"
+
+#. Line 4
+#: src/dialogs.c:1490 src/dialogs.c:2193
+msgid "Maiden Name"
+msgstr "Äï¼ÒÐÕ"
+
+#. Line 6
+#: src/dialogs.c:1512 src/dialogs.c:2216
+msgid "State"
+msgstr "Ê¡"
+
+#. Line 7
+#: src/dialogs.c:1523 src/dialogs.c:2227
+msgid "Country"
+msgstr "¹ú"
+
+#: src/dialogs.c:1577
+msgid "New Passwords Do Not Match"
+msgstr "ÐÂÃÜÂë²»Ò»ÖÂ"
+
+#: src/dialogs.c:1577 src/dialogs.c:1582
+msgid "Gaim - Change Password Error"
+msgstr "Gaim - ¸ü¸ÄÃÜÂë´íÎó"
+
+#: src/dialogs.c:1582
+msgid "Fill out all fields completely"
+msgstr "°ÑËùÓеıí¸ñ¶¼ÌíÁË"
+
+#: src/dialogs.c:1637
+msgid "Original Password"
+msgstr "¾ÉÃÜÂë"
+
+#: src/dialogs.c:1651
+msgid "New Password"
+msgstr "ÐÂÃÜÂë"
+
+#: src/dialogs.c:1665
+msgid "New Password (again)"
+msgstr "ÐÂÃÜÂ루ȷ¶¨£©"
+
+#: src/dialogs.c:1706
+msgid "Gaim - Set User Info"
+msgstr "Gaim - É趨Óû§×ÊÁÏ"
+
+#: src/dialogs.c:1814
+msgid "Below are the results of your search: "
+msgstr "ÒÔÏÂÊÇÄãËÑË÷µÄ½á¹û£º"
+
+#: src/dialogs.c:1947 src/dialogs.c:1954
+msgid "Permit"
+msgstr "ÔÊÐí"
+
+#: src/dialogs.c:1949 src/dialogs.c:1956
+msgid "Deny"
+msgstr "¾Ü¾ø"
+
+#: src/dialogs.c:1993
+msgid "Gaim - Add Permit"
+msgstr "Gaim - Ôö¼ÓÔÊÐíÈË"
+
+#: src/dialogs.c:1995
+msgid "Gaim - Add Deny"
+msgstr "Gaim - Ôö¼Ó½ûÖ¹ÈË"
+
+#: src/dialogs.c:2055
+msgid "Gaim - Log Conversation"
+msgstr "Gaim - ¼Ç¼¶Ô»°ÄÚÈÝ"
+
+#: src/dialogs.c:2133 src/dialogs.c:2296
+msgid "Search for Buddy"
+msgstr "ËÑÑ°ÅóÓÑ"
+
+#: src/dialogs.c:2261
+msgid "Gaim - Find Buddy By Info"
+msgstr "Gaim - ¸ù¾ÝÓû§×ÊÁϲéÑ°ÅóÓÑ"
+
+#: src/dialogs.c:2290
+msgid "Gaim - Find Buddy By Email"
+msgstr "Gaim - ¸ù¾ÝµçÓʲéÑ°ÅóÓÑ"
+
+#: src/dialogs.c:2303
+msgid "Email"
+msgstr "µçÓÊ"
+
+#: src/dialogs.c:2398
+msgid "URL"
+msgstr "URL"
+
+#. Right side: frame with description and the filepath of plugin
+#: src/dialogs.c:2406 src/plugins.c:211
+msgid "Description"
+msgstr "ÃèÊö"
+
+#: src/dialogs.c:2430
+msgid "Gaim - Add URL"
+msgstr "Gaim - Ôö¼Ó URL"
+
+#: src/dialogs.c:2581 src/dialogs.c:2602 src/dialogs.c:2656
+msgid "Select Text Color"
+msgstr "É趨ÎÄ×ÖÑÕÉ«"
+
+#: src/dialogs.c:2635
+msgid "Select Background Color"
+msgstr "É趨±³¾°ÑÕÉ«"
+
+#: src/dialogs.c:2857
+msgid "Import to:"
+msgstr ""
+
+#: src/dialogs.c:2881
+msgid "Gaim - Import Buddy List"
+msgstr "Gaim - µ¼ÈëÅóÓÑÁбí"
+
+#. We shouldn't allow a blank title
+#: src/dialogs.c:2948
+msgid "You cannot create an away message with a blank title"
+msgstr "ÔÝʱÀ뿪ÏûÏ¢²»ÄÜûÓбêÌâ"
+
+#. We shouldn't allow a blank message
+#: src/dialogs.c:2955
+msgid "You cannot create an empty away message"
+msgstr "ÔÝʱÀ뿪ÏûÏ¢²»ÄÜΪ¿Õ"
+
+#: src/dialogs.c:3023
+msgid "Gaim - New away message"
+msgstr "Gaim - ¸üÐÂÔÝʱÀ뿪ÐÅÏ¢"
+
+#: src/dialogs.c:3033
+msgid "New away message"
+msgstr "еÄÔÝʱÀ뿪ÐÅÏ¢"
+
+#: src/dialogs.c:3046
+msgid "Away title: "
+msgstr "ÔÝʱÀ뿪±êÌ⣺"
+
+#: src/dialogs.c:3085
+msgid "Use"
+msgstr "ʹÓÃ"
+
+#: src/dialogs.c:3089
+msgid "Save & Use"
+msgstr "±£´æ²¢Ê¹ÓÃ"
+
+#. show everything
+#: src/dialogs.c:3292
+msgid "Smile!"
+msgstr "ЦÁ³"
+
+#: src/dialogs.c:3344
+msgid "Alias Buddy"
+msgstr "¸øÅóÓÑÈ¡Ò»¸öÍâºÅ¶ù"
+
+#: src/dialogs.c:3377
+msgid "Gaim - Alias Buddy"
+msgstr "Gaim - ¸øÅóÓÑÈ¡Ò»¸öÍâºÅ¶ù"
+
+#: src/dialogs.c:3449
+msgid "Gaim - Save Log File"
+msgstr "Gaim - ±£´æ¼Ç¼Ϊ¡­¡­"
+
+#: src/dialogs.c:3481
+#, c-format
+msgid "Unable to remove file %s - %s"
+msgstr "²»ÄÜɾ³ýÎļþ %s¡£"
+
+#: src/dialogs.c:3509
+msgid "Really clear log?"
+msgstr "ÕæµÃÒªÇå³þ¼Ç¼£¿"
+
+#: src/dialogs.c:3524
+msgid "Okay"
+msgstr "È·¶¨"
+
+#: src/dialogs.c:3695
+#, fuzzy
+msgid "Date"
+msgstr "Ê¡"
+
+#: src/dialogs.c:3758
+#, fuzzy
+msgid "Conversation"
+msgstr "¶Ô»°"
+
+#: src/dialogs.c:3781
+msgid "Clear"
+msgstr "Çå³ý"
+
+#: src/dialogs.c:3859
+msgid "Gaim - Rename Group"
+msgstr "Gaim - ÖØÃüÃû×é"
+
+#: src/dialogs.c:3869
+msgid "Rename Group"
+msgstr "ÖØÃüÃû×é"
+
+#: src/dialogs.c:3876 src/dialogs.c:3982
+msgid "New name:"
+msgstr "ÐÂÃû×Ö£º"
+
+#: src/dialogs.c:3965
+msgid "Gaim - Rename Buddy"
+msgstr "Gaim - ÖØÃüÃû¸çÃǶù"
+
+#: src/dialogs.c:3975
+msgid "Rename Buddy"
+msgstr "ÖØÃüÃû¸çÃǶù"
 
 #. Below is basically stolen from plugins.c
-#: src/perl.c:656
+#: src/dialogs.c:4059
 msgid "Gaim - Select Perl Script"
 msgstr "Gaim - Ñ¡Ôñ Perl ½Å±¾"
 
-#: src/perl.c:704
+#: src/gaimrc.c:1113
+#, c-format
+msgid "Could not open config file %s."
+msgstr "ÎÞ·¨´ò¿ªÅäÖÃÎļþ"
+
+#: src/gaimrc.c:1114
+msgid "Preferences Error"
+msgstr "Ñ¡Ïî´íÎó"
+
+#: src/html.c:183
+#, c-format
+msgid "Receieved: '%s'\n"
+msgstr "ÊÕµ½ÁË£º¡°%s¡±\n"
+
+#: src/html.c:221
+msgid "g003: Error opening connection.\n"
+msgstr "g003: ´ò¿ªÁ¬½Ó´íÎó\n"
+
+#: src/multi.c:427
+#, fuzzy
+msgid "Gaim - Load Buddy Icon"
+msgstr "Gaim - Ôö¼ÓÅóÓÑ"
+
+#: src/multi.c:470
+#, fuzzy
+msgid "Buddy Icon File:"
+msgstr "ÅóÓÑͼ±ê"
+
+#: src/multi.c:481
+#, fuzzy
+msgid "Browse"
+msgstr "ä¯ÀÀÆ÷"
+
+#: src/multi.c:486 src/prefs.c:1512
+msgid "Reset"
+msgstr "ÖØÖÃ"
+
+#: src/multi.c:513
+msgid "Screenname:"
+msgstr "µÇ¼Ãû£º"
+
+#: src/multi.c:533
+msgid "Protocol:"
+msgstr "ЭÒ飺"
+
+#: src/multi.c:538
+msgid "Remember Password"
+msgstr "¼ÇסÃÜÂë"
+
+#: src/multi.c:539
+msgid "Auto-Login"
+msgstr "×Ô¶¯µÇ¼"
+
+#: src/multi.c:579
+msgid "New Mail Notifications"
+msgstr ""
+
+#: src/multi.c:727
+msgid "Gaim - Modify Account"
+msgstr "Gaim - ÐÞ¸ÄÕʺÅ"
+
+#: src/multi.c:846
+msgid "Enter Password"
+msgstr "ÊäÈëÃÜÂë"
+
+#: src/multi.c:935
+#, c-format
+msgid "Are you sure you want to delete %s?"
+msgstr "ÄãÕæµÄÏëɾ³ý %s£¿"
+
+#: src/multi.c:972
+msgid "Gaim - Account Editor"
+msgstr "Gaim - Õʺű༭Æ÷"
+
+#: src/multi.c:991
+msgid "Select All"
+msgstr "È«Ñ¡"
+
+#: src/multi.c:996
+msgid "Select Autos"
+msgstr "Ñ¡Ôñ×Ô¶¯»Ø¸´ÏûÏ¢"
+
+#: src/multi.c:1000
+msgid "Select None"
+msgstr "È«²¿²»Ñ¡"
+
+#: src/multi.c:1014
+msgid "Modify"
+msgstr "ÐÞ¸Ä"
+
+#: src/multi.c:1018
+msgid "Sign On/Off"
+msgstr "µÇ¼/À뿪"
+
+#: src/multi.c:1022
+msgid "Delete"
+msgstr "ɾ³ý"
+
+#: src/multi.c:1256
+#, c-format
+msgid ""
+"%s\n"
+"%s: %s"
+msgstr ""
+
+#: src/multi.c:1275
+#, fuzzy, c-format
+msgid "%s was unable to sign on"
+msgstr ""
+"%s\n"
+"%s ÎÞ·¨µÇ¼£º %s"
+
+#: src/multi.c:1286
+#, fuzzy
+msgid "Notice"
+msgstr "ÉùÒô"
+
+#: src/perl.c:856
 msgid "Perl Scripts"
 msgstr "Perl ½Å±¾"
 
-#: src/plugins.c:129
+#: src/plugins.c:113
 msgid "Gaim - Plugin List"
 msgstr "Gaim - ²å¼þÁбí"
 
-#: src/plugins.c:206 src/plugins.c:212 src/plugins.c:222
-msgid "Plugin Error"
-msgstr "²å¼þ´íÎó"
-
-#: src/plugins.c:275
+#: src/plugins.c:178
 msgid "Gaim - Plugins"
 msgstr "Gaim - ²å¼þ"
 
-#: src/plugins.c:335
+#: src/plugins.c:238
 msgid "Filepath:"
 msgstr "Îļþ·¾¶£º"
 
-#: src/plugins.c:353
+#: src/plugins.c:256
 msgid "Load"
 msgstr "¼ÓÔØ"
 
-#: src/plugins.c:356
+#: src/plugins.c:259
 msgid "Load a plugin from a file"
 msgstr "´ÓÎļþ¼ÓÔزå¼þ"
 
-#: src/plugins.c:358
+#: src/plugins.c:261
 msgid "Configure"
 msgstr "É趨²å¼þ"
 
-#: src/plugins.c:361
+#: src/plugins.c:264
 msgid "Configure settings of the selected plugin"
 msgstr "ÅäÖÃÑ¡¶¨µÄ²å¼þ"
 
-#: src/plugins.c:363
+#: src/plugins.c:266
 msgid "Reload"
 msgstr "ÖØмÓÔØ"
 
-#: src/plugins.c:367
+#: src/plugins.c:270
 msgid "Reload the selected plugin"
 msgstr "ÖØмÓÔØÑ¡ÖеIJå¼þ"
 
-#: src/plugins.c:369
+#: src/plugins.c:272
 msgid "Unload"
 msgstr "жÔزå¼þ"
 
-#: src/plugins.c:372
+#: src/plugins.c:275
 msgid "Unload the selected plugin"
 msgstr "жÔØÑ¡¶¨µÄ²å¼þ"
 
-#: src/plugins.c:377
+#: src/plugins.c:280
 msgid "Close this window"
 msgstr "ÔÚ½»Ì¸´°¿ÚÏÔʾµÇ¼£¯µÇ³öÐÅÏ¢"
 
-#: src/prefs.c:197 src/prefs.c:362 src/prefs.c:503 src/prefs.c:602
-#: src/prefs.c:835 src/prefs.c:1366 src/prefs.c:1628 src/prefs.c:1835
-#: src/prefs.c:2220
+#: src/prefs.c:190
+msgid "General Options"
+msgstr "Ò»°ãÑ¡Ïî"
+
+#: src/prefs.c:198 src/prefs.c:373 src/prefs.c:539 src/prefs.c:640
+#: src/prefs.c:893 src/prefs.c:1037 src/prefs.c:1262 src/prefs.c:1576
+#: src/prefs.c:1850 src/prefs.c:2283
 msgid "All options take effect immediately unless otherwise noted."
 msgstr "Èç¹ûûÓÐÒâÍ⣬ËùÓеÄÉ趨ÂíÉÏÉúЧ"
 
-#: src/prefs.c:209
+#: src/prefs.c:210
 msgid "Miscellaneous"
 msgstr "ÔÓÏî"
 
-#: src/prefs.c:217
+#: src/prefs.c:218
 msgid "Use borderless buttons"
 msgstr "ʹÓÃÎޱ߿ò°´Å¥"
 
@@ -1554,39 +2214,39 @@
 msgid "Show Buddy Ticker"
 msgstr "ÏÔʾÅóÓÑÀà±ðͼÐÎ"
 
-#: src/prefs.c:228
+#: src/prefs.c:227
 msgid "Show Debug Window"
 msgstr "ÏÔʾ Debug ´°¿Ú"
 
-#: src/prefs.c:232
+#: src/prefs.c:230
 msgid "Report Idle Times"
 msgstr "±¨¸æ·¢´ôʱ¼ä"
 
-#: src/prefs.c:240
+#: src/prefs.c:238
 msgid "None"
 msgstr "ÎÞ"
 
-#: src/prefs.c:241
+#: src/prefs.c:239
 msgid "Gaim Use"
 msgstr "Gaim ʹÓÃ"
 
-#: src/prefs.c:243
+#: src/prefs.c:241
 msgid "X Use"
 msgstr "X ʹÓÃ"
 
-#: src/prefs.c:254
+#: src/prefs.c:252
 msgid "Log all conversations"
 msgstr "¼Ç¼ËùÓжԻ°ÄÚÈÝ"
 
-#: src/prefs.c:255
+#: src/prefs.c:253
 msgid "Strip HTML from logs"
 msgstr "Çå³ý¼Ç¼ÎļþÄÚµÄ HTML ±ê¼Ç"
 
+#: src/prefs.c:259
+msgid "Log when buddies sign on/sign off"
+msgstr "¼Ç¼¸çÃǶùµÇ¼£¯Í˳öʱ¼ä"
+
 #: src/prefs.c:261
-msgid "Log when buddies sign on/sign off"
-msgstr "¼Ç¼¸çÃǶùµÇ¼£¯Í˳öʱ¼ä"
-
-#: src/prefs.c:262
 msgid "Log when buddies become idle/un-idle"
 msgstr "¼Ç¼¸çÃǶùʲôʱºò·¢´ô£¬Ê²Ã´Ê±ºòÇåÐÑ"
 
@@ -1598,383 +2258,406 @@
 msgid "Log your own signons/idleness/awayness"
 msgstr "¼Ç¼×Ô¼ººÎʱµÇ¼/·¢´ô/À뿪"
 
-#: src/prefs.c:265
+#: src/prefs.c:266
 msgid "Individual log file for each buddy's signons"
 msgstr "ÿһ¸ö¸çÃǶùʹÓò»Í¬µÄ¼Ç¼Îļþ"
 
-#: src/prefs.c:267
+#: src/prefs.c:269
 msgid "Browser"
 msgstr "ä¯ÀÀÆ÷"
 
-#: src/prefs.c:279
+#: src/prefs.c:281
 msgid "KFM"
 msgstr "KFM"
 
-#: src/prefs.c:280
-msgid "Netscape"
-msgstr "Netscape"
+#: src/prefs.c:282
+msgid "Opera"
+msgstr ""
 
 #: src/prefs.c:283
+msgid "Netscape"
+msgstr "Netscape"
+
+#: src/prefs.c:286
 msgid "Pop up new window by default"
 msgstr "ȱʡµ¯³öд°¿Ú"
 
-#: src/prefs.c:290
+#: src/prefs.c:293
 msgid "GNOME URL Handler"
 msgstr "GNOME URL Handler"
 
-#: src/prefs.c:292
+#: src/prefs.c:295
+msgid "Galeon"
+msgstr ""
+
+#: src/prefs.c:296
 msgid "Manual"
 msgstr "Óû§ÊÖ²á"
 
-#: src/prefs.c:354
+#: src/prefs.c:365
 msgid "Proxy Options"
 msgstr "´úÀí·þÎñÆ÷Ñ¡Ïî"
 
-#: src/prefs.c:366
+#: src/prefs.c:377
 msgid ""
 "Not all protocols can use these proxy options. Please see the README file "
 "for details."
+msgstr "²»ÊÇËùÓеÄЭÒ鶼ʹÓÃÕâЩ´úÀí·þÎñÆ÷ÉèÖã¬ÏêÇéÇë²ÎÔÄ README Îļþ¡£"
+
+#: src/prefs.c:382
+msgid "Proxy Type"
+msgstr "´úÀí·þÎñÆ÷ÀàÐÍ"
+
+#: src/prefs.c:394
+msgid "Proxy Server"
+msgstr "´úÀí·þÎñÆ÷ÉèÖÃ"
+
+#: src/prefs.c:397
+msgid "No Proxy"
+msgstr "ÎÞ´úÀí·þÎñÆ÷"
+
+#: src/prefs.c:409
+#, fuzzy
+msgid "SOCKS 4"
+msgstr "SOCKS v4 ´úÀí"
+
+#: src/prefs.c:419
+msgid "SOCKS 5"
 msgstr ""
-"²»ÊÇËùÓеÄЭÒ鶼ʹÓÃÕâЩ´úÀí·þÎñÆ÷ÉèÖã¬ÏêÇéÇë²ÎÔÄ README Îļþ¡£"
-
-#: src/prefs.c:495
+
+#: src/prefs.c:428
+msgid "HTTP"
+msgstr ""
+
+#: src/prefs.c:452
+msgid "Host"
+msgstr "Ö÷»úµØÖ·"
+
+#: src/prefs.c:468
+msgid "Port"
+msgstr "¶Ë¿Ú"
+
+#: src/prefs.c:485
+msgid "User"
+msgstr "µÇ¼Óû§"
+
+#: src/prefs.c:501
+msgid "Password"
+msgstr "µÇ¼ÃÜÂë"
+
+#: src/prefs.c:531
 msgid "Buddy List Options"
 msgstr "ÅóÓÑÁбíÑ¡Ïî"
 
-#: src/prefs.c:507
+#: src/prefs.c:543
 msgid "Buddy List Window"
 msgstr "ÅóÓÑÁÐ±í´°¿Ú"
 
-#: src/prefs.c:519
+#: src/prefs.c:555
 msgid "Hide IM/Info/Chat buttons"
 msgstr "Òþ²Ø ÏûÏ¢/ÐÅÏ¢/ÁÄÌì °´Å¥"
 
-#: src/prefs.c:521
+#: src/prefs.c:557
 msgid "Automatically show buddy list on sign on"
 msgstr "µÇ¼ºó×Ô¶¯ÏÔʾÅóÓÑÁбí"
 
-#: src/prefs.c:524
+#: src/prefs.c:560
 msgid "Save Window Size/Position"
 msgstr "±£´æ´°¿ÚµÄ´óСºÍλÖÃ"
 
-#: src/prefs.c:530
+#: src/prefs.c:567
 msgid "Show pictures on buttons"
 msgstr "ÔÚ°´Å¥ÉÏÏÔʾͼÐÎ"
 
-#: src/prefs.c:535
+#: src/prefs.c:572
 msgid "Display Buddy List near applet"
 msgstr "ÔÚ applet ¸½½üÏÔʾÅóÓÑÁбí"
 
-#: src/prefs.c:538
+#: src/prefs.c:575
 msgid "Group Displays"
 msgstr "ÅóÓÑ×éÏÔʾ"
 
-#: src/prefs.c:550
+#: src/prefs.c:587
 msgid "Hide groups with no online buddies"
 msgstr "Òþ²ØûÓиçÃǶùµÇ¼µÄ×é"
 
-#: src/prefs.c:556
+#: src/prefs.c:593
 msgid "Show numbers in groups"
 msgstr "ÔÚ×éÀïÏÔʾºÅÂë"
 
-#: src/prefs.c:558
+#: src/prefs.c:595
 msgid "Buddy Displays"
 msgstr "ÅóÓÑÁбíÏÔʾ"
 
-#: src/prefs.c:570
+#: src/prefs.c:607
 msgid "Show buddy type icons"
 msgstr "ÏÔʾÅóÓÑÀà±ðͼÐÎ"
 
-#: src/prefs.c:571
+#: src/prefs.c:608
 msgid "Show warning levels"
 msgstr "ÏÔʾ¾¯¸æ¼¶±ð"
 
-#: src/prefs.c:577
+#: src/prefs.c:614
 msgid "Show idle times"
 msgstr "ÏÔʾ¿Õתʱ¼ä"
 
-#: src/prefs.c:594
+#: src/prefs.c:615
+msgid "Grey idle buddies"
+msgstr ""
+
+#: src/prefs.c:632
 msgid "Conversation Options"
 msgstr "¶Ô»°Ñ¡Ïî"
 
-#: src/prefs.c:606
+#: src/prefs.c:644
 msgid "Keyboard Options"
 msgstr "¼üÅÌÑ¡Ïî"
 
-#: src/prefs.c:618
+#: src/prefs.c:656
 msgid "Enter sends message"
 msgstr "µ¥»÷ Enter ¼ü·¢ËÍÐÅÏ¢"
 
-#: src/prefs.c:619
+#: src/prefs.c:657
 msgid "Control-Enter sends message"
 msgstr "Ctrl-Enter ½¡·¢ËÍÐÅÏ¢"
 
-#: src/prefs.c:620
+#: src/prefs.c:658
 msgid "Escape closes window"
 msgstr "ESC ½¡¹Ø±Õ´°¿Ú"
 
-#: src/prefs.c:626
+#: src/prefs.c:664
 msgid "Control-{B/I/U/S} inserts HTML tags"
 msgstr "Ctrl-{B/I/U/S} ²åÈë HTML ±ê¼Ç"
 
-#: src/prefs.c:627
+#: src/prefs.c:665
 msgid "Control-(number) inserts smileys"
 msgstr "Ctrl-Êý×Ö ²åÈëЦÁ³Í¼±ê"
 
-#: src/prefs.c:628
+#: src/prefs.c:666
 msgid "F2 toggles timestamp display"
 msgstr "F2 Çл»Ê±¼ä´ÁÏÔʾ"
 
-#: src/prefs.c:630
+#: src/prefs.c:668
 msgid "Display and General Options"
 msgstr "ÏÔʾºÍÒ»°ãÑ¡Ïî"
 
-#: src/prefs.c:642
+#: src/prefs.c:680
 msgid "Show graphical smileys"
 msgstr "ÏÔʾͼÐÎЦÁ³"
 
-#: src/prefs.c:643
+#: src/prefs.c:681
 msgid "Show timestamp on messages"
 msgstr "ÔÚÐÅÏ¢ÀïÏÔʾʱ¼ä"
 
-#: src/prefs.c:644
+#: src/prefs.c:682
 msgid "Show URLs as links"
 msgstr "ÒÔ³¬Á¬½Ó·½Ê½ÏÔʾ URL"
 
-#: src/prefs.c:645
+#: src/prefs.c:683
 msgid "Highlight misspelled words"
 msgstr "¸ßÁÁÏÔʾƴ´íµÄµ¥´Ê"
 
-#: src/prefs.c:646 src/prefs.c:1857
+#: src/prefs.c:684 src/prefs.c:1872
 msgid "Sending messages removes away status"
 msgstr "·¢³öÐÅϢʱ×Ô¶¯È¡ÏûÔÝʱÀ뿪״̬"
 
-#: src/prefs.c:647 src/prefs.c:1864
+#: src/prefs.c:685 src/prefs.c:1885
 msgid "Queue new messages when away"
 msgstr "ÔÝʱÀ뿪ʱÊÕµ½µÄÏûÏ¢·Åµ½¶ÓÁÐÀï"
 
-#: src/prefs.c:653
+#: src/prefs.c:691
 msgid "Ignore colors"
 msgstr "ºöÂÔÊÕµ½ÏûÏ¢µÄÑÕÉ«±ê¼Ç"
 
-#: src/prefs.c:654
+#: src/prefs.c:692
 msgid "Ignore font faces"
 msgstr "ºöÂÔÊÕµ½ÏûÏ¢µÄ×ÖÌå±ê¼Ç"
 
-#: src/prefs.c:655
+#: src/prefs.c:693
 msgid "Ignore font sizes"
 msgstr "ºöÂÔÊÕµ½ÏûÏ¢µÄ×ÖÌå´óСÉèÖÃ"
 
-#: src/prefs.c:656
+#: src/prefs.c:694
 msgid "Ignore TiK Automated Messages"
 msgstr "ºöÂÔ×Ô¶¯Éú³ÉµÄÏûÏ¢"
 
-#: src/prefs.c:657 src/prefs.c:1855
+#: src/prefs.c:695 src/prefs.c:1870
 msgid "Ignore new conversations when away"
 msgstr "ÔÝʱÀ뿪ʱ£¬ºöÂÔеĶԻ°"
 
-#: src/prefs.c:827
+#: src/prefs.c:884
 msgid "IM Options"
 msgstr "¼´Ê±ÏûϢѡÏî"
 
-#: src/prefs.c:839
+#: src/prefs.c:897 src/prefs.c:2832
 msgid "IM Window"
 msgstr "¼´Ê±ÏûÏ¢´°¿Ú"
 
-#: src/prefs.c:855 src/prefs.c:899
+#: src/prefs.c:913 src/prefs.c:1057
 msgid "Show buttons as: "
 msgstr "°´Å¥ÏÔʾÉèÖãº"
 
-#: src/prefs.c:859 src/prefs.c:903
+#: src/prefs.c:917 src/prefs.c:1062
 msgid "Pictures And Text"
 msgstr "ͼÐκÍÎÄ×Ö"
 
-#: src/prefs.c:860 src/prefs.c:904
+#: src/prefs.c:918 src/prefs.c:1064
 msgid "Pictures"
 msgstr "ͼÐÎ"
 
-#: src/prefs.c:861 src/prefs.c:905
+#: src/prefs.c:919 src/prefs.c:1065
 msgid "Text"
 msgstr "ÎÄ×Ö"
 
-#: src/prefs.c:871
+#: src/prefs.c:930
 msgid "Show all conversations in one tabbed window"
 msgstr "ÔÚÒ»¸ö»îÒ³´°¿ÚÖÐÏÔʾËùÓжԻ°"
 
-#: src/prefs.c:871
+#: src/prefs.c:932
 msgid "Show chats in the same tabbed window"
 msgstr "ÔÚͬһ¸öÒ»¸ö»îÒ³´°¿ÚÖÐÏÔʾ¶Ô»°"
 
-#: src/prefs.c:872 src/prefs.c:916
+#: src/prefs.c:939 src/prefs.c:1085
 msgid "Raise windows on events"
 msgstr "ÓÐʼþ·¢ÉúʱÌáÉý´°¿Ú"
 
-#: src/prefs.c:873
+#: src/prefs.c:940
 msgid "Show logins in window"
 msgstr "ÔÚ½»Ì¸´°¿ÚÏÔʾµÇ¼£¯µÇ³öÐÅÏ¢"
 
-#: src/prefs.c:873
+#: src/prefs.c:941
 msgid "Show aliases in tabs/titles"
 msgstr "ÔÚ´°¿Ú»ò»îÒ³µÄ±êÌâÖÐÏÔʾÍâºÅ¶ù"
 
-#: src/prefs.c:873
+#: src/prefs.c:942
 msgid "Hide window on send"
 msgstr "·¢³öÏûÏ¢ºóÒþ²Ø´°¿Ú"
 
-#: src/prefs.c:879 src/prefs.c:923
+#: src/prefs.c:944 src/prefs.c:1088
+msgid "Window Sizes"
+msgstr "´°¿Ú´óСÉ趨"
+
+#: src/prefs.c:952 src/prefs.c:1096
 msgid "New window width:"
 msgstr "еĴ°¿Ú¿í¶ÈÉ趨£º"
 
-#: src/prefs.c:880 src/prefs.c:924
+#: src/prefs.c:953 src/prefs.c:1097
 msgid "New window height:"
 msgstr "еĴ°¿Ú¸ß¶ÈÉ趨£º"
 
-#: src/prefs.c:881 src/prefs.c:925
+#: src/prefs.c:954 src/prefs.c:1098
 msgid "Entry widget height:"
 msgstr "ÊäÈë´°¿Ú¸ß¶È£º"
 
-msgid "Tab Completion"
-msgstr "TAB ¼ü×Ô¶¯²¹È«"
-
-msgid "Tab-Complete Nicks"
-msgstr "TAB ¼ü×Ô¶¯²¹È«êdzÆ"
-
-msgid "Old-Style Tab Completion"
-msgstr "ÀÏʽµÄ TAB ¼ü×Ô¶¯²¹È«"
-
-#: src/prefs.c:883
-msgid "Group Chat Window"
-msgstr "×éÁÄÌì´°¿Ú"
-
-msgid "Window Sizes"
-msgstr "´°¿Ú´óСÉ趨"
-
-#: src/prefs.c:915
-msgid "Show all chats in one tabbed window"
-msgstr "ÔÚÒ»¸ö»îÒ³´°¿ÚÖÐÏÔʾËùÓÐÁÄÌì"
-
-#: src/prefs.c:883
-msgid "Show conversations in the same tabbed window"
-msgstr "ÔÚÒ»¸ö»îÒ³´°¿ÚÖÐÏÔʾËùÓжԻ°"
-
-#: src/prefs.c:917
-msgid "Show people joining/leaving in window"
-msgstr "ÔÚ´°¿ÚÖÐÏÔʾÈËÃǼÓÈë/À뿪µÄÐÅÏ¢"
-
-#: src/prefs.c:927
-msgid "Tabbed Window Options"
-msgstr "»îÒ³´°¿ÚÑ¡Ïî"
-
-#: src/prefs.c:939
+#: src/prefs.c:956 src/prefs.c:1100
 msgid "Tab Placement"
 msgstr "¶Ô»°»îҳλÖÃ"
 
-#: src/prefs.c:951 src/prefs.c:985
+#: src/prefs.c:976 src/prefs.c:1120
 msgid "Top"
 msgstr "¶¥¶Ë"
 
-#: src/prefs.c:953 src/prefs.c:987
+#: src/prefs.c:978 src/prefs.c:1122
 msgid "Bottom"
 msgstr "µ×¶Ë"
 
-#: src/prefs.c:960 src/prefs.c:994
+#: src/prefs.c:985 src/prefs.c:1129
 msgid "Left"
 msgstr "×ó±ß"
 
-#: src/prefs.c:962 src/prefs.c:996
+#: src/prefs.c:987 src/prefs.c:1131
 msgid "Right"
 msgstr "ÓÒ±ß"
 
-#: src/prefs.c:1031 src/prefs.c:1033 src/prefs.c:1241 src/prefs.c:1243
-msgid "Gaim Chat"
-msgstr "Gaim ÁÄÌì"
-
-#: src/prefs.c:1179 src/prefs.c:2697
-msgid "Chat Rooms"
-msgstr "ÁÄÌìÊÒ"
-
-#: src/prefs.c:1197
-msgid "Refresh"
-msgstr "Ë¢ÐÂ"
-
-#: src/prefs.c:1222
-msgid "List of available chats"
-msgstr "ÏÖÓÐÁÄÌìÁбí"
-
-#: src/prefs.c:1232
-msgid "List of subscribed chats"
-msgstr "¶©ÔĵÄÁÄÌìÁбí"
-
-#: src/prefs.c:1358 src/prefs.c:2692
+#: src/prefs.c:991
+msgid "Buddy Icons"
+msgstr "ÅóÓÑͼ±ê"
+
+#: src/prefs.c:1003
+msgid "Hide Buddy Icons"
+msgstr "Òþ²Ø¸çÃǶùÃǵÄͼ±ê"
+
+#: src/prefs.c:1029
+msgid "Chat Options"
+msgstr "ÁÄÌìÑ¡Ïî"
+
+#: src/prefs.c:1041
+msgid "Group Chat Window"
+msgstr "×éÁÄÌì´°¿Ú"
+
+#: src/prefs.c:1076
+msgid "Show all chats in one tabbed window"
+msgstr "ÔÚÒ»¸ö»îÒ³´°¿ÚÖÐÏÔʾËùÓÐÁÄÌì"
+
+#: src/prefs.c:1078
+msgid "Show conversations in the same tabbed window"
+msgstr "ÔÚÒ»¸ö»îÒ³´°¿ÚÖÐÏÔʾËùÓжԻ°"
+
+#: src/prefs.c:1086
+msgid "Show people joining/leaving in window"
+msgstr "ÔÚ´°¿ÚÖÐÏÔʾÈËÃǼÓÈë/À뿪µÄÐÅÏ¢"
+
+#: src/prefs.c:1134
+msgid "Tab Completion"
+msgstr "TAB ¼ü×Ô¶¯²¹È«"
+
+#: src/prefs.c:1146
+msgid "Tab-Complete Nicks"
+msgstr "TAB ¼ü×Ô¶¯²¹È«êdzÆ"
+
+#: src/prefs.c:1152
+msgid "Old-Style Tab Completion"
+msgstr "ÀÏʽµÄ TAB ¼ü×Ô¶¯²¹È«"
+
+#: src/prefs.c:1254 src/prefs.c:2842
 msgid "Font Options"
 msgstr "×ÖÌåÑ¡Ïî"
 
-#: src/prefs.c:1358 src/prefs.c:2692
-msgid "Font Style"
-msgstr "×ÖÌåÑùʽ"
-
-#: src/prefs.c:1375
-msgid "Underlined Text"
-msgstr "ϼÓÏßÎÄ×Ö"
-
-#: src/prefs.c:1376
+#: src/prefs.c:1280
 msgid "Italic Text"
 msgstr "бÌåÎÄ×Ö"
 
-#: src/prefs.c:1376
-msgid "Strike Text"
-msgstr "Öл®ÏßÎÄ×Ö"
-
-msgid "Font Color"
-msgstr "×ÖÌåÑÕÉ«"
-
-msgid "Font Face"
-msgstr "×ÖÌåÍâ¹Û"
-
-#: src/prefs.c:1406 src/prefs.c:1424 src/prefs.c:1446
+#: src/prefs.c:1324 src/prefs.c:1342 src/prefs.c:1364
 msgid "Select"
 msgstr "Ñ¡Ôñ"
 
-#: src/prefs.c:1444
+#: src/prefs.c:1362
 msgid "Font Face for Text"
 msgstr "ÎÄ×ÖµÄ×ÖÐÍ"
 
-#: src/prefs.c:1459
+#: src/prefs.c:1377
 msgid "Font Size for Text"
 msgstr "ÎÄ×ÖµÄ×ÖÌå´óС"
 
-#: src/prefs.c:1541
+#: src/prefs.c:1472
 msgid "Gaim - Sound Configuration"
 msgstr "Gaim - ÉùÒôÉèÖÃ"
 
-#: src/prefs.c:1576
-msgid "Reset"
-msgstr "ÖØÖÃ"
-
-#: src/prefs.c:1581
+#: src/prefs.c:1507
+msgid "Play"
+msgstr ""
+
+#: src/prefs.c:1517
 msgid "Choose..."
 msgstr "Ñ¡Ôñ"
 
-#: src/prefs.c:1620
+#: src/prefs.c:1568
 msgid "Sound Options"
 msgstr "ÉùÒôÑ¡Ïî"
 
-#: src/prefs.c:1648
+#: src/prefs.c:1596
 msgid "No sounds when you log in"
 msgstr "ÇÄÇĵؽøÈ¥£¬´òǹµØ²»Òª"
 
-#: src/prefs.c:1649 src/prefs.c:1856
+#: src/prefs.c:1602 src/prefs.c:1871
 msgid "Sounds while away"
 msgstr "À뿪ʱµÄÉùÒô"
 
+#: src/prefs.c:1612
 msgid "Sound Player:"
 msgstr "ÉùÒô²¥·ÅÆ÷£º"
 
-#: src/prefs.c:1655
-msgid "Beep instead of playing sound"
-msgstr "ʹÓà PC À®°È£¬²»²¥·ÅÉùÒôÎļþ"
-
-#: src/prefs.c:1665
+#: src/prefs.c:1681
 #, c-format
 msgid ""
 "Command to play sound files\n"
@@ -1983,149 +2666,147 @@
 "²¥·ÅÉùÒôµÄÃüÁî\n"
 "(ÉùÒôÎļþÍêÕû·¾¶Ê¹Óà %s; Èç¹ûΪ¿ÕÔòʹÓÃÄÚ²¿ÃüÁî)"
 
-#: src/prefs.c:1676
+#: src/prefs.c:1692
 msgid "Events"
 msgstr "ʼþÉùЧ"
 
-#: src/prefs.c:1684
+#: src/prefs.c:1700
 msgid "Sound when buddy logs in"
 msgstr "ÅóÓѵǼÉù"
 
-#: src/prefs.c:1685
-msgid "Sound when buddy logs out"
-msgstr "ÅóÓѵdzöÉù"
-
-#: src/prefs.c:1691
-msgid "Sound when received message begins conversation"
-msgstr "½¨Á¢ÐµĶԻ°Ê±²¥·Å"
-
-#: src/prefs.c:1692
-msgid "Sound when message is received"
-msgstr "ÊÕµ½ÐÅϢʱ²¥·Å"
-
-#: src/prefs.c:1693
-msgid "Sound when message is sent"
-msgstr "·¢³öÐÅϢʱ²¥·Å"
-
-#: src/prefs.c:1699
-msgid "Sound in chat rooms when people enter"
-msgstr "ÓÐÅóÓѽøÈëÁÄÌìÊÒʱ²¥·Å"
-
-#: src/prefs.c:1700
-msgid "Sound in chat rooms when people leave"
-msgstr "ÓÐÅóÓÑÀ뿪ÁÄÌìÊÒʱ²¥·Å"
-
 #: src/prefs.c:1701
+msgid "Sound when buddy logs out"
+msgstr "ÅóÓѵdzöÉù"
+
+#: src/prefs.c:1707
+msgid "Sound when received message begins conversation"
+msgstr "½¨Á¢ÐµĶԻ°Ê±²¥·Å"
+
+#: src/prefs.c:1709
+msgid "Sound when message is received"
+msgstr "ÊÕµ½ÐÅϢʱ²¥·Å"
+
+#: src/prefs.c:1710
+msgid "Sound when message is sent"
+msgstr "·¢³öÐÅϢʱ²¥·Å"
+
+#: src/prefs.c:1716
+msgid "Sound in chat rooms when people enter"
+msgstr "ÓÐÅóÓѽøÈëÁÄÌìÊÒʱ²¥·Å"
+
+#: src/prefs.c:1717
+msgid "Sound in chat rooms when people leave"
+msgstr "ÓÐÅóÓÑÀ뿪ÁÄÌìÊÒʱ²¥·Å"
+
+#: src/prefs.c:1718
 msgid "Sound in chat rooms when you talk"
 msgstr "ÄãÔÚÁÄÌìÊÒÀï˵»°µÄÉùÒô"
 
-#: src/prefs.c:1702
+#: src/prefs.c:1719
 msgid "Sound in chat rooms when others talk"
 msgstr "±ðÈËÔÚÁÄÌìÊÒÀï˵»°µÄÉùÒô"
 
-#: src/prefs.c:1827 src/prefs.c:2719
+#: src/prefs.c:1842 src/prefs.c:2864
 msgid "Away Messages"
 msgstr "ÔÝʱÀ뿪ÐÅÏ¢"
 
-#: src/prefs.c:1863
+#: src/prefs.c:1879
 msgid "Don't send auto-response"
 msgstr "²»Òª·¢ËÍ×Ô¶¯»Ø¸´"
 
+#: src/prefs.c:1880
 msgid "Only send auto-response when idle"
 msgstr "Ö»ÓÐÔÚ·¢´ôµÄʱºò²Å·¢ËÍ×Ô¶¯»Ø¸´"
 
+#: src/prefs.c:1895
 msgid "Time between sending auto-responses (in seconds):"
 msgstr "·¢ËÍ×Ô¶¯»Ø¸´µÄ¼ä¸ô (Ãë)£º"
 
-#: src/prefs.c:1874
+#: src/prefs.c:1910
 msgid "Auto Away after"
 msgstr "×Ô¶¯ÔÚ"
 
-#: src/prefs.c:1888
+#: src/prefs.c:1924
 msgid "minutes using"
 msgstr "·ÖÖÓʱʹÓÃ"
 
-#: src/prefs.c:1901
+#: src/prefs.c:1937
 msgid "Messages"
 msgstr "ÏûÏ¢ÉèÖÃ"
 
-#: src/prefs.c:1913
+#: src/prefs.c:1949
 msgid "Title"
 msgstr "±êÌâ"
 
-#: src/prefs.c:1917
-msgid "Message"
-msgstr "ÏûÏ¢ÄÚÈÝ"
-
-#: src/prefs.c:1956
+#: src/prefs.c:1994
 msgid "Edit"
 msgstr "±à¼­"
 
-#: src/prefs.c:1960
+#: src/prefs.c:1998
 msgid "Make Away"
 msgstr "Á¢¼´É趨ΪÔÝʱÀ뿪"
 
-#: src/prefs.c:2212
+#: src/prefs.c:2275
 msgid "Privacy Options"
 msgstr "¸öÈËÒþ˽ѡÏî"
 
-#: src/prefs.c:2228
+#: src/prefs.c:2291
 msgid "Set privacy for:"
 msgstr "ÉèÖÃÒþ˽ѡÏîΪ£º"
 
-#: src/prefs.c:2247
+#: src/prefs.c:2310
 msgid "Allow all users to contact me"
 msgstr "ÔÊÐíËùÓеÄÓû§ºÍÎÒÁªÏµ"
 
-#: src/prefs.c:2248
+#: src/prefs.c:2311
 msgid "Allow only the users below"
 msgstr "Ö»ÔÊÐíÈçÏÂÓû§ºÍÎÒÁªÏµ"
 
-#: src/prefs.c:2250
+#: src/prefs.c:2313
 msgid "Allow List"
 msgstr "ÔÊÐíµÄÓû§Áбí"
 
-#: src/prefs.c:2281
+#: src/prefs.c:2344
 msgid "Deny all users"
 msgstr "¾Ü¾øËùÓÐÓû§ºÍÎÒÁªÏµ"
 
-#: src/prefs.c:2282
+#: src/prefs.c:2345
 msgid "Block the users below"
 msgstr "¶ÂסÕâЩ¼Ò»ïµÄ×ì"
 
-#: src/prefs.c:2284
+#: src/prefs.c:2347
 msgid "Block List"
 msgstr "±»¶Âס×ìµÄ¼Ò»ï"
 
-#: src/prefs.c:2379
+#: src/prefs.c:2442
 msgid "Gaim - Preferences"
 msgstr "Gaim - É趨"
 
-#: src/prefs.c:2459
+#: src/prefs.c:2525
 msgid "Gaim debug output window"
 msgstr "Gaim ³ý³æÊä³ö´°¿Ú"
 
-#: src/prefs.c:2653
+#: src/prefs.c:2798
 msgid "General"
 msgstr "Ò»°ãÉ趨"
 
-#: src/prefs.c:2658
+#: src/prefs.c:2803
 msgid "Proxy"
 msgstr "´úÀí·þÎñÆ÷"
 
-#: src/prefs.c:2682
+#: src/prefs.c:2827
 msgid "Conversations"
 msgstr "¶Ô»°"
 
-#: src/prefs.c:2862
+#: src/prefs.c:2853
 msgid "Sounds"
 msgstr "ÉùÒô"
 
-#: src/prefs.c:2730
+#: src/prefs.c:2875
 msgid "Privacy"
 msgstr "Òþ˽"
 
-#: src/prpl.c:76
+#: src/prpl.c:70
 msgid ""
 "You have attempted to load a protocol which was not compiled from the same "
 "version of the source as this application was. Unfortunately, because it is "
@@ -2135,176 +2816,244 @@
 "You have attempted to load a protocol which was not compiled from the same "
 "version of the source as this application was. Unfortunately, because it is "
 "not the same version I cannot safely tell you which one it was. Needless to "
-"say, it was not successfully loaded."
-"ÄãÕýÔÚ³¢ÊÔ¼ÓÔØÒ»¸öΪ²»Í¬°æ±¾µÄ Gaim ±àÒëµÄЭÒé²å¼þ¡£ºÜ²»ÐÒ£¬ÓÉÓÚ°æ±¾²»Í¬£¬"
-"ÎÒÎÞ·¨ÕýÈ·µØ±æÈÏËüÊÇʲô¡£²»±Ø¶à˵ÁË£¬¸Ã²å¼þûÓгɹ¦¼ÓÔØ¡£"
-
-#: src/prpl.c:80
+"say, it was not successfully loaded.ÄãÕýÔÚ³¢ÊÔ¼ÓÔØÒ»¸öΪ²»Í¬°æ±¾µÄ Gaim "
+"±àÒëµÄЭÒé²å¼þ¡£ºÜ²»ÐÒ£¬ÓÉÓÚ°æ±¾²»Í¬£¬ÎÒÎÞ·¨ÕýÈ·µØ±æÈÏËüÊÇʲô¡£²»±Ø¶à˵ÁË£¬¸"
+"òå¼þûÓгɹ¦¼ÓÔØ¡£"
+
+#: src/prpl.c:74
 msgid "Protocol Error"
 msgstr "ЭÒé´íÎó"
 
-#: src/prpl.c:100
+#: src/prpl.c:93
 #, c-format
 msgid "%s was using %s, which got removed. %s is now offline."
 msgstr "%s Ôø¾­Ê¹Óà %s£¬µ«ÊÇÏÖÔÚÒѾ­±»É¾³ýÁË¡£%s ÏÖÔÚÀëÏß¡£"
 
-#: src/prpl.c:103
+#: src/prpl.c:96
 msgid "Disconnect"
 msgstr "¶Ï¿ª"
 
-#: src/prpl.c:143
+#: src/prpl.c:133
 msgid "Accept?"
 msgstr "½ÓÊÜ£¿"
 
-#: src/prpl.c:163 src/prpl.c:235
-msgid "Accept"
-msgstr "½ÓÊÜ"
-
-#: src/prpl.c:208
+#: src/prpl.c:199
 msgid "Gaim - Prompt"
 msgstr "Gaim - Ìáʾ"
 
-#: src/prpl.c:303
-msgid "Gaim - New User Registration"
+#: src/prpl.c:419
+#, fuzzy
+msgid "Gaim - New Mail"
+msgstr "Gaim - ·¢ËÍÎļþ"
+
+#: src/prpl.c:445
+msgid "Open Mail"
+msgstr ""
+
+#: src/prpl.c:564
+#, fuzzy, c-format
+msgid "%s%s%s%s has made %s their buddy%s%s%s"
+msgstr "%s has made %s their buddy%s%s"
+
+#: src/prpl.c:572
+msgid ""
+"\n"
+"\n"
+"Do you wish to add them to your buddy list?"
+msgstr ""
+
+#: src/prpl.c:615
+msgid ""
+"You do not currently have any protocols available that are able to register "
+"new accounts."
+msgstr ""
+
+#: src/prpl.c:652
+#, fuzzy
+msgid "Gaim - Registration"
 msgstr "Gaim - ÐÂÓû§×¢²á"
 
-#: src/prpl.c:312
-msgid "New User Registration"
-msgstr "ÐÂÓû§×¢²á"
-
-#: src/prpl.c:324
-msgid "Register new user for"
-msgstr "×¢²áеÄÓû§"
-
-#: src/prpl.c:552
-msgid "Gaim - Select File"
-msgstr "Gaim - Ñ¡ÔñÎļþ"
-
-#: src/prpl.c:554
-msgid "Gaim - Send File"
-msgstr "Gaim - ·¢ËÍÎļþ"
-
-#: src/server.c:56
+#: src/prpl.c:667
+msgid "Registration Information"
+msgstr ""
+
+#: src/prpl.c:684
+msgid "Register"
+msgstr "×¢²á"
+
+#: src/server.c:55
+msgid "Please enter your password"
+msgstr "ÇëÊäÈëÄúµÄµÇ¼¿ÚÁî"
+
+#: src/server.c:62
 msgid ""
 "You cannot log this account in; you do not have the protocol it uses loaded, "
 "or the protocol does not have a login function."
 msgstr ""
-"ÎÞ·¨µÇ¼¸ÃÕʺţ¬ÒòΪûÓмÓÔظÃЭÒéµÄ²å¼þ£¬»òÕ߸ÃЭÒé²»¾ß±¸µÇ¼¹¦ÄÜ¡£"
-"You cannot log this account in; you do not have the protocol it uses loaded, "
-"or the protocol does not have a login function."
-
-#: src/server.c:58
+"ÎÞ·¨µÇ¼¸ÃÕʺţ¬ÒòΪûÓмÓÔظÃЭÒéµÄ²å¼þ£¬»òÕ߸ÃЭÒé²»¾ß±¸µÇ¼¹¦ÄÜ¡£You "
+"cannot log this account in; you do not have the protocol it uses loaded, or "
+"the protocol does not have a login function."
+
+#: src/server.c:64
 msgid "Login Error"
 msgstr "µÇ¼´íÎó"
 
-#: src/server.c:487
+#: src/server.c:550
 #, c-format
 msgid "(%d messages)"
 msgstr "(%d ÌõÏûÏ¢)"
 
-#: src/server.c:493
+#: src/server.c:556
 msgid "(1 message)"
 msgstr "(1 ÌõÏûÏ¢)£º"
 
-#: src/server.c:781
+#: src/server.c:747
+#, fuzzy
+msgid "Warned"
+msgstr "¾¯¸æ"
+
+#: src/server.c:818
 msgid "Yes"
 msgstr "Yes"
 
-#: src/server.c:782
+#: src/server.c:819
 msgid "No"
 msgstr "No"
 
-#: src/toc.c:324 src/toc.c:331
-msgid "Connection Closed"
-msgstr "Á¬½ÓÒѹرÕ"
-
-#: src/toc.c:366
-msgid "Waiting for reply..."
-msgstr "µÈ´ýÏìÓ¦"
-
-#: src/toc.c:429
-msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "TOC È¡ÏûÔÝÍ£¡£ÏÖÔÚÄã¿ÉÒÔ¼ÌÐø·¢ËÍÏûÏ¢ÁË¡£"
-
-#: src/toc.c:430
-msgid "TOC Resume"
-msgstr "TOC »Ö¸´"
-
-#: src/toc.c:587
-msgid "Chat Error"
-msgstr "ÁÄÌì´íÎó"
-
-#: src/toc.c:606
-msgid "Password Change Successeful"
-msgstr "Gaim - ¸ü¸ÄÃÜÂë"
-
-#: src/toc.c:609
-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 ""
-"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."
-
-#: src/toc.c:612
-msgid "TOC Pause"
-msgstr "TOC ÔÝÍ£"
-
-#: src/toc.c:1016
-msgid "Community:"
-msgstr "¹ú"
-
-#: src/toc.c:1037
-msgid "Get Dir Info"
-msgstr "ÐÕÃûµØַ¼"
-
-#: src/toc.c:1215
-msgid ""
-"Unfortunately, currently TOC only allows new user registration by going to "
-"http://aim.aol.com/aimnew/Aim/register.adp?promo=106723&pageset=Aim&client=no"
-". Clicking the Register button will open the URL for you."
-msgstr ""
-"Unfortunately, currently TOC only allows new user registration by going to "
-"http://aim.aol.com/aimnew/Aim/register.adp?promo=106723&pageset=Aim&client=no"
-". Clicking the Register button will open the URL for you."
-
-#: src/toc.c:1499 src/toc.c:1541 src/toc.c:1675 src/toc.c:1761
-msgid "Could not connect for transfer!"
-msgstr "ÎÞ·¨½¨Á¢´«ÊäÁ¬½Ó¡£"
-
-#: src/toc.c:1705
-msgid "Could not write file header!"
-msgstr "ÎÞ·¨Ð´ÎļþÍ·£¡"
-
-#: src/toc.c:1794
-msgid "Gaim - Save As..."
-msgstr "Gaim - ´æÅÌΪ¡­¡­"
-
-#: src/toc.c:1833
-#, c-format
-msgid "%s requests %s to accept %d file%s: %s (%.2f %s)%s%s"
-msgstr "%s ÇëÇó %s ½ÓÊÜ %d ¸öÎļþ %s  %s (%.2f %s)%s%s"
-
-#: src/toc.c:1838
-#, c-format
-msgid "%s requests you to send them a file"
-msgstr "%s ÇëÇóÄã¸øËûÃÇ·¢ËÍÒ»¸öÎļþ"
-
-msgid "Gaim - Change MSN Name"
-msgstr "Gaim - ¸ü¸Ä MSN Ãû×Ö"
+#: src/server.c:995
+#, fuzzy
+msgid "More Info"
+msgstr "Óû§Ïêϸ×ÊÁÏ"
+
+#~ msgid "Gaim - Buddy"
+#~ msgstr "Gaim - ÅóÓÑ"
+
+#~ msgid "Napster registration is currently under development"
+#~ msgstr "Napster ×¢²á¹¦ÄÜÕýÔÚ¿ª·¢ÖÐ, ÉÐδʵÏÖ"
+
+#~ msgid "file not found: %s\n"
+#~ msgstr "ÕÒ²»µ½Îļþ£º %s\n"
+
+#~ msgid "by Email"
+#~ msgstr "ʹÓõç×ÓÓʼþ"
+
+#~ msgid "by Dir Info"
+#~ msgstr "ʹÓÃÐÕÃûµØַ¼"
+
+#~ msgid "Settings"
+#~ msgstr "É趨"
+
+#~ msgid "User Info"
+#~ msgstr "Óû§Ïêϸ×ÊÁÏ"
+
+#~ msgid "Invite who?"
+#~ msgstr "ÏëÇëË­£¿"
+
+#~ msgid "With message:"
+#~ msgstr "ÑûÇëÐÅÏ¢£º"
+
+#~ msgid "Gaim - Error %d"
+#~ msgstr "Gaim - ´íÎó %d"
+
+#~ msgid "Pounce buddy as:"
+#~ msgstr "¼àÊÓÅóÓÑʱʹÓÃÕʺÅ"
+
+#~ msgid "Buddy:"
+#~ msgstr "ÅóÓÑ"
+
+#~ msgid "Open IM window on pounce"
+#~ msgstr "·¢ÏÖ¶¯¾²¾Í´ò¿ª¼´Ê±ÐÅÏ¢´°¿Ú"
+
+#~ msgid "Send IM on pounce"
+#~ msgstr "·¢ÏÖ¶¯¾²¾Í·¢Ëͼ´Ê±ÐÅÏ¢"
+
+#~ msgid "Message:"
+#~ msgstr "ÏûÏ¢£º"
+
+#~ msgid "Command:"
+#~ msgstr "ÃüÁ"
+
+#~ msgid "Sound:"
+#~ msgstr "ÉùÒô"
+
+#~ msgid "Getting %d bytes from %s"
+#~ msgstr "½ÓÊÕµ½ %d ×Ö½Ú£¬À´Ô´£º %s"
+
+#~ msgid "Logging in %s\n"
+#~ msgstr "ÕýÔÚ³¢ÊԵǼ£º %s\n"
+
+#~ msgid ""
+#~ "Unfortunately, currently Oscar only allows new user registration by going to "
+#~ "http://aim.aol.com/aimnew/Aim/register.adp?promo=106723&pageset=Aim&client=no"
+#~ ". Clicking the Register button will open the URL for you."
+#~ msgstr ""
+#~ "ºÜ²»ÐÒ£¬ÏÖÔÚ°Â˹¿¨Ö»ÔÊÐíͨ¹ý·ÃÎÊ WEB Ò³Ãæ½øÐÐÐÂÓû§×¢²á£¬Äã¿ÉÒÔ¿´¿´ÕâÀ "
+#~ "http://aim.aol.com/aimnew/Aim/register.adp?promo=106723&pageset=Aim&client=no"
+#~ "¡£µ¥»÷¡°×¢²á¡±°´Å¥½øÐÐ×¢²á¡£"
+
+#~ msgid "Plugin Error"
+#~ msgstr "²å¼þ´íÎó"
+
+#~ msgid "Tabbed Window Options"
+#~ msgstr "»îÒ³´°¿ÚÑ¡Ïî"
+
+#~ msgid "Gaim Chat"
+#~ msgstr "Gaim ÁÄÌì"
+
+#~ msgid "Chat Rooms"
+#~ msgstr "ÁÄÌìÊÒ"
+
+#~ msgid "Refresh"
+#~ msgstr "Ë¢ÐÂ"
+
+#~ msgid "List of available chats"
+#~ msgstr "ÏÖÓÐÁÄÌìÁбí"
+
+#~ msgid "List of subscribed chats"
+#~ msgstr "¶©ÔĵÄÁÄÌìÁбí"
+
+#~ msgid "Font Style"
+#~ msgstr "×ÖÌåÑùʽ"
+
+#~ msgid "Underlined Text"
+#~ msgstr "ϼÓÏßÎÄ×Ö"
+
+#~ msgid "Strike Text"
+#~ msgstr "Öл®ÏßÎÄ×Ö"
+
+#~ msgid "Font Color"
+#~ msgstr "×ÖÌåÑÕÉ«"
+
+#~ msgid "Beep instead of playing sound"
+#~ msgstr "ʹÓà PC À®°È£¬²»²¥·ÅÉùÒôÎļþ"
+
+#~ msgid "New User Registration"
+#~ msgstr "ÐÂÓû§×¢²á"
+
+#~ msgid "Register new user for"
+#~ msgstr "×¢²áеÄÓû§"
+
+#~ msgid "Gaim - Select File"
+#~ msgstr "Gaim - Ñ¡ÔñÎļþ"
+
+#~ msgid "Community:"
+#~ msgstr "¹ú"
+
+#~ msgid ""
+#~ "Unfortunately, currently TOC only allows new user registration by going to "
+#~ "http://aim.aol.com/aimnew/Aim/register.adp?promo=106723&pageset=Aim&client=no"
+#~ ". Clicking the Register button will open the URL for you."
+#~ msgstr ""
+#~ "Unfortunately, currently TOC only allows new user registration by going to "
+#~ "http://aim.aol.com/aimnew/Aim/register.adp?promo=106723&pageset=Aim&client=no"
+#~ ". Clicking the Register button will open the URL for you."
+
+#~ msgid "Gaim - Change MSN Name"
+#~ msgstr "Gaim - ¸ü¸Ä MSN Ãû×Ö"
 
 #~ msgid "Ok"
 #~ msgstr "È·¶¨"
 
-#: src/buddy.c:2459
-msgid "Export Buddy List"
-msgstr "µ¼³öÅóÓÑÁбí"
-
-#~ msgid "Error writing file %s"
-#~ msgstr "дÈëÎļþ %s ·¢Éú´íÎó"
-
 #~ msgid "Gaim - Export Buddy List"
 #~ msgstr "Gaim - µ¼³öÅóÓÑÁбí"
 
@@ -2323,10 +3072,6 @@
 #~ msgid "Text Only"
 #~ msgstr "ÎÄ×ÖÑÕÉ«"
 
-#: src/prefs.c:1029
-msgid "Chat Options"
-msgstr "ÁÄÌìÑ¡Ïî"
-
 #~ msgid "Sound Events"
 #~ msgstr "ÉùÒô"
 
@@ -2372,17 +3117,6 @@
 #~ msgid "GetFile Error"
 #~ msgstr "Gaim - ´íÎó %d"
 
-#~ msgid ""
-#~ "Username : <B>%s</B>\n"
-#~ "<BR>Warning Level : <B>%d %%</B>\n"
-#~ "<BR>Online Since : <B>%s</B><BR>Idle Minutes : <B>%d</B>\n"
-#~ "<BR><HR><BR>%s\n"
-#~ msgstr ""
-#~ "Óû§Ãû³Æ£º <B>%s</B>\n"
-#~ "<BR>¾¯¸æ¼¶±ð£º <B>%d %%</B>\n"
-#~ "<BR>Á¬Ïßʱ¿Ì£º <B>%s</B><BR>¿Õתʱ¼ä£¨·ÖÖÓ£©£º <B>%d</B>\n"
-#~ "<BR><HR><BR>%s\n"
-
 #~ msgid "Receiving %s from %s"
 #~ msgstr "ÊÕµ½ %s £¬À´Ô´£º %s"
 
@@ -2419,9 +3153,6 @@
 #~ msgid "g001: Error resolving host\n"
 #~ msgstr "g001: ½âÎöÖ÷»ú´íÎó\n"
 
-#~ msgid "Looking up %s"
-#~ msgstr "Ñ°ÕÒ %s"
-
 #~ msgid "Remember password"
 #~ msgstr "¼ÇסÃÜÂë"
 
@@ -2431,34 +3162,6 @@
 #~ msgid "TOC Host:"
 #~ msgstr "TOC Ö÷»ú£º"
 
-#: src/prefs.c:394
-msgid "Proxy Server"
-msgstr "´úÀí·þÎñÆ÷ÉèÖÃ"
-
-#: src/prefs.c:382
-msgid "Proxy Type"
-msgstr "´úÀí·þÎñÆ÷ÀàÐÍ"
-
-#: src/prefs.c:382
-msgid "No Proxy"
-msgstr "ÎÞ´úÀí·þÎñÆ÷"
-
-#: src/prefs.c:452
-msgid "Host"
-msgstr "Ö÷»úµØÖ·"
-
-#: src/prefs.c:468
-msgid "Port"
-msgstr "¶Ë¿Ú"
-
-#: src/prefs.c:485
-msgid "User"
-msgstr "µÇ¼Óû§"
-
-#: src/prefs.c:501
-msgid "Password"
-msgstr "µÇ¼ÃÜÂë"
-
 #~ msgid "Login Host:"
 #~ msgstr "µÇÈëÖ÷»ú£º"
 
@@ -2486,9 +3189,6 @@
 #~ msgid "Internal HTML Widget (Quite likely a bad idea!)"
 #~ msgstr "ÄÚ²¿³¬Îı¾Îļþ¿Ø¼þ £¨×îºÃ±ðÓã¡£©"
 
-#~ msgid "Connection"
-#~ msgstr "Á¬½Ó"
-
 #~ msgid "Permit/Deny"
 #~ msgstr "Ö»ÔÊÐíijЩÈË"
 
@@ -2516,9 +3216,6 @@
 #~ msgid "No Idle"
 #~ msgstr "ûÓпÕת"
 
-#~ msgid "SOCKS v4 Proxy"
-#~ msgstr "SOCKS v4 ´úÀí"
-
 #~ msgid "SOCKS v5 Proxy (DOES NOT WORK!)"
 #~ msgstr "SOCKS v5 ´úÀí £¨»¹²»ÄÜÓã¡£©"