changeset 13552:ba0147a93c56

[gaim-migrate @ 15930] some updates committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Thu, 23 Mar 2006 16:38:36 +0000
parents 40612ca80643
children e83afa26a42e
files po/POTFILES.in po/de.po po/gl.po po/he.po po/ja.po src/gtkdialogs.c src/win32/nsis/translations/german.nsh
diffstat 7 files changed, 5108 insertions(+), 4614 deletions(-) [+]
line wrap: on
line diff
--- a/po/POTFILES.in	Thu Mar 23 14:20:56 2006 +0000
+++ b/po/POTFILES.in	Thu Mar 23 16:38:36 2006 +0000
@@ -1,3 +1,4 @@
+
 gaim.desktop.in
 plugins/ciphertest.c
 plugins/contact_priority.c
@@ -80,6 +81,7 @@
 src/log.c
 src/plugin.c
 src/protocols/bonjour/bonjour.c
+src/protocols/bonjour/bonjour.h
 src/protocols/bonjour/jabber.c
 src/protocols/gg/gg.c
 src/protocols/irc/cmds.c
@@ -131,6 +133,7 @@
 src/protocols/yahoo/ycht.c
 src/protocols/zephyr/zephyr.c
 src/proxy.c
+src/request.h
 src/savedstatuses.c
 src/server.c
 src/status.c
--- a/po/de.po	Thu Mar 23 14:20:56 2006 +0000
+++ b/po/de.po	Thu Mar 23 16:38:36 2006 +0000
@@ -1,7 +1,8 @@
 # Gaim German translation
 # Copyright (C) 2001, Daniel Seifert <gaim-translation@dseifert.de>
 # Copyright (C) 2002, Karsten Weiss <knweiss@gmx.de>
-# Copyright (C) 2002-2006, Bj旦rn Voigt <bjoern@cs.tu-berlin.de>
+# Copyright (C) 2002-2006, Bj旦rn Voigt <bjoern@cs.tu-berlin.de>,
+#                     Jochen Kemnade <kemnade@gmail.com>      
 #
 # This file is distributed under the same license as the Gaim package.
 #
@@ -9,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: Gaim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-18 19:27+0100\n"
-"PO-Revision-Date: 2006-03-18 20:37+0100\n"
+"POT-Creation-Date: 2006-03-23 10:11+0100\n"
+"PO-Revision-Date: 2006-03-23 08:27+0100\n"
 "Last-Translator: Bj旦rn Voigt <bjoern@cs.tu-berlin.de>\n"
 "Language-Team: de <de@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -195,7 +196,7 @@
 msgid "Right-click for more unread messages...\n"
 msgstr "Rechtsklicken f端r weitere ungelesene Nachrichten...\n"
 
-#: ../plugins/docklet/docklet.c:157 ../src/gtkblist.c:3241
+#: ../plugins/docklet/docklet.c:157 ../src/gtkblist.c:3238
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
@@ -231,7 +232,7 @@
 msgid "Invisible"
 msgstr "Unsichtbar"
 
-#: ../plugins/docklet/docklet.c:447 ../src/gtkblist.c:2971
+#: ../plugins/docklet/docklet.c:447 ../src/gtkblist.c:2968
 #: ../src/gtkstatusbox.c:676 ../src/protocols/jabber/buddy.c:1099
 #: ../src/protocols/novell/novell.c:2857 ../src/protocols/oscar/oscar.c:859
 #: ../src/protocols/oscar/oscar.c:7851 ../src/protocols/yahoo/yahoo.c:2733
@@ -251,7 +252,7 @@
 msgid "Show Buddy List"
 msgstr "Kontaktliste anzeigen"
 
-#: ../plugins/docklet/docklet.c:489 ../src/gtkconv.c:5642
+#: ../plugins/docklet/docklet.c:489 ../src/gtkconv.c:5640
 msgid "Unread Messages"
 msgstr "Ungelesene Nachrichten"
 
@@ -607,10 +608,14 @@
 "dann nach rechts, um zum n辰chsten Gespr辰che zu wechseln."
 
 #. Extract their Name and put it in
+#. Contact Info
+#. Personal
+#. Business
 #: ../plugins/gevolution/add_buddy_dialog.c:131
 #: ../plugins/gevolution/assoc-buddy.c:119 ../src/gtkplugin.c:587
 #: ../src/gtkroomlist.c:604 ../src/protocols/jabber/jabber.c:755
-#: ../src/protocols/msn/msn.c:1534
+#: ../src/protocols/msn/msn.c:1532 ../src/protocols/msn/msn.c:1585
+#: ../src/protocols/msn/msn.c:1606
 msgid "Name"
 msgstr "Name"
 
@@ -634,8 +639,8 @@
 msgstr "Suchen"
 
 #: ../plugins/gevolution/add_buddy_dialog.c:548
-#: ../plugins/gevolution/new_person_dialog.c:306 ../src/gtkblist.c:4615
-#: ../src/gtkblist.c:4979
+#: ../plugins/gevolution/new_person_dialog.c:306 ../src/gtkblist.c:4612
+#: ../src/gtkblist.c:4976
 msgid "Group:"
 msgstr "Gruppe:"
 
@@ -676,7 +681,7 @@
 
 #: ../plugins/gevolution/gevo-util.c:64 ../plugins/gevolution/gevolution.c:96
 #: ../src/blist.c:516 ../src/blist.c:1278 ../src/blist.c:1505
-#: ../src/gtkblist.c:4424 ../src/protocols/jabber/roster.c:65
+#: ../src/gtkblist.c:4421 ../src/protocols/jabber/roster.c:65
 msgid "Buddies"
 msgstr "Buddys"
 
@@ -751,6 +756,7 @@
 msgstr "Kontotyp:"
 
 #: ../plugins/gevolution/new_person_dialog.c:294 ../src/gtkaccount.c:784
+#: ../src/gtkblist.c:4574
 msgid "Screen name:"
 msgstr "Benutzername:"
 
@@ -1157,8 +1163,8 @@
 msgstr "C_hat-Fenster"
 
 #: ../plugins/notify.c:657
-msgid "\t_Only when someone says your nick"
-msgstr "\t_Nur wenn jemand Ihren Namen sagt"
+msgid "\t_Only when someone says your screen name"
+msgstr "\t_Nur wenn jemand Ihren Benutzernamen nennt"
 
 #: ../plugins/notify.c:667
 msgid "_Focused windows"
@@ -1772,7 +1778,7 @@
 msgstr "_Starte Gaim beim Windows-Start"
 
 #. Buddy List
-#: ../plugins/win32/winprefs/winprefs.c:417 ../src/gtkblist.c:3668
+#: ../plugins/win32/winprefs/winprefs.c:417 ../src/gtkblist.c:3665
 msgid "Buddy List"
 msgstr "Kontaktliste"
 
@@ -1837,8 +1843,11 @@
 msgid "Save password"
 msgstr "Passwort speichern"
 
-#: ../src/account.c:968 ../src/account.c:1139 ../src/gtkblist.c:3552
-#: ../src/gtkdialogs.c:588 ../src/gtkdialogs.c:725 ../src/gtkdialogs.c:789
+#. *
+#. * A wrapper for gaim_request_action() that uses @c OK and @c Cancel buttons.
+#.
+#: ../src/account.c:968 ../src/account.c:1139 ../src/gtkblist.c:3549
+#: ../src/gtkdialogs.c:590 ../src/gtkdialogs.c:727 ../src/gtkdialogs.c:791
 #: ../src/gtkrequest.c:269 ../src/protocols/gg/gg.c:497
 #: ../src/protocols/gg/gg.c:638 ../src/protocols/gg/gg.c:774
 #: ../src/protocols/jabber/jabber.c:1319 ../src/protocols/jabber/xdata.c:337
@@ -1852,16 +1861,16 @@
 #: ../src/protocols/silc/chat.c:461 ../src/protocols/silc/chat.c:724
 #: ../src/protocols/silc/ops.c:1297 ../src/protocols/silc/ops.c:1910
 #: ../src/protocols/silc/silc.c:753 ../src/protocols/yahoo/yahoo.c:3063
-#: ../src/protocols/yahoo/yahoo.c:3072
+#: ../src/protocols/yahoo/yahoo.c:3072 ../src/request.h:1344
 msgid "OK"
 msgstr "OK"
 
 #: ../src/account.c:969 ../src/account.c:1140 ../src/account.c:1177
-#: ../src/gtkaccount.c:2171 ../src/gtkaccount.c:2638 ../src/gtkblist.c:5020
-#: ../src/gtkdialogs.c:589 ../src/gtkdialogs.c:726 ../src/gtkdialogs.c:790
-#: ../src/gtkdialogs.c:809 ../src/gtkdialogs.c:831 ../src/gtkdialogs.c:851
-#: ../src/gtkdialogs.c:895 ../src/gtkdialogs.c:950 ../src/gtkdialogs.c:987
-#: ../src/gtkdialogs.c:1012 ../src/gtkimhtmltoolbar.c:419
+#: ../src/gtkaccount.c:2171 ../src/gtkaccount.c:2638 ../src/gtkblist.c:5017
+#: ../src/gtkdialogs.c:591 ../src/gtkdialogs.c:728 ../src/gtkdialogs.c:792
+#: ../src/gtkdialogs.c:811 ../src/gtkdialogs.c:833 ../src/gtkdialogs.c:853
+#: ../src/gtkdialogs.c:897 ../src/gtkdialogs.c:952 ../src/gtkdialogs.c:989
+#: ../src/gtkdialogs.c:1014 ../src/gtkimhtmltoolbar.c:419
 #: ../src/gtkplugin.c:296 ../src/gtkpounce.c:1095 ../src/gtkprivacy.c:568
 #: ../src/gtkprivacy.c:581 ../src/gtkprivacy.c:606 ../src/gtkprivacy.c:617
 #: ../src/gtkrequest.c:270 ../src/gtksavedstatuses.c:296
@@ -1889,7 +1898,8 @@
 #: ../src/protocols/silc/chat.c:596 ../src/protocols/silc/chat.c:725
 #: ../src/protocols/silc/ops.c:1911 ../src/protocols/silc/silc.c:754
 #: ../src/protocols/silc/silc.c:959 ../src/protocols/yahoo/yahoo.c:3064
-#: ../src/protocols/yahoo/yahoo.c:3073
+#: ../src/protocols/yahoo/yahoo.c:3073 ../src/request.h:1344
+#: ../src/request.h:1354
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -1898,8 +1908,8 @@
 msgid "Missing protocol plugin for %s"
 msgstr "Fehlendes Protokoll-Plugin f端r %s"
 
-#: ../src/account.c:996 ../src/connection.c:99 ../src/gtkblist.c:3544
-#: ../src/gtkblist.c:3550
+#: ../src/account.c:996 ../src/connection.c:99 ../src/gtkblist.c:3541
+#: ../src/gtkblist.c:3547
 msgid "Connection Error"
 msgstr "Verbindungsfehler"
 
@@ -2193,7 +2203,7 @@
 msgid "Password:"
 msgstr "Passwort:"
 
-#: ../src/gtkaccount.c:863 ../src/gtkblist.c:4598 ../src/gtkblist.c:4964
+#: ../src/gtkaccount.c:863 ../src/gtkblist.c:4595 ../src/gtkblist.c:4961
 msgid "Alias:"
 msgstr "Alias:"
 
@@ -2208,7 +2218,7 @@
 
 #: ../src/gtkaccount.c:932
 msgid "New mail notifications"
-msgstr "Neue Mailbenachrichtigungen"
+msgstr "Benachrichtigung 端ber neue Mails"
 
 #: ../src/gtkaccount.c:941
 msgid "Buddy icon:"
@@ -2280,7 +2290,7 @@
 msgid "Add Account"
 msgstr "Konto hinzuf端gen"
 
-#: ../src/gtkaccount.c:1738 ../src/gtkblist.c:3553
+#: ../src/gtkaccount.c:1738 ../src/gtkblist.c:3550
 msgid "Modify Account"
 msgstr "Konto bearbeiten"
 
@@ -2325,7 +2335,7 @@
 msgid "Add buddy to your list?"
 msgstr "Benutzer zu Ihrer Kontaktliste hinzuf端gen?"
 
-#: ../src/gtkaccount.c:2637 ../src/gtkblist.c:5019 ../src/gtkconv.c:1625
+#: ../src/gtkaccount.c:2637 ../src/gtkblist.c:5016 ../src/gtkconv.c:1625
 #: ../src/gtkrequest.c:274 ../src/protocols/gg/gg.c:853
 #: ../src/protocols/oscar/oscar.c:4877
 #: ../src/protocols/sametime/sametime.c:5408 ../src/protocols/silc/chat.c:595
@@ -2419,12 +2429,12 @@
 msgid "_Expand"
 msgstr "A_usklappen"
 
-#: ../src/gtkblist.c:1381 ../src/gtkblist.c:1393 ../src/gtkblist.c:3813
-#: ../src/gtkblist.c:3823
+#: ../src/gtkblist.c:1381 ../src/gtkblist.c:1393 ../src/gtkblist.c:3810
+#: ../src/gtkblist.c:3820
 msgid "/Tools/Mute Sounds"
 msgstr "/Werkzeuge/Stummschalten"
 
-#: ../src/gtkblist.c:1856 ../src/gtkconv.c:4209 ../src/gtkpounce.c:426
+#: ../src/gtkblist.c:1853 ../src/gtkconv.c:4209 ../src/gtkpounce.c:426
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
@@ -2432,126 +2442,126 @@
 "kann, um diesen Buddy hinzuzuf端gen."
 
 #. Buddies menu
-#: ../src/gtkblist.c:2430
+#: ../src/gtkblist.c:2427
 msgid "/_Buddies"
 msgstr "/_Buddys"
 
+#: ../src/gtkblist.c:2428
+msgid "/Buddies/New Instant _Message..."
+msgstr "/Buddys/_Neue Nachricht..."
+
+#: ../src/gtkblist.c:2429
+msgid "/Buddies/Join a _Chat..."
+msgstr "/Buddys/Einen _Chat betreten..."
+
+#: ../src/gtkblist.c:2430
+msgid "/Buddies/Get User _Info..."
+msgstr "/Buddys/B_enutzer-Info abrufen..."
+
 #: ../src/gtkblist.c:2431
-msgid "/Buddies/New Instant _Message..."
-msgstr "/Buddys/_Neue Nachricht..."
-
-#: ../src/gtkblist.c:2432
-msgid "/Buddies/Join a _Chat..."
-msgstr "/Buddys/Einen _Chat betreten..."
+msgid "/Buddies/View User _Log..."
+msgstr "/Buddys/Benutzer-_Mitschnitt ansehen..."
 
 #: ../src/gtkblist.c:2433
-msgid "/Buddies/Get User _Info..."
-msgstr "/Buddys/B_enutzer-Info abrufen..."
+msgid "/Buddies/Show _Offline Buddies"
+msgstr "/Buddys/Zeige _offline Buddys"
 
 #: ../src/gtkblist.c:2434
-msgid "/Buddies/View User _Log..."
-msgstr "/Buddys/Benutzer-_Mitschnitt ansehen..."
-
-#: ../src/gtkblist.c:2436
-msgid "/Buddies/Show _Offline Buddies"
-msgstr "/Buddys/Zeige _offline Buddys"
-
-#: ../src/gtkblist.c:2437
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Buddys/Zeige _leere Gruppen"
 
-#: ../src/gtkblist.c:2438
+#: ../src/gtkblist.c:2435
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/Buddys/Zeige Buddy-_Details"
 
-#: ../src/gtkblist.c:2439
+#: ../src/gtkblist.c:2436
 msgid "/Buddies/Show Idle _Times"
 msgstr "/Buddys/Zeige Unt辰tigkeitszei_ten"
 
-#: ../src/gtkblist.c:2440
+#: ../src/gtkblist.c:2437
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Buddys/Buddys _sortieren"
 
-#: ../src/gtkblist.c:2442
+#: ../src/gtkblist.c:2439
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Buddys/B_uddy hinzuf端gen..."
 
-#: ../src/gtkblist.c:2443
+#: ../src/gtkblist.c:2440
 msgid "/Buddies/Add C_hat..."
 msgstr "/Buddys/C_hat hinzuf端gen..."
 
-#: ../src/gtkblist.c:2444
+#: ../src/gtkblist.c:2441
 msgid "/Buddies/Add _Group..."
 msgstr "/Buddys/_Gruppe hinzuf端gen..."
 
-#: ../src/gtkblist.c:2446
+#: ../src/gtkblist.c:2443
 msgid "/Buddies/_Quit"
 msgstr "/Buddys/_Beenden"
 
 #. Accounts menu
-#: ../src/gtkblist.c:2449
+#: ../src/gtkblist.c:2446
 msgid "/_Accounts"
 msgstr "/_Konten"
 
-#: ../src/gtkblist.c:2450 ../src/gtkblist.c:5598
+#: ../src/gtkblist.c:2447 ../src/gtkblist.c:5595
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Konten/Hinzuf端gen\\/�ndern"
 
 #. Tools
-#: ../src/gtkblist.c:2453
+#: ../src/gtkblist.c:2450
 msgid "/_Tools"
 msgstr "/_Werkzeuge"
 
-#: ../src/gtkblist.c:2454
+#: ../src/gtkblist.c:2451
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Werkzeuge/Buddy-_Alarm"
 
-#: ../src/gtkblist.c:2455
+#: ../src/gtkblist.c:2452
 msgid "/Tools/Plu_gins"
 msgstr "/Werkzeuge/Plu_gins"
 
-#: ../src/gtkblist.c:2456
+#: ../src/gtkblist.c:2453
 msgid "/Tools/Pr_eferences"
 msgstr "/Werkzeuge/_Einstellungen"
 
+#: ../src/gtkblist.c:2454
+msgid "/Tools/Pr_ivacy"
+msgstr "/Werkzeuge/Pri_vatsph辰re"
+
+#: ../src/gtkblist.c:2456
+msgid "/Tools/_File Transfers"
+msgstr "/Werkzeuge/_Datei端bertragungen"
+
 #: ../src/gtkblist.c:2457
-msgid "/Tools/Pr_ivacy"
-msgstr "/Werkzeuge/Pri_vatsph辰re"
-
-#: ../src/gtkblist.c:2459
-msgid "/Tools/_File Transfers"
-msgstr "/Werkzeuge/_Datei端bertragungen"
+msgid "/Tools/R_oom List"
+msgstr "/Werkzeuge/_Raumliste"
+
+#: ../src/gtkblist.c:2458
+msgid "/Tools/System _Log"
+msgstr "/Werkzeuge/_System-Mitschnitt"
 
 #: ../src/gtkblist.c:2460
-msgid "/Tools/R_oom List"
-msgstr "/Werkzeuge/_Raumliste"
-
-#: ../src/gtkblist.c:2461
-msgid "/Tools/System _Log"
-msgstr "/Werkzeuge/_System-Mitschnitt"
-
-#: ../src/gtkblist.c:2463
 msgid "/Tools/Mute _Sounds"
 msgstr "/Werkzeuge/_Stummschalten"
 
 #. Help
-#: ../src/gtkblist.c:2466
+#: ../src/gtkblist.c:2463
 msgid "/_Help"
 msgstr "/_Hilfe"
 
-#: ../src/gtkblist.c:2467
+#: ../src/gtkblist.c:2464
 msgid "/Help/Online _Help"
 msgstr "/Hilfe/Online-_Hilfe"
 
-#: ../src/gtkblist.c:2468
+#: ../src/gtkblist.c:2465
 msgid "/Help/_Debug Window"
 msgstr "/Hilfe/_Debug-Fenster"
 
-#: ../src/gtkblist.c:2469
+#: ../src/gtkblist.c:2466
 msgid "/Help/_About"
 msgstr "/Hilfe/I_nfo"
 
-#: ../src/gtkblist.c:2501 ../src/gtkblist.c:2570
+#: ../src/gtkblist.c:2498 ../src/gtkblist.c:2567
 #, c-format
 msgid ""
 "\n"
@@ -2560,7 +2570,7 @@
 "\n"
 "<b>Konto:</b> %s"
 
-#: ../src/gtkblist.c:2582
+#: ../src/gtkblist.c:2579
 #, c-format
 msgid ""
 "\n"
@@ -2569,7 +2579,7 @@
 "\n"
 "<b>Buddy-Alias:</b> %s"
 
-#: ../src/gtkblist.c:2594
+#: ../src/gtkblist.c:2591
 #, c-format
 msgid ""
 "\n"
@@ -2578,7 +2588,7 @@
 "\n"
 "<b>Spitzname:</b> %s"
 
-#: ../src/gtkblist.c:2603
+#: ../src/gtkblist.c:2600
 #, c-format
 msgid ""
 "\n"
@@ -2587,7 +2597,7 @@
 "\n"
 "<b>Angemeldet:</b> %s"
 
-#: ../src/gtkblist.c:2614
+#: ../src/gtkblist.c:2611
 #, c-format
 msgid ""
 "\n"
@@ -2596,7 +2606,7 @@
 "\n"
 "<b>Unt辰tig:</b> %s"
 
-#: ../src/gtkblist.c:2649
+#: ../src/gtkblist.c:2646
 #, c-format
 msgid ""
 "\n"
@@ -2605,7 +2615,7 @@
 "\n"
 "<b>Zuletzt gesehen:</b> vor %s"
 
-#: ../src/gtkblist.c:2658
+#: ../src/gtkblist.c:2655
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2613,7 +2623,7 @@
 "\n"
 "<b>Status:</b> Offline"
 
-#: ../src/gtkblist.c:2669
+#: ../src/gtkblist.c:2666
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2621,7 +2631,7 @@
 "\n"
 "<b>Beschreibung:</b> Spooky"
 
-#: ../src/gtkblist.c:2671
+#: ../src/gtkblist.c:2668
 msgid ""
 "\n"
 "<b>Status:</b> Awesome"
@@ -2629,7 +2639,7 @@
 "\n"
 "<b>Status:</b> gro�artig"
 
-#: ../src/gtkblist.c:2673
+#: ../src/gtkblist.c:2670
 msgid ""
 "\n"
 "<b>Status:</b> Rockin'"
@@ -2637,18 +2647,18 @@
 "\n"
 "<b>Status:</b> Rockin'"
 
-#: ../src/gtkblist.c:2962
+#: ../src/gtkblist.c:2959
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Unt辰tig %dh %02dm"
 
-#: ../src/gtkblist.c:2964
+#: ../src/gtkblist.c:2961
 #, c-format
 msgid "Idle %dm"
 msgstr "Unt辰tig %dm"
 
 #. Idle stuff
-#: ../src/gtkblist.c:2967 ../src/gtkprefs.c:1745
+#: ../src/gtkblist.c:2964 ../src/gtkprefs.c:1745
 #: ../src/protocols/bonjour/bonjour.c:333 ../src/protocols/msn/msn.c:552
 #: ../src/protocols/msn/state.c:32 ../src/protocols/novell/novell.c:2854
 #: ../src/protocols/oscar/oscar.c:5273 ../src/protocols/yahoo/yahoo.c:2731
@@ -2656,106 +2666,106 @@
 msgid "Idle"
 msgstr "Unt辰tig"
 
-#: ../src/gtkblist.c:3099
+#: ../src/gtkblist.c:3096
 msgid "/Buddies/New Instant Message..."
 msgstr "/Buddys/_Neue Nachricht..."
 
-#: ../src/gtkblist.c:3100 ../src/gtkblist.c:3133
+#: ../src/gtkblist.c:3097 ../src/gtkblist.c:3130
 msgid "/Buddies/Join a Chat..."
 msgstr "/Buddys/Chat betreten..."
 
-#: ../src/gtkblist.c:3101
+#: ../src/gtkblist.c:3098
 msgid "/Buddies/Get User Info..."
 msgstr "/Buddys/B_enutzer-Info abrufen..."
 
-#: ../src/gtkblist.c:3102
+#: ../src/gtkblist.c:3099
 msgid "/Buddies/Add Buddy..."
 msgstr "/Buddys/B_uddy hinzuf端gen..."
 
-#: ../src/gtkblist.c:3103 ../src/gtkblist.c:3136
+#: ../src/gtkblist.c:3100 ../src/gtkblist.c:3133
 msgid "/Buddies/Add Chat..."
 msgstr "/Buddys/C_hat hinzuf端gen..."
 
-#: ../src/gtkblist.c:3104
+#: ../src/gtkblist.c:3101
 msgid "/Buddies/Add Group..."
 msgstr "/Buddys/Gruppe hinzuf端gen..."
 
-#: ../src/gtkblist.c:3139
+#: ../src/gtkblist.c:3136
 msgid "/Tools/Buddy Pounces"
 msgstr "/Werkzeuge/Buddy-Alarm"
 
-#: ../src/gtkblist.c:3142
+#: ../src/gtkblist.c:3139
 msgid "/Tools/Privacy"
 msgstr "/Werkzeuge/Privatsph辰re"
 
-#: ../src/gtkblist.c:3145
+#: ../src/gtkblist.c:3142
 msgid "/Tools/Room List"
 msgstr "/Werkzeuge/Raumliste"
 
-#: ../src/gtkblist.c:3339
+#: ../src/gtkblist.c:3336
 msgid "Manually"
 msgstr "Manuell"
 
-#: ../src/gtkblist.c:3341
+#: ../src/gtkblist.c:3338
 msgid "Alphabetically"
 msgstr "Alphabetisch"
 
-#: ../src/gtkblist.c:3342
+#: ../src/gtkblist.c:3339
 msgid "By status"
 msgstr "Nach Status"
 
-#: ../src/gtkblist.c:3343
+#: ../src/gtkblist.c:3340
 msgid "By log size"
 msgstr "Nach Gr旦�e der Logs"
 
-#: ../src/gtkblist.c:3538 ../src/gtkconn.c:196
+#: ../src/gtkblist.c:3535 ../src/gtkconn.c:196
 #, c-format
 msgid "%s disconnected"
 msgstr "%s abgemeldet"
 
-#: ../src/gtkblist.c:3554 ../src/protocols/sametime/sametime.c:3630
+#: ../src/gtkblist.c:3551 ../src/protocols/sametime/sametime.c:3630
 msgid "Connect"
 msgstr "Verbinden"
 
-#: ../src/gtkblist.c:3554 ../src/gtkblist.c:5697
-msgid "Enable Account"
-msgstr "Konten aktivieren"
-
-#: ../src/gtkblist.c:3575
+#: ../src/gtkblist.c:3551
+msgid "Re-enable Account"
+msgstr "Konten reaktivieren"
+
+#: ../src/gtkblist.c:3572
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s abgemeldet: %s</span>"
 
-#: ../src/gtkblist.c:3702
+#: ../src/gtkblist.c:3699
 msgid "/Accounts"
 msgstr "/Konten"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../src/gtkblist.c:3807
+#: ../src/gtkblist.c:3804
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Buddys/Zeige Offline Buddys"
 
-#: ../src/gtkblist.c:3810
+#: ../src/gtkblist.c:3807
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Buddys/Zeige leere Gruppen"
 
+#: ../src/gtkblist.c:3813
+msgid "/Buddies/Show Buddy Details"
+msgstr "/Buddys/Zeige Buddy-Details"
+
 #: ../src/gtkblist.c:3816
-msgid "/Buddies/Show Buddy Details"
-msgstr "/Buddys/Zeige Buddy-Details"
-
-#: ../src/gtkblist.c:3819
 msgid "/Buddies/Show Idle Times"
 msgstr "/Buddys/Zeige Unt辰tigkeitszeiten"
 
-#: ../src/gtkblist.c:4531 ../src/protocols/silc/buddy.c:736
+#: ../src/gtkblist.c:4528 ../src/protocols/silc/buddy.c:736
 #: ../src/protocols/silc/buddy.c:1030 ../src/protocols/silc/buddy.c:1075
 #: ../src/protocols/silc/buddy.c:1174 ../src/protocols/yahoo/yahoo.c:2978
 msgid "Add Buddy"
 msgstr "Buddy hinzuf端gen"
 
-#: ../src/gtkblist.c:4555
+#: ../src/gtkblist.c:4552
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
@@ -2766,30 +2776,26 @@
 "Buddy eingeben. Der Alias wird anstelle des Benutzernamens ausgegeben,  wann "
 "immer es m旦glich ist.\n"
 
-#: ../src/gtkblist.c:4577
-msgid "Screen Name:"
-msgstr "Benutzername:"
-
 #. Set up stuff for the account box
-#: ../src/gtkblist.c:4625 ../src/gtkblist.c:4944
+#: ../src/gtkblist.c:4622 ../src/gtkblist.c:4941
 msgid "Account:"
 msgstr "Konto:"
 
-#: ../src/gtkblist.c:4877
+#: ../src/gtkblist.c:4874
 msgid "This protocol does not support chat rooms."
 msgstr "Dieses Protokoll unterst端tzt keine Chatr辰ume."
 
-#: ../src/gtkblist.c:4893
+#: ../src/gtkblist.c:4890
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "Sie sind derzeit mit keinem Chat-f辰higen Protokoll angemeldet."
 
-#: ../src/gtkblist.c:4910
+#: ../src/gtkblist.c:4907
 msgid "Add Chat"
 msgstr "Chat hinzuf端gen"
 
-#: ../src/gtkblist.c:4934
+#: ../src/gtkblist.c:4931
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2797,32 +2803,36 @@
 "Bitte geben Sie einen Alias und geeignete Informationen 端ber den Chat ein, "
 "den Sie in Ihre Kontaktliste aufnehmen wollen.\n"
 
-#: ../src/gtkblist.c:5016 ../src/protocols/sametime/sametime.c:5319
+#: ../src/gtkblist.c:5013 ../src/protocols/sametime/sametime.c:5319
 #: ../src/protocols/sametime/sametime.c:5406
 msgid "Add Group"
 msgstr "Gruppe hinzuf端gen"
 
-#: ../src/gtkblist.c:5017
+#: ../src/gtkblist.c:5014
 msgid "Please enter the name of the group to be added."
 msgstr "Bitte geben Sie den Namen der Gruppe ein, die hinzugef端gt werden soll."
 
-#: ../src/gtkblist.c:5638
+#: ../src/gtkblist.c:5635
 msgid "_Edit Account"
 msgstr "Konto _bearbeiten"
 
-#: ../src/gtkblist.c:5671 ../src/gtkblist.c:5677
+#: ../src/gtkblist.c:5668 ../src/gtkblist.c:5674
 msgid "No actions available"
 msgstr "Keine Aktionen verf端gbar"
 
-#: ../src/gtkblist.c:5685
+#: ../src/gtkblist.c:5682
 msgid "_Disable"
 msgstr "_Deaktivieren"
 
-#: ../src/gtkblist.c:5750
+#: ../src/gtkblist.c:5694
+msgid "Enable Account"
+msgstr "Konten aktivieren"
+
+#: ../src/gtkblist.c:5747
 msgid "/Tools"
 msgstr "/Werkzeuge"
 
-#: ../src/gtkblist.c:5836
+#: ../src/gtkblist.c:5833
 msgid "/Buddies/Sort Buddies"
 msgstr "/Buddys/Buddys _sortieren"
 
@@ -3202,11 +3212,19 @@
 msgid "Typing"
 msgstr "Tippt gerade"
 
-#: ../src/gtkconv.c:5647 ../src/gtkprefs.c:1678
-msgid "Event"
-msgstr "Ereignis"
-
-#: ../src/gtkconv.c:6549
+#: ../src/gtkconv.c:5630
+msgid "Stopped Typing"
+msgstr "Tippen gestoppt"
+
+#: ../src/gtkconv.c:5635
+msgid "Nick Said"
+msgstr "Spitzname gesagt"
+
+#: ../src/gtkconv.c:5645
+msgid "New Event"
+msgstr "Neue Ereignisse"
+
+#: ../src/gtkconv.c:6547
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -3214,13 +3232,13 @@
 "say &lt;Nachricht&gt;:  Sendet eine Nachricht genau so, als wenn Sie die "
 "Nachricht ohne ein Kommando absenden."
 
-#: ../src/gtkconv.c:6552
+#: ../src/gtkconv.c:6550
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;Aktion&gt;:  Sende eine IRC-辰hnliche Aktion an einen Buddy oder einen "
 "Chat."
 
-#: ../src/gtkconv.c:6555
+#: ../src/gtkconv.c:6553
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -3228,60 +3246,60 @@
 "debug &lt;Option&gt;:  Verschiedene Debugging-Informationen zur aktuellen "
 "Unterhaltung senden."
 
-#: ../src/gtkconv.c:6558
+#: ../src/gtkconv.c:6556
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Leert das Gespr辰chsfenster."
 
-#: ../src/gtkconv.c:6561
+#: ../src/gtkconv.c:6559
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;Kommando&gt;:  Hilfe zu einem bestimmten Kommando."
 
-#: ../src/gtkconv.c:6720
+#: ../src/gtkconv.c:6718
 msgid "Confirm close"
 msgstr "Schlie�en best辰tigen"
 
-#: ../src/gtkconv.c:6752
+#: ../src/gtkconv.c:6750
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr ""
 "Sie haben ungelesene Nachrichten. Wollen Sie das Fenster wirklich schlie�en?"
 
-#: ../src/gtkconv.c:7274
+#: ../src/gtkconv.c:7272
 msgid "Close other tabs"
 msgstr "Andere Reiter schlie�en"
 
-#: ../src/gtkconv.c:7280
+#: ../src/gtkconv.c:7278
 msgid "Close all tabs"
 msgstr "Alle Reiter schlie�en"
 
-#: ../src/gtkconv.c:7288
+#: ../src/gtkconv.c:7286
 msgid "Detach this tab"
 msgstr "Diesen Reiter abl旦sen"
 
-#: ../src/gtkconv.c:7294
+#: ../src/gtkconv.c:7292
 msgid "Close this tab"
 msgstr "Diesen Reiter schlie�en"
 
-#: ../src/gtkconv.c:7556
+#: ../src/gtkconv.c:7554
 msgid "Close conversation"
 msgstr "Unterhaltung schlie�en"
 
-#: ../src/gtkconv.c:8020
+#: ../src/gtkconv.c:8018
 msgid "Last created window"
 msgstr "Letztes erstelltes Fenster"
 
-#: ../src/gtkconv.c:8022
+#: ../src/gtkconv.c:8020
 msgid "Separate IM and Chat windows"
 msgstr "Getrennte IM- und Chat-Fenster"
 
-#: ../src/gtkconv.c:8024 ../src/gtkprefs.c:1243
+#: ../src/gtkconv.c:8022 ../src/gtkprefs.c:1243
 msgid "New window"
 msgstr "Neues Fenster"
 
+#: ../src/gtkconv.c:8024
+msgid "By group"
+msgstr "Nach Gruppe"
+
 #: ../src/gtkconv.c:8026
-msgid "By group"
-msgstr "Nach Gruppe"
-
-#: ../src/gtkconv.c:8028
 msgid "By account"
 msgstr "Nach Konto"
 
@@ -3365,7 +3383,7 @@
 msgid "original author"
 msgstr "Originalautor"
 
-#: ../src/gtkdialogs.c:109 ../src/gtkdialogs.c:110 ../src/gtkdialogs.c:164
+#: ../src/gtkdialogs.c:109 ../src/gtkdialogs.c:110 ../src/gtkdialogs.c:166
 msgid "Bulgarian"
 msgstr "Bulgarisch"
 
@@ -3377,182 +3395,182 @@
 msgid "Bosnian"
 msgstr "Bosnisch"
 
-#: ../src/gtkdialogs.c:114 ../src/gtkdialogs.c:165 ../src/gtkdialogs.c:166
+#: ../src/gtkdialogs.c:114 ../src/gtkdialogs.c:167 ../src/gtkdialogs.c:168
 msgid "Catalan"
 msgstr "Katalanisch"
 
-#: ../src/gtkdialogs.c:115 ../src/gtkdialogs.c:167
+#: ../src/gtkdialogs.c:115
+msgid "Valencian"
+msgstr "Valencianisch"
+
+#: ../src/gtkdialogs.c:116 ../src/gtkdialogs.c:169
 msgid "Czech"
 msgstr "Tschechisch"
 
-#: ../src/gtkdialogs.c:116
+#: ../src/gtkdialogs.c:117
 msgid "Danish"
 msgstr "D辰nisch"
 
-#: ../src/gtkdialogs.c:117 ../src/gtkdialogs.c:168
+#: ../src/gtkdialogs.c:118 ../src/gtkdialogs.c:119 ../src/gtkdialogs.c:170
 msgid "German"
 msgstr "Deutsch"
 
-#: ../src/gtkdialogs.c:118 ../src/gtkdialogs.c:119
+#: ../src/gtkdialogs.c:120 ../src/gtkdialogs.c:121
 msgid "Greek"
 msgstr "Griechisch"
 
-#: ../src/gtkdialogs.c:120
+#: ../src/gtkdialogs.c:122
 msgid "Australian English"
 msgstr "Australisches Englisch"
 
-#: ../src/gtkdialogs.c:121
+#: ../src/gtkdialogs.c:123
 msgid "Canadian English"
 msgstr "Kanadisches Englisch"
 
-#: ../src/gtkdialogs.c:122
+#: ../src/gtkdialogs.c:124
 msgid "British English"
 msgstr "Britisches Englisch"
 
-#: ../src/gtkdialogs.c:123 ../src/gtkdialogs.c:169 ../src/gtkdialogs.c:170
-#: ../src/gtkdialogs.c:171 ../src/gtkdialogs.c:172
+#: ../src/gtkdialogs.c:125 ../src/gtkdialogs.c:171 ../src/gtkdialogs.c:172
+#: ../src/gtkdialogs.c:173 ../src/gtkdialogs.c:174
 msgid "Spanish"
 msgstr "Spanisch"
 
-#: ../src/gtkdialogs.c:124 ../src/gtkdialogs.c:125
+#: ../src/gtkdialogs.c:126 ../src/gtkdialogs.c:127
 msgid "Persian"
 msgstr "Persisch"
 
-#: ../src/gtkdialogs.c:126 ../src/gtkdialogs.c:173 ../src/gtkdialogs.c:174
+#: ../src/gtkdialogs.c:128 ../src/gtkdialogs.c:175 ../src/gtkdialogs.c:176
 msgid "Finnish"
 msgstr "Finnisch"
 
-#: ../src/gtkdialogs.c:127 ../src/gtkdialogs.c:175 ../src/gtkdialogs.c:176
-#: ../src/gtkdialogs.c:177 ../src/gtkdialogs.c:178
+#: ../src/gtkdialogs.c:129 ../src/gtkdialogs.c:177 ../src/gtkdialogs.c:178
+#: ../src/gtkdialogs.c:179 ../src/gtkdialogs.c:180
 msgid "French"
 msgstr "Franz旦sisch"
 
-#: ../src/gtkdialogs.c:128
+#: ../src/gtkdialogs.c:130
 msgid "Hebrew"
 msgstr "Hebr辰isch"
 
-#: ../src/gtkdialogs.c:129
+#: ../src/gtkdialogs.c:131
 msgid "Hindi"
 msgstr "Hindi"
 
-#: ../src/gtkdialogs.c:130
+#: ../src/gtkdialogs.c:132
 msgid "Hungarian"
 msgstr "Ungarisch"
 
-#: ../src/gtkdialogs.c:131 ../src/gtkdialogs.c:179
+#: ../src/gtkdialogs.c:133 ../src/gtkdialogs.c:181
 msgid "Italian"
 msgstr "Italienisch"
 
-#: ../src/gtkdialogs.c:132 ../src/gtkdialogs.c:180 ../src/gtkdialogs.c:181
-#: ../src/gtkdialogs.c:182
+#: ../src/gtkdialogs.c:134 ../src/gtkdialogs.c:182 ../src/gtkdialogs.c:183
+#: ../src/gtkdialogs.c:184
 msgid "Japanese"
 msgstr "Japanisch"
 
-#: ../src/gtkdialogs.c:133 ../src/gtkdialogs.c:183
+#: ../src/gtkdialogs.c:135 ../src/gtkdialogs.c:185
 msgid "Georgian"
 msgstr "Georgisch"
 
-#: ../src/gtkdialogs.c:134 ../src/gtkdialogs.c:184
+#: ../src/gtkdialogs.c:136 ../src/gtkdialogs.c:186
 msgid "Korean"
 msgstr "Koreanisch"
 
-#: ../src/gtkdialogs.c:135
+#: ../src/gtkdialogs.c:137 ../src/gtkdialogs.c:138
 msgid "Kurdish"
 msgstr "Kurdisch"
 
-#: ../src/gtkdialogs.c:136 ../src/gtkdialogs.c:185 ../src/gtkdialogs.c:186
+#: ../src/gtkdialogs.c:139 ../src/gtkdialogs.c:187 ../src/gtkdialogs.c:188
 msgid "Lithuanian"
 msgstr "Litauisch"
 
-#: ../src/gtkdialogs.c:137
+#: ../src/gtkdialogs.c:140
 msgid "Macedonian"
 msgstr "Makedonisch"
 
-#: ../src/gtkdialogs.c:138
+#: ../src/gtkdialogs.c:141
 msgid "Dutch, Flemish"
 msgstr "Niederl辰ndisch, Fl辰misch"
 
-#: ../src/gtkdialogs.c:139
+#: ../src/gtkdialogs.c:142
 msgid "Norwegian"
 msgstr "Norwegisch"
 
-#: ../src/gtkdialogs.c:140 ../src/gtkdialogs.c:141 ../src/gtkdialogs.c:187
+#: ../src/gtkdialogs.c:143 ../src/gtkdialogs.c:144 ../src/gtkdialogs.c:189
 msgid "Polish"
 msgstr "Polnisch"
 
-#: ../src/gtkdialogs.c:142
+#: ../src/gtkdialogs.c:145
 msgid "Portuguese"
 msgstr "Portugiesisch"
 
-#: ../src/gtkdialogs.c:143
+#: ../src/gtkdialogs.c:146
 msgid "Portuguese-Brazil"
 msgstr "Portugiesisch (Brasilien)"
 
-#: ../src/gtkdialogs.c:144
+#: ../src/gtkdialogs.c:147
 msgid "Romanian"
 msgstr "Rum辰nisch"
 
-#: ../src/gtkdialogs.c:145 ../src/gtkdialogs.c:188 ../src/gtkdialogs.c:189
+#: ../src/gtkdialogs.c:148 ../src/gtkdialogs.c:190 ../src/gtkdialogs.c:191
 msgid "Russian"
 msgstr "Russisch"
 
-#: ../src/gtkdialogs.c:146 ../src/gtkdialogs.c:147
+#: ../src/gtkdialogs.c:149 ../src/gtkdialogs.c:150
 msgid "Serbian"
 msgstr "Serbisch"
 
-#: ../src/gtkdialogs.c:148
+#: ../src/gtkdialogs.c:151
 msgid "Slovenian"
 msgstr "Slowenisch"
 
-#: ../src/gtkdialogs.c:149 ../src/gtkdialogs.c:191
+#: ../src/gtkdialogs.c:152 ../src/gtkdialogs.c:193
 msgid "Swedish"
 msgstr "Schwedisch"
 
-#: ../src/gtkdialogs.c:150
+#: ../src/gtkdialogs.c:153
 msgid "Tamil"
 msgstr "Tamil"
 
-#: ../src/gtkdialogs.c:151
+#: ../src/gtkdialogs.c:154
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../src/gtkdialogs.c:152
+#: ../src/gtkdialogs.c:155
 msgid "Turkish"
 msgstr "T端rkisch"
 
-#: ../src/gtkdialogs.c:153
-msgid "Valencian"
-msgstr "Valencianisch"
-
-#: ../src/gtkdialogs.c:154
+#: ../src/gtkdialogs.c:156
 msgid "Vietnamese"
 msgstr "Vietnamesisch"
 
-#: ../src/gtkdialogs.c:154
+#: ../src/gtkdialogs.c:156
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh und das Gnome-Vi Team"
 
-#: ../src/gtkdialogs.c:155 ../src/gtkdialogs.c:192
+#: ../src/gtkdialogs.c:157 ../src/gtkdialogs.c:194
 msgid "Simplified Chinese"
 msgstr "Vereinfachtes Chinesisch"
 
-#: ../src/gtkdialogs.c:156 ../src/gtkdialogs.c:157 ../src/gtkdialogs.c:193
+#: ../src/gtkdialogs.c:158 ../src/gtkdialogs.c:159 ../src/gtkdialogs.c:195
 msgid "Traditional Chinese"
 msgstr "Traditionelles Chinesisch"
 
-#: ../src/gtkdialogs.c:163
+#: ../src/gtkdialogs.c:165
 msgid "Amharic"
 msgstr "Amharisch"
 
-#: ../src/gtkdialogs.c:190
+#: ../src/gtkdialogs.c:192
 msgid "Slovak"
 msgstr "Slowakisch"
 
-#: ../src/gtkdialogs.c:234
+#: ../src/gtkdialogs.c:236
 msgid "About Gaim"
 msgstr "�ber Gaim"
 
-#: ../src/gtkdialogs.c:258
+#: ../src/gtkdialogs.c:260
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, "
@@ -3573,61 +3591,61 @@
 "Liste der Entwickler. Wir 端bernehmen keine Haftung f端r dieses Programm."
 "<BR><BR>"
 
-#: ../src/gtkdialogs.c:272
+#: ../src/gtkdialogs.c:274
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #wingaim auf irc.freenode.net<BR><BR>"
 
-#: ../src/gtkdialogs.c:275
+#: ../src/gtkdialogs.c:277
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #gaim auf irc.freenode.net<BR><BR>"
 
-#: ../src/gtkdialogs.c:281
+#: ../src/gtkdialogs.c:283
 msgid "Current Developers"
 msgstr "Aktuelle Entwickler"
 
-#: ../src/gtkdialogs.c:296
+#: ../src/gtkdialogs.c:298
 msgid "Crazy Patch Writers"
 msgstr "Verr端ckte Patchschreiber"
 
-#: ../src/gtkdialogs.c:311
+#: ../src/gtkdialogs.c:313
 msgid "Retired Developers"
 msgstr "Zur端ckgetretene Entwickler"
 
-#: ../src/gtkdialogs.c:326
+#: ../src/gtkdialogs.c:328
 msgid "Current Translators"
 msgstr "Aktuelle �bersetzer"
 
-#: ../src/gtkdialogs.c:346
+#: ../src/gtkdialogs.c:348
 msgid "Past Translators"
 msgstr "Fr端here �bersetzer"
 
-#: ../src/gtkdialogs.c:364
+#: ../src/gtkdialogs.c:366
 msgid "Debugging Information"
 msgstr "Debugging-Information"
 
-#: ../src/gtkdialogs.c:570 ../src/gtkdialogs.c:707 ../src/gtkdialogs.c:770
+#: ../src/gtkdialogs.c:572 ../src/gtkdialogs.c:709 ../src/gtkdialogs.c:772
 msgid "_Name"
 msgstr "_Name"
 
-#: ../src/gtkdialogs.c:575 ../src/gtkdialogs.c:712 ../src/gtkdialogs.c:775
+#: ../src/gtkdialogs.c:577 ../src/gtkdialogs.c:714 ../src/gtkdialogs.c:777
 msgid "_Account"
 msgstr "_Konto"
 
-#: ../src/gtkdialogs.c:583
+#: ../src/gtkdialogs.c:585
 msgid "New Instant Message"
 msgstr "Neue Nachricht"
 
-#: ../src/gtkdialogs.c:585
+#: ../src/gtkdialogs.c:587
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr ""
 "Bitte geben Sie den Benutzernamen der Person ein, mit der Sie chatten wollen."
 
-#: ../src/gtkdialogs.c:720
+#: ../src/gtkdialogs.c:722
 msgid "Get User Info"
 msgstr "Benutzer-Info abrufen"
 
-#: ../src/gtkdialogs.c:722
+#: ../src/gtkdialogs.c:724
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
@@ -3635,11 +3653,11 @@
 "Bitte geben Sie den Benutzernamen oder den Alias der Person ein, deren Info "
 "Sie sehen m旦chten."
 
-#: ../src/gtkdialogs.c:784
+#: ../src/gtkdialogs.c:786
 msgid "View User Log"
 msgstr "Benutzer-Mitschnitt anzeigen"
 
-#: ../src/gtkdialogs.c:786
+#: ../src/gtkdialogs.c:788
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
@@ -3647,37 +3665,37 @@
 "Bitte geben Sie den Benutzernamen der Person ein, deren Mitschnitt Sie sehen "
 "m旦chten."
 
-#: ../src/gtkdialogs.c:805
+#: ../src/gtkdialogs.c:807
 msgid "Alias Contact"
 msgstr "Kontakt-Alias"
 
-#: ../src/gtkdialogs.c:806
+#: ../src/gtkdialogs.c:808
 msgid "Enter an alias for this contact."
 msgstr "Geben Sie einen Alias f端r diesen Kontakt ein."
 
-#: ../src/gtkdialogs.c:808 ../src/gtkdialogs.c:830 ../src/gtkdialogs.c:850
+#: ../src/gtkdialogs.c:810 ../src/gtkdialogs.c:832 ../src/gtkdialogs.c:852
 #: ../src/gtkrequest.c:277 ../src/protocols/silc/chat.c:586
 msgid "Alias"
 msgstr "Alias"
 
-#: ../src/gtkdialogs.c:826
+#: ../src/gtkdialogs.c:828
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Geben Sie einen Alias %s ein."
 
-#: ../src/gtkdialogs.c:828
+#: ../src/gtkdialogs.c:830
 msgid "Alias Buddy"
 msgstr "Alias f端r Buddy"
 
-#: ../src/gtkdialogs.c:847
+#: ../src/gtkdialogs.c:849
 msgid "Alias Chat"
 msgstr "Chat-Alias"
 
-#: ../src/gtkdialogs.c:848
+#: ../src/gtkdialogs.c:850
 msgid "Enter an alias for this chat."
 msgstr "Geben Sie einen Alias f端r diesen Chat ein."
 
-#: ../src/gtkdialogs.c:885
+#: ../src/gtkdialogs.c:887
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -3692,15 +3710,15 @@
 "Sie sind dabei, den Kontakt, der %s und %d andere Buddys enth辰lt, aus Ihrer "
 "Kontaktliste zu entfernen.  M旦chten Sie fortsetzen?"
 
-#: ../src/gtkdialogs.c:893
+#: ../src/gtkdialogs.c:895
 msgid "Remove Contact"
 msgstr "Kontakt entfernen"
 
-#: ../src/gtkdialogs.c:894
+#: ../src/gtkdialogs.c:896
 msgid "_Remove Contact"
 msgstr "_Kontakt entfernen"
 
-#: ../src/gtkdialogs.c:945
+#: ../src/gtkdialogs.c:947
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -3709,15 +3727,15 @@
 "Sie sind dabei, die Gruppe %s und alle darin enthaltenen Mitglieder aus "
 "Ihrer Kontaktliste zu entfernen. M旦chten Sie fortsetzen?"
 
-#: ../src/gtkdialogs.c:948
+#: ../src/gtkdialogs.c:950
 msgid "Remove Group"
 msgstr "Gruppe entfernen"
 
-#: ../src/gtkdialogs.c:949
+#: ../src/gtkdialogs.c:951
 msgid "_Remove Group"
 msgstr "_Gruppe entfernen"
 
-#: ../src/gtkdialogs.c:982
+#: ../src/gtkdialogs.c:984
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
@@ -3725,15 +3743,15 @@
 "Sie sind dabei, %s aus Ihrer Kontaktliste zu entfernen. M旦chten Sie "
 "fortsetzen?"
 
-#: ../src/gtkdialogs.c:985
+#: ../src/gtkdialogs.c:987
 msgid "Remove Buddy"
 msgstr "Buddy entfernen"
 
-#: ../src/gtkdialogs.c:986
+#: ../src/gtkdialogs.c:988
 msgid "_Remove Buddy"
 msgstr "Buddy _entfernen"
 
-#: ../src/gtkdialogs.c:1007
+#: ../src/gtkdialogs.c:1009
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -3742,11 +3760,11 @@
 "Sie sind dabei, den Chat %s aus Ihrer Kontaktliste zu entfernen. M旦chten Sie "
 "fortsetzen?"
 
-#: ../src/gtkdialogs.c:1010
+#: ../src/gtkdialogs.c:1012
 msgid "Remove Chat"
 msgstr "Chat Entfernen"
 
-#: ../src/gtkdialogs.c:1011
+#: ../src/gtkdialogs.c:1013
 msgid "_Remove Chat"
 msgstr "Chat _entfernen"
 
@@ -3881,41 +3899,40 @@
 msgid "Paste as Plain _Text"
 msgstr "Einf端gen als normaler _Text"
 
-#. XXX: make this new with mnemonic, and HIG-happy after string thaw
-#: ../src/gtkimhtml.c:834 ../src/gtkimhtmltoolbar.c:1030
-msgid "Clear formatting"
-msgstr "Formatierung entfernen"
-
-#: ../src/gtkimhtml.c:1328
+#: ../src/gtkimhtml.c:833
+msgid "_Reset formatting"
+msgstr "Formatierung _zur端cksetzen"
+
+#: ../src/gtkimhtml.c:1327
 msgid "Hyperlink color"
 msgstr "Hyperlink-Farbe"
 
-#: ../src/gtkimhtml.c:1329
+#: ../src/gtkimhtml.c:1328
 msgid "Color to draw hyperlinks."
 msgstr "Farbe zum Darstellen von Hyperlinks."
 
+#: ../src/gtkimhtml.c:1331
+msgid "Hyperlink prelight color"
+msgstr "Hyperlink-Farbe"
+
 #: ../src/gtkimhtml.c:1332
-msgid "Hyperlink prelight color"
-msgstr "Hyperlink-Farbe"
-
-#: ../src/gtkimhtml.c:1333
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr ""
 "Farbe zum Darstellen von Hyperlinks, wenn sich die Maus dar端ber befindet."
 
-#: ../src/gtkimhtml.c:1554
+#: ../src/gtkimhtml.c:1553
 msgid "_Copy E-Mail Address"
-msgstr "Kopiere _E-Mail Adresse"
-
-#: ../src/gtkimhtml.c:1566
+msgstr "Kopiere _E-Mail-Adresse"
+
+#: ../src/gtkimhtml.c:1565
 msgid "_Open Link in Browser"
 msgstr "�_ffne Link im Browser"
 
-#: ../src/gtkimhtml.c:1576
+#: ../src/gtkimhtml.c:1575
 msgid "_Copy Link Location"
 msgstr "_Kopiere den Link"
 
-#: ../src/gtkimhtml.c:3273
+#: ../src/gtkimhtml.c:3272
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -3925,7 +3942,7 @@
 "\n"
 "Verwende Standard (PNG)."
 
-#: ../src/gtkimhtml.c:3276
+#: ../src/gtkimhtml.c:3275
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -3935,7 +3952,7 @@
 "\n"
 "Verwende Standard (PNG)."
 
-#: ../src/gtkimhtml.c:3289
+#: ../src/gtkimhtml.c:3288
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -3946,7 +3963,7 @@
 "\n"
 "%s"
 
-#: ../src/gtkimhtml.c:3292
+#: ../src/gtkimhtml.c:3291
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -3957,11 +3974,11 @@
 "\n"
 "%s"
 
-#: ../src/gtkimhtml.c:3372 ../src/gtkimhtml.c:3384
+#: ../src/gtkimhtml.c:3371 ../src/gtkimhtml.c:3383
 msgid "Save Image"
 msgstr "Bild speichern"
 
-#: ../src/gtkimhtml.c:3412
+#: ../src/gtkimhtml.c:3411
 msgid "_Save Image..."
 msgstr "Bild _speichern..."
 
@@ -4055,6 +4072,10 @@
 msgid "Background color"
 msgstr "Hintergrundfarbe"
 
+#: ../src/gtkimhtmltoolbar.c:1030
+msgid "Reset formatting"
+msgstr "Formatierung zur端cksetzen"
+
 #: ../src/gtkimhtmltoolbar.c:1045
 msgid "Insert link"
 msgstr "Link einf端gen"
@@ -4086,8 +4107,8 @@
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
 msgstr ""
-"Systemereignisse werden nur mitgeschnitten, wenn die Option \"Schneide "
-"alleStatusver辰nderungen im Systemmitschnitt mit\" aktiviert ist."
+"Systemereignisse werden nur mitgeschnitten, wenn die Option \"Schneide alle "
+"Statusver辰nderungen im System-Mitschnitt mit\" aktiviert ist."
 
 #: ../src/gtklog.c:299
 msgid ""
@@ -4250,24 +4271,22 @@
 msgid "Buddy Information"
 msgstr "Buddy-Information"
 
-#. TODO: Change the bold tags to quotes when not in string freeze
-#: ../src/gtknotify.c:882
-#, c-format
-msgid "The browser command <b>%s</b> is invalid."
-msgstr "Das Browser-Kommando <b>%s</b> ist falsch."
-
-#: ../src/gtknotify.c:884 ../src/gtknotify.c:897 ../src/gtknotify.c:911
-#: ../src/gtknotify.c:1034
+#: ../src/gtknotify.c:881
+#, c-format
+msgid "The browser command \"%s\" is invalid."
+msgstr "Das Browser-Kommando \"%s\" ist falsch."
+
+#: ../src/gtknotify.c:883 ../src/gtknotify.c:895 ../src/gtknotify.c:908
+#: ../src/gtknotify.c:1031
 msgid "Unable to open URL"
 msgstr "Kann die URL nicht 旦ffnen"
 
-#. TODO: Change the bold tags to quotes when not in string freeze
-#: ../src/gtknotify.c:895 ../src/gtknotify.c:909
-#, c-format
-msgid "Error launching <b>%s</b>: %s"
-msgstr "Fehler beim Aufruf von <b>%s</b>: %s"
-
-#: ../src/gtknotify.c:1035
+#: ../src/gtknotify.c:893 ../src/gtknotify.c:906
+#, c-format
+msgid "Error launching \"%s\": %s"
+msgstr "Fehler beim Aufruf von \"%s\": %s"
+
+#: ../src/gtknotify.c:1032
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
@@ -4544,7 +4563,7 @@
 
 #: ../src/gtkprefs.c:842
 msgid "_Notify buddies that you are typing to them"
-msgstr "Buddys be_nachrichten, wenn Sie Ihnen schreiben"
+msgstr "Buddys be_nachrichtigen, dass Sie ihnen schreiben"
 
 #: ../src/gtkprefs.c:845
 msgid "Highlight _misspelled words"
@@ -4834,6 +4853,10 @@
 msgid "Play"
 msgstr "Abspielen"
 
+#: ../src/gtkprefs.c:1678
+msgid "Event"
+msgstr "Ereignis"
+
 #: ../src/gtkprefs.c:1697
 msgid "Test"
 msgstr "Testen"
@@ -4864,7 +4887,7 @@
 
 #: ../src/gtkprefs.c:1765
 msgid "When both away and idle"
-msgstr "When abwesend und unt辰tig"
+msgstr "Wenn abwesend und unt辰tig"
 
 #. Auto-away stuff
 #: ../src/gtkprefs.c:1771
@@ -5008,10 +5031,14 @@
 msgid "Are you sure you want to block %s?"
 msgstr "Sie Sie sicher, dass Sie %s blockieren wollen?"
 
+#. *
+#. * A wrapper for gaim_request_action() that uses @c Yes and @c No buttons.
+#.
 #: ../src/gtkrequest.c:267 ../src/protocols/msn/dialog.c:114
 #: ../src/protocols/msn/msn.c:559 ../src/protocols/msn/msn.c:568
 #: ../src/protocols/novell/novell.c:1921 ../src/protocols/silc/buddy.c:313
 #: ../src/protocols/silc/pk.c:117 ../src/protocols/silc/wb.c:303
+#: ../src/request.h:1335
 msgid "Yes"
 msgstr "Ja"
 
@@ -5019,6 +5046,7 @@
 #: ../src/protocols/msn/msn.c:559 ../src/protocols/msn/msn.c:568
 #: ../src/protocols/novell/novell.c:1922 ../src/protocols/silc/buddy.c:314
 #: ../src/protocols/silc/pk.c:118 ../src/protocols/silc/wb.c:304
+#: ../src/request.h:1335
 msgid "No"
 msgstr "Nein"
 
@@ -5039,6 +5067,14 @@
 msgid "Would you like to overwrite it?"
 msgstr "M旦chten Sie sie 端berschreiben?"
 
+#: ../src/gtkrequest.c:1469
+msgid "Overwrite"
+msgstr "�berschreiben"
+
+#: ../src/gtkrequest.c:1470
+msgid "Choose New Name"
+msgstr "Einen neuen Namen w辰hlen"
+
 #: ../src/gtkrequest.c:1512 ../src/gtkrequest.c:1553
 msgid "Save File..."
 msgstr "Datei speichern..."
@@ -5047,6 +5083,10 @@
 msgid "Open File..."
 msgstr "Datei 旦ffnen..."
 
+#: ../src/gtkrequest.c:1601 ../src/gtkrequest.c:1615
+msgid "Select Folder..."
+msgstr "Ordner ausw辰hlen..."
+
 #: ../src/gtkroomlist.c:287
 msgid "_Add"
 msgstr "_Hinzuf端gen"
@@ -5187,15 +5227,15 @@
 msgstr "Andere sprechen im Chat"
 
 #: ../src/gtksound.c:72
-msgid "Someone says your name in chat"
-msgstr "Jemand nennt Ihren Namen im Chat"
-
-#: ../src/gtksound.c:489
+msgid "Someone says your screen name in chat"
+msgstr "Jemand nennt Ihren Benutzernamen im Chat"
+
+#: ../src/gtksound.c:485
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr "Kann keinen Sound spielen, da die gew辰hlte Datei (%s) nicht existiert."
 
-#: ../src/gtksound.c:505
+#: ../src/gtksound.c:501
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
@@ -5203,7 +5243,7 @@
 "Kann keinen Sound spielen, weil die 'Kommando'-Methode gew辰hlt, aber kein "
 "Kommando angegeben wurde."
 
-#: ../src/gtksound.c:517
+#: ../src/gtksound.c:513
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
@@ -5495,29 +5535,32 @@
 #. Creating the options for the protocol
 #. port to connect to
 #: ../src/protocols/bonjour/bonjour.c:579 ../src/protocols/irc/irc.c:900
-#: ../src/protocols/msn/msn.c:2074 ../src/protocols/napster/napster.c:724
+#: ../src/protocols/msn/msn.c:2054 ../src/protocols/napster/napster.c:724
 #: ../src/protocols/sametime/sametime.c:5643 ../src/protocols/silc/silc.c:1859
 msgid "Port"
 msgstr "Port"
 
 # old strings
 #: ../src/protocols/bonjour/bonjour.c:582 ../src/protocols/gg/gg.c:605
-#: ../src/protocols/gg/gg.c:1015
+#: ../src/protocols/gg/gg.c:1015 ../src/protocols/jabber/jabber.c:770
 msgid "First name"
 msgstr "Vorname"
 
 #: ../src/protocols/bonjour/bonjour.c:585 ../src/protocols/gg/gg.c:600
+#: ../src/protocols/jabber/jabber.c:775
 msgid "Last name"
 msgstr "Nachname"
 
-#: ../src/protocols/bonjour/bonjour.c:588 ../src/protocols/jabber/buddy.c:261
-#: ../src/protocols/jabber/buddy.c:779 ../src/protocols/jabber/buddy.c:787
-#: ../src/protocols/silc/silc.c:699 ../src/protocols/silc/silc.c:939
-#: ../src/protocols/silc/util.c:512
-#: ../src/protocols/yahoo/yahoo_profile.c:1036
-msgid "Email"
+#: ../src/protocols/bonjour/bonjour.c:588 ../src/protocols/gg/gg.c:468
+#: ../src/protocols/jabber/jabber.c:760 ../src/protocols/silc/silc.c:699
+#: ../src/protocols/silc/silc.c:939
+msgid "E-mail"
 msgstr "E-Mail"
 
+#: ../src/protocols/bonjour/bonjour.h:35
+msgid "Bonjour"
+msgstr "Bonjour"
+
 #: ../src/protocols/bonjour/jabber.c:357
 #, c-format
 msgid "%s has closed the conversation."
@@ -5545,11 +5588,11 @@
 "Die Nachricht kann nicht gesendet werden, das Gespr辰ch kann nicht gestartet "
 "werden."
 
-#: ../src/protocols/gg/gg.c:76 ../src/proxy.c:2336
+#: ../src/protocols/gg/gg.c:76 ../src/proxy.c:2345
 msgid "Invalid proxy settings"
 msgstr "Falsche Proxy-Einstellungen"
 
-#: ../src/protocols/gg/gg.c:77 ../src/proxy.c:2336
+#: ../src/protocols/gg/gg.c:77 ../src/proxy.c:2345
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -5617,10 +5660,6 @@
 msgid "Registration completed successfully!"
 msgstr "Registrierung erfolgreich abgeschlossen!"
 
-#: ../src/protocols/gg/gg.c:468 ../src/protocols/jabber/jabber.c:760
-msgid "E-Mail"
-msgstr "E-Mail"
-
 #: ../src/protocols/gg/gg.c:473 ../src/protocols/gg/gg.c:747
 #: ../src/protocols/jabber/jabber.c:749 ../src/protocols/jabber/jabber.c:1307
 msgid "Password"
@@ -5654,12 +5693,14 @@
 msgid "You have a pending search. Please wait for it to finish."
 msgstr "Eine Suche l辰uft gerade. Bitte warten Sie, bis sie beendet ist."
 
+#. General
 #: ../src/protocols/gg/gg.c:610 ../src/protocols/gg/gg.c:1018
 #: ../src/protocols/gg/gg.c:2048 ../src/protocols/jabber/buddy.c:252
 #: ../src/protocols/jabber/buddy.c:695 ../src/protocols/jabber/buddy.c:1402
 #: ../src/protocols/jabber/jabber.c:765 ../src/protocols/msn/msn.c:1373
-#: ../src/protocols/silc/buddy.c:1528 ../src/protocols/silc/ops.c:1036
-#: ../src/protocols/silc/ops.c:1179 ../src/protocols/silc/ops.c:1328
+#: ../src/protocols/msn/msn.c:1535 ../src/protocols/silc/buddy.c:1528
+#: ../src/protocols/silc/ops.c:1036 ../src/protocols/silc/ops.c:1179
+#: ../src/protocols/silc/ops.c:1328
 #: ../src/protocols/yahoo/yahoo_profile.c:1041
 msgid "Nickname"
 msgstr "Spitzname"
@@ -5674,7 +5715,7 @@
 msgid "Year of birth"
 msgstr "Geburtsjahr"
 
-#: ../src/protocols/gg/gg.c:623 ../src/protocols/msn/msn.c:1541
+#: ../src/protocols/gg/gg.c:623 ../src/protocols/msn/msn.c:1537
 #: ../src/protocols/oscar/oscar.c:6192
 #: ../src/protocols/yahoo/yahoo_profile.c:1066
 msgid "Gender"
@@ -6024,7 +6065,8 @@
 msgid "Username"
 msgstr "Benutzer"
 
-#: ../src/protocols/irc/irc.c:909
+#: ../src/protocols/irc/irc.c:909 ../src/protocols/irc/msgs.c:230
+#: ../src/protocols/silc/silc.c:937
 msgid "Real name"
 msgstr "Echter Name"
 
@@ -6080,12 +6122,6 @@
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s:</b> %s<br>"
 
-#: ../src/protocols/irc/msgs.c:230 ../src/protocols/silc/ops.c:1183
-#: ../src/protocols/silc/ops.c:1332
-#: ../src/protocols/yahoo/yahoo_profile.c:1046
-msgid "Realname"
-msgstr "Echter Name"
-
 #: ../src/protocols/irc/msgs.c:241 ../src/protocols/silc/ops.c:1255
 msgid "Currently on"
 msgstr "Im Moment in"
@@ -6103,93 +6139,98 @@
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr "<br><b>Definiere ein Adjektiv:</b> Glanzvoll<br>"
 
-#: ../src/protocols/irc/msgs.c:322
+#: ../src/protocols/irc/msgs.c:326
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s hat das Thema zu %s abge辰ndert"
 
-#: ../src/protocols/irc/msgs.c:329
+#: ../src/protocols/irc/msgs.c:328
+#, c-format
+msgid "%s has cleared the topic."
+msgstr "%s hat das Thema entfernt."
+
+#: ../src/protocols/irc/msgs.c:336
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "Das Thema f端r %s ist: %s"
 
-#: ../src/protocols/irc/msgs.c:347
+#: ../src/protocols/irc/msgs.c:354
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Unbekannte Nachricht '%s'"
 
-#: ../src/protocols/irc/msgs.c:348
+#: ../src/protocols/irc/msgs.c:355
 msgid "Unknown message"
 msgstr "Unbekannte Nachricht"
 
-#: ../src/protocols/irc/msgs.c:348
+#: ../src/protocols/irc/msgs.c:355
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim hat eine Nachricht versandt, die der IRC-Server nicht versteht."
 
-#: ../src/protocols/irc/msgs.c:371
+#: ../src/protocols/irc/msgs.c:378
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Benutzer auf %s: %s"
 
-#: ../src/protocols/irc/msgs.c:499
+#: ../src/protocols/irc/msgs.c:506
 msgid "Time Response"
 msgstr "Zeit-Antwort"
 
-#: ../src/protocols/irc/msgs.c:500
+#: ../src/protocols/irc/msgs.c:507
 msgid "The IRC server's local time is:"
 msgstr "Die Lokalzeit des IRC-Servers ist:"
 
-#: ../src/protocols/irc/msgs.c:511
+#: ../src/protocols/irc/msgs.c:518
 msgid "No such channel"
 msgstr "Dieser Kanal existiert nicht"
 
 #. does this happen?
-#: ../src/protocols/irc/msgs.c:522
+#: ../src/protocols/irc/msgs.c:529
 msgid "no such channel"
 msgstr "Dieser Kanal existiert nicht"
 
-#: ../src/protocols/irc/msgs.c:525
+#: ../src/protocols/irc/msgs.c:532
 msgid "User is not logged in"
 msgstr "Benutzer ist nicht angemeldet"
 
-#: ../src/protocols/irc/msgs.c:530
+#: ../src/protocols/irc/msgs.c:537
 msgid "No such nick or channel"
 msgstr "Es gibt keinen solchen Spitznamen oder Kanal"
 
-#: ../src/protocols/irc/msgs.c:550
+#: ../src/protocols/irc/msgs.c:557
 msgid "Could not send"
 msgstr "Konnte nicht senden"
 
-#: ../src/protocols/irc/msgs.c:606
+#: ../src/protocols/irc/msgs.c:613
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Das Betreten von %s erfordert eine Einladung."
 
-#: ../src/protocols/irc/msgs.c:607
+#: ../src/protocols/irc/msgs.c:614
 msgid "Invitation only"
 msgstr "Nur Einladungen"
 
-#: ../src/protocols/irc/msgs.c:708
+#: ../src/protocols/irc/msgs.c:715
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Sie wurden hinausgeworfen von %s: (%s)"
 
 #. Remove user from channel
-#: ../src/protocols/irc/msgs.c:713 ../src/protocols/silc/ops.c:721
+#: ../src/protocols/irc/msgs.c:720 ../src/protocols/silc/ops.c:721
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Hinausgeworfen durch %s (%s)"
 
-#: ../src/protocols/irc/msgs.c:736
+#: ../src/protocols/irc/msgs.c:743
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "Modus (%s %s) von %s"
 
-#: ../src/protocols/irc/msgs.c:821 ../src/protocols/irc/msgs.c:822
+#: ../src/protocols/irc/msgs.c:828 ../src/protocols/irc/msgs.c:829
 msgid "Invalid nickname"
 msgstr "Ung端ltiger Benutzername"
 
-#: ../src/protocols/irc/msgs.c:823
+#: ../src/protocols/irc/msgs.c:830
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -6197,7 +6238,7 @@
 "Ihr gew辰hlter Kontoname wurde vom Server abgelehnt.  Er enth辰lt vermutlich "
 "ung端ltige Zeichen."
 
-#: ../src/protocols/irc/msgs.c:827
+#: ../src/protocols/irc/msgs.c:834
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -6205,42 +6246,42 @@
 "Ihr gew辰hlter Kontoname wurde vom Server abgelehnt.  Er enth辰lt vermutlich "
 "ung端ltige Zeichen."
 
-#: ../src/protocols/irc/msgs.c:866
+#: ../src/protocols/irc/msgs.c:873
 msgid "Cannot change nick"
 msgstr "Kann den Spitznamen nicht 辰ndern"
 
-#: ../src/protocols/irc/msgs.c:866
+#: ../src/protocols/irc/msgs.c:873
 msgid "Could not change nick"
 msgstr "Konnte den Spitznamen nicht 辰ndern"
 
-#: ../src/protocols/irc/msgs.c:887
+#: ../src/protocols/irc/msgs.c:894
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Sie waren im Kanal%s%s"
 
-#: ../src/protocols/irc/msgs.c:929
+#: ../src/protocols/irc/msgs.c:936
 msgid "Error: invalid PONG from server"
 msgstr "Fehler: falsches PONG vom Server"
 
-#: ../src/protocols/irc/msgs.c:931
+#: ../src/protocols/irc/msgs.c:938
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING-Antwort -- Verz旦gerung: %lu Sekunden"
 
-#: ../src/protocols/irc/msgs.c:1012
+#: ../src/protocols/irc/msgs.c:1019
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Kann %s nicht betreten:"
 
-#: ../src/protocols/irc/msgs.c:1013 ../src/protocols/silc/ops.c:1128
+#: ../src/protocols/irc/msgs.c:1020 ../src/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Kann den Kanal nicht betreten"
 
-#: ../src/protocols/irc/msgs.c:1047
+#: ../src/protocols/irc/msgs.c:1054
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Der Spitzname oder Kanal ist zur Zeit nicht verf端gbar."
 
-#: ../src/protocols/irc/msgs.c:1059
+#: ../src/protocols/irc/msgs.c:1066
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops von %s"
@@ -6566,7 +6607,6 @@
 msgstr "Region"
 
 #: ../src/protocols/jabber/buddy.c:258 ../src/protocols/jabber/buddy.c:745
-#: ../src/protocols/jabber/jabber.c:795
 msgid "Postal Code"
 msgstr "Postleitzahl"
 
@@ -6580,6 +6620,13 @@
 msgid "Telephone"
 msgstr "Telefon"
 
+#: ../src/protocols/jabber/buddy.c:261 ../src/protocols/jabber/buddy.c:779
+#: ../src/protocols/jabber/buddy.c:787 ../src/protocols/silc/ops.c:1075
+#: ../src/protocols/silc/util.c:512
+#: ../src/protocols/yahoo/yahoo_profile.c:1036
+msgid "E-Mail"
+msgstr "E-Mail"
+
 #: ../src/protocols/jabber/buddy.c:262 ../src/protocols/jabber/buddy.c:802
 msgid "Organization Name"
 msgstr "Name der Organisation"
@@ -6593,7 +6640,7 @@
 msgstr "Funktion"
 
 #: ../src/protocols/jabber/buddy.c:266 ../src/protocols/jabber/buddy.c:698
-#: ../src/protocols/oscar/oscar.c:6198
+#: ../src/protocols/msn/msn.c:1594 ../src/protocols/oscar/oscar.c:6198
 msgid "Birthday"
 msgstr "Geburtstag"
 
@@ -6689,19 +6736,19 @@
 "F端llen sie ein oder mehrere Felder aus, um nach entsprechenden Jabber-"
 "Benutzern zu suchen."
 
-#: ../src/protocols/jabber/buddy.c:1392 ../src/protocols/jabber/jabber.c:770
-#: ../src/protocols/oscar/oscar.c:6175 ../src/protocols/silc/ops.c:1024
+#: ../src/protocols/jabber/buddy.c:1392 ../src/protocols/oscar/oscar.c:6175
+#: ../src/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr "Vorname"
 
-#: ../src/protocols/jabber/buddy.c:1397 ../src/protocols/jabber/jabber.c:775
-#: ../src/protocols/oscar/oscar.c:6176
+#: ../src/protocols/jabber/buddy.c:1397 ../src/protocols/oscar/oscar.c:6176
 msgid "Last Name"
 msgstr "Nachname"
 
-#: ../src/protocols/jabber/buddy.c:1407
+#: ../src/protocols/jabber/buddy.c:1407 ../src/protocols/novell/novell.c:1490
+#: ../src/protocols/oscar/oscar.c:6178 ../src/protocols/oscar/oscar.c:6185
 msgid "E-Mail Address"
-msgstr "E-Mail Adresse"
+msgstr "E-Mail-Adresse"
 
 #: ../src/protocols/jabber/buddy.c:1416 ../src/protocols/jabber/buddy.c:1417
 msgid "Search for Jabber users"
@@ -6856,6 +6903,10 @@
 msgid "State"
 msgstr "Provinz/Bundesland"
 
+#: ../src/protocols/jabber/jabber.c:795
+msgid "Postal code"
+msgstr "Postleitzahl"
+
 #: ../src/protocols/jabber/jabber.c:800 ../src/protocols/silc/ops.c:1069
 #: ../src/protocols/silc/silc.c:701 ../src/protocols/silc/util.c:514
 msgid "Phone"
@@ -7411,7 +7462,7 @@
 
 #: ../src/protocols/msn/error.c:42
 msgid "Invalid e-mail address"
-msgstr "Ung端ltige E-Mailadresse"
+msgstr "Ung端ltige E-Mail-Adresse"
 
 #: ../src/protocols/msn/error.c:45
 msgid "User does not exist"
@@ -7779,74 +7830,219 @@
 msgstr "<b>Alias:</b> %s<br>"
 
 #. put a link to the actual profile URL
-#: ../src/protocols/msn/msn.c:1373 ../src/protocols/msn/msn.c:1825
-#: ../src/protocols/yahoo/yahoo_profile.c:1208 ../src/util.c:1055
+#: ../src/protocols/msn/msn.c:1373 ../src/protocols/yahoo/yahoo_profile.c:1208
+#: ../src/util.c:1055
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b> "
 
-#: ../src/protocols/msn/msn.c:1465
+#: ../src/protocols/msn/msn.c:1463
 msgid "MSN Profile"
 msgstr "MSN-Profil"
 
-#: ../src/protocols/msn/msn.c:1470 ../src/protocols/msn/msn.c:1809
+#: ../src/protocols/msn/msn.c:1468 ../src/protocols/msn/msn.c:1794
 #: ../src/protocols/yahoo/yahoo_profile.c:795
 msgid "Error retrieving profile"
 msgstr "Fehler beim Empfangen des Profils"
 
-#: ../src/protocols/msn/msn.c:1540 ../src/protocols/oscar/oscar.c:6204
+#: ../src/protocols/msn/msn.c:1536 ../src/protocols/oscar/oscar.c:6204
 #: ../src/protocols/yahoo/yahoo_profile.c:1056
 msgid "Age"
 msgstr "Alter"
 
-#: ../src/protocols/msn/msn.c:1542 ../src/protocols/yahoo/yahoo_profile.c:1071
+#: ../src/protocols/msn/msn.c:1538 ../src/protocols/yahoo/yahoo_profile.c:1071
 msgid "Occupation"
 msgstr "Beruf"
 
-#: ../src/protocols/msn/msn.c:1543 ../src/protocols/novell/novell.c:1480
+#: ../src/protocols/msn/msn.c:1539 ../src/protocols/novell/novell.c:1480
 #: ../src/protocols/yahoo/yahoo_profile.c:1051
 msgid "Location"
 msgstr "Ort"
 
-#: ../src/protocols/msn/msn.c:1548 ../src/protocols/msn/msn.c:1738
-#: ../src/protocols/msn/msn.c:1744 ../src/protocols/msn/msn.c:1751
+#: ../src/protocols/msn/msn.c:1544 ../src/protocols/msn/msn.c:1723
+#: ../src/protocols/msn/msn.c:1729 ../src/protocols/msn/msn.c:1736
 msgid "Hobbies and Interests"
 msgstr "Hobbys und Interessen"
 
-#: ../src/protocols/msn/msn.c:1554 ../src/protocols/msn/msn.c:1672
+#: ../src/protocols/msn/msn.c:1550 ../src/protocols/msn/msn.c:1657
+#: ../src/protocols/msn/msn.c:1663 ../src/protocols/msn/msn.c:1670
 #: ../src/protocols/msn/msn.c:1678 ../src/protocols/msn/msn.c:1685
-#: ../src/protocols/msn/msn.c:1693 ../src/protocols/msn/msn.c:1700
 msgid "A Little About Me"
 msgstr "Einige Informationen 端ber mich"
 
+#: ../src/protocols/msn/msn.c:1556
+#, c-format
+msgid "%s<b>General</b><br>%s"
+msgstr "%s<b>Allgemein</b><br>%s"
+
 #. Social
-#: ../src/protocols/msn/msn.c:1572 ../src/protocols/yahoo/yahoo_profile.c:1061
+#: ../src/protocols/msn/msn.c:1565 ../src/protocols/yahoo/yahoo_profile.c:1061
 msgid "Marital Status"
 msgstr "Familienstatus"
 
-#: ../src/protocols/msn/msn.c:1582 ../src/protocols/msn/msn.c:1760
-#: ../src/protocols/msn/msn.c:1766 ../src/protocols/yahoo/yahoo_profile.c:1113
+#: ../src/protocols/msn/msn.c:1566
+msgid "Interests"
+msgstr "Interessen"
+
+#: ../src/protocols/msn/msn.c:1567
+msgid "Pets"
+msgstr "Haustiere"
+
+#: ../src/protocols/msn/msn.c:1568
+msgid "Hometown"
+msgstr "Heimatstadt"
+
+#: ../src/protocols/msn/msn.c:1569
+msgid "Places Lived"
+msgstr "Bisherige Wohnorte"
+
+#: ../src/protocols/msn/msn.c:1570
+msgid "Fashion"
+msgstr "Mode"
+
+#: ../src/protocols/msn/msn.c:1571
+msgid "Humor"
+msgstr "Humor"
+
+#: ../src/protocols/msn/msn.c:1572
+msgid "Music"
+msgstr "Musik"
+
+#: ../src/protocols/msn/msn.c:1573 ../src/protocols/msn/msn.c:1745
+#: ../src/protocols/msn/msn.c:1751 ../src/protocols/yahoo/yahoo_profile.c:1113
 msgid "Favorite Quote"
 msgstr "Lieblingsspruch"
 
-#: ../src/protocols/msn/msn.c:1709 ../src/protocols/msn/msn.c:1715
-#: ../src/protocols/msn/msn.c:1722 ../src/protocols/msn/msn.c:1729
+#: ../src/protocols/msn/msn.c:1577
+#, c-format
+msgid "%s<b>Social</b><br>%s"
+msgstr "%s<b>Soziales</b><br>%s"
+
+#: ../src/protocols/msn/msn.c:1586
+msgid "Significant Other"
+msgstr "Andere wichtige Dinge"
+
+#: ../src/protocols/msn/msn.c:1587
+msgid "Home Phone"
+msgstr "Telefon (privat)"
+
+#: ../src/protocols/msn/msn.c:1588
+msgid "Home Phone 2"
+msgstr "Telefon 2 (privat)"
+
+#: ../src/protocols/msn/msn.c:1589 ../src/protocols/oscar/oscar.c:6216
+msgid "Home Address"
+msgstr "Privatadresse"
+
+#: ../src/protocols/msn/msn.c:1590
+msgid "Personal Mobile"
+msgstr "Handy (privat)"
+
+#: ../src/protocols/msn/msn.c:1591
+msgid "Home Fax"
+msgstr "Fax (privat)"
+
+#: ../src/protocols/msn/msn.c:1592
+msgid "Personal E-Mail"
+msgstr "E-Mail (privat)"
+
+#: ../src/protocols/msn/msn.c:1593
+msgid "Personal IM"
+msgstr "IM (privat)"
+
+#: ../src/protocols/msn/msn.c:1595
+msgid "Anniversary"
+msgstr "Jahrestag"
+
+#: ../src/protocols/msn/msn.c:1596 ../src/protocols/msn/msn.c:1620
+msgid "Notes"
+msgstr "Notizen"
+
+#: ../src/protocols/msn/msn.c:1600
+#, c-format
+msgid "<br><b>Personal</b><br>%s"
+msgstr "<br><b>Pers旦nliches</b><br>%s"
+
+#: ../src/protocols/msn/msn.c:1607 ../src/protocols/silc/ops.c:1044
+msgid "Job Title"
+msgstr "Beruf"
+
+#: ../src/protocols/msn/msn.c:1608 ../src/protocols/oscar/oscar.c:6233
+msgid "Company"
+msgstr "Firma"
+
+#: ../src/protocols/msn/msn.c:1609 ../src/protocols/novell/novell.c:1482
+msgid "Department"
+msgstr "Abteilung"
+
+#: ../src/protocols/msn/msn.c:1610
+msgid "Profession"
+msgstr "Beruf"
+
+#: ../src/protocols/msn/msn.c:1611
+msgid "Work Phone"
+msgstr "Telefon (gesch辰ftlich)"
+
+#: ../src/protocols/msn/msn.c:1612
+msgid "Work Phone 2"
+msgstr "Telefon 2 (gesch辰ftlich)"
+
+#: ../src/protocols/msn/msn.c:1613 ../src/protocols/oscar/oscar.c:6224
+msgid "Work Address"
+msgstr "Adresse (gesch辰ftlich)"
+
+#: ../src/protocols/msn/msn.c:1614
+msgid "Work Mobile"
+msgstr "Handy (gesch辰ftlich)"
+
+#: ../src/protocols/msn/msn.c:1615
+msgid "Work Pager"
+msgstr "Pager (gesch辰ftlich)"
+
+#: ../src/protocols/msn/msn.c:1616
+msgid "Work Fax"
+msgstr "Fax (gesch辰ftlich)"
+
+#: ../src/protocols/msn/msn.c:1617
+msgid "Work E-Mail"
+msgstr "E-Mail (gesch辰ftlich)"
+
+#: ../src/protocols/msn/msn.c:1618
+msgid "Work IM"
+msgstr "IM (gesch辰ftlich)"
+
+#: ../src/protocols/msn/msn.c:1619
+msgid "Start Date"
+msgstr "Anfangsdatum"
+
+#: ../src/protocols/msn/msn.c:1624
+#, c-format
+msgid "<br><b>Business</b><br>%s"
+msgstr "<br><b>Gesch辰ftliches</b><br>%s"
+
+#: ../src/protocols/msn/msn.c:1635
+#, c-format
+msgid "<hr><b>Contact Info</b>%s%s"
+msgstr "<hr><b>Kontakt-Info</b>%s%s"
+
+#: ../src/protocols/msn/msn.c:1694 ../src/protocols/msn/msn.c:1700
+#: ../src/protocols/msn/msn.c:1707 ../src/protocols/msn/msn.c:1714
 msgid "Favorite Things"
 msgstr "Lieblingsdinge"
 
-#: ../src/protocols/msn/msn.c:1774
+#: ../src/protocols/msn/msn.c:1759
 msgid "Last Updated"
 msgstr "Zuletzt aktualisiert"
 
-#: ../src/protocols/msn/msn.c:1786 ../src/protocols/silc/ops.c:1060
+#: ../src/protocols/msn/msn.c:1771 ../src/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "Homepage"
 
-#: ../src/protocols/msn/msn.c:1811
+#: ../src/protocols/msn/msn.c:1796
 msgid "The user has not created a public profile."
 msgstr "Der Benutzer hat kein 旦ffentliches Profil erstellt."
 
-#: ../src/protocols/msn/msn.c:1812
+#: ../src/protocols/msn/msn.c:1797
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
@@ -7856,7 +8052,7 @@
 "der Benutzer nicht existiert oder dass der Benutzer zwar existiert, aber "
 "kein 旦ffentliches Profil angelegt hat."
 
-#: ../src/protocols/msn/msn.c:1816
+#: ../src/protocols/msn/msn.c:1801
 msgid ""
 "Gaim could not find any information in the user's profile. The user most "
 "likely does not exist."
@@ -7864,8 +8060,13 @@
 "Gaim konnte keinerlei Information im Profil des Benutzers finden. Der "
 "Benutzer existiert wahrscheinlich nicht."
 
-#: ../src/protocols/msn/msn.c:1822 ../src/protocols/msn/msn.c:1825
-#: ../src/protocols/yahoo/yahoo_profile.c:1208
+#. put a link to the actual profile URL
+#: ../src/protocols/msn/msn.c:1806
+#, c-format
+msgid "<hr><b>%s:</b> "
+msgstr "<hr><b>%s:</b> "
+
+#: ../src/protocols/msn/msn.c:1806 ../src/protocols/yahoo/yahoo_profile.c:1208
 msgid "Profile URL"
 msgstr "URL des Profils"
 
@@ -7879,23 +8080,23 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/msn/msn.c:2048 ../src/protocols/msn/msn.c:2050
+#: ../src/protocols/msn/msn.c:2028 ../src/protocols/msn/msn.c:2030
 msgid "MSN Protocol Plugin"
 msgstr "MSN-Protokoll-Plugin"
 
-#: ../src/protocols/msn/msn.c:2069
+#: ../src/protocols/msn/msn.c:2049
 msgid "Login server"
 msgstr "Anmeldeserver"
 
-#: ../src/protocols/msn/msn.c:2078
+#: ../src/protocols/msn/msn.c:2058
 msgid "Use HTTP Method"
 msgstr "Benutze HTTP"
 
-#: ../src/protocols/msn/msn.c:2083
+#: ../src/protocols/msn/msn.c:2063
 msgid "Show custom smileys"
-msgstr "Zeige benutzerdefinierte Smilys"
-
-#: ../src/protocols/msn/msn.c:2091
+msgstr "Zeige benutzerdefinierte Smileys"
+
+#: ../src/protocols/msn/msn.c:2071
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: Einen Kontakt ansto�en, um seine Aufmerksamkeit zu erhalten"
 
@@ -8454,10 +8655,6 @@
 msgid "Telephone Number"
 msgstr "Telefonnummer"
 
-#: ../src/protocols/novell/novell.c:1482
-msgid "Department"
-msgstr "Abteilung"
-
 #: ../src/protocols/novell/novell.c:1484
 msgid "Personal Title"
 msgstr "Pers旦nlicher Titel"
@@ -8466,11 +8663,6 @@
 msgid "Mailstop"
 msgstr "Mailstop"
 
-#: ../src/protocols/novell/novell.c:1490 ../src/protocols/oscar/oscar.c:6178
-#: ../src/protocols/oscar/oscar.c:6185
-msgid "Email Address"
-msgstr "E-Mail Adresse"
-
 #: ../src/protocols/novell/novell.c:1506
 msgid "User ID"
 msgstr "Benutzer-ID"
@@ -8912,12 +9104,12 @@
 #, c-format
 msgid ""
 "Transfer of file %s timed out.\n"
-" Try enabling proxy servers for file transfers in Accounts->%s->Edit Account-"
-">Advanced."
+" Try enabling proxy servers for file transfers in Accounts -> %s -> Edit "
+"Account -> Advanced."
 msgstr ""
 "Zeit端berschreitung bei der �bertragung der Datei %s.\n"
 " Versuchen Sie das Einschalten eines Proxy-Servers f端r die Datei端bertragung "
-"unter Konten->%s>Konto bearbeiten->Erweitert."
+"unter Konten -> %s -> Konto bearbeiten -> Erweitert."
 
 #: ../src/protocols/oscar/oscar.c:2338
 #: ../src/protocols/yahoo/yahoo_filexfer.c:253
@@ -9317,26 +9509,14 @@
 msgid "Additional Information"
 msgstr "Zus辰tzliche Informationen"
 
-#: ../src/protocols/oscar/oscar.c:6216
-msgid "Home Address"
-msgstr "Privatadresse"
-
 #: ../src/protocols/oscar/oscar.c:6220 ../src/protocols/oscar/oscar.c:6228
 msgid "Zip Code"
 msgstr "PLZ"
 
-#: ../src/protocols/oscar/oscar.c:6224
-msgid "Work Address"
-msgstr "Adresse (Arbeit)"
-
 #: ../src/protocols/oscar/oscar.c:6232
 msgid "Work Information"
 msgstr "Information (Arbeit)"
 
-#: ../src/protocols/oscar/oscar.c:6233
-msgid "Company"
-msgstr "Firma"
-
 #: ../src/protocols/oscar/oscar.c:6234
 msgid "Division"
 msgstr "Abteilung"
@@ -9363,7 +9543,7 @@
 #: ../src/protocols/oscar/oscar.c:6366
 #, c-format
 msgid "No results found for e-mail address %s"
-msgstr "Keine Ergebnisse f端r die E-Mail Adresse %s gefunden"
+msgstr "Keine Ergebnisse f端r die E-Mail-Adresse %s gefunden"
 
 #: ../src/protocols/oscar/oscar.c:6387
 #, c-format
@@ -9411,8 +9591,8 @@
 "Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
-"Error 0x%04x: Kann den Benutzernamen nicht formatieren, weil er schon durch "
-"eine andere Anfrage ge辰ndert wird."
+"Error 0x%04x: Kann die E-Mail-Adresse nicht 辰ndern, weil es schon eine "
+"laufende Anfrage f端r diesen Benutzernamen gibt."
 
 #: ../src/protocols/oscar/oscar.c:6435
 #, c-format
@@ -9420,8 +9600,8 @@
 "Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
-"Fehler 0x%04x: Kann die E-Mailadresse nicht 辰ndern, weil es schon zu viele E-"
-"Mailadressen gibt, die zum Benutzernamen geh旦ren."
+"Fehler 0x%04x: Kann die E-Mail-Adresse nicht 辰ndern, weil es schon zu viele "
+"E-Mail-Adressen gibt, die zum Benutzernamen geh旦ren."
 
 #: ../src/protocols/oscar/oscar.c:6438
 #, c-format
@@ -9429,7 +9609,7 @@
 "Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
-"Fehler 0x%04x: Kann die E-Mailadresse nicht 辰ndern, weil die angegebene "
+"Fehler 0x%04x: Kann die E-Mail-Adresse nicht 辰ndern, weil die angegebene "
 "Adresse falsch ist."
 
 #: ../src/protocols/oscar/oscar.c:6441
@@ -9718,15 +9898,15 @@
 
 #: ../src/protocols/oscar/oscar.c:8394
 msgid "Find Buddy by E-Mail"
-msgstr "Suche Buddys nach E-Mail Adresse"
+msgstr "Suche Buddys nach E-Mail-Adresse"
 
 #: ../src/protocols/oscar/oscar.c:8395
 msgid "Search for a buddy by e-mail address"
-msgstr "Suche nach einem Buddy mit einer bestimmten E-Mail Adresse"
+msgstr "Suche nach einem Buddy mit einer bestimmten E-Mail-Adresse"
 
 #: ../src/protocols/oscar/oscar.c:8396
 msgid "Type the e-mail address of the buddy you are searching for."
-msgstr "Geben Sie die E-Mail Adresse des Buddys ein, nach dem Sie suchen."
+msgstr "Geben Sie die E-Mail-Adresse des Buddys ein, nach dem Sie suchen."
 
 #: ../src/protocols/oscar/oscar.c:8489
 msgid "Set User Info (URL)..."
@@ -9768,7 +9948,7 @@
 
 #: ../src/protocols/oscar/oscar.c:8546
 msgid "Search for Buddy by E-Mail..."
-msgstr "Suche Buddys nach Email-Adresse..."
+msgstr "Suche Buddys nach E-Mail-Adresse..."
 
 #: ../src/protocols/oscar/oscar.c:8551
 msgid "Search for Buddy by Information"
@@ -10512,8 +10692,7 @@
 msgid "Invincible"
 msgstr "Unersch端tterlich"
 
-#: ../src/protocols/silc/buddy.c:1498 ../src/protocols/silc/silc.c:684
-#: ../src/protocols/silc/util.c:485
+#: ../src/protocols/silc/buddy.c:1498 ../src/protocols/silc/util.c:485
 msgid "In Love"
 msgstr "Verliebt"
 
@@ -10913,10 +11092,6 @@
 msgid "Birth Day"
 msgstr "Geburtstag"
 
-#: ../src/protocols/silc/ops.c:1044
-msgid "Job Title"
-msgstr "Beruf"
-
 #: ../src/protocols/silc/ops.c:1048
 msgid "Job Role"
 msgstr "Position"
@@ -10929,10 +11104,6 @@
 msgid "Unit"
 msgstr "Abteilung"
 
-#: ../src/protocols/silc/ops.c:1075
-msgid "EMail"
-msgstr "E-Mail"
-
 #: ../src/protocols/silc/ops.c:1080
 msgid "Note"
 msgstr "Bemerkung"
@@ -10941,6 +11112,11 @@
 msgid "Join Chat"
 msgstr "Chat betreten"
 
+#: ../src/protocols/silc/ops.c:1183 ../src/protocols/silc/ops.c:1332
+#: ../src/protocols/yahoo/yahoo_profile.c:1046
+msgid "Real Name"
+msgstr "Echter Name"
+
 #: ../src/protocols/silc/ops.c:1211
 msgid "Status Text"
 msgstr "Statustext"
@@ -11224,6 +11400,10 @@
 msgid "Your Current Mood"
 msgstr "Ihre momentane Stimmung"
 
+#: ../src/protocols/silc/silc.c:684
+msgid "In love"
+msgstr "Verliebt"
+
 #: ../src/protocols/silc/silc.c:695
 msgid ""
 "\n"
@@ -11240,8 +11420,8 @@
 msgid "MMS"
 msgstr "MMS"
 
-#: ../src/protocols/silc/silc.c:707 ../src/protocols/silc/util.c:522
-msgid "Video Conferencing"
+#: ../src/protocols/silc/silc.c:707
+msgid "Video conferencing"
 msgstr "Videokonferenz"
 
 #: ../src/protocols/silc/silc.c:712
@@ -11316,13 +11496,9 @@
 msgid "Private key file"
 msgstr "Privater Schl端ssel (Datei)"
 
-#: ../src/protocols/silc/silc.c:937
-msgid "Real Name"
-msgstr "Echter Name"
-
 #: ../src/protocols/silc/silc.c:951
-msgid "Re-type Passphrase"
-msgstr "Passphrase wiederholen"
+msgid "Passphrase (retype)"
+msgstr "Passphrase (nochmal)"
 
 #: ../src/protocols/silc/silc.c:958
 msgid "Generate Key Pair"
@@ -11602,7 +11778,7 @@
 
 #: ../src/protocols/silc/util.c:318
 #, c-format
-msgid "EMail: \t\t%s\n"
+msgid "E-Mail: \t\t%s\n"
 msgstr "E-Mail: \t\t%s\n"
 
 #: ../src/protocols/silc/util.c:320
@@ -11627,7 +11803,7 @@
 
 #: ../src/protocols/silc/util.c:326
 #, c-format
-msgid "Key length: \t%d bits\n"
+msgid "Key Length: \t%d bits\n"
 msgstr "Schl端ssell辰nge: \t%d Bits\n"
 
 #: ../src/protocols/silc/util.c:328
@@ -11658,6 +11834,10 @@
 msgid "Paging"
 msgstr "Funkruf"
 
+#: ../src/protocols/silc/util.c:522
+msgid "Video Conferencing"
+msgstr "Videokonferenz"
+
 #: ../src/protocols/silc/util.c:540
 msgid "Computer"
 msgstr "Computer"
@@ -12618,6 +12798,14 @@
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr-Protokoll-Plugin"
 
+#: ../src/protocols/zephyr/zephyr.c:2896
+msgid "Use tzc"
+msgstr "Benutze tzc"
+
+#: ../src/protocols/zephyr/zephyr.c:2899
+msgid "tzc command"
+msgstr "tzc-Kommando"
+
 #: ../src/protocols/zephyr/zephyr.c:2902
 msgid "Export to .anyone"
 msgstr "Export an .anyone"
@@ -12642,19 +12830,26 @@
 msgid "Exposure"
 msgstr "Aussetzen"
 
-#: ../src/proxy.c:1207 ../src/proxy.c:1263 ../src/proxy.c:1311
-#: ../src/proxy.c:1338
+#: ../src/proxy.c:1216 ../src/proxy.c:1272 ../src/proxy.c:1320
+#: ../src/proxy.c:1347
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "Proxy-Verbindungsfehler %d"
 
 #. Forbidden
-#: ../src/proxy.c:1327
+#: ../src/proxy.c:1336
 #, c-format
 msgid "Access denied: proxy server forbids port %d tunnelling."
 msgstr ""
 "Zugriff verboten: Der Proxy-Server verbietet das Tunneling 端ber Port %d."
 
+#. *
+#. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
+#.
+#: ../src/request.h:1354
+msgid "_Accept"
+msgstr "_Akzeptieren"
+
 #: ../src/savedstatuses.c:514
 msgid "saved statuses"
 msgstr "gespeicherter Status"
@@ -12698,42 +12893,37 @@
 msgid "Mobile"
 msgstr "Mobil"
 
-#: ../src/status.c:623
-#, c-format
-msgid "%s signed on"
-msgstr "%s hat sich angemeldet"
-
-#: ../src/status.c:629
-#, c-format
-msgid "%s signed off"
-msgstr "%s hat sich abgemeldet"
-
-#: ../src/status.c:634
-#, c-format
-msgid "%s came back"
-msgstr "%s kam zur端ck"
-
-#: ../src/status.c:639
-#, c-format
-msgid "%s went away"
-msgstr "%s ist weggegangen"
-
-#: ../src/status.c:1330
+#: ../src/status.c:622
+#, c-format
+msgid "%s changed status from %s to %s"
+msgstr "%s hat den Status von %s zu %s ge辰ndert"
+
+#: ../src/status.c:632
+#, c-format
+msgid "%s is now %s"
+msgstr "%s ist jetzt %s"
+
+#: ../src/status.c:637
+#, c-format
+msgid "%s is no longer %s"
+msgstr "%s ist nicht mehr %s"
+
+#: ../src/status.c:1320
 #, c-format
 msgid "%s became idle"
 msgstr "%s wurde unt辰tig"
 
-#: ../src/status.c:1347
+#: ../src/status.c:1337
 #, c-format
 msgid "%s became unidle"
 msgstr "%s wurde t辰tig"
 
-#: ../src/status.c:1413
+#: ../src/status.c:1403
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s wurde unt辰tig"
 
-#: ../src/status.c:1415
+#: ../src/status.c:1405
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s wurde t辰tig"
@@ -12811,6 +13001,33 @@
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Fehler bei Herstellen der Verbindung.\n"
 
+#~ msgid "Screen Name:"
+#~ msgstr "Benutzername:"
+
+#~ msgid "Error launching <b>%s</b>: %s"
+#~ msgstr "Fehler beim Aufruf von <b>%s</b>: %s"
+
+#~ msgid "Email"
+#~ msgstr "E-Mail"
+
+#~ msgid "Realname"
+#~ msgstr "Echter Name"
+
+#~ msgid "Re-type Passphrase"
+#~ msgstr "Passphrase wiederholen"
+
+#~ msgid "%s signed on"
+#~ msgstr "%s hat sich angemeldet"
+
+#~ msgid "%s signed off"
+#~ msgstr "%s hat sich abgemeldet"
+
+#~ msgid "%s came back"
+#~ msgstr "%s kam zur端ck"
+
+#~ msgid "%s went away"
+#~ msgstr "%s ist weggegangen"
+
 #~ msgid "Background color name"
 #~ msgstr "Name der Hintergrundfarbe"
 
@@ -12920,18 +13137,6 @@
 #~ msgid "%s logged out."
 #~ msgstr "%s hat sich abgemeldet."
 
-#~ msgid "I'dle Mak'er1"
-#~ msgstr "Unt辰tigkeitsmarker1"
-
-#~ msgid "I'dle Mak'er2"
-#~ msgstr "Unt辰tigkeitsmarker2"
-
-#~ msgid "I'dle Mak'er3"
-#~ msgstr "Unt辰tigkeitsmarker3"
-
-#~ msgid "e-Mail"
-#~ msgstr "E-Mail"
-
 #~ msgid "Use recent buddies group"
 #~ msgstr "Benutze neueste Gruppe"
 
@@ -12941,15 +13146,6 @@
 #~ msgid "Use AIM/ICQ proxy server (slower, but usually works)"
 #~ msgstr "Benutze AIM/ICQ-Proxyserver (langsamer, aber funktioniert meistens)"
 
-#~ msgid "%m/%Y"
-#~ msgstr "%m/%Y"
-
-#~ msgid "%m/%d/%Y %I:%M:%S %p"
-#~ msgstr "%d.%m.%Y %H:%M:%S"
-
-#~ msgid "Start _Voice Chat"
-#~ msgstr "Starte _Voice-Chat"
-
 #~ msgid "Call ended."
 #~ msgstr "Anruf beendet."
 
@@ -12980,21 +13176,12 @@
 #~ msgid "Saved Status..."
 #~ msgstr "Gespeicherter Status..."
 
-#~ msgid "Bonjour"
-#~ msgstr "Bonjour"
-
-#~ msgid "_Accept"
-#~ msgstr "_Akzeptieren"
-
 #~ msgid "Conversation in %s on %s"
 #~ msgstr "Unterhaltung in %s auf %s"
 
 #~ msgid "_Warn"
 #~ msgstr "_Warnen"
 
-#~ msgid "Nick name"
-#~ msgstr "Spitzname"
-
 #~ msgid "Screenname:"
 #~ msgstr "Benutzername:"
 
--- a/po/gl.po	Thu Mar 23 14:20:56 2006 +0000
+++ b/po/gl.po	Thu Mar 23 16:38:36 2006 +0000
@@ -7,14 +7,15 @@
 msgstr ""
 "Project-Id-Version: gl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-03-05 18:23+0100\n"
-"PO-Revision-Date: 2006-03-05 18:22+0100\n"
+"POT-Creation-Date: 2006-03-22 13:23+0100\n"
+"PO-Revision-Date: 2006-03-22 13:51+0100\n"
 "Last-Translator: Ignacio Casal Quinteiro <nacho.resa@gmail.com>\n"
-"Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
+"Language-Team: Galego <trasno@ceu.fi.udc.es>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);X-Generator: KBabel 1.11.2\n"
+"X-Generator: KBabel 1.11.2\n"
 
 #: ../gaim.desktop.in.h:1
 msgid "Gaim Internet Messenger"
@@ -101,10 +102,8 @@
 #. *< version
 #. *< summary
 #: ../plugins/contact_priority.c:185
-msgid ""
-"Allows for controlling the values associated with different buddy states."
-msgstr ""
-"Permite controlar os valores asociados aos diferentes estados dos amigos."
+msgid "Allows for controlling the values associated with different buddy states."
+msgstr "Permite controlar os valores asociados aos diferentes estados dos amigos."
 
 #. *< description
 #: ../plugins/contact_priority.c:187
@@ -160,7 +159,7 @@
 
 #. add enabled / disabled
 #: ../plugins/crazychat/cc_gaim_plugin.c:345 ../src/gtkaccount.c:2251
-#: ../src/gtkplugin.c:577
+#: ../src/gtkplugin.c:574
 msgid "Enabled"
 msgstr "Activado"
 
@@ -190,7 +189,7 @@
 msgid "Right-click for more unread messages...\n"
 msgstr "Premer co bot坦n dereito para m叩is mensaxes sen ler...\n"
 
-#: ../plugins/docklet/docklet.c:157 ../src/gtkblist.c:3274
+#: ../plugins/docklet/docklet.c:157 ../src/gtkblist.c:3238
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
@@ -205,31 +204,31 @@
 #: ../src/protocols/jabber/buddy.c:1101 ../src/protocols/msn/state.c:29
 #: ../src/protocols/msn/state.c:30 ../src/protocols/msn/state.c:37
 #: ../src/protocols/msn/state.c:38 ../src/protocols/novell/novell.c:2845
-#: ../src/protocols/yahoo/yahoo.c:2734 ../src/status.c:155
+#: ../src/protocols/yahoo/yahoo.c:2735 ../src/status.c:155
 msgid "Available"
 msgstr "Dispo単ible"
 
 #. Away stuff
 #: ../plugins/docklet/docklet.c:439 ../src/gtkprefs.c:1759
 #: ../src/gtkstatusbox.c:674 ../src/protocols/irc/irc.c:520
-#: ../src/protocols/irc/msgs.c:219 ../src/protocols/jabber/buddy.c:1105
+#: ../src/protocols/irc/msgs.c:223 ../src/protocols/jabber/buddy.c:1105
 #: ../src/protocols/novell/novell.c:2848 ../src/protocols/oscar/oscar.c:793
-#: ../src/protocols/oscar/oscar.c:6830 ../src/protocols/oscar/oscar.c:7871
-#: ../src/protocols/silc/buddy.c:1469 ../src/protocols/yahoo/yahoo.c:3188
+#: ../src/protocols/oscar/oscar.c:6836 ../src/protocols/oscar/oscar.c:7879
+#: ../src/protocols/silc/buddy.c:1469 ../src/protocols/yahoo/yahoo.c:3189
 #: ../src/status.c:158
 msgid "Away"
 msgstr "Ausente"
 
 #: ../plugins/docklet/docklet.c:443 ../src/gtkstatusbox.c:675
-#: ../src/protocols/oscar/oscar.c:797 ../src/protocols/yahoo/yahoo.c:2728
+#: ../src/protocols/oscar/oscar.c:797 ../src/protocols/yahoo/yahoo.c:2729
 #: ../src/status.c:157
 msgid "Invisible"
 msgstr "Invisible"
 
-#: ../plugins/docklet/docklet.c:447 ../src/gtkblist.c:3004
+#: ../plugins/docklet/docklet.c:447 ../src/gtkblist.c:2968
 #: ../src/gtkstatusbox.c:676 ../src/protocols/jabber/buddy.c:1099
 #: ../src/protocols/novell/novell.c:2857 ../src/protocols/oscar/oscar.c:859
-#: ../src/protocols/oscar/oscar.c:7843 ../src/protocols/yahoo/yahoo.c:2732
+#: ../src/protocols/oscar/oscar.c:7851 ../src/protocols/yahoo/yahoo.c:2733
 #: ../src/status.c:154
 msgid "Offline"
 msgstr "Desconectado"
@@ -246,7 +245,7 @@
 msgid "Show Buddy List"
 msgstr "Amosar lista de amigos"
 
-#: ../plugins/docklet/docklet.c:489
+#: ../plugins/docklet/docklet.c:489 ../src/gtkconv.c:5640
 msgid "Unread Messages"
 msgstr "Mensaxes sen ler"
 
@@ -258,7 +257,7 @@
 msgid "Accounts"
 msgstr "Contas"
 
-#: ../plugins/docklet/docklet.c:520 ../src/gtkplugin.c:541
+#: ../plugins/docklet/docklet.c:520 ../src/gtkplugin.c:538
 msgid "Plugins"
 msgstr "Complementos"
 
@@ -395,7 +394,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/filectl.c:245
+#: ../plugins/filectl.c:248
 msgid "Gaim File Control"
 msgstr "Control de ficheiros de Gaim"
 
@@ -403,7 +402,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/filectl.c:248 ../plugins/filectl.c:250
+#: ../plugins/filectl.c:251 ../plugins/filectl.c:253
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "Permite controlar Gaim introducindo comandos nun ficheiro."
 
@@ -597,10 +596,14 @@
 "Arriba e despois 叩 dereita para cambiar 叩 seguinte conversaci坦n."
 
 #. Extract their Name and put it in
+#. Contact Info
+#. Personal
+#. Business
 #: ../plugins/gevolution/add_buddy_dialog.c:131
-#: ../plugins/gevolution/assoc-buddy.c:119 ../src/gtkplugin.c:590
+#: ../plugins/gevolution/assoc-buddy.c:119 ../src/gtkplugin.c:587
 #: ../src/gtkroomlist.c:604 ../src/protocols/jabber/jabber.c:755
-#: ../src/protocols/msn/msn.c:1525
+#: ../src/protocols/msn/msn.c:1532 ../src/protocols/msn/msn.c:1585
+#: ../src/protocols/msn/msn.c:1606
 msgid "Name"
 msgstr "Nome"
 
@@ -618,14 +621,14 @@
 #. "Search"
 #: ../plugins/gevolution/add_buddy_dialog.c:467
 #: ../plugins/gevolution/assoc-buddy.c:353
-#: ../src/protocols/jabber/buddy.c:1418 ../src/protocols/oscar/oscar.c:8391
+#: ../src/protocols/jabber/buddy.c:1418 ../src/protocols/oscar/oscar.c:8399
 #: ../src/protocols/sametime/sametime.c:5532
 msgid "Search"
 msgstr "Buscar"
 
 #: ../plugins/gevolution/add_buddy_dialog.c:548
-#: ../plugins/gevolution/new_person_dialog.c:306 ../src/gtkblist.c:4570
-#: ../src/gtkblist.c:4934
+#: ../plugins/gevolution/new_person_dialog.c:306 ../src/gtkblist.c:4612
+#: ../src/gtkblist.c:4976
 msgid "Group:"
 msgstr "Grupo:"
 
@@ -660,13 +663,13 @@
 msgstr "_Asociar amigo"
 
 #: ../plugins/gevolution/eds-utils.c:73 ../plugins/gevolution/eds-utils.c:86
-#: ../src/protocols/jabber/jabber.c:1121
+#: ../src/protocols/jabber/jabber.c:1122
 msgid "None"
 msgstr "Ning炭n"
 
 #: ../plugins/gevolution/gevo-util.c:64 ../plugins/gevolution/gevolution.c:96
-#: ../src/blist.c:516 ../src/blist.c:1270 ../src/blist.c:1495
-#: ../src/gtkblist.c:4379 ../src/protocols/jabber/roster.c:65
+#: ../src/blist.c:516 ../src/blist.c:1278 ../src/blist.c:1505
+#: ../src/gtkblist.c:4421 ../src/protocols/jabber/roster.c:65
 msgid "Buddies"
 msgstr "Amigos"
 
@@ -699,11 +702,10 @@
 #. Label
 #: ../plugins/gevolution/gevolution.c:420
 msgid "Select all accounts that buddies should be auto-added to."
-msgstr ""
-"Seleccione todas as contas aos que os amigos engadiranse de forma autom叩tica"
+msgstr "Seleccione todas as contas aos que os amigos engadiranse de forma autom叩tica"
 
 #: ../plugins/gevolution/gevolution.c:450 ../plugins/idle.c:147
-#: ../plugins/idle.c:183 ../src/gtknotify.c:371 ../src/gtkpounce.c:1262
+#: ../plugins/idle.c:183 ../src/gtknotify.c:397 ../src/gtkpounce.c:1262
 msgid "Account"
 msgstr "Conta"
 
@@ -732,14 +734,14 @@
 
 #: ../plugins/gevolution/new_person_dialog.c:270
 msgid "Please enter the buddy's screen name and account type below."
-msgstr ""
-"Introduza o nome de usuario do seu amigo e o tipo de conta m叩is abaixo."
+msgstr "Introduza o nome de usuario do seu amigo e o tipo de conta m叩is abaixo."
 
 #: ../plugins/gevolution/new_person_dialog.c:290
 msgid "Account type:"
 msgstr "Tipo de conta:"
 
 #: ../plugins/gevolution/new_person_dialog.c:294 ../src/gtkaccount.c:784
+#: ../src/gtkblist.c:4574
 msgid "Screen name:"
 msgstr "Nome de usuario:"
 
@@ -813,8 +815,7 @@
 
 #: ../plugins/history.c:190
 msgid "Shows recently logged conversations in new conversations."
-msgstr ""
-"Mostra as conversaci坦ns rexistradas previamente nas novas conversaci坦ns."
+msgstr "Mostra as conversaci坦ns rexistradas previamente nas novas conversaci坦ns."
 
 #: ../plugins/history.c:191
 msgid ""
@@ -840,8 +841,7 @@
 #. *  description
 #: ../plugins/iconaway.c:85 ../plugins/iconaway.c:87
 msgid "Iconifies the buddy list and your conversations when you go away."
-msgstr ""
-"Iconiza a lista de amigos e de conversaci坦ns cando vostede est叩 ausente."
+msgstr "Iconiza a lista de amigos e de conversaci坦ns cando vostede est叩 ausente."
 
 #: ../plugins/idle.c:152 ../plugins/idle.c:210
 msgid "Minutes"
@@ -938,31 +938,31 @@
 "Complemento de soporte IPC de proba, como un servidor. Este rexistra os "
 "comandos IPC."
 
-#: ../plugins/log_reader.c:1407
+#: ../plugins/log_reader.c:1405
 msgid "User is offline."
 msgstr "O usuario est叩 desconectado."
 
-#: ../plugins/log_reader.c:1413
+#: ../plugins/log_reader.c:1411
 msgid "Auto-response sent:"
 msgstr "Enviar resposta autom叩tica:"
 
-#: ../plugins/log_reader.c:1423 ../plugins/log_reader.c:1426
-#: ../plugins/statenotify.c:79
+#: ../plugins/log_reader.c:1421 ../plugins/log_reader.c:1424
+#: ../plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s desconectouse."
 
-#: ../plugins/log_reader.c:1440
+#: ../plugins/log_reader.c:1438
 msgid "One or more messages may have been undeliverable."
 msgstr "Unha ou m叩is mensaxes pode que non chegaran ao destino."
 
 #. MSG_SERVER_DISCONNECTING
 #. we have been kicked off =^(
-#: ../plugins/log_reader.c:1450 ../src/protocols/napster/napster.c:363
+#: ../plugins/log_reader.c:1448 ../src/protocols/napster/napster.c:363
 msgid "You were disconnected from the server."
 msgstr "Foi desconectado do servidor."
 
-#: ../plugins/log_reader.c:1458
+#: ../plugins/log_reader.c:1456
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
@@ -970,49 +970,49 @@
 "Est叩 actualmente desconectado. As mensaxes non se recibir叩n a non ser que se "
 "conecte."
 
-#: ../plugins/log_reader.c:1473
+#: ../plugins/log_reader.c:1471
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr "Non se puido enviar a mensaxe porque excedeu a lonxitude m叩xima."
 
-#: ../plugins/log_reader.c:1478
+#: ../plugins/log_reader.c:1476
 msgid "Message could not be sent."
 msgstr "A mensaxe non puido ser enviada."
 
-#: ../plugins/log_reader.c:1837 ../plugins/log_reader.c:1930
+#: ../plugins/log_reader.c:1835 ../plugins/log_reader.c:1928
 msgid "Adium"
 msgstr "Adium"
 
-#: ../plugins/log_reader.c:1846 ../plugins/log_reader.c:1934
+#: ../plugins/log_reader.c:1844 ../plugins/log_reader.c:1932
 msgid "Fire"
 msgstr "Fogo"
 
-#: ../plugins/log_reader.c:1855 ../plugins/log_reader.c:1938
+#: ../plugins/log_reader.c:1853 ../plugins/log_reader.c:1936
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
-#: ../plugins/log_reader.c:1864 ../plugins/log_reader.c:1942
+#: ../plugins/log_reader.c:1862 ../plugins/log_reader.c:1940
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: ../plugins/log_reader.c:1873 ../plugins/log_reader.c:1946
+#: ../plugins/log_reader.c:1871 ../plugins/log_reader.c:1944
 msgid "Trillian"
 msgstr "Trillian"
 
 #. Add general preferences.
-#: ../plugins/log_reader.c:1912
+#: ../plugins/log_reader.c:1910
 msgid "General Log Reading Configuration"
 msgstr "Configuraci坦n de lectura de rexistro xeral"
 
-#: ../plugins/log_reader.c:1916
+#: ../plugins/log_reader.c:1914
 msgid "Fast size calculations"
 msgstr "C叩lculos de tama単o r叩pido"
 
-#: ../plugins/log_reader.c:1920
+#: ../plugins/log_reader.c:1918
 msgid "Use name heuristics"
 msgstr "Usar nomes heur鱈sticos"
 
 #. Add Log Directory preferences.
-#: ../plugins/log_reader.c:1926
+#: ../plugins/log_reader.c:1924
 msgid "Log Directory"
 msgstr "Directorio de rexistro"
 
@@ -1022,19 +1022,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/log_reader.c:1969
+#: ../plugins/log_reader.c:1967
 msgid "Log Reader"
 msgstr "Lector de rexistro"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../plugins/log_reader.c:1973
+#: ../plugins/log_reader.c:1971
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Inclu鱈r outros rexistros de clientes de MI no visor de rexistro."
 
 #. * description
-#: ../plugins/log_reader.c:1977
+#: ../plugins/log_reader.c:1975
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, Fire, Messenger Plus!, MSN Messenger, and "
@@ -1054,8 +1054,7 @@
 
 #: ../plugins/mailchk.c:163
 msgid "Adds a small box to the buddy list that shows if you have new mail."
-msgstr ""
-"Engade unha pequena caixa 叩 lista de amigos que mostra se ten novo correo."
+msgstr "Engade unha pequena caixa 叩 lista de amigos que mostra se ten novo correo."
 
 #: ../plugins/mono/loader/mono.c:213
 msgid "Mono Plugin Loader"
@@ -1376,73 +1375,72 @@
 msgid "Tests to see that most things are working."
 msgstr "Fai probas para determinar se a maior parte das cousas funcionan."
 
-#: ../plugins/spellchk.c:1917
+#: ../plugins/spellchk.c:1918
 msgid "Duplicate Correction"
 msgstr "Correcci坦n duplicada"
 
-#: ../plugins/spellchk.c:1918
+#: ../plugins/spellchk.c:1919
 msgid "The specified word already exists in the correction list."
 msgstr "A palabra especificada xa existe na lista de correcci坦n."
 
-#: ../plugins/spellchk.c:2127
+#: ../plugins/spellchk.c:2128
 msgid "Text Replacements"
 msgstr "Remprazos de texto"
 
-#: ../plugins/spellchk.c:2150
+#: ../plugins/spellchk.c:2151
 msgid "You type"
 msgstr "Vostede escribe"
 
-#: ../plugins/spellchk.c:2164
+#: ../plugins/spellchk.c:2165
 msgid "You send"
 msgstr "Vostede env鱈a"
 
-#: ../plugins/spellchk.c:2178
+#: ../plugins/spellchk.c:2179
 msgid "Whole words only"
 msgstr "Soamente palabras enteiras"
 
-#: ../plugins/spellchk.c:2190
+#: ../plugins/spellchk.c:2191
 msgid "Case sensitive"
 msgstr "Sensible 叩s mai炭sculas"
 
-#: ../plugins/spellchk.c:2216
+#: ../plugins/spellchk.c:2217
 msgid "Add a new text replacement"
 msgstr "Engadir unha nova regra de remprazo de texto"
 
-#: ../plugins/spellchk.c:2232
+#: ../plugins/spellchk.c:2233
 msgid "You _type:"
 msgstr "Vostede _escribe:"
 
-#: ../plugins/spellchk.c:2249
+#: ../plugins/spellchk.c:2250
 msgid "You _send:"
 msgstr "Vostede _env鱈a:"
 
 #. Created here so it can be passed to whole_words_button_toggled.
-#: ../plugins/spellchk.c:2261
+#: ../plugins/spellchk.c:2262
 msgid "_Exact case match (uncheck for automatic case handling)"
 msgstr ""
 "Axustar ao formato _exacto (desmarcar para xestionar mai炭sculas e min炭sculas "
 "automaticamente)"
 
-#: ../plugins/spellchk.c:2263
+#: ../plugins/spellchk.c:2264
 msgid "Only replace _whole words"
 msgstr "Reemprazar soamente palabras _enteiras"
 
-#: ../plugins/spellchk.c:2288
-msgid "General Text Replacement Options"
-msgstr "Opci坦ns de reemprazos de texto xeral"
-
 #: ../plugins/spellchk.c:2289
+msgid "General Text Replacement Options"
+msgstr "Opci坦ns de reemprazos de texto xeral"
+
+#: ../plugins/spellchk.c:2290
 msgid "Enable replacement of last word on send"
 msgstr "Activar a sustituci坦n da 炭ltima palabra ao enviar"
 
-#: ../plugins/spellchk.c:2314
+#: ../plugins/spellchk.c:2315
 msgid "Text replacement"
 msgstr "Remprazo de texto"
 
-#: ../plugins/spellchk.c:2316 ../plugins/spellchk.c:2317
+#: ../plugins/spellchk.c:2317 ../plugins/spellchk.c:2318
 msgid "Replaces text in outgoing messages according to user-defined rules."
-msgstr ""
-"Rempraza o texto das mensaxes sa鱈ntes seg炭n as regras definidas polo usuario."
+msgstr "Rempraza o texto das mensaxes sa鱈ntes seg炭n as regras definidas polo usuario."
 
 #. *< type
 #. *< ui_requirement
@@ -1496,47 +1494,46 @@
 #. *  description
 #: ../plugins/ssl/ssl.c:97 ../plugins/ssl/ssl.c:99
 msgid "Provides a wrapper around SSL support libraries."
-msgstr ""
-"Proporciona un recubrimento a trav辿s das bibliotecas de soporte de SSL."
-
-#: ../plugins/statenotify.c:49
+msgstr "Proporciona un recubrimento a trav辿s das bibliotecas de soporte de SSL."
+
+#: ../plugins/statenotify.c:50
 #, c-format
 msgid "%s is no longer away."
 msgstr "%s xa non est叩 ausente."
 
-#: ../plugins/statenotify.c:51
+#: ../plugins/statenotify.c:52
 #, c-format
 msgid "%s has gone away."
 msgstr "%s marchouse."
 
-#: ../plugins/statenotify.c:61
+#: ../plugins/statenotify.c:62
 #, c-format
 msgid "%s has become idle."
 msgstr "%s est叩 agora inactivo."
 
-#: ../plugins/statenotify.c:63
+#: ../plugins/statenotify.c:64
 #, c-format
 msgid "%s is no longer idle."
 msgstr "%s xa non est叩 inactivo."
 
-#: ../plugins/statenotify.c:72
+#: ../plugins/statenotify.c:73
 #, c-format
 msgid "%s has signed on."
 msgstr "%s conectouse."
 
-#: ../plugins/statenotify.c:90
+#: ../plugins/statenotify.c:91
 msgid "Notify When"
 msgstr "Notificar cando"
 
-#: ../plugins/statenotify.c:93
+#: ../plugins/statenotify.c:94
 msgid "Buddy Goes _Away"
 msgstr "O amigo _aus辿ntase"
 
-#: ../plugins/statenotify.c:96
+#: ../plugins/statenotify.c:97
 msgid "Buddy Goes _Idle"
 msgstr "O amigo est叩 _inactivo"
 
-#: ../plugins/statenotify.c:99
+#: ../plugins/statenotify.c:100
 msgid "Buddy _Signs On/Off"
 msgstr "_Con辿ctase/Desconectouse un amigo"
 
@@ -1546,7 +1543,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/statenotify.c:141
+#: ../plugins/statenotify.c:142
 msgid "Buddy State Notification"
 msgstr "Notificaci坦n de estado de amigos"
 
@@ -1554,7 +1551,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/statenotify.c:144 ../plugins/statenotify.c:147
+#: ../plugins/statenotify.c:145 ../plugins/statenotify.c:148
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
@@ -1606,7 +1603,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/timestamp.c:262
+#: ../plugins/timestamp.c:254
 msgid "Timestamp"
 msgstr "Marca temporal"
 
@@ -1614,10 +1611,9 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/timestamp.c:265 ../plugins/timestamp.c:267
+#: ../plugins/timestamp.c:257 ../plugins/timestamp.c:259
 msgid "Adds iChat-style timestamps to conversations every N minutes."
-msgstr ""
-"Engade unha marca de tempo ao estilo iChat nas conversaci坦ns cada N minutos."
+msgstr "Engade unha marca de tempo ao estilo iChat nas conversaci坦ns cada N minutos."
 
 #: ../plugins/timestamp_format.c:22
 msgid "Timestamp Format Options"
@@ -1720,19 +1716,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/win32/transparency/win2ktrans.c:657
+#: ../plugins/win32/transparency/win2ktrans.c:658
 msgid "Transparency"
 msgstr "Transparencia"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../plugins/win32/transparency/win2ktrans.c:660
+#: ../plugins/win32/transparency/win2ktrans.c:661
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Transparencia variable para a lista de amigos e as conversaci坦ns."
 
 #. *  description
-#: ../plugins/win32/transparency/win2ktrans.c:662
+#: ../plugins/win32/transparency/win2ktrans.c:663
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -1758,7 +1754,7 @@
 msgstr "_Iniciar Gaim ao iniciar Windows"
 
 #. Buddy List
-#: ../plugins/win32/winprefs/winprefs.c:417 ../src/gtkblist.c:3623
+#: ../plugins/win32/winprefs/winprefs.c:417 ../src/gtkblist.c:3665
 msgid "Buddy List"
 msgstr "Lista de amigos"
 
@@ -1823,48 +1819,48 @@
 msgid "Save password"
 msgstr "Gardar contrasinal"
 
-#: ../src/account.c:968 ../src/account.c:1139 ../src/gtkblist.c:3507
-#: ../src/gtkdialogs.c:584 ../src/gtkdialogs.c:721 ../src/gtkdialogs.c:789
-#: ../src/gtkrequest.c:275 ../src/protocols/gg/gg.c:454
-#: ../src/protocols/gg/gg.c:595 ../src/protocols/gg/gg.c:731
-#: ../src/protocols/jabber/jabber.c:1318 ../src/protocols/jabber/xdata.c:337
+#: ../src/account.c:968 ../src/account.c:1139 ../src/gtkblist.c:3549
+#: ../src/gtkdialogs.c:588 ../src/gtkdialogs.c:725 ../src/gtkdialogs.c:789
+#: ../src/gtkrequest.c:269 ../src/protocols/gg/gg.c:497
+#: ../src/protocols/gg/gg.c:638 ../src/protocols/gg/gg.c:774
+#: ../src/protocols/jabber/jabber.c:1319 ../src/protocols/jabber/xdata.c:337
 #: ../src/protocols/msn/msn.c:250 ../src/protocols/msn/msn.c:265
 #: ../src/protocols/msn/msn.c:280 ../src/protocols/msn/msn.c:295
 #: ../src/protocols/oscar/oscar.c:3064 ../src/protocols/oscar/oscar.c:4607
-#: ../src/protocols/oscar/oscar.c:4688 ../src/protocols/oscar/oscar.c:8122
-#: ../src/protocols/oscar/oscar.c:8245 ../src/protocols/oscar/oscar.c:8270
-#: ../src/protocols/oscar/oscar.c:8322 ../src/protocols/silc/buddy.c:466
+#: ../src/protocols/oscar/oscar.c:4688 ../src/protocols/oscar/oscar.c:8130
+#: ../src/protocols/oscar/oscar.c:8253 ../src/protocols/oscar/oscar.c:8278
+#: ../src/protocols/oscar/oscar.c:8330 ../src/protocols/silc/buddy.c:466
 #: ../src/protocols/silc/buddy.c:1182 ../src/protocols/silc/chat.c:423
 #: ../src/protocols/silc/chat.c:461 ../src/protocols/silc/chat.c:724
 #: ../src/protocols/silc/ops.c:1297 ../src/protocols/silc/ops.c:1910
-#: ../src/protocols/silc/silc.c:749 ../src/protocols/yahoo/yahoo.c:3062
-#: ../src/protocols/yahoo/yahoo.c:3071
+#: ../src/protocols/silc/silc.c:753 ../src/protocols/yahoo/yahoo.c:3063
+#: ../src/protocols/yahoo/yahoo.c:3072
 msgid "OK"
 msgstr "Aceptar"
 
 #: ../src/account.c:969 ../src/account.c:1140 ../src/account.c:1177
-#: ../src/gtkaccount.c:2171 ../src/gtkaccount.c:2638 ../src/gtkblist.c:4975
-#: ../src/gtkdialogs.c:585 ../src/gtkdialogs.c:722 ../src/gtkdialogs.c:790
+#: ../src/gtkaccount.c:2171 ../src/gtkaccount.c:2638 ../src/gtkblist.c:5017
+#: ../src/gtkdialogs.c:589 ../src/gtkdialogs.c:726 ../src/gtkdialogs.c:790
 #: ../src/gtkdialogs.c:809 ../src/gtkdialogs.c:831 ../src/gtkdialogs.c:851
 #: ../src/gtkdialogs.c:895 ../src/gtkdialogs.c:950 ../src/gtkdialogs.c:987
 #: ../src/gtkdialogs.c:1012 ../src/gtkimhtmltoolbar.c:419
-#: ../src/gtkplugin.c:297 ../src/gtkpounce.c:1095 ../src/gtkprivacy.c:568
+#: ../src/gtkplugin.c:296 ../src/gtkpounce.c:1095 ../src/gtkprivacy.c:568
 #: ../src/gtkprivacy.c:581 ../src/gtkprivacy.c:606 ../src/gtkprivacy.c:617
-#: ../src/gtkrequest.c:276 ../src/gtksavedstatuses.c:296
-#: ../src/protocols/gg/gg.c:455 ../src/protocols/gg/gg.c:596
-#: ../src/protocols/gg/gg.c:732 ../src/protocols/gg/gg.c:812
+#: ../src/gtkrequest.c:270 ../src/gtksavedstatuses.c:296
+#: ../src/protocols/gg/gg.c:498 ../src/protocols/gg/gg.c:639
+#: ../src/protocols/gg/gg.c:775 ../src/protocols/gg/gg.c:854
 #: ../src/protocols/jabber/buddy.c:573 ../src/protocols/jabber/buddy.c:1419
 #: ../src/protocols/jabber/buddy.c:1453 ../src/protocols/jabber/chat.c:780
-#: ../src/protocols/jabber/jabber.c:824 ../src/protocols/jabber/jabber.c:1319
+#: ../src/protocols/jabber/jabber.c:824 ../src/protocols/jabber/jabber.c:1320
 #: ../src/protocols/jabber/xdata.c:338 ../src/protocols/msn/msn.c:251
 #: ../src/protocols/msn/msn.c:266 ../src/protocols/msn/msn.c:281
 #: ../src/protocols/msn/msn.c:296 ../src/protocols/msn/msn.c:313
 #: ../src/protocols/oscar/oscar.c:1705 ../src/protocols/oscar/oscar.c:3065
 #: ../src/protocols/oscar/oscar.c:4565 ../src/protocols/oscar/oscar.c:4608
 #: ../src/protocols/oscar/oscar.c:4645 ../src/protocols/oscar/oscar.c:4689
-#: ../src/protocols/oscar/oscar.c:8123 ../src/protocols/oscar/oscar.c:8246
-#: ../src/protocols/oscar/oscar.c:8271 ../src/protocols/oscar/oscar.c:8323
-#: ../src/protocols/oscar/oscar.c:8392
+#: ../src/protocols/oscar/oscar.c:8131 ../src/protocols/oscar/oscar.c:8254
+#: ../src/protocols/oscar/oscar.c:8279 ../src/protocols/oscar/oscar.c:8331
+#: ../src/protocols/oscar/oscar.c:8400
 #: ../src/protocols/sametime/sametime.c:3376
 #: ../src/protocols/sametime/sametime.c:3461
 #: ../src/protocols/sametime/sametime.c:3631
@@ -1873,9 +1869,9 @@
 #: ../src/protocols/sametime/sametime.c:5533 ../src/protocols/silc/buddy.c:467
 #: ../src/protocols/silc/buddy.c:1078 ../src/protocols/silc/buddy.c:1183
 #: ../src/protocols/silc/chat.c:596 ../src/protocols/silc/chat.c:725
-#: ../src/protocols/silc/ops.c:1911 ../src/protocols/silc/silc.c:750
-#: ../src/protocols/silc/silc.c:955 ../src/protocols/yahoo/yahoo.c:3063
-#: ../src/protocols/yahoo/yahoo.c:3072
+#: ../src/protocols/silc/ops.c:1911 ../src/protocols/silc/silc.c:754
+#: ../src/protocols/silc/silc.c:959 ../src/protocols/yahoo/yahoo.c:3064
+#: ../src/protocols/yahoo/yahoo.c:3073
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -1884,13 +1880,13 @@
 msgid "Missing protocol plugin for %s"
 msgstr "Falta o complemento de protocolo para %s"
 
-#: ../src/account.c:996 ../src/connection.c:99 ../src/gtkblist.c:3499
-#: ../src/gtkblist.c:3505
+#: ../src/account.c:996 ../src/connection.c:99 ../src/gtkblist.c:3541
+#: ../src/gtkblist.c:3547
 msgid "Connection Error"
 msgstr "Erro de conexi坦n"
 
-#: ../src/account.c:1076 ../src/protocols/gg/gg.c:636
-#: ../src/protocols/jabber/jabber.c:1271
+#: ../src/account.c:1076 ../src/protocols/gg/gg.c:679
+#: ../src/protocols/jabber/jabber.c:1272
 msgid "New passwords do not match."
 msgstr "Os novos contrasinais non coinciden."
 
@@ -1924,7 +1920,7 @@
 msgid "Change user information for %s"
 msgstr "Cambiar a informaci坦n do usuario %s"
 
-#: ../src/account.c:1176 ../src/gtkdebug.c:684 ../src/gtkrequest.c:282
+#: ../src/account.c:1176 ../src/gtkdebug.c:684 ../src/gtkrequest.c:276
 #: ../src/protocols/jabber/buddy.c:572
 msgid "Save"
 msgstr "Gardar"
@@ -1939,11 +1935,11 @@
 msgid "buddy list"
 msgstr "lista de amigos"
 
-#: ../src/blist.c:1173
+#: ../src/blist.c:1179
 msgid "Chats"
 msgstr "Chats"
 
-#: ../src/blist.c:1886
+#: ../src/blist.c:1901
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because it belongs to an account "
@@ -1959,7 +1955,7 @@
 "%d amigos do grupo %s non se eliminou porque a s炭a conta non estaba "
 "conectada. Este amigo e os seus grupos non foron eliminados.\n"
 
-#: ../src/blist.c:1896
+#: ../src/blist.c:1911
 msgid "Group not removed"
 msgstr "Grupo non eliminado"
 
@@ -1972,7 +1968,7 @@
 msgid "+++ %s signed on"
 msgstr "+++ %s conectouse"
 
-#: ../src/connection.c:322
+#: ../src/connection.c:313
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s desconectouse"
@@ -2024,7 +2020,7 @@
 msgid "%s left the room (%s)."
 msgstr "%s sa鱈u da sala (%s)."
 
-#: ../src/desktopitem.c:286 ../src/desktopitem.c:875
+#: ../src/desktopitem.c:286 ../src/desktopitem.c:877
 msgid "No name"
 msgstr "Sen nome"
 
@@ -2176,7 +2172,7 @@
 msgid "Password:"
 msgstr "Contrasinal:"
 
-#: ../src/gtkaccount.c:863 ../src/gtkblist.c:4553 ../src/gtkblist.c:4919
+#: ../src/gtkaccount.c:863 ../src/gtkblist.c:4595 ../src/gtkblist.c:4961
 msgid "Alias:"
 msgstr "Alcume:"
 
@@ -2263,7 +2259,7 @@
 msgid "Add Account"
 msgstr "Engadir conta"
 
-#: ../src/gtkaccount.c:1738 ../src/gtkblist.c:3508
+#: ../src/gtkaccount.c:1738 ../src/gtkblist.c:3550
 msgid "Modify Account"
 msgstr "Modificar conta"
 
@@ -2285,7 +2281,7 @@
 msgid "Are you sure you want to delete %s?"
 msgstr "Est叩 seguro de que quere borrar %s?"
 
-#: ../src/gtkaccount.c:2170 ../src/gtkpounce.c:1094 ../src/gtkrequest.c:279
+#: ../src/gtkaccount.c:2170 ../src/gtkpounce.c:1094 ../src/gtkrequest.c:273
 #: ../src/gtksavedstatuses.c:295
 msgid "Delete"
 msgstr "Borrar"
@@ -2308,229 +2304,228 @@
 msgid "Add buddy to your list?"
 msgstr "Engadir o amigo a s炭a lista?"
 
-#: ../src/gtkaccount.c:2637 ../src/gtkblist.c:4974 ../src/gtkconv.c:1594
-#: ../src/gtkrequest.c:280 ../src/protocols/gg/gg.c:811
+#: ../src/gtkaccount.c:2637 ../src/gtkblist.c:5016 ../src/gtkconv.c:1625
+#: ../src/gtkrequest.c:274 ../src/protocols/gg/gg.c:853
 #: ../src/protocols/oscar/oscar.c:4877
 #: ../src/protocols/sametime/sametime.c:5408 ../src/protocols/silc/chat.c:595
 msgid "Add"
 msgstr "Engadir"
 
-#: ../src/gtkblist.c:673
+#: ../src/gtkblist.c:672
 msgid "Join a Chat"
 msgstr "Unirse a un Chat"
 
-#: ../src/gtkblist.c:694
+#: ../src/gtkblist.c:693
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "Introduza a informaci坦n apropiada do chat ao que desexar鱈a unirse.\n"
 
-#: ../src/gtkblist.c:705 ../src/gtkpounce.c:527 ../src/gtkroomlist.c:377
+#: ../src/gtkblist.c:704 ../src/gtkpounce.c:527 ../src/gtkroomlist.c:377
 msgid "_Account:"
 msgstr "Con_ta:"
 
-#: ../src/gtkblist.c:949
+#: ../src/gtkblist.c:948
 msgid "Get _Info"
 msgstr "Obter _informaci坦n:"
 
-#: ../src/gtkblist.c:952 ../src/gtkstock.c:141
+#: ../src/gtkblist.c:951 ../src/gtkstock.c:141
 msgid "I_M"
 msgstr "_MI"
 
-#: ../src/gtkblist.c:958
+#: ../src/gtkblist.c:957
 msgid "_Send File"
 msgstr "E_nviar ficheiro"
 
-#: ../src/gtkblist.c:965
+#: ../src/gtkblist.c:964
 msgid "Add Buddy _Pounce"
 msgstr "Engadir _aviso de amigo"
 
-#: ../src/gtkblist.c:969 ../src/gtkblist.c:973 ../src/gtkblist.c:1072
-#: ../src/gtkblist.c:1095
+#: ../src/gtkblist.c:968 ../src/gtkblist.c:972 ../src/gtkblist.c:1071
+#: ../src/gtkblist.c:1094
 msgid "View _Log"
 msgstr "Ver _rexistro"
 
-#: ../src/gtkblist.c:984
+#: ../src/gtkblist.c:983
 msgid "Alias..."
 msgstr "Alcume..."
 
-#: ../src/gtkblist.c:987 ../src/gtkconv.c:1591 ../src/gtkrequest.c:281
+#: ../src/gtkblist.c:986 ../src/gtkconv.c:1622 ../src/gtkrequest.c:275
 msgid "Remove"
 msgstr "Eliminar"
 
-#: ../src/gtkblist.c:993 ../src/gtkblist.c:1080 ../src/gtkblist.c:1101
+#: ../src/gtkblist.c:992 ../src/gtkblist.c:1079 ../src/gtkblist.c:1100
 msgid "_Alias..."
 msgstr "_Alcume..."
 
-#: ../src/gtkblist.c:995 ../src/gtkblist.c:1082 ../src/gtkblist.c:1103
+#: ../src/gtkblist.c:994 ../src/gtkblist.c:1081 ../src/gtkblist.c:1102
 msgid "_Remove"
 msgstr "_Eliminar"
 
-#: ../src/gtkblist.c:1043
+#: ../src/gtkblist.c:1042
 msgid "Add a _Buddy"
 msgstr "Engadir un a_migo"
 
-#: ../src/gtkblist.c:1045
+#: ../src/gtkblist.c:1044
 msgid "Add a C_hat"
 msgstr "Engadir un C_hat"
 
-#: ../src/gtkblist.c:1048
+#: ../src/gtkblist.c:1047
 msgid "_Delete Group"
 msgstr "_Borrar grupo"
 
-#: ../src/gtkblist.c:1050
+#: ../src/gtkblist.c:1049
 msgid "_Rename"
 msgstr "_Renomear"
 
 #. join button
-#: ../src/gtkblist.c:1068 ../src/gtkroomlist.c:285 ../src/gtkroomlist.c:441
+#: ../src/gtkblist.c:1067 ../src/gtkroomlist.c:285 ../src/gtkroomlist.c:441
 #: ../src/gtkstock.c:139
 msgid "_Join"
 msgstr "_Unirse"
 
-#: ../src/gtkblist.c:1070
+#: ../src/gtkblist.c:1069
 msgid "Auto-Join"
 msgstr "Conectarse automaticamente"
 
-#: ../src/gtkblist.c:1108 ../src/gtkblist.c:1131
+#: ../src/gtkblist.c:1107 ../src/gtkblist.c:1130
 msgid "_Collapse"
 msgstr "_Contraer"
 
-#: ../src/gtkblist.c:1136
+#: ../src/gtkblist.c:1135
 msgid "_Expand"
 msgstr "_Expandir"
 
-#: ../src/gtkblist.c:1414 ../src/gtkblist.c:1426 ../src/gtkblist.c:3768
-#: ../src/gtkblist.c:3778
+#: ../src/gtkblist.c:1381 ../src/gtkblist.c:1393 ../src/gtkblist.c:3810
+#: ../src/gtkblist.c:3820
 msgid "/Tools/Mute Sounds"
 msgstr "/Ferramentas/Silenciar sons"
 
-#: ../src/gtkblist.c:1889 ../src/gtkconv.c:4193 ../src/gtkpounce.c:426
-msgid ""
-"You are not currently signed on with an account that can add that buddy."
+#: ../src/gtkblist.c:1853 ../src/gtkconv.c:4209 ../src/gtkpounce.c:426
+msgid "You are not currently signed on with an account that can add that buddy."
 msgstr "Non est叩 conectado con ningunha conta que poida engadir a ese amigo."
 
 #. Buddies menu
-#: ../src/gtkblist.c:2463
+#: ../src/gtkblist.c:2427
 msgid "/_Buddies"
 msgstr "/_Amigos"
 
-#: ../src/gtkblist.c:2464
+#: ../src/gtkblist.c:2428
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Amigos/_Mensaxe instant叩nea nova..."
 
-#: ../src/gtkblist.c:2465
+#: ../src/gtkblist.c:2429
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Amigos/Unirse a un _Chat..."
 
-#: ../src/gtkblist.c:2466
+#: ../src/gtkblist.c:2430
 msgid "/Buddies/Get User _Info..."
 msgstr "/Amigos/Obter _informaci坦n do usuario..."
 
-#: ../src/gtkblist.c:2467
+#: ../src/gtkblist.c:2431
 msgid "/Buddies/View User _Log..."
 msgstr "/Amigos/Ver _rexistro do usuario..."
 
-#: ../src/gtkblist.c:2469
+#: ../src/gtkblist.c:2433
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Amigos/Amosar amigos _desconectados"
 
-#: ../src/gtkblist.c:2470
+#: ../src/gtkblist.c:2434
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Amigos/Amosar grupos _baleiros"
 
-#: ../src/gtkblist.c:2471
+#: ../src/gtkblist.c:2435
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/Amigos/Amosar _detalles de amigos"
 
-#: ../src/gtkblist.c:2472
+#: ../src/gtkblist.c:2436
 msgid "/Buddies/Show Idle _Times"
 msgstr "/Amigos/Amosar _tempo de ausencia"
 
-#: ../src/gtkblist.c:2473
+#: ../src/gtkblist.c:2437
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Amigos/A_rranxar amigos"
 
-#: ../src/gtkblist.c:2475
+#: ../src/gtkblist.c:2439
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Amigos/_Engadir un amigo..."
 
-#: ../src/gtkblist.c:2476
+#: ../src/gtkblist.c:2440
 msgid "/Buddies/Add C_hat..."
 msgstr "/Amigos/Engadir un _Chat..."
 
-#: ../src/gtkblist.c:2477
+#: ../src/gtkblist.c:2441
 msgid "/Buddies/Add _Group..."
 msgstr "/Amigos/Engadir un _grupo..."
 
-#: ../src/gtkblist.c:2479
+#: ../src/gtkblist.c:2443
 msgid "/Buddies/_Quit"
 msgstr "/Amigos/_Sa鱈r"
 
 #. Accounts menu
-#: ../src/gtkblist.c:2482
+#: ../src/gtkblist.c:2446
 msgid "/_Accounts"
 msgstr "/_Contas"
 
-#: ../src/gtkblist.c:2483 ../src/gtkblist.c:5553
+#: ../src/gtkblist.c:2447 ../src/gtkblist.c:5595
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Contas/Engadir\\/Editar"
 
 #. Tools
-#: ../src/gtkblist.c:2486
+#: ../src/gtkblist.c:2450
 msgid "/_Tools"
 msgstr "/_Ferramentas"
 
-#: ../src/gtkblist.c:2487
+#: ../src/gtkblist.c:2451
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Ferramentas/_Avisos de amigo"
 
-#: ../src/gtkblist.c:2488
+#: ../src/gtkblist.c:2452
 msgid "/Tools/Plu_gins"
 msgstr "/Ferramentas/C_omplementos"
 
-#: ../src/gtkblist.c:2489
+#: ../src/gtkblist.c:2453
 msgid "/Tools/Pr_eferences"
 msgstr "/Ferramentas/Pr_eferencias"
 
-#: ../src/gtkblist.c:2490
+#: ../src/gtkblist.c:2454
 msgid "/Tools/Pr_ivacy"
 msgstr "/Ferramentas/Pr_ivacidade"
 
-#: ../src/gtkblist.c:2492
+#: ../src/gtkblist.c:2456
 msgid "/Tools/_File Transfers"
 msgstr "/Ferramentas/Transferencias de _ficheiros"
 
-#: ../src/gtkblist.c:2493
+#: ../src/gtkblist.c:2457
 msgid "/Tools/R_oom List"
 msgstr "/Ferramentas/Lista de _salas"
 
-#: ../src/gtkblist.c:2494
+#: ../src/gtkblist.c:2458
 msgid "/Tools/System _Log"
 msgstr "/Ferramentas/_Rexistro do sistema"
 
-#: ../src/gtkblist.c:2496
+#: ../src/gtkblist.c:2460
 msgid "/Tools/Mute _Sounds"
 msgstr "/Ferramentas/Silenciar _sons"
 
 #. Help
-#: ../src/gtkblist.c:2499
+#: ../src/gtkblist.c:2463
 msgid "/_Help"
 msgstr "/A_xuda"
 
-#: ../src/gtkblist.c:2500
+#: ../src/gtkblist.c:2464
 msgid "/Help/Online _Help"
 msgstr "/Axuda/A_xuda en li単a"
 
-#: ../src/gtkblist.c:2501
+#: ../src/gtkblist.c:2465
 msgid "/Help/_Debug Window"
 msgstr "/Axuda/Fiestra de _depuraci坦n"
 
-#: ../src/gtkblist.c:2502
+#: ../src/gtkblist.c:2466
 msgid "/Help/_About"
 msgstr "/Axuda/_Acerca de"
 
-#: ../src/gtkblist.c:2534 ../src/gtkblist.c:2603
+#: ../src/gtkblist.c:2498 ../src/gtkblist.c:2567
 #, c-format
 msgid ""
 "\n"
@@ -2539,7 +2534,7 @@
 "\n"
 "<b>Conta:</b> %s"
 
-#: ../src/gtkblist.c:2615
+#: ../src/gtkblist.c:2579
 #, c-format
 msgid ""
 "\n"
@@ -2548,7 +2543,7 @@
 "\n"
 "<b>Alcume de amigo:</b> %s"
 
-#: ../src/gtkblist.c:2627
+#: ../src/gtkblist.c:2591
 #, c-format
 msgid ""
 "\n"
@@ -2557,7 +2552,7 @@
 "\n"
 "<b>Alcume:</b> %s"
 
-#: ../src/gtkblist.c:2636
+#: ../src/gtkblist.c:2600
 #, c-format
 msgid ""
 "\n"
@@ -2566,7 +2561,7 @@
 "\n"
 "<b>Conectado:</b> %s"
 
-#: ../src/gtkblist.c:2647
+#: ../src/gtkblist.c:2611
 #, c-format
 msgid ""
 "\n"
@@ -2575,7 +2570,7 @@
 "\n"
 "<b>Inactivo:</b> %s"
 
-#: ../src/gtkblist.c:2682
+#: ../src/gtkblist.c:2646
 #, c-format
 msgid ""
 "\n"
@@ -2584,7 +2579,7 @@
 "\n"
 "<b>Visto por 炭ltima vez</b> fai %s"
 
-#: ../src/gtkblist.c:2691
+#: ../src/gtkblist.c:2655
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2592,7 +2587,7 @@
 "\n"
 "<b>Estado:</b> Desconectado"
 
-#: ../src/gtkblist.c:2702
+#: ../src/gtkblist.c:2666
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2600,7 +2595,7 @@
 "\n"
 "<b>Descrici坦n:</b> Terror鱈fica"
 
-#: ../src/gtkblist.c:2704
+#: ../src/gtkblist.c:2668
 msgid ""
 "\n"
 "<b>Status:</b> Awesome"
@@ -2608,7 +2603,7 @@
 "\n"
 "<b>Estado</b>: Xenial"
 
-#: ../src/gtkblist.c:2706
+#: ../src/gtkblist.c:2670
 msgid ""
 "\n"
 "<b>Status:</b> Rockin'"
@@ -2616,125 +2611,125 @@
 "\n"
 "<b>Estado</b>: Rock & roll"
 
-#: ../src/gtkblist.c:2995
+#: ../src/gtkblist.c:2959
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Inactivo %dh %02dm"
 
-#: ../src/gtkblist.c:2997
+#: ../src/gtkblist.c:2961
 #, c-format
 msgid "Idle %dm"
 msgstr "Inactivo %dm"
 
 #. Idle stuff
-#: ../src/gtkblist.c:3000 ../src/gtkprefs.c:1745
+#: ../src/gtkblist.c:2964 ../src/gtkprefs.c:1745
 #: ../src/protocols/bonjour/bonjour.c:333 ../src/protocols/msn/msn.c:552
 #: ../src/protocols/msn/state.c:32 ../src/protocols/novell/novell.c:2854
-#: ../src/protocols/oscar/oscar.c:5273 ../src/protocols/yahoo/yahoo.c:2730
+#: ../src/protocols/oscar/oscar.c:5273 ../src/protocols/yahoo/yahoo.c:2731
 #: ../src/protocols/yahoo/yahoo_profile.c:691
 msgid "Idle"
 msgstr "Inactivo"
 
-#: ../src/gtkblist.c:3132
+#: ../src/gtkblist.c:3096
 msgid "/Buddies/New Instant Message..."
 msgstr "/Amigos/Mensaxe instant叩nea _nova..."
 
-#: ../src/gtkblist.c:3133 ../src/gtkblist.c:3166
+#: ../src/gtkblist.c:3097 ../src/gtkblist.c:3130
 msgid "/Buddies/Join a Chat..."
 msgstr "/Amigos/Unirse a un Chat..."
 
-#: ../src/gtkblist.c:3134
+#: ../src/gtkblist.c:3098
 msgid "/Buddies/Get User Info..."
 msgstr "/Amigos/Obter informaci坦n do usuario..."
 
-#: ../src/gtkblist.c:3135
+#: ../src/gtkblist.c:3099
 msgid "/Buddies/Add Buddy..."
 msgstr "/Amigos/Engadir un amigo..."
 
-#: ../src/gtkblist.c:3136 ../src/gtkblist.c:3169
+#: ../src/gtkblist.c:3100 ../src/gtkblist.c:3133
 msgid "/Buddies/Add Chat..."
 msgstr "/Amigos/Engadir un Chat..."
 
-#: ../src/gtkblist.c:3137
+#: ../src/gtkblist.c:3101
 msgid "/Buddies/Add Group..."
 msgstr "/Amigos/Engadir un grupo..."
 
-#: ../src/gtkblist.c:3172
+#: ../src/gtkblist.c:3136
 msgid "/Tools/Buddy Pounces"
 msgstr "/Ferramentas/Avisos de amigo"
 
-#: ../src/gtkblist.c:3175
+#: ../src/gtkblist.c:3139
 msgid "/Tools/Privacy"
 msgstr "/Ferramentas/Privacidade"
 
-#: ../src/gtkblist.c:3178
+#: ../src/gtkblist.c:3142
 msgid "/Tools/Room List"
 msgstr "/Ferramentas/Lista de salas"
 
-#: ../src/gtkblist.c:3372
+#: ../src/gtkblist.c:3336
 msgid "Manually"
 msgstr "Manualmente"
 
-#: ../src/gtkblist.c:3374
+#: ../src/gtkblist.c:3338
 msgid "Alphabetically"
 msgstr "Alfabeticamente"
 
-#: ../src/gtkblist.c:3375
+#: ../src/gtkblist.c:3339
 msgid "By status"
 msgstr "Por estado"
 
-#: ../src/gtkblist.c:3376
+#: ../src/gtkblist.c:3340
 msgid "By log size"
 msgstr "Por tama単o de rexistro"
 
-#: ../src/gtkblist.c:3493 ../src/gtkconn.c:196
+#: ../src/gtkblist.c:3535 ../src/gtkconn.c:196
 #, c-format
 msgid "%s disconnected"
 msgstr "%s desconectado"
 
-#: ../src/gtkblist.c:3509 ../src/protocols/sametime/sametime.c:3630
+#: ../src/gtkblist.c:3551 ../src/protocols/sametime/sametime.c:3630
 msgid "Connect"
 msgstr "Conectar"
 
-#: ../src/gtkblist.c:3509 ../src/gtkblist.c:5652
-msgid "Enable Account"
-msgstr "Activar conta"
-
-#: ../src/gtkblist.c:3530
+#: ../src/gtkblist.c:3551
+msgid "Re-enable Account"
+msgstr "Re-activar conta"
+
+#: ../src/gtkblist.c:3572
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s desconectado: %s</span>"
 
-#: ../src/gtkblist.c:3657
+#: ../src/gtkblist.c:3699
 msgid "/Accounts"
 msgstr "/Contas"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../src/gtkblist.c:3762
+#: ../src/gtkblist.c:3804
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Amigos/Amosar amigos desconectados"
 
-#: ../src/gtkblist.c:3765
+#: ../src/gtkblist.c:3807
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Amigos/Amosar grupos baleiros"
 
-#: ../src/gtkblist.c:3771
+#: ../src/gtkblist.c:3813
 msgid "/Buddies/Show Buddy Details"
 msgstr "/Amigos/Amosar detalles de amigos"
 
-#: ../src/gtkblist.c:3774
+#: ../src/gtkblist.c:3816
 msgid "/Buddies/Show Idle Times"
 msgstr "/Amigos/Amosar tempos de ausencia"
 
-#: ../src/gtkblist.c:4486 ../src/protocols/silc/buddy.c:736
+#: ../src/gtkblist.c:4528 ../src/protocols/silc/buddy.c:736
 #: ../src/protocols/silc/buddy.c:1030 ../src/protocols/silc/buddy.c:1075
-#: ../src/protocols/silc/buddy.c:1174 ../src/protocols/yahoo/yahoo.c:2977
+#: ../src/protocols/silc/buddy.c:1174 ../src/protocols/yahoo/yahoo.c:2978
 msgid "Add Buddy"
 msgstr "Engadir amigo"
 
-#: ../src/gtkblist.c:4510
+#: ../src/gtkblist.c:4552
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
@@ -2744,31 +2739,26 @@
 "Pode, opcionalmente, introducir un alias ou alcume. O alcume mostrarase en "
 "lugar do nome de usuario sempre que sexa posible.\n"
 
-#: ../src/gtkblist.c:4532
-msgid "Screen Name:"
-msgstr "Nome de usuario:"
-
 #. Set up stuff for the account box
-#: ../src/gtkblist.c:4580 ../src/gtkblist.c:4899
+#: ../src/gtkblist.c:4622 ../src/gtkblist.c:4941
 msgid "Account:"
 msgstr "Conta:"
 
-#: ../src/gtkblist.c:4832
+#: ../src/gtkblist.c:4874
 msgid "This protocol does not support chat rooms."
 msgstr "Este protocolo non est叩 soportado nas salas de chats."
 
-#: ../src/gtkblist.c:4848
+#: ../src/gtkblist.c:4890
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
-msgstr ""
-"Non est叩 conectado con ningunha conta que te単a capacidade de acceder a chats."
-
-#: ../src/gtkblist.c:4865
+msgstr "Non est叩 conectado con ningunha conta que te単a capacidade de acceder a chats."
+
+#: ../src/gtkblist.c:4907
 msgid "Add Chat"
 msgstr "Engadir Chat"
 
-#: ../src/gtkblist.c:4889
+#: ../src/gtkblist.c:4931
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2776,32 +2766,36 @@
 "Introduza un alcume, e a informaci坦n que crea apropiada do chat que "
 "desexar鱈a engadir na lista de amigos.\n"
 
-#: ../src/gtkblist.c:4971 ../src/protocols/sametime/sametime.c:5319
+#: ../src/gtkblist.c:5013 ../src/protocols/sametime/sametime.c:5319
 #: ../src/protocols/sametime/sametime.c:5406
 msgid "Add Group"
 msgstr "Engadir grupo"
 
-#: ../src/gtkblist.c:4972
+#: ../src/gtkblist.c:5014
 msgid "Please enter the name of the group to be added."
 msgstr "Introduza o nome do grupo a engadir."
 
-#: ../src/gtkblist.c:5593
+#: ../src/gtkblist.c:5635
 msgid "_Edit Account"
 msgstr "_Editar conta"
 
-#: ../src/gtkblist.c:5626 ../src/gtkblist.c:5632
+#: ../src/gtkblist.c:5668 ../src/gtkblist.c:5674
 msgid "No actions available"
 msgstr "Non hai acci坦ns dispo単ibles"
 
-#: ../src/gtkblist.c:5640
+#: ../src/gtkblist.c:5682
 msgid "_Disable"
 msgstr "_Desactivar"
 
-#: ../src/gtkblist.c:5705
+#: ../src/gtkblist.c:5694
+msgid "Enable Account"
+msgstr "Activar conta"
+
+#: ../src/gtkblist.c:5747
 msgid "/Tools"
 msgstr "/Ferramentas"
 
-#: ../src/gtkblist.c:5800
+#: ../src/gtkblist.c:5833
 msgid "/Buddies/Sort Buddies"
 msgstr "/Amigos/Ordenar amigos"
 
@@ -2861,10 +2855,8 @@
 msgstr "Ese amigo non utiliza o mesmo protocolo que este chat."
 
 #: ../src/gtkconv.c:764
-msgid ""
-"You are not currently signed on with an account that can invite that buddy."
-msgstr ""
-"Non est叩 conectado con ningunha conta coa que poida invitar a ese amigo."
+msgid "You are not currently signed on with an account that can invite that buddy."
+msgstr "Non est叩 conectado con ningunha conta coa que poida invitar a ese amigo."
 
 #: ../src/gtkconv.c:817
 msgid "Invite Buddy Into Chat Room"
@@ -2888,7 +2880,7 @@
 msgid "_Message:"
 msgstr "_Mensaxe:"
 
-#: ../src/gtkconv.c:945 ../src/gtkconv.c:2377 ../src/gtkdebug.c:217
+#: ../src/gtkconv.c:945 ../src/gtkconv.c:2392 ../src/gtkdebug.c:217
 #: ../src/gtkft.c:488
 msgid "Unable to open file."
 msgstr "Non se puido abrir o ficheiro."
@@ -2902,279 +2894,295 @@
 msgid "Save Conversation"
 msgstr "Gardar conversaci坦n"
 
-#: ../src/gtkconv.c:1093 ../src/gtkdebug.c:165 ../src/gtkdebug.c:678
+#: ../src/gtkconv.c:1096 ../src/gtkdebug.c:165 ../src/gtkdebug.c:678
 msgid "Find"
 msgstr "Buscar"
 
-#: ../src/gtkconv.c:1119 ../src/gtkdebug.c:193
+#: ../src/gtkconv.c:1122 ../src/gtkdebug.c:193
 msgid "_Search for:"
 msgstr "Termo a _buscar:"
 
-#: ../src/gtkconv.c:1290
+#: ../src/gtkconv.c:1293
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
 "Iniciuose o rexistro. A partir de agora rexistraranse todas as mensaxes "
 "desta conversaci坦n."
 
-#: ../src/gtkconv.c:1298
-msgid ""
-"Logging stopped. Future messages in this conversation will not be logged."
+#: ../src/gtkconv.c:1301
+msgid "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
 "Deteuse o rexistro. Non se rexistrar叩n mensaxes desta conversaci坦n de agora "
 "endiante."
 
-#: ../src/gtkconv.c:1556
+#: ../src/gtkconv.c:1562
 msgid "IM"
 msgstr "MI"
 
-#: ../src/gtkconv.c:1562 ../src/protocols/oscar/oscar.c:714
+#: ../src/gtkconv.c:1573 ../src/protocols/oscar/oscar.c:714
 msgid "Send File"
 msgstr "Enviar ficheiro"
 
-#: ../src/gtkconv.c:1569
+#: ../src/gtkconv.c:1588
 msgid "Un-Ignore"
 msgstr "Non ignorar"
 
-#: ../src/gtkconv.c:1572
+#: ../src/gtkconv.c:1591
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../src/gtkconv.c:1578
+#: ../src/gtkconv.c:1601
 msgid "Info"
 msgstr "Info"
 
-#: ../src/gtkconv.c:1584
+#: ../src/gtkconv.c:1611
 msgid "Get Away Message"
 msgstr "Mensaxe de ausencia"
 
-#: ../src/gtkconv.c:1599
+#: ../src/gtkconv.c:1634
 msgid "Last said"
 msgstr "Dito a 炭ltima vez"
 
-#: ../src/gtkconv.c:2385
+#: ../src/gtkconv.c:2400
 msgid "Unable to save icon file to disk."
 msgstr "Non se puido gardar o ficheiro de iconas ao disco."
 
-#: ../src/gtkconv.c:2408
+#: ../src/gtkconv.c:2424
 msgid "Save Icon"
 msgstr "Gardar icona"
 
-#: ../src/gtkconv.c:2457
+#: ../src/gtkconv.c:2473
 msgid "Animate"
 msgstr "Animar"
 
-#: ../src/gtkconv.c:2462
+#: ../src/gtkconv.c:2478
 msgid "Hide Icon"
 msgstr "Agochar icona"
 
-#: ../src/gtkconv.c:2468
+#: ../src/gtkconv.c:2484
 msgid "Save Icon As..."
 msgstr "Gardar icona como..."
 
 #. Conversation menu
-#: ../src/gtkconv.c:2609
+#: ../src/gtkconv.c:2625
 msgid "/_Conversation"
 msgstr "/_Conversaci坦n"
 
-#: ../src/gtkconv.c:2611
+#: ../src/gtkconv.c:2627
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversaci坦n/_Mensaxe instant叩nea nova..."
 
-#: ../src/gtkconv.c:2616
+#: ../src/gtkconv.c:2632
 msgid "/Conversation/_Find..."
 msgstr "/Conversaci坦n/_Buscar..."
 
-#: ../src/gtkconv.c:2618
+#: ../src/gtkconv.c:2634
 msgid "/Conversation/View _Log"
 msgstr "/Conversaci坦n/Ver _rexistro"
 
-#: ../src/gtkconv.c:2619
+#: ../src/gtkconv.c:2635
 msgid "/Conversation/_Save As..."
 msgstr "/Conversaci坦n/_Gardar como..."
 
-#: ../src/gtkconv.c:2621
+#: ../src/gtkconv.c:2637
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Conversaci坦n/_Limpar deslizante"
 
-#: ../src/gtkconv.c:2625
+#: ../src/gtkconv.c:2641
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversaci坦n/E_nviar ficheiro..."
 
-#: ../src/gtkconv.c:2626
+#: ../src/gtkconv.c:2642
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversaci坦n/Engadir _aviso de amigo..."
 
-#: ../src/gtkconv.c:2628
+#: ../src/gtkconv.c:2644
 msgid "/Conversation/_Get Info"
 msgstr "/Conversaci坦n/_Obter informaci坦n"
 
-#: ../src/gtkconv.c:2630
+#: ../src/gtkconv.c:2646
 msgid "/Conversation/In_vite..."
 msgstr "/Conversaci坦n/In_vitar..."
 
-#: ../src/gtkconv.c:2635
+#: ../src/gtkconv.c:2651
 msgid "/Conversation/Al_ias..."
 msgstr "/Conversaci坦n/Alc_ume..."
 
-#: ../src/gtkconv.c:2637
+#: ../src/gtkconv.c:2653
 msgid "/Conversation/_Block..."
 msgstr "/Conversaci坦n/_Bloquear..."
 
-#: ../src/gtkconv.c:2639
+#: ../src/gtkconv.c:2655
 msgid "/Conversation/_Add..."
 msgstr "/Conversaci坦n/_Engadir..."
 
-#: ../src/gtkconv.c:2641
+#: ../src/gtkconv.c:2657
 msgid "/Conversation/_Remove..."
 msgstr "/Conversaci坦n/El_iminar..."
 
-#: ../src/gtkconv.c:2646
+#: ../src/gtkconv.c:2662
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Conversaci坦n/Inserir li_gaz坦n..."
 
-#: ../src/gtkconv.c:2648
+#: ../src/gtkconv.c:2664
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Conversaci坦n/Inserir ima_xe..."
 
-#: ../src/gtkconv.c:2653
+#: ../src/gtkconv.c:2669
 msgid "/Conversation/_Close"
 msgstr "/Conversaci坦n/_Pechar"
 
 #. Options
-#: ../src/gtkconv.c:2657
+#: ../src/gtkconv.c:2673
 msgid "/_Options"
 msgstr "/_Opci坦ns"
 
-#: ../src/gtkconv.c:2658
+#: ../src/gtkconv.c:2674
 msgid "/Options/Enable _Logging"
 msgstr "/Opci坦ns/Activar _rexistro"
 
-#: ../src/gtkconv.c:2659
+#: ../src/gtkconv.c:2675
 msgid "/Options/Enable _Sounds"
 msgstr "/Opci坦ns/Activar _sons"
 
-#: ../src/gtkconv.c:2660
+#: ../src/gtkconv.c:2676
 msgid "/Options/Show Buddy _Icon"
 msgstr "/Opci坦ns/Amosar _iconas dos amigos"
 
-#: ../src/gtkconv.c:2662
+#: ../src/gtkconv.c:2678
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Opci坦ns/Amosar _barra de formato"
 
-#: ../src/gtkconv.c:2663
+#: ../src/gtkconv.c:2679
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Opci坦ns/Amosar _marcas de tempo"
 
-#: ../src/gtkconv.c:2755
+#: ../src/gtkconv.c:2771
 msgid "/Conversation/View Log"
 msgstr "/Conversaci坦n/Ver rexistro"
 
-#: ../src/gtkconv.c:2761
+#: ../src/gtkconv.c:2777
 msgid "/Conversation/Send File..."
 msgstr "/Conversaci坦n/Enviar ficheiro..."
 
-#: ../src/gtkconv.c:2765
+#: ../src/gtkconv.c:2781
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversaci坦n/Engadir aviso de amigo..."
 
-#: ../src/gtkconv.c:2771
+#: ../src/gtkconv.c:2787
 msgid "/Conversation/Get Info"
 msgstr "/Conversaci坦n/Obter informaci坦n"
 
-#: ../src/gtkconv.c:2775
+#: ../src/gtkconv.c:2791
 msgid "/Conversation/Invite..."
 msgstr "/Conversaci坦n/Invitar..."
 
-#: ../src/gtkconv.c:2781
+#: ../src/gtkconv.c:2797
 msgid "/Conversation/Alias..."
 msgstr "/Conversaci坦n/Alcume..."
 
-#: ../src/gtkconv.c:2785
+#: ../src/gtkconv.c:2801
 msgid "/Conversation/Block..."
 msgstr "/Conversaci坦n/Bloquear..."
 
-#: ../src/gtkconv.c:2789
+#: ../src/gtkconv.c:2805
 msgid "/Conversation/Add..."
 msgstr "/Conversaci坦n/Engadir..."
 
-#: ../src/gtkconv.c:2793
+#: ../src/gtkconv.c:2809
 msgid "/Conversation/Remove..."
 msgstr "/Conversaci坦n/Eliminar..."
 
-#: ../src/gtkconv.c:2799
+#: ../src/gtkconv.c:2815
 msgid "/Conversation/Insert Link..."
 msgstr "/Conversaci坦n/Inserir ligaz坦n..."
 
-#: ../src/gtkconv.c:2803
+#: ../src/gtkconv.c:2819
 msgid "/Conversation/Insert Image..."
 msgstr "/Conversaci坦n/Inserir imaxe..."
 
-#: ../src/gtkconv.c:2809
+#: ../src/gtkconv.c:2825
 msgid "/Options/Enable Logging"
 msgstr "/Opci坦ns/Activar rexistro"
 
-#: ../src/gtkconv.c:2812
+#: ../src/gtkconv.c:2828
 msgid "/Options/Enable Sounds"
 msgstr "/Opci坦ns/Activar sons"
 
-#: ../src/gtkconv.c:2825
+#: ../src/gtkconv.c:2841
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Opci坦ns/Amosar barra de formato"
 
-#: ../src/gtkconv.c:2828
+#: ../src/gtkconv.c:2844
 msgid "/Options/Show Timestamps"
 msgstr "/Opci坦ns/Amosar marcas de tempo"
 
-#: ../src/gtkconv.c:2831
+#: ../src/gtkconv.c:2847
 msgid "/Options/Show Buddy Icon"
 msgstr "/Opci坦ns/Amosar iconas dos amigos"
 
-#: ../src/gtkconv.c:2911
+#: ../src/gtkconv.c:2927
 msgid "User is typing..."
 msgstr "O usuario est叩 escribindo..."
 
-#: ../src/gtkconv.c:2914
+#: ../src/gtkconv.c:2930
 msgid "User has typed something and stopped"
 msgstr "O usuario escribiu algo e parou"
 
 #. Build the Send To menu
-#: ../src/gtkconv.c:3097
+#: ../src/gtkconv.c:3113
 msgid "_Send To"
 msgstr "_Enviar a"
 
-#: ../src/gtkconv.c:3749
+#: ../src/gtkconv.c:3765
 msgid "_Send"
 msgstr "_Enviar"
 
-#: ../src/gtkconv.c:3804 ../src/protocols/sametime/sametime.c:3572
+#: ../src/gtkconv.c:3820 ../src/protocols/sametime/sametime.c:3572
 msgid "Topic:"
 msgstr "T坦pico:"
 
 #. Setup the label telling how many people are in the room.
-#: ../src/gtkconv.c:3856
+#: ../src/gtkconv.c:3872
 msgid "0 people in room"
 msgstr "0 persoas na conversaci坦n"
 
-#: ../src/gtkconv.c:3935
+#: ../src/gtkconv.c:3951
 msgid "IM the user"
 msgstr "Enviar un MI ao usuario"
 
-#: ../src/gtkconv.c:3948
+#: ../src/gtkconv.c:3964
 msgid "Ignore the user"
 msgstr "Ignorar ao usuario"
 
-#: ../src/gtkconv.c:3960
+#: ../src/gtkconv.c:3976
 msgid "Get the user's information"
 msgstr "Obter a informaci坦n do usuario"
 
-#: ../src/gtkconv.c:4933 ../src/gtkconv.c:5042
+#: ../src/gtkconv.c:4958 ../src/gtkconv.c:5067
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d persoa na conversaci坦n"
 msgstr[1] "%d persoas na conversaci坦n"
 
-#: ../src/gtkconv.c:6515
+#: ../src/gtkconv.c:5624 ../src/gtkstatusbox.c:366
+msgid "Typing"
+msgstr "Escribindo"
+
+#: ../src/gtkconv.c:5630
+msgid "Stopped Typing"
+msgstr "Deixa de escribir"
+
+#: ../src/gtkconv.c:5635
+#, fuzzy
+msgid "Nick Said"
+msgstr "Alcume"
+
+#: ../src/gtkconv.c:5645
+msgid "New Event"
+msgstr "Evento novo"
+
+#: ../src/gtkconv.c:6547
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -3182,12 +3190,11 @@
 "say &lt;mensaxe&gt;:  Enviar unha mensaxe como se non se estivera utilizando "
 "un comando."
 
-#: ../src/gtkconv.c:6518
+#: ../src/gtkconv.c:6550
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
-msgstr ""
-"me &lt;acci坦n&gt;:  Enviar unha acci坦n estilo IRC a un amigo ou a un chat."
-
-#: ../src/gtkconv.c:6521
+msgstr "me &lt;acci坦n&gt;:  Enviar unha acci坦n estilo IRC a un amigo ou a un chat."
+
+#: ../src/gtkconv.c:6553
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -3195,59 +3202,59 @@
 "debug &lt;opci坦n&gt;:  Enviar informaci坦n de depuraci坦n sobre a conversaci坦n "
 "actual."
 
-#: ../src/gtkconv.c:6524
+#: ../src/gtkconv.c:6556
 msgid "clear: Clears the conversation scrollback."
 msgstr "limpar: Limpa a conversaci坦n desprazada."
 
-#: ../src/gtkconv.c:6527
+#: ../src/gtkconv.c:6559
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;comando&gt;:  Recibir axuda dun comando espec鱈fico."
 
-#: ../src/gtkconv.c:6686
-msgid "Confirm close"
-msgstr "Confirmar peche"
-
 #: ../src/gtkconv.c:6718
+msgid "Confirm close"
+msgstr "Confirmar peche"
+
+#: ../src/gtkconv.c:6750
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "Ten mensaxes sen ler. Est叩 seguro que quere pechar a fiestra?"
 
-#: ../src/gtkconv.c:7240
+#: ../src/gtkconv.c:7272
 msgid "Close other tabs"
 msgstr "Pechar outras solapas"
 
-#: ../src/gtkconv.c:7246
+#: ../src/gtkconv.c:7278
 msgid "Close all tabs"
 msgstr "Pechar todas as solapas"
 
-#: ../src/gtkconv.c:7254
+#: ../src/gtkconv.c:7286
 msgid "Detach this tab"
 msgstr "Desacoplar esta solapa"
 
-#: ../src/gtkconv.c:7260
+#: ../src/gtkconv.c:7292
 msgid "Close this tab"
 msgstr "Pechar esta solapa"
 
-#: ../src/gtkconv.c:7522
+#: ../src/gtkconv.c:7554
 msgid "Close conversation"
 msgstr "Pechar conversaci坦n"
 
-#: ../src/gtkconv.c:7986
+#: ../src/gtkconv.c:8018
 msgid "Last created window"
 msgstr "�ltima fiestra creada"
 
-#: ../src/gtkconv.c:7988
+#: ../src/gtkconv.c:8020
 msgid "Separate IM and Chat windows"
 msgstr "Separar fiestras de MIs e Chats"
 
-#: ../src/gtkconv.c:7990 ../src/gtkprefs.c:1243
+#: ../src/gtkconv.c:8022 ../src/gtkprefs.c:1243
 msgid "New window"
 msgstr "Nova fiestra"
 
-#: ../src/gtkconv.c:7992
+#: ../src/gtkconv.c:8024
 msgid "By group"
 msgstr "Por grupo"
 
-#: ../src/gtkconv.c:7994
+#: ../src/gtkconv.c:8026
 msgid "By account"
 msgstr "Por conta"
 
@@ -3287,14 +3294,15 @@
 msgid "Right click for more options."
 msgstr "Premer co bot坦n dereito para m叩is opci坦ns."
 
-#: ../src/gtkdialogs.c:61 ../src/gtkdialogs.c:100
+#: ../src/gtkdialogs.c:61 ../src/gtkdialogs.c:103
 msgid "lead developer"
 msgstr "desenrolador principal"
 
 #: ../src/gtkdialogs.c:62 ../src/gtkdialogs.c:63 ../src/gtkdialogs.c:65
-#: ../src/gtkdialogs.c:67 ../src/gtkdialogs.c:68 ../src/gtkdialogs.c:69
-#: ../src/gtkdialogs.c:70 ../src/gtkdialogs.c:71 ../src/gtkdialogs.c:73
-#: ../src/gtkdialogs.c:74
+#: ../src/gtkdialogs.c:66 ../src/gtkdialogs.c:68 ../src/gtkdialogs.c:69
+#: ../src/gtkdialogs.c:70 ../src/gtkdialogs.c:71 ../src/gtkdialogs.c:72
+#: ../src/gtkdialogs.c:73 ../src/gtkdialogs.c:75 ../src/gtkdialogs.c:76
+#: ../src/gtkdialogs.c:77
 msgid "developer"
 msgstr "desenrolador"
 
@@ -3302,218 +3310,222 @@
 msgid "win32 port"
 msgstr "adaptaci坦n a win32"
 
-#: ../src/gtkdialogs.c:66
+#: ../src/gtkdialogs.c:67
 msgid "developer & webmaster"
 msgstr "desenrolador e webmaster"
 
-#: ../src/gtkdialogs.c:72
+#: ../src/gtkdialogs.c:74
 msgid "support"
 msgstr "soporte"
 
-#: ../src/gtkdialogs.c:94 ../src/gtkdialogs.c:95
+#: ../src/gtkdialogs.c:97 ../src/gtkdialogs.c:98
 msgid "maintainer"
 msgstr "mantedor"
 
-#: ../src/gtkdialogs.c:96
-msgid "libfaim maintainer"
-msgstr "mantedor de libfaim"
-
-#: ../src/gtkdialogs.c:97
-msgid "hacker and designated driver [lazy bum]"
-msgstr "hacker e dese単ador de controladores [lazy bum]"
-
-#: ../src/gtkdialogs.c:98
-msgid "Jabber developer"
-msgstr "desenrolador de Jabber"
-
 #: ../src/gtkdialogs.c:99
+msgid "libfaim maintainer"
+msgstr "mantedor de libfaim"
+
+#: ../src/gtkdialogs.c:100
+msgid "hacker and designated driver [lazy bum]"
+msgstr "hacker e dese単ador de controladores [lazy bum]"
+
+#: ../src/gtkdialogs.c:101
+msgid "Jabber developer"
+msgstr "desenrolador de Jabber"
+
+#: ../src/gtkdialogs.c:102
 msgid "original author"
 msgstr "autor orixinal"
 
-#: ../src/gtkdialogs.c:106 ../src/gtkdialogs.c:107 ../src/gtkdialogs.c:160
+#: ../src/gtkdialogs.c:109 ../src/gtkdialogs.c:110 ../src/gtkdialogs.c:164
 msgid "Bulgarian"
 msgstr "B炭lgaro"
 
-#: ../src/gtkdialogs.c:108 ../src/gtkdialogs.c:109
+#: ../src/gtkdialogs.c:111 ../src/gtkdialogs.c:112
 msgid "Bengali"
 msgstr "Bengal鱈"
 
-#: ../src/gtkdialogs.c:110
+#: ../src/gtkdialogs.c:113
 msgid "Bosnian"
 msgstr "Bosnia"
 
-#: ../src/gtkdialogs.c:111 ../src/gtkdialogs.c:161 ../src/gtkdialogs.c:162
+#: ../src/gtkdialogs.c:114 ../src/gtkdialogs.c:165 ../src/gtkdialogs.c:166
 msgid "Catalan"
 msgstr "Catal叩n"
 
-#: ../src/gtkdialogs.c:112 ../src/gtkdialogs.c:163
+#: ../src/gtkdialogs.c:115
+msgid "Valencian"
+msgstr "Valenciano"
+
+#: ../src/gtkdialogs.c:116 ../src/gtkdialogs.c:167
 msgid "Czech"
 msgstr "Checo"
 
-#: ../src/gtkdialogs.c:113
+#: ../src/gtkdialogs.c:117
 msgid "Danish"
 msgstr "Dan辿s"
 
-#: ../src/gtkdialogs.c:114 ../src/gtkdialogs.c:164
+#: ../src/gtkdialogs.c:118 ../src/gtkdialogs.c:168
 msgid "German"
 msgstr "Alem叩n"
 
-#: ../src/gtkdialogs.c:115 ../src/gtkdialogs.c:116
+#: ../src/gtkdialogs.c:119 ../src/gtkdialogs.c:120
 msgid "Greek"
 msgstr "Grego"
 
-#: ../src/gtkdialogs.c:117
+#: ../src/gtkdialogs.c:121
 msgid "Australian English"
 msgstr "Ingl辿s australiano"
 
-#: ../src/gtkdialogs.c:118
+#: ../src/gtkdialogs.c:122
 msgid "Canadian English"
 msgstr "Ingl辿s canadiense"
 
-#: ../src/gtkdialogs.c:119
+#: ../src/gtkdialogs.c:123
 msgid "British English"
 msgstr "Ingl辿s brit叩nico"
 
-#: ../src/gtkdialogs.c:120 ../src/gtkdialogs.c:165 ../src/gtkdialogs.c:166
-#: ../src/gtkdialogs.c:167 ../src/gtkdialogs.c:168
+#: ../src/gtkdialogs.c:124 ../src/gtkdialogs.c:169 ../src/gtkdialogs.c:170
+#: ../src/gtkdialogs.c:171 ../src/gtkdialogs.c:172
 msgid "Spanish"
 msgstr "Espa単ol"
 
-#: ../src/gtkdialogs.c:121 ../src/gtkdialogs.c:122
+#: ../src/gtkdialogs.c:125 ../src/gtkdialogs.c:126
 msgid "Persian"
 msgstr "Perso"
 
-#: ../src/gtkdialogs.c:123 ../src/gtkdialogs.c:169 ../src/gtkdialogs.c:170
+#: ../src/gtkdialogs.c:127 ../src/gtkdialogs.c:173 ../src/gtkdialogs.c:174
 msgid "Finnish"
 msgstr "Finland辿s"
 
-#: ../src/gtkdialogs.c:124 ../src/gtkdialogs.c:171 ../src/gtkdialogs.c:172
-#: ../src/gtkdialogs.c:173 ../src/gtkdialogs.c:174
+#: ../src/gtkdialogs.c:128 ../src/gtkdialogs.c:175 ../src/gtkdialogs.c:176
+#: ../src/gtkdialogs.c:177 ../src/gtkdialogs.c:178
 msgid "French"
 msgstr "Franc辿s"
 
-#: ../src/gtkdialogs.c:125
+#: ../src/gtkdialogs.c:129
 msgid "Hebrew"
 msgstr "Hebreo"
 
-#: ../src/gtkdialogs.c:126
+#: ../src/gtkdialogs.c:130
 msgid "Hindi"
 msgstr "Hind炭"
 
-#: ../src/gtkdialogs.c:127
+#: ../src/gtkdialogs.c:131
 msgid "Hungarian"
 msgstr "H炭ngaro"
 
-#: ../src/gtkdialogs.c:128 ../src/gtkdialogs.c:175
+#: ../src/gtkdialogs.c:132 ../src/gtkdialogs.c:179
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../src/gtkdialogs.c:129 ../src/gtkdialogs.c:176 ../src/gtkdialogs.c:177
-#: ../src/gtkdialogs.c:178
+#: ../src/gtkdialogs.c:133 ../src/gtkdialogs.c:180 ../src/gtkdialogs.c:181
+#: ../src/gtkdialogs.c:182
 msgid "Japanese"
 msgstr "Xapon辿s"
 
-#: ../src/gtkdialogs.c:130 ../src/gtkdialogs.c:179
+#: ../src/gtkdialogs.c:134 ../src/gtkdialogs.c:183
 msgid "Georgian"
 msgstr "Xeorxiano"
 
-#: ../src/gtkdialogs.c:131 ../src/gtkdialogs.c:180
+#: ../src/gtkdialogs.c:135 ../src/gtkdialogs.c:184
 msgid "Korean"
 msgstr "Coreano"
 
-#: ../src/gtkdialogs.c:132
+#: ../src/gtkdialogs.c:136
 msgid "Kurdish"
 msgstr "Curdo"
 
-#: ../src/gtkdialogs.c:133 ../src/gtkdialogs.c:181 ../src/gtkdialogs.c:182
+#: ../src/gtkdialogs.c:137 ../src/gtkdialogs.c:185 ../src/gtkdialogs.c:186
 msgid "Lithuanian"
 msgstr "Lituano"
 
-#: ../src/gtkdialogs.c:134
+#: ../src/gtkdialogs.c:138
 msgid "Macedonian"
 msgstr "Macedonio"
 
-#: ../src/gtkdialogs.c:135
+#: ../src/gtkdialogs.c:139
 msgid "Dutch, Flemish"
 msgstr "Holand辿s, Flamenco"
 
-#: ../src/gtkdialogs.c:136
+#: ../src/gtkdialogs.c:140
 msgid "Norwegian"
 msgstr "Noruego"
 
-#: ../src/gtkdialogs.c:137 ../src/gtkdialogs.c:138 ../src/gtkdialogs.c:183
+#: ../src/gtkdialogs.c:141 ../src/gtkdialogs.c:142 ../src/gtkdialogs.c:187
 msgid "Polish"
 msgstr "Polaco"
 
-#: ../src/gtkdialogs.c:139
+#: ../src/gtkdialogs.c:143
 msgid "Portuguese"
 msgstr "Portugu辿s"
 
-#: ../src/gtkdialogs.c:140
+#: ../src/gtkdialogs.c:144
 msgid "Portuguese-Brazil"
 msgstr "Portugu辿s brasileiro"
 
-#: ../src/gtkdialogs.c:141
+#: ../src/gtkdialogs.c:145
 msgid "Romanian"
 msgstr "Rumano"
 
-#: ../src/gtkdialogs.c:142 ../src/gtkdialogs.c:184 ../src/gtkdialogs.c:185
+#: ../src/gtkdialogs.c:146 ../src/gtkdialogs.c:188 ../src/gtkdialogs.c:189
 msgid "Russian"
 msgstr "Ruso"
 
-#: ../src/gtkdialogs.c:143 ../src/gtkdialogs.c:144
+#: ../src/gtkdialogs.c:147 ../src/gtkdialogs.c:148
 msgid "Serbian"
 msgstr "Servio"
 
-#: ../src/gtkdialogs.c:145
+#: ../src/gtkdialogs.c:149
 msgid "Slovenian"
 msgstr "Esloveno"
 
-#: ../src/gtkdialogs.c:146 ../src/gtkdialogs.c:187
+#: ../src/gtkdialogs.c:150 ../src/gtkdialogs.c:191
 msgid "Swedish"
 msgstr "Sueco"
 
-#: ../src/gtkdialogs.c:147
+#: ../src/gtkdialogs.c:151
 msgid "Tamil"
 msgstr "Tamil"
 
-#: ../src/gtkdialogs.c:148
+#: ../src/gtkdialogs.c:152
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../src/gtkdialogs.c:149
+#: ../src/gtkdialogs.c:153
 msgid "Turkish"
 msgstr "Turco"
 
-#: ../src/gtkdialogs.c:150
+#: ../src/gtkdialogs.c:154
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: ../src/gtkdialogs.c:150
+#: ../src/gtkdialogs.c:154
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh eo equipo Gnome-Vi"
 
-#: ../src/gtkdialogs.c:151 ../src/gtkdialogs.c:188
+#: ../src/gtkdialogs.c:155 ../src/gtkdialogs.c:192
 msgid "Simplified Chinese"
 msgstr "Chin辿s simplificado"
 
-#: ../src/gtkdialogs.c:152 ../src/gtkdialogs.c:153 ../src/gtkdialogs.c:189
+#: ../src/gtkdialogs.c:156 ../src/gtkdialogs.c:157 ../src/gtkdialogs.c:193
 msgid "Traditional Chinese"
 msgstr "Chin辿s tradicional"
 
-#: ../src/gtkdialogs.c:159
+#: ../src/gtkdialogs.c:163
 msgid "Amharic"
 msgstr "Amh叩rico"
 
-#: ../src/gtkdialogs.c:186
+#: ../src/gtkdialogs.c:190
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: ../src/gtkdialogs.c:230
+#: ../src/gtkdialogs.c:234
 msgid "About Gaim"
 msgstr "Acerca de Gaim"
 
-#: ../src/gtkdialogs.c:254
+#: ../src/gtkdialogs.c:258
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, "
@@ -3534,61 +3546,59 @@
 "lista completa de persoas que contribu鱈ron. Este programa distrib炭ese "
 "senningunha garant鱈a.<BR><BR>"
 
-#: ../src/gtkdialogs.c:268
+#: ../src/gtkdialogs.c:272
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #wingaim en irc.freenode.net<BR><BR>"
 
-#: ../src/gtkdialogs.c:271
+#: ../src/gtkdialogs.c:275
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #gaim en irc.freenode.net<BR><BR>"
 
-#: ../src/gtkdialogs.c:277
+#: ../src/gtkdialogs.c:281
 msgid "Current Developers"
 msgstr "Desenroladores actuais"
 
-#: ../src/gtkdialogs.c:292
+#: ../src/gtkdialogs.c:296
 msgid "Crazy Patch Writers"
 msgstr "Tolos escritores de parches"
 
-#: ../src/gtkdialogs.c:307
+#: ../src/gtkdialogs.c:311
 msgid "Retired Developers"
 msgstr "Desenroladores retirados"
 
-#: ../src/gtkdialogs.c:322
+#: ../src/gtkdialogs.c:326
 msgid "Current Translators"
 msgstr "Traductores actuais"
 
-#: ../src/gtkdialogs.c:342
+#: ../src/gtkdialogs.c:346
 msgid "Past Translators"
 msgstr "Traductores anteriores"
 
-#: ../src/gtkdialogs.c:360
+#: ../src/gtkdialogs.c:364
 msgid "Debugging Information"
 msgstr "Informaci坦n de depuraci坦n"
 
-#: ../src/gtkdialogs.c:566 ../src/gtkdialogs.c:703 ../src/gtkdialogs.c:770
+#: ../src/gtkdialogs.c:570 ../src/gtkdialogs.c:707 ../src/gtkdialogs.c:770
 msgid "_Name"
 msgstr "_Nome"
 
-#: ../src/gtkdialogs.c:571 ../src/gtkdialogs.c:708 ../src/gtkdialogs.c:775
+#: ../src/gtkdialogs.c:575 ../src/gtkdialogs.c:712 ../src/gtkdialogs.c:775
 msgid "_Account"
 msgstr "_Conta"
 
-#: ../src/gtkdialogs.c:579
+#: ../src/gtkdialogs.c:583
 msgid "New Instant Message"
 msgstr "Mensaxe instant叩nea nova"
 
-#: ../src/gtkdialogs.c:581
-msgid ""
-"Please enter the screen name or alias of the person you would like to IM."
-msgstr ""
-"Introduza o nome de usuario ou alias da persoa coa que quere comunicarse."
-
-#: ../src/gtkdialogs.c:716
+#: ../src/gtkdialogs.c:585
+msgid "Please enter the screen name or alias of the person you would like to IM."
+msgstr "Introduza o nome de usuario ou alias da persoa coa que quere comunicarse."
+
+#: ../src/gtkdialogs.c:720
 msgid "Get User Info"
 msgstr "Obter informaci坦n do usuario"
 
-#: ../src/gtkdialogs.c:718
+#: ../src/gtkdialogs.c:722
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
@@ -3617,7 +3627,7 @@
 msgstr "Introduza un alcume para este contacto"
 
 #: ../src/gtkdialogs.c:808 ../src/gtkdialogs.c:830 ../src/gtkdialogs.c:850
-#: ../src/gtkrequest.c:283 ../src/protocols/silc/chat.c:586
+#: ../src/gtkrequest.c:277 ../src/protocols/silc/chat.c:586
 msgid "Alias"
 msgstr "Alcume"
 
@@ -3647,11 +3657,11 @@
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
 msgstr[0] ""
-"Est叩 a punto de eliminar o contacto que cont辿n a %s e outro %d amigo da s炭a"
-"lista de amigos. Quere continuar?"
+"Est叩 a punto de eliminar o contacto que cont辿n a %s e outro %d amigo da "
+"s炭alista de amigos. Quere continuar?"
 msgstr[1] ""
-"Est叩 a punto de eliminar o contacto que cont辿n a %s e outros %d amigos da s炭a"
-"lista de amigos. Quere continuar?"
+"Est叩 a punto de eliminar o contacto que cont辿n a %s e outros %d amigos da "
+"s炭alista de amigos. Quere continuar?"
 
 #: ../src/gtkdialogs.c:893
 msgid "Remove Contact"
@@ -3680,8 +3690,7 @@
 
 #: ../src/gtkdialogs.c:982
 #, c-format
-msgid ""
-"You are about to remove %s from your buddy list.  Do you want to continue?"
+msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Est叩 a punto de eliminar a %s da s炭a lista de amigos. Quere continuar?"
 
 #: ../src/gtkdialogs.c:985
@@ -3697,8 +3706,7 @@
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
-msgstr ""
-"Est叩 a punto de eliminar o chat %s da s炭a lista de amigos. Quere continuar?"
+msgstr "Est叩 a punto de eliminar o chat %s da s炭a lista de amigos. Quere continuar?"
 
 #: ../src/gtkdialogs.c:1010
 msgid "Remove Chat"
@@ -3743,8 +3751,7 @@
 
 #: ../src/gtkft.c:443
 msgid "There is no application configured to open this type of file."
-msgstr ""
-"Non se configurou ningunha aplicaci坦n para abrir este tipo de ficheiro."
+msgstr "Non se configurou ningunha aplicaci坦n para abrir este tipo de ficheiro."
 
 #: ../src/gtkft.c:448
 msgid "An error occurred while opening the file."
@@ -3840,40 +3847,39 @@
 msgid "Paste as Plain _Text"
 msgstr "Pegar como _texto plano"
 
-#. XXX: make this new with mnemonic, and HIG-happy after string thaw
-#: ../src/gtkimhtml.c:834 ../src/gtkimhtmltoolbar.c:1030
-msgid "Clear formatting"
-msgstr "Limpar formatos"
+#: ../src/gtkimhtml.c:833
+msgid "_Reset formatting"
+msgstr "_Reiniciar formatos"
+
+#: ../src/gtkimhtml.c:1327
+msgid "Hyperlink color"
+msgstr "Cor de ligaz坦n"
 
 #: ../src/gtkimhtml.c:1328
-msgid "Hyperlink color"
-msgstr "Cor de ligaz坦n"
-
-#: ../src/gtkimhtml.c:1329
 msgid "Color to draw hyperlinks."
 msgstr "Cor para debuxar ligaz坦ns."
 
-#: ../src/gtkimhtml.c:1332
+#: ../src/gtkimhtml.c:1331
 msgid "Hyperlink prelight color"
 msgstr "Cor de ligaz坦n pre-iluminado"
 
-#: ../src/gtkimhtml.c:1333
+#: ../src/gtkimhtml.c:1332
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Cor para debuxar ligaz坦ns cando o rato est辿 enriba."
 
-#: ../src/gtkimhtml.c:1554
+#: ../src/gtkimhtml.c:1553
 msgid "_Copy E-Mail Address"
 msgstr "_Copiar enderezo E-Mail"
 
-#: ../src/gtkimhtml.c:1566
+#: ../src/gtkimhtml.c:1565
 msgid "_Open Link in Browser"
 msgstr "_Abrir ligaz坦n en navegador"
 
-#: ../src/gtkimhtml.c:1576
+#: ../src/gtkimhtml.c:1575
 msgid "_Copy Link Location"
 msgstr "_Copiar destino da ligaz坦n"
 
-#: ../src/gtkimhtml.c:3273
+#: ../src/gtkimhtml.c:3272
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -3883,7 +3889,7 @@
 "\n"
 "Por defecto PNG."
 
-#: ../src/gtkimhtml.c:3276
+#: ../src/gtkimhtml.c:3275
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -3893,7 +3899,7 @@
 "\n"
 "Por defecto PNG."
 
-#: ../src/gtkimhtml.c:3289
+#: ../src/gtkimhtml.c:3288
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -3904,7 +3910,7 @@
 "\n"
 "%s"
 
-#: ../src/gtkimhtml.c:3292
+#: ../src/gtkimhtml.c:3291
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -3915,11 +3921,11 @@
 "\n"
 "%s"
 
-#: ../src/gtkimhtml.c:3372 ../src/gtkimhtml.c:3384
+#: ../src/gtkimhtml.c:3371 ../src/gtkimhtml.c:3383
 msgid "Save Image"
 msgstr "Gardar imaxe"
 
-#: ../src/gtkimhtml.c:3412
+#: ../src/gtkimhtml.c:3411
 msgid "_Save Image..."
 msgstr "_Gardar imaxe..."
 
@@ -4013,6 +4019,10 @@
 msgid "Background color"
 msgstr "Cor de fondo"
 
+#: ../src/gtkimhtmltoolbar.c:1030
+msgid "Reset formatting"
+msgstr "Reiniciar formatos"
+
 #: ../src/gtkimhtmltoolbar.c:1045
 msgid "Insert link"
 msgstr "Inserir ligaz坦n"
@@ -4025,21 +4035,21 @@
 msgid "Insert smiley"
 msgstr "Inserir emotic坦n"
 
-#: ../src/gtklog.c:202
+#: ../src/gtklog.c:188
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Conversaci坦n en %s de %s</span>"
 
-#: ../src/gtklog.c:207
+#: ../src/gtklog.c:193
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Conversaci坦n con %s en %s</span>"
 
-#: ../src/gtklog.c:258
+#: ../src/gtklog.c:242
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../src/gtklog.c:311
+#: ../src/gtklog.c:295
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
@@ -4047,7 +4057,7 @@
 "S坦 se rexistrar叩n os eventos do sistema cando est辿 activada a opci坦n "
 "\"Rexistrar todos os cambios de estado no rexistro do sistema."
 
-#: ../src/gtklog.c:315
+#: ../src/gtklog.c:299
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
@@ -4055,32 +4065,31 @@
 "S坦 se rexistrar叩n as mensaxes instant叩neas se est叩 activada a preferencia "
 "\"Rexistrar todas as mensaxes instant叩neas\"."
 
-#: ../src/gtklog.c:318
-msgid ""
-"Chats will only be logged if the \"Log all chats\" preference is enabled."
+#: ../src/gtklog.c:302
+msgid "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
 "Os chats s坦 ser叩n rexistrados se a opci坦n \"Rexistrar todos os chats\" est叩 "
 "activada nas preferencias"
 
-#: ../src/gtklog.c:322
+#: ../src/gtklog.c:306
 msgid "No logs were found"
 msgstr "Non se atoparon rexistros"
 
-#: ../src/gtklog.c:398
+#: ../src/gtklog.c:382
 msgid "Total log size:"
 msgstr "Tama単o total de rexistro:"
 
-#: ../src/gtklog.c:474
+#: ../src/gtklog.c:458
 #, c-format
 msgid "Conversations in %s"
 msgstr "Conversaci坦ns en %s"
 
-#: ../src/gtklog.c:482 ../src/gtklog.c:533
+#: ../src/gtklog.c:466 ../src/gtklog.c:517
 #, c-format
 msgid "Conversations with %s"
 msgstr "Conversaci坦ns con %s"
 
-#: ../src/gtklog.c:558
+#: ../src/gtklog.c:542
 msgid "System Log"
 msgstr "Rexistro do sistema"
 
@@ -4154,34 +4163,34 @@
 "con Sean ou Luke a trav辿s doutros protocolos en \n"
 "%scontactinfo.php\n"
 
-#: ../src/gtknotify.c:305
+#: ../src/gtknotify.c:327
 msgid "New Mail"
 msgstr "Correo novo"
 
-#: ../src/gtknotify.c:321
+#: ../src/gtknotify.c:343
 msgid "Open All Messages"
 msgstr "Abrir todas as mensaxes"
 
-#: ../src/gtknotify.c:382 ../src/protocols/jabber/jabber.c:1114
+#: ../src/gtknotify.c:409 ../src/protocols/jabber/jabber.c:1115
 msgid "From"
 msgstr "De"
 
-#: ../src/gtknotify.c:390
+#: ../src/gtknotify.c:418
 msgid "Subject"
 msgstr "Asunto"
 
-#: ../src/gtknotify.c:399
+#: ../src/gtknotify.c:427
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Ten correo!</span>"
 
-#: ../src/gtknotify.c:451
+#: ../src/gtknotify.c:493
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s ten %d mensaxe novo."
 msgstr[1] "%s ten %d mensaxes novas."
 
-#: ../src/gtknotify.c:456
+#: ../src/gtknotify.c:498
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -4192,54 +4201,53 @@
 "\n"
 "%s"
 
-#: ../src/gtknotify.c:643 ../src/protocols/sametime/sametime.c:5459
+#: ../src/gtknotify.c:685 ../src/protocols/sametime/sametime.c:5459
 msgid "Search Results"
 msgstr "Resultados da busca"
 
-#: ../src/gtknotify.c:799 ../src/protocols/oscar/oscar.c:5061
+#: ../src/gtknotify.c:841 ../src/protocols/oscar/oscar.c:5061
 #, c-format
 msgid "Info for %s"
 msgstr "Informaci坦n sobre %s"
 
-#: ../src/gtknotify.c:800 ../src/protocols/toc/toc.c:470
+#: ../src/gtknotify.c:842 ../src/protocols/toc/toc.c:470
 msgid "Buddy Information"
 msgstr "Informaci坦n de amigos"
 
-#: ../src/gtknotify.c:840
-#, c-format
-msgid "The browser command <b>%s</b> is invalid."
-msgstr "O comando de navegador <b>%s</b> 辿 inv叩lido."
-
-#: ../src/gtknotify.c:842 ../src/gtknotify.c:854 ../src/gtknotify.c:867
-#: ../src/gtknotify.c:992
+#: ../src/gtknotify.c:881
+#, c-format
+msgid "The browser command \"%s\" is invalid."
+msgstr "O comando de navegador \"%s\" 辿 inv叩lido."
+
+#: ../src/gtknotify.c:883 ../src/gtknotify.c:895 ../src/gtknotify.c:908
+#: ../src/gtknotify.c:1031
 msgid "Unable to open URL"
 msgstr "Non se puido abrir a URL"
 
-#: ../src/gtknotify.c:852 ../src/gtknotify.c:865
-#, c-format
-msgid "Error launching <b>%s</b>: %s"
-msgstr "Erro ao lanzar <b>%s</b>: %s"
-
-#: ../src/gtknotify.c:993
-msgid ""
-"The 'Manual' browser command has been chosen, but no command has been set."
+#: ../src/gtknotify.c:893 ../src/gtknotify.c:906
+#, c-format
+msgid "Error launching \"%s\": %s"
+msgstr "Erro ao lanzar \"%s\": %s"
+
+#: ../src/gtknotify.c:1032
+msgid "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 "Definiuse un comando de navegador 'Manual', pero non se definiu ning炭n "
 "comando para executalo."
 
-#: ../src/gtkplugin.c:275
+#: ../src/gtkplugin.c:274
 msgid "The following plugins will be unloaded."
 msgstr "Desactivaranse os seguintes complementos."
 
-#: ../src/gtkplugin.c:294
+#: ../src/gtkplugin.c:293
 msgid "Multiple plugins will be unloaded."
 msgstr "Desactivaranse m炭ltiples complementos."
 
-#: ../src/gtkplugin.c:296
+#: ../src/gtkplugin.c:295
 msgid "Unload Plugins"
 msgstr "Desactivar complementos"
 
-#: ../src/gtkplugin.c:410
+#: ../src/gtkplugin.c:407
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -4250,7 +4258,7 @@
 "<span weight=\"bold\">Sitio web:</span>\t\t%s\n"
 "<span weight=\"bold\">Nome do ficheiro:</span>\t\t%s"
 
-#: ../src/gtkplugin.c:420
+#: ../src/gtkplugin.c:417
 #, c-format
 msgid ""
 "%s\n"
@@ -4261,11 +4269,11 @@
 "<span揃foreground=\"#ff0000\"揃weight=\"bold\">Erro:揃%s\n"
 "Comprobe o sitio web do complemento para obter unha actualizaci坦n.</span>"
 
-#: ../src/gtkplugin.c:546
+#: ../src/gtkplugin.c:543
 msgid "Configure Pl_ugin"
 msgstr "Configurar _complemento"
 
-#: ../src/gtkplugin.c:604
+#: ../src/gtkplugin.c:601
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Detalles do complemento</b>"
 
@@ -4715,7 +4723,7 @@
 msgid "Quiet"
 msgstr "Silencio"
 
-#: ../src/gtkprefs.c:1468 ../src/protocols/silc/silc.c:666
+#: ../src/gtkprefs.c:1468 ../src/protocols/silc/silc.c:670
 msgid "Normal"
 msgstr "Normal"
 
@@ -4862,7 +4870,7 @@
 msgid "Sounds"
 msgstr "Sons"
 
-#: ../src/gtkprefs.c:1867 ../src/protocols/silc/silc.c:1847
+#: ../src/gtkprefs.c:1867 ../src/protocols/silc/silc.c:1851
 msgid "Network"
 msgstr "Rede"
 
@@ -4917,8 +4925,7 @@
 
 #: ../src/gtkprivacy.c:564
 msgid "Please enter the name of the user you wish to be able to contact you."
-msgstr ""
-"Introduza o nome de usuario ao que quere permitir que contacte con vostede."
+msgstr "Introduza o nome de usuario ao que quere permitir que contacte con vostede."
 
 #: ../src/gtkprivacy.c:567 ../src/gtkprivacy.c:580
 msgid "_Permit"
@@ -4960,45 +4967,57 @@
 msgid "Are you sure you want to block %s?"
 msgstr "Est叩 seguro de que quere bloquear a %s?"
 
-#: ../src/gtkrequest.c:273 ../src/protocols/msn/dialog.c:114
+#: ../src/gtkrequest.c:267 ../src/protocols/msn/dialog.c:114
 #: ../src/protocols/msn/msn.c:559 ../src/protocols/msn/msn.c:568
 #: ../src/protocols/novell/novell.c:1921 ../src/protocols/silc/buddy.c:313
 #: ../src/protocols/silc/pk.c:117 ../src/protocols/silc/wb.c:303
 msgid "Yes"
 msgstr "Si"
 
-#: ../src/gtkrequest.c:274 ../src/protocols/msn/dialog.c:115
+#: ../src/gtkrequest.c:268 ../src/protocols/msn/dialog.c:115
 #: ../src/protocols/msn/msn.c:559 ../src/protocols/msn/msn.c:568
 #: ../src/protocols/novell/novell.c:1922 ../src/protocols/silc/buddy.c:314
 #: ../src/protocols/silc/pk.c:118 ../src/protocols/silc/wb.c:304
 msgid "No"
 msgstr "Non"
 
-#: ../src/gtkrequest.c:277
+#: ../src/gtkrequest.c:271
 msgid "Apply"
 msgstr "Aplicar"
 
-#: ../src/gtkrequest.c:278 ../src/protocols/msn/msn.c:357
+#: ../src/gtkrequest.c:272 ../src/protocols/msn/msn.c:357
 #: ../src/protocols/silc/util.c:336
 msgid "Close"
 msgstr "Pechar"
 
-#: ../src/gtkrequest.c:1473
+#: ../src/gtkrequest.c:1467
 msgid "That file already exists"
 msgstr "Ese ficheiro xa existe"
 
-#: ../src/gtkrequest.c:1474
+#: ../src/gtkrequest.c:1468
 msgid "Would you like to overwrite it?"
 msgstr "Quere sobrescribilo?"
 
-#: ../src/gtkrequest.c:1518 ../src/gtkrequest.c:1559
+#: ../src/gtkrequest.c:1469
+msgid "Overwrite"
+msgstr "Sobreescribir"
+
+#: ../src/gtkrequest.c:1470
+msgid "Choose New Name"
+msgstr "Escoller un novo nome"
+
+#: ../src/gtkrequest.c:1512 ../src/gtkrequest.c:1553
 msgid "Save File..."
 msgstr "Gardar ficheiro..."
 
-#: ../src/gtkrequest.c:1519 ../src/gtkrequest.c:1560
+#: ../src/gtkrequest.c:1513 ../src/gtkrequest.c:1554
 msgid "Open File..."
 msgstr "Abrir ficheiro..."
 
+#: ../src/gtkrequest.c:1601 ../src/gtkrequest.c:1615
+msgid "Select Folder..."
+msgstr "Seleccionar cartafol..."
+
 #: ../src/gtkroomlist.c:287
 msgid "_Add"
 msgstr "_Engadir"
@@ -5029,24 +5048,24 @@
 #. Available status messages are plain text
 #: ../src/gtksavedstatuses.c:459 ../src/gtksavedstatuses.c:920
 #: ../src/protocols/bonjour/bonjour.c:256
-#: ../src/protocols/bonjour/bonjour.c:263 ../src/protocols/gg/gg.c:1421
-#: ../src/protocols/gg/gg.c:1431 ../src/protocols/gg/gg.c:1437
-#: ../src/protocols/gg/gg.c:1446 ../src/protocols/gg/gg.c:1451
-#: ../src/protocols/irc/irc.c:227 ../src/protocols/jabber/jabber.c:1181
-#: ../src/protocols/jabber/jabber.c:1191 ../src/protocols/jabber/jabber.c:1201
-#: ../src/protocols/jabber/jabber.c:1211 ../src/protocols/jabber/jabber.c:1221
-#: ../src/protocols/jabber/jabber.c:1233 ../src/protocols/novell/novell.c:2868
+#: ../src/protocols/bonjour/bonjour.c:263 ../src/protocols/gg/gg.c:1461
+#: ../src/protocols/gg/gg.c:1471 ../src/protocols/gg/gg.c:1477
+#: ../src/protocols/gg/gg.c:1486 ../src/protocols/gg/gg.c:1491
+#: ../src/protocols/irc/irc.c:227 ../src/protocols/jabber/jabber.c:1182
+#: ../src/protocols/jabber/jabber.c:1192 ../src/protocols/jabber/jabber.c:1202
+#: ../src/protocols/jabber/jabber.c:1212 ../src/protocols/jabber/jabber.c:1222
+#: ../src/protocols/jabber/jabber.c:1234 ../src/protocols/novell/novell.c:2868
 #: ../src/protocols/novell/novell.c:2974 ../src/protocols/novell/novell.c:2980
-#: ../src/protocols/novell/novell.c:2986 ../src/protocols/oscar/oscar.c:7794
-#: ../src/protocols/oscar/oscar.c:7808 ../src/protocols/oscar/oscar.c:7813
-#: ../src/protocols/oscar/oscar.c:8022 ../src/protocols/oscar/oscar.c:8034
+#: ../src/protocols/novell/novell.c:2986 ../src/protocols/oscar/oscar.c:7801
+#: ../src/protocols/oscar/oscar.c:7816 ../src/protocols/oscar/oscar.c:7821
+#: ../src/protocols/oscar/oscar.c:8030 ../src/protocols/oscar/oscar.c:8042
 #: ../src/protocols/sametime/sametime.c:3274
 #: ../src/protocols/sametime/sametime.c:3280
 #: ../src/protocols/sametime/sametime.c:3286
 #: ../src/protocols/sametime/sametime.c:3365
 #: ../src/protocols/silc/buddy.c:1544 ../src/protocols/simple/simple.c:242
-#: ../src/protocols/yahoo/yahoo.c:3279 ../src/protocols/yahoo/yahoo.c:3285
-#: ../src/protocols/zephyr/zephyr.c:2261
+#: ../src/protocols/yahoo/yahoo.c:3280 ../src/protocols/yahoo/yahoo.c:3286
+#: ../src/protocols/zephyr/zephyr.c:2281
 msgid "Message"
 msgstr "Mensaxe"
 
@@ -5068,13 +5087,13 @@
 msgstr "Diferente"
 
 #: ../src/gtksavedstatuses.c:909 ../src/gtksavedstatuses.c:1056
-#: ../src/protocols/gg/gg.c:1403 ../src/protocols/gg/gg.c:1408
+#: ../src/protocols/gg/gg.c:1444 ../src/protocols/gg/gg.c:1448
 #: ../src/protocols/jabber/buddy.c:623 ../src/protocols/jabber/buddy.c:630
-#: ../src/protocols/jabber/buddy.c:641 ../src/protocols/jabber/jabber.c:1152
+#: ../src/protocols/jabber/buddy.c:641 ../src/protocols/jabber/jabber.c:1153
 #: ../src/protocols/msn/msn.c:550 ../src/protocols/novell/novell.c:2867
 #: ../src/protocols/novell/novell.c:2871 ../src/protocols/oscar/oscar.c:849
 #: ../src/protocols/oscar/oscar.c:855 ../src/protocols/oscar/oscar.c:858
-#: ../src/protocols/yahoo/yahoo.c:2881
+#: ../src/protocols/yahoo/yahoo.c:2882
 msgid "Status"
 msgstr "Estado"
 
@@ -5141,13 +5160,12 @@
 msgid "Someone says your name in chat"
 msgstr "Algu辿n menciona seu nome no chat"
 
-#: ../src/gtksound.c:488
+#: ../src/gtksound.c:485
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
-msgstr ""
-"Non foi posible reproducir o son porque o ficheiro escollido (%s) non existe."
-
-#: ../src/gtksound.c:504
+msgstr "Non foi posible reproducir o son porque o ficheiro escollido (%s) non existe."
+
+#: ../src/gtksound.c:501
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
@@ -5155,7 +5173,7 @@
 "Non foi posible reproducir o son porque escolleuse o m辿todo de 'Comando',"
 "pero non se especificou o comando."
 
-#: ../src/gtksound.c:516
+#: ../src/gtksound.c:513
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
@@ -5164,18 +5182,14 @@
 "Non foi posible reproducir o son porque o comando de son establecido non se "
 "puido lanzar: %s"
 
-#: ../src/gtkstatusbox.c:366
-msgid "Typing"
-msgstr "Escribindo"
-
 #. connect to the server
 #: ../src/gtkstatusbox.c:368 ../src/protocols/irc/irc.c:313
 #: ../src/protocols/jabber/jabber.c:979 ../src/protocols/msn/session.c:349
 #: ../src/protocols/napster/napster.c:536
 #: ../src/protocols/novell/novell.c:2183 ../src/protocols/oscar/oscar.c:1938
 #: ../src/protocols/sametime/sametime.c:3693
-#: ../src/protocols/simple/simple.c:1594 ../src/protocols/yahoo/yahoo.c:2571
-#: ../src/protocols/zephyr/zephyr.c:1547
+#: ../src/protocols/simple/simple.c:1594 ../src/protocols/yahoo/yahoo.c:2572
+#: ../src/protocols/zephyr/zephyr.c:1565
 msgid "Connecting"
 msgstr "Conectando"
 
@@ -5286,17 +5300,9 @@
 "Arrastrou un lanzado de escritorio. O m叩is probable 辿 que queira enviar a o "
 "que apunta o lanzador m叩is que o lanzador en si."
 
-#. Write a local message to this conversation showing that a request for a
-#. * Doodle session has been made
-#.
-#: ../src/gtkwhiteboard.c:344 ../src/protocols/yahoo/yahoo_doodle.c:96
-msgid "Sent Doodle request."
-msgstr "Enviar petici坦n Doodle."
-
 #: ../src/log.c:167
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
-msgstr ""
-"<b><font color=\"red\">O rexistro non ten funci坦n de lectura</font></b>"
+msgstr "<b><font color=\"red\">O rexistro non ten funci坦n de lectura</font></b>"
 
 #: ../src/log.c:549
 msgid "HTML"
@@ -5318,7 +5324,7 @@
 msgid "XML"
 msgstr "XML"
 
-#: ../src/log.c:1077
+#: ../src/log.c:1083
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -5327,7 +5333,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;RESPOSTA "
 "AUTOM�TICA&gt;:</b></font> %s<br/>\n"
 
-#: ../src/log.c:1079
+#: ../src/log.c:1085
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -5336,17 +5342,16 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;RESPOSTA "
 "AUTOM�TICA&gt;:</b></font> %s<br/>\n"
 
-#: ../src/log.c:1136 ../src/log.c:1262
+#: ../src/log.c:1142 ../src/log.c:1273
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
-msgstr ""
-"<font color=\"red\"><b>Non se puido atopar a ruta do rexistro!</b></font>"
-
-#: ../src/log.c:1148 ../src/log.c:1276
+msgstr "<font color=\"red\"><b>Non se puido atopar a ruta do rexistro!</b></font>"
+
+#: ../src/log.c:1154 ../src/log.c:1287
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Non se puido ler o ficheiro: %s</b></font>"
 
-#: ../src/log.c:1205
+#: ../src/log.c:1216
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <RESPOSTA AUTOM�TICA>: %s\n"
@@ -5359,14 +5364,12 @@
 #: ../src/plugin.c:424
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
-msgstr ""
-"Non houbo conincidencia no n炭mero m叩xico do complemento %d (necesitaba %d)"
+msgstr "Non houbo conincidencia no n炭mero m叩xico do complemento %d (necesitaba %d)"
 
 #: ../src/plugin.c:441
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
-msgstr ""
-"Non houbo coincidencia no n炭mero de versi坦n ABI %d.%d.x (necesitaba %d.%d.x)"
+msgstr "Non houbo coincidencia no n炭mero de versi坦n ABI %d.%d.x (necesitaba %d.%d.x)"
 
 #: ../src/plugin.c:458
 msgid "Plugin does not implement all required functions"
@@ -5409,10 +5412,8 @@
 msgstr "Imposible escoitar as conexi坦ns de MI entrantes\n"
 
 #: ../src/protocols/bonjour/bonjour.c:146
-msgid ""
-"Unable to establish connection with the local mDNS server.  Is it running?"
-msgstr ""
-"Imposible establecer a conexi坦n co servidor local mDNS. Estase executando?"
+msgid "Unable to establish connection with the local mDNS server.  Is it running?"
+msgstr "Imposible establecer a conexi坦n co servidor local mDNS. Estase executando?"
 
 #: ../src/protocols/bonjour/bonjour.c:337
 #: ../src/protocols/sametime/sametime.c:3251
@@ -5455,34 +5456,33 @@
 msgstr "Usuario de Gaim"
 
 #. Creating the user splits
-#: ../src/protocols/bonjour/bonjour.c:575 ../src/protocols/silc/silc.c:931
+#: ../src/protocols/bonjour/bonjour.c:575 ../src/protocols/silc/silc.c:935
 msgid "Hostname"
 msgstr "Nome do servidor"
 
 #. Creating the options for the protocol
 #. port to connect to
 #: ../src/protocols/bonjour/bonjour.c:579 ../src/protocols/irc/irc.c:900
-#: ../src/protocols/msn/msn.c:2048 ../src/protocols/napster/napster.c:724
-#: ../src/protocols/sametime/sametime.c:5643 ../src/protocols/silc/silc.c:1855
+#: ../src/protocols/msn/msn.c:2054 ../src/protocols/napster/napster.c:724
+#: ../src/protocols/sametime/sametime.c:5643 ../src/protocols/silc/silc.c:1859
 msgid "Port"
 msgstr "Porto"
 
-#: ../src/protocols/bonjour/bonjour.c:582 ../src/protocols/gg/gg.c:562
-#: ../src/protocols/gg/gg.c:971
+#: ../src/protocols/bonjour/bonjour.c:582 ../src/protocols/gg/gg.c:605
+#: ../src/protocols/gg/gg.c:1015 ../src/protocols/jabber/jabber.c:770
 msgid "First name"
 msgstr "Nome"
 
-#: ../src/protocols/bonjour/bonjour.c:585 ../src/protocols/gg/gg.c:557
+#: ../src/protocols/bonjour/bonjour.c:585 ../src/protocols/gg/gg.c:600
+#: ../src/protocols/jabber/jabber.c:775
 msgid "Last name"
 msgstr "Apelidos"
 
-#: ../src/protocols/bonjour/bonjour.c:588 ../src/protocols/jabber/buddy.c:261
-#: ../src/protocols/jabber/buddy.c:779 ../src/protocols/jabber/buddy.c:787
-#: ../src/protocols/silc/silc.c:695 ../src/protocols/silc/silc.c:935
-#: ../src/protocols/silc/util.c:512
-#: ../src/protocols/yahoo/yahoo_profile.c:1030
-msgid "Email"
-msgstr "Correo electr坦nico"
+#: ../src/protocols/bonjour/bonjour.c:588 ../src/protocols/gg/gg.c:468
+#: ../src/protocols/jabber/jabber.c:760 ../src/protocols/silc/silc.c:699
+#: ../src/protocols/silc/silc.c:939
+msgid "E-mail"
+msgstr "E-mail"
 
 #: ../src/protocols/bonjour/jabber.c:357
 #, c-format
@@ -5509,307 +5509,316 @@
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Non se puido enviar a mensaxe, non se puido iniciar a conversaci坦n."
 
-#: ../src/protocols/gg/gg.c:80 ../src/protocols/gg/gg.c:102
-#: ../src/protocols/gg/gg.c:137
+#: ../src/protocols/gg/gg.c:76 ../src/proxy.c:2345
+msgid "Invalid proxy settings"
+msgstr "Configuraci坦n inv叩lida de proxy"
+
+#: ../src/protocols/gg/gg.c:77 ../src/proxy.c:2345
+msgid ""
+"Either the host name or port number specified for your given proxy type is "
+"invalid."
+msgstr ""
+"O nome do servidor ou o porto especificados non son v叩lidos para seu tipo de "
+"proxy."
+
+#: ../src/protocols/gg/gg.c:115 ../src/protocols/gg/gg.c:137
+#: ../src/protocols/gg/gg.c:180
 msgid "Token Error"
 msgstr "Erro de token"
 
-#: ../src/protocols/gg/gg.c:81 ../src/protocols/gg/gg.c:103
-#: ../src/protocols/gg/gg.c:138
+#: ../src/protocols/gg/gg.c:116 ../src/protocols/gg/gg.c:138
+#: ../src/protocols/gg/gg.c:181
 msgid "Unable to fetch the token.\n"
 msgstr "Non se puido obter o token.\n"
 
-#: ../src/protocols/gg/gg.c:226 ../src/protocols/gg/gg.c:245
+#: ../src/protocols/gg/gg.c:269 ../src/protocols/gg/gg.c:288
 msgid "Save Buddylist..."
 msgstr "Gardar lista de amigos..."
 
-#: ../src/protocols/gg/gg.c:227
+#: ../src/protocols/gg/gg.c:270
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "A t炭a lista de amigos est叩 baleira, non se escribiu nada no ficheiro."
 
-#: ../src/protocols/gg/gg.c:233 ../src/protocols/gg/gg.c:235
+#: ../src/protocols/gg/gg.c:276 ../src/protocols/gg/gg.c:278
 msgid "Couldn't open file"
 msgstr "Non se puido abrir o ficheiro"
 
-#: ../src/protocols/gg/gg.c:246
+#: ../src/protocols/gg/gg.c:289
 msgid "Buddylist saved successfully!"
 msgstr "Lista de amigos gardada correctamente!"
 
-#: ../src/protocols/gg/gg.c:264 ../src/protocols/gg/gg.c:265
+#: ../src/protocols/gg/gg.c:307 ../src/protocols/gg/gg.c:308
 msgid "Couldn't load buddylist"
 msgstr "Non se puido cargar a lista de amigos"
 
-#: ../src/protocols/gg/gg.c:281
+#: ../src/protocols/gg/gg.c:324
 msgid "Load Buddylist..."
 msgstr "Cargar lista de amigos..."
 
-#: ../src/protocols/gg/gg.c:282
+#: ../src/protocols/gg/gg.c:325
 msgid "Buddylist loaded successfully!"
 msgstr "Lista de amigos cargada satisfactoriamente!"
 
-#: ../src/protocols/gg/gg.c:293
+#: ../src/protocols/gg/gg.c:336
 msgid "Save buddylist..."
 msgstr "Gardar lista de amigos..."
 
-#: ../src/protocols/gg/gg.c:337
+#: ../src/protocols/gg/gg.c:380
 msgid "Fill in the registration fields."
 msgstr "Encher os campos de rexistro."
 
-#: ../src/protocols/gg/gg.c:342
+#: ../src/protocols/gg/gg.c:385
 msgid "Passwords do not match."
 msgstr "Os contrasinais non coinciden."
 
-#: ../src/protocols/gg/gg.c:351
+#: ../src/protocols/gg/gg.c:394
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "Non se puido rexistrar a conta nova. Ocorreu un erro.\n"
 
-#: ../src/protocols/gg/gg.c:364
+#: ../src/protocols/gg/gg.c:407
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Nova conta rexistrada de Gadu-Gadu"
 
-#: ../src/protocols/gg/gg.c:365
+#: ../src/protocols/gg/gg.c:408
 msgid "Registration completed successfully!"
 msgstr "Rexistro completado satisfactoriamente!"
 
-#: ../src/protocols/gg/gg.c:425 ../src/protocols/jabber/jabber.c:760
-msgid "E-Mail"
-msgstr "Correo electr坦nico"
-
-#: ../src/protocols/gg/gg.c:430 ../src/protocols/gg/gg.c:704
-#: ../src/protocols/jabber/jabber.c:749 ../src/protocols/jabber/jabber.c:1306
+#: ../src/protocols/gg/gg.c:473 ../src/protocols/gg/gg.c:747
+#: ../src/protocols/jabber/jabber.c:749 ../src/protocols/jabber/jabber.c:1307
 msgid "Password"
 msgstr "Contrasinal"
 
-#: ../src/protocols/gg/gg.c:435 ../src/protocols/gg/gg.c:709
+#: ../src/protocols/gg/gg.c:478 ../src/protocols/gg/gg.c:752
 msgid "Password (retype)"
 msgstr "Contrasinal (reescribir)"
 
-#: ../src/protocols/gg/gg.c:440 ../src/protocols/gg/gg.c:714
+#: ../src/protocols/gg/gg.c:483 ../src/protocols/gg/gg.c:757
 msgid "Enter current token"
 msgstr "Introduza o token actual"
 
-#: ../src/protocols/gg/gg.c:446 ../src/protocols/gg/gg.c:720
+#: ../src/protocols/gg/gg.c:489 ../src/protocols/gg/gg.c:763
 msgid "Current token"
 msgstr "Token actual"
 
-#: ../src/protocols/gg/gg.c:450 ../src/protocols/gg/gg.c:451
+#: ../src/protocols/gg/gg.c:493 ../src/protocols/gg/gg.c:494
 msgid "Register New Gadu-Gadu Account"
 msgstr "Rexistrar conta nova de Gadu-Gadu"
 
-#: ../src/protocols/gg/gg.c:452
+#: ../src/protocols/gg/gg.c:495
 msgid "Please, fill in the following fields"
 msgstr "Por favor, encha os seguintes campos"
 
-#: ../src/protocols/gg/gg.c:547 ../src/protocols/gg/gg.c:1610
+#: ../src/protocols/gg/gg.c:590 ../src/protocols/gg/gg.c:1657
 msgid "Unable to initiate a new search"
 msgstr "Non se puido iniciar unha nova busca"
 
-#: ../src/protocols/gg/gg.c:548 ../src/protocols/gg/gg.c:1611
+#: ../src/protocols/gg/gg.c:591 ../src/protocols/gg/gg.c:1658
 msgid "You have a pending search. Please wait for it to finish."
 msgstr "Ten unha busca pendente. Agarde ata que remate."
 
-#: ../src/protocols/gg/gg.c:567 ../src/protocols/gg/gg.c:974
-#: ../src/protocols/gg/gg.c:2003 ../src/protocols/jabber/buddy.c:252
+#. General
+#: ../src/protocols/gg/gg.c:610 ../src/protocols/gg/gg.c:1018
+#: ../src/protocols/gg/gg.c:2048 ../src/protocols/jabber/buddy.c:252
 #: ../src/protocols/jabber/buddy.c:695 ../src/protocols/jabber/buddy.c:1402
 #: ../src/protocols/jabber/jabber.c:765 ../src/protocols/msn/msn.c:1373
-#: ../src/protocols/silc/buddy.c:1528 ../src/protocols/silc/ops.c:1036
-#: ../src/protocols/silc/ops.c:1179 ../src/protocols/silc/ops.c:1328
-#: ../src/protocols/yahoo/yahoo_profile.c:1035
+#: ../src/protocols/msn/msn.c:1535 ../src/protocols/silc/buddy.c:1528
+#: ../src/protocols/silc/ops.c:1036 ../src/protocols/silc/ops.c:1179
+#: ../src/protocols/silc/ops.c:1328
+#: ../src/protocols/yahoo/yahoo_profile.c:1041
 msgid "Nickname"
 msgstr "Alcume"
 
-#: ../src/protocols/gg/gg.c:572 ../src/protocols/gg/gg.c:977
+#: ../src/protocols/gg/gg.c:615 ../src/protocols/gg/gg.c:1021
 #: ../src/protocols/jabber/jabber.c:785 ../src/protocols/oscar/oscar.c:6218
 #: ../src/protocols/oscar/oscar.c:6226
 msgid "City"
 msgstr "Cidade"
 
-#: ../src/protocols/gg/gg.c:577
+#: ../src/protocols/gg/gg.c:620
 msgid "Year of birth"
 msgstr "Cumpreanos"
 
-#: ../src/protocols/gg/gg.c:580 ../src/protocols/msn/msn.c:1532
+#: ../src/protocols/gg/gg.c:623 ../src/protocols/msn/msn.c:1537
 #: ../src/protocols/oscar/oscar.c:6192
-#: ../src/protocols/yahoo/yahoo_profile.c:1060
+#: ../src/protocols/yahoo/yahoo_profile.c:1066
 msgid "Gender"
 msgstr "Sexo"
 
-#: ../src/protocols/gg/gg.c:581
+#: ../src/protocols/gg/gg.c:624
 msgid "Male or female"
 msgstr "Home ou muller"
 
-#: ../src/protocols/gg/gg.c:582 ../src/protocols/oscar/oscar.c:6192
+#: ../src/protocols/gg/gg.c:625 ../src/protocols/oscar/oscar.c:6192
 msgid "Male"
 msgstr "Home"
 
-#: ../src/protocols/gg/gg.c:583 ../src/protocols/oscar/oscar.c:6192
+#: ../src/protocols/gg/gg.c:626 ../src/protocols/oscar/oscar.c:6192
 msgid "Female"
 msgstr "Muller"
 
-#: ../src/protocols/gg/gg.c:587
+#: ../src/protocols/gg/gg.c:630
 msgid "Only online"
 msgstr "S坦 conectado"
 
-#: ../src/protocols/gg/gg.c:591 ../src/protocols/gg/gg.c:592
+#: ../src/protocols/gg/gg.c:634 ../src/protocols/gg/gg.c:635
 msgid "Find buddies"
 msgstr "Procurar amigos"
 
-#: ../src/protocols/gg/gg.c:593
+#: ../src/protocols/gg/gg.c:636
 msgid "Please, enter your search criteria below"
 msgstr "Por favor, introduza a continuaci坦n o seu criterio de busca"
 
-#: ../src/protocols/gg/gg.c:630
+#: ../src/protocols/gg/gg.c:673
 msgid "Fill in the fields."
 msgstr "Encher os campos."
 
-#: ../src/protocols/gg/gg.c:642
+#: ../src/protocols/gg/gg.c:685
 msgid "Your current password is different from the one that you specified."
 msgstr "Teu contrasinal actual 辿 diferente do primeiro que especificou."
 
-#: ../src/protocols/gg/gg.c:656
+#: ../src/protocols/gg/gg.c:699
 msgid "Unable to change password. Error occured.\n"
 msgstr "Non se puido cambiar o contrasinal. Ocorreu un erro.\n"
 
-#: ../src/protocols/gg/gg.c:665
+#: ../src/protocols/gg/gg.c:708
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Cambiar o contrasinal da conta Gadu-Gadu"
 
-#: ../src/protocols/gg/gg.c:666
+#: ../src/protocols/gg/gg.c:709
 msgid "Password was changed successfully!"
 msgstr "Cambiouse con 辿xito o contrasinal!"
 
-#: ../src/protocols/gg/gg.c:699
+#: ../src/protocols/gg/gg.c:742
 msgid "Current password"
 msgstr "Contrasinal actual"
 
-#: ../src/protocols/gg/gg.c:724
+#: ../src/protocols/gg/gg.c:767
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Introduza o seu contrasinal actual e o contrasinal novo para UIN:"
 
-#: ../src/protocols/gg/gg.c:728 ../src/protocols/gg/gg.c:729
+#: ../src/protocols/gg/gg.c:771 ../src/protocols/gg/gg.c:772
 msgid "Change Gadu-Gadu Password"
 msgstr "Cambiar o contrasinal Gadu-Gadu"
 
-#. TODO: s/screenname/alias/
-#: ../src/protocols/gg/gg.c:804
+#: ../src/protocols/gg/gg.c:846
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Seleccione un chat para o amigo: %s"
 
-#: ../src/protocols/gg/gg.c:807 ../src/protocols/gg/gg.c:808
+#: ../src/protocols/gg/gg.c:849 ../src/protocols/gg/gg.c:850
 msgid "Add to chat..."
 msgstr "Engadir ao chat..."
 
-#: ../src/protocols/gg/gg.c:950
+#: ../src/protocols/gg/gg.c:993
 msgid "No matching users found"
 msgstr "Non se atoparon usuarios coincidintes"
 
-#: ../src/protocols/gg/gg.c:951
+#: ../src/protocols/gg/gg.c:994
 msgid "There are no users matching your search criteria."
 msgstr "Non hai usuarios que coincidan cos seus criterios de busca."
 
-#: ../src/protocols/gg/gg.c:962 ../src/protocols/gg/gg.c:1029
+#: ../src/protocols/gg/gg.c:1006 ../src/protocols/gg/gg.c:1073
 #: ../src/protocols/oscar/oscar.c:6329
 msgid "Unable to display the search results."
 msgstr "Non se poden amosar os resultados da busca."
 
-#: ../src/protocols/gg/gg.c:968 ../src/protocols/oscar/oscar.c:6164
+#: ../src/protocols/gg/gg.c:1012 ../src/protocols/oscar/oscar.c:6164
 msgid "UIN"
 msgstr "UIN"
 
-#: ../src/protocols/gg/gg.c:980
+#: ../src/protocols/gg/gg.c:1024
 msgid "Birth year"
 msgstr "Data de nacemento"
 
-#: ../src/protocols/gg/gg.c:1020
+#: ../src/protocols/gg/gg.c:1064
 msgid "Gadu-Gadu Public Directory"
 msgstr "Directorio p炭blico Gadu-Gadu"
 
-#: ../src/protocols/gg/gg.c:1021
+#: ../src/protocols/gg/gg.c:1065
 msgid "Search results"
 msgstr "Resultados da busca"
 
-#: ../src/protocols/gg/gg.c:1118 ../src/protocols/gg/gg.c:1265
+#: ../src/protocols/gg/gg.c:1162 ../src/protocols/gg/gg.c:1309
 msgid "Unable to read socket"
 msgstr "Non se puido ler o socket"
 
-#: ../src/protocols/gg/gg.c:1201
+#: ../src/protocols/gg/gg.c:1245
 msgid "Buddy list downloaded"
 msgstr "Lista de amigos descargada"
 
-#: ../src/protocols/gg/gg.c:1202
+#: ../src/protocols/gg/gg.c:1246
 msgid "Your buddy list was downloaded from the server."
 msgstr "A t炭a lista de amigos foi descargada desde o servidor."
 
-#: ../src/protocols/gg/gg.c:1209
+#: ../src/protocols/gg/gg.c:1253
 msgid "Buddy list uploaded"
 msgstr "Lista de amigos subida"
 
-#: ../src/protocols/gg/gg.c:1210
+#: ../src/protocols/gg/gg.c:1254
 msgid "Your buddy list was stored on the server."
 msgstr "A t炭a lista de amigos foi almacenada no servidor."
 
-#: ../src/protocols/gg/gg.c:1311 ../src/protocols/gg/gg.c:1532
+#: ../src/protocols/gg/gg.c:1355 ../src/protocols/gg/gg.c:1579
 msgid "Connection failed."
 msgstr "Fallou a conexi坦n."
 
-#: ../src/protocols/gg/gg.c:1445 ../src/protocols/msn/msn.c:566
+#: ../src/protocols/gg/gg.c:1485 ../src/protocols/msn/msn.c:566
 msgid "Blocked"
 msgstr "Bloqueado"
 
-#: ../src/protocols/gg/gg.c:1468
+#: ../src/protocols/gg/gg.c:1508
 msgid "Add to chat"
 msgstr "Engadir ao chat"
 
-#: ../src/protocols/gg/gg.c:1477
+#: ../src/protocols/gg/gg.c:1517
 msgid "Unblock"
 msgstr "Desbloquear"
 
-#: ../src/protocols/gg/gg.c:1481
+#: ../src/protocols/gg/gg.c:1521
 msgid "Block"
 msgstr "Bloquear"
 
-#: ../src/protocols/gg/gg.c:1498
+#: ../src/protocols/gg/gg.c:1538
 msgid "Chat _name:"
 msgstr "_Nome do chat:"
 
-#: ../src/protocols/gg/gg.c:1724
+#: ../src/protocols/gg/gg.c:1769
 msgid "Chat error"
 msgstr "Erro do chat"
 
-#: ../src/protocols/gg/gg.c:1725
+#: ../src/protocols/gg/gg.c:1770
 msgid "This chat name is already in use"
 msgstr "O nome deste chat xa est叩 en uso"
 
-#: ../src/protocols/gg/gg.c:1808
+#: ../src/protocols/gg/gg.c:1853
 msgid "Not connected to the server."
 msgstr "Non conectado ao servidor."
 
-#: ../src/protocols/gg/gg.c:1831
+#: ../src/protocols/gg/gg.c:1876
 msgid "Find buddies..."
 msgstr "Procurar amigos..."
 
-#: ../src/protocols/gg/gg.c:1837
+#: ../src/protocols/gg/gg.c:1882
 msgid "Change password..."
 msgstr "Trocar contrasinal..."
 
-#: ../src/protocols/gg/gg.c:1843
+#: ../src/protocols/gg/gg.c:1888
 msgid "Upload buddylist to Server"
 msgstr "Subir lista de amigos ao servidor"
 
-#: ../src/protocols/gg/gg.c:1847
+#: ../src/protocols/gg/gg.c:1892
 msgid "Download buddylist from Server"
 msgstr "Descargar lista de amigos do servidor"
 
-#: ../src/protocols/gg/gg.c:1851
+#: ../src/protocols/gg/gg.c:1896
 msgid "Delete buddylist from Server"
 msgstr "Borrar lista de amigos do servidor"
 
-#: ../src/protocols/gg/gg.c:1855
+#: ../src/protocols/gg/gg.c:1900
 msgid "Save buddylist to file..."
 msgstr "Gardar lista de amigos ao ficheiro..."
 
-#: ../src/protocols/gg/gg.c:1859
+#: ../src/protocols/gg/gg.c:1904
 msgid "Load buddylist from file..."
 msgstr "Cargar lista de amigos desde ficheiro..."
 
@@ -5824,32 +5833,32 @@
 #. id
 #. name
 #. version
-#: ../src/protocols/gg/gg.c:1955
+#: ../src/protocols/gg/gg.c:2000
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Complemento de protocolo Gadu-Gadu"
 
 #. summary
-#: ../src/protocols/gg/gg.c:1956
+#: ../src/protocols/gg/gg.c:2001
 msgid "Polish popular IM"
 msgstr "MI polaca moi popular"
 
-#: ../src/protocols/gg/gg.c:2004
+#: ../src/protocols/gg/gg.c:2049
 msgid "Gadu-Gadu User"
 msgstr "Usuario de Gadu-Gadu"
 
-#: ../src/protocols/irc/cmds.c:43 ../src/protocols/silc/silc.c:1582
+#: ../src/protocols/irc/cmds.c:43 ../src/protocols/silc/silc.c:1586
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Comando desco単ecido: %s"
 
 #: ../src/protocols/irc/cmds.c:482 ../src/protocols/jabber/chat.c:592
-#: ../src/protocols/silc/silc.c:1290
+#: ../src/protocols/silc/silc.c:1294
 #, c-format
 msgid "current topic is: %s"
 msgstr "o t坦pico actual 辿: %s"
 
 #: ../src/protocols/irc/cmds.c:486 ../src/protocols/jabber/chat.c:596
-#: ../src/protocols/silc/silc.c:1294
+#: ../src/protocols/silc/silc.c:1298
 msgid "No topic is set"
 msgstr "Non hai un t坦pico establecido"
 
@@ -5958,11 +5967,11 @@
 msgstr "Complemento de protocolo IRC menos malo"
 
 #. host to connect to
-#: ../src/protocols/irc/irc.c:897 ../src/protocols/irc/msgs.c:231
-#: ../src/protocols/jabber/jabber.c:1904
+#: ../src/protocols/irc/irc.c:897 ../src/protocols/irc/msgs.c:235
+#: ../src/protocols/jabber/jabber.c:1905
 #: ../src/protocols/napster/napster.c:719
 #: ../src/protocols/sametime/sametime.c:5638 ../src/protocols/silc/ops.c:1242
-#: ../src/protocols/silc/ops.c:1344 ../src/protocols/simple/simple.c:1753
+#: ../src/protocols/silc/ops.c:1344 ../src/protocols/simple/simple.c:1754
 msgid "Server"
 msgstr "Servidor"
 
@@ -5970,15 +5979,16 @@
 msgid "Encodings"
 msgstr "Codificaci坦ns"
 
-#: ../src/protocols/irc/irc.c:906 ../src/protocols/irc/msgs.c:225
+#: ../src/protocols/irc/irc.c:906 ../src/protocols/irc/msgs.c:229
 #: ../src/protocols/jabber/jabber.c:745 ../src/protocols/silc/buddy.c:1531
 #: ../src/protocols/silc/ops.c:1189 ../src/protocols/silc/ops.c:1191
 #: ../src/protocols/silc/ops.c:1338 ../src/protocols/silc/ops.c:1340
-#: ../src/protocols/silc/silc.c:929
+#: ../src/protocols/silc/silc.c:933
 msgid "Username"
 msgstr "Nome de usuario"
 
-#: ../src/protocols/irc/irc.c:909
+#: ../src/protocols/irc/irc.c:909 ../src/protocols/irc/msgs.c:230
+#: ../src/protocols/silc/silc.c:937
 msgid "Real name"
 msgstr "Nome real"
 
@@ -5990,160 +6000,159 @@
 msgid "Use SSL"
 msgstr "Usar SSL"
 
-#: ../src/protocols/irc/msgs.c:103
+#: ../src/protocols/irc/msgs.c:107
 msgid "Bad mode"
 msgstr "Modo err坦neo"
 
-#: ../src/protocols/irc/msgs.c:114
+#: ../src/protocols/irc/msgs.c:118
 #, c-format
 msgid "You are banned from %s."
 msgstr "Foi vetado desde %s."
 
-#: ../src/protocols/irc/msgs.c:115
+#: ../src/protocols/irc/msgs.c:119
 msgid "Banned"
 msgstr "Vetado"
 
-#: ../src/protocols/irc/msgs.c:132
+#: ../src/protocols/irc/msgs.c:136
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "Non se puido vetar a %s: a lista de vetados est叩 chea"
 
-#: ../src/protocols/irc/msgs.c:211 ../src/protocols/irc/msgs.c:231
-#: ../src/protocols/irc/msgs.c:244
+#: ../src/protocols/irc/msgs.c:215 ../src/protocols/irc/msgs.c:235
+#: ../src/protocols/irc/msgs.c:248
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../src/protocols/irc/msgs.c:211 ../src/protocols/oscar/oscar.c:6165
+#: ../src/protocols/irc/msgs.c:215 ../src/protocols/oscar/oscar.c:6165
 #: ../src/protocols/silc/ops.c:1412
 msgid "Nick"
 msgstr "Alcume"
 
-#: ../src/protocols/irc/msgs.c:214
+#: ../src/protocols/irc/msgs.c:218
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: ../src/protocols/irc/msgs.c:215
+#: ../src/protocols/irc/msgs.c:219
 msgid " <i>(identified)</i>"
 msgstr " <i>(identificado)</i>"
 
-#: ../src/protocols/irc/msgs.c:219 ../src/protocols/irc/msgs.c:225
-#: ../src/protocols/irc/msgs.c:226 ../src/protocols/irc/msgs.c:237
+#: ../src/protocols/irc/msgs.c:223 ../src/protocols/irc/msgs.c:229
+#: ../src/protocols/irc/msgs.c:230 ../src/protocols/irc/msgs.c:241
 #: ../src/protocols/yahoo/yahoo_profile.c:691
 #, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s:</b> %s<br>"
 
-#: ../src/protocols/irc/msgs.c:226 ../src/protocols/silc/ops.c:1183
-#: ../src/protocols/silc/ops.c:1332
-#: ../src/protocols/yahoo/yahoo_profile.c:1040
-msgid "Realname"
-msgstr "Nome real"
-
-#: ../src/protocols/irc/msgs.c:237 ../src/protocols/silc/ops.c:1255
+#: ../src/protocols/irc/msgs.c:241 ../src/protocols/silc/ops.c:1255
 msgid "Currently on"
 msgstr "Actualmente en"
 
-#: ../src/protocols/irc/msgs.c:242
+#: ../src/protocols/irc/msgs.c:246
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
 msgstr "<b>Inactivo desde:</b> %s<br>"
 
-#: ../src/protocols/irc/msgs.c:244
+#: ../src/protocols/irc/msgs.c:248
 msgid "Online since"
 msgstr "Conectado desde"
 
-#: ../src/protocols/irc/msgs.c:248
+#: ../src/protocols/irc/msgs.c:252
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr "<br><b>Adxetivo que o define:</b> Glorioso<br>"
 
-#: ../src/protocols/irc/msgs.c:316
+#: ../src/protocols/irc/msgs.c:326
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s cambiou o t坦pico a: %s"
 
-#: ../src/protocols/irc/msgs.c:321
+#: ../src/protocols/irc/msgs.c:328
+#, c-format
+msgid "%s has cleared the topic."
+msgstr "%s quitou o t坦pico."
+
+#: ../src/protocols/irc/msgs.c:336
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "O t坦pico de %s 辿: %s"
 
-#: ../src/protocols/irc/msgs.c:338
+#: ../src/protocols/irc/msgs.c:354
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Mensaxe desco単ecida '%s'"
 
-#: ../src/protocols/irc/msgs.c:339
+#: ../src/protocols/irc/msgs.c:355
 msgid "Unknown message"
 msgstr "Mensaxe desco単ecida"
 
-#: ../src/protocols/irc/msgs.c:339
+#: ../src/protocols/irc/msgs.c:355
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim enviou unha mensaxe que o servidor IRC non puido entender."
 
-#: ../src/protocols/irc/msgs.c:362
+#: ../src/protocols/irc/msgs.c:378
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Usuarios en %s: %s"
 
-#: ../src/protocols/irc/msgs.c:490
+#: ../src/protocols/irc/msgs.c:506
 msgid "Time Response"
 msgstr "Resposta de hora"
 
-#: ../src/protocols/irc/msgs.c:491
+#: ../src/protocols/irc/msgs.c:507
 msgid "The IRC server's local time is:"
 msgstr "A hora local do servidor de IRC 辿:"
 
-#: ../src/protocols/irc/msgs.c:502
+#: ../src/protocols/irc/msgs.c:518
 msgid "No such channel"
 msgstr "Non existe ese canle"
 
 #. does this happen?
-#: ../src/protocols/irc/msgs.c:513
+#: ../src/protocols/irc/msgs.c:529
 msgid "no such channel"
 msgstr "non existe o canle"
 
-#: ../src/protocols/irc/msgs.c:516
+#: ../src/protocols/irc/msgs.c:532
 msgid "User is not logged in"
 msgstr "O usuario non est叩 conectado"
 
-#: ../src/protocols/irc/msgs.c:521
+#: ../src/protocols/irc/msgs.c:537
 msgid "No such nick or channel"
 msgstr "Non existe o alcume ou canle"
 
-#: ../src/protocols/irc/msgs.c:541
+#: ../src/protocols/irc/msgs.c:557
 msgid "Could not send"
 msgstr "Non se puido enviar"
 
-#: ../src/protocols/irc/msgs.c:597
+#: ../src/protocols/irc/msgs.c:613
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Para unirse a %s requ鱈rese unha invitaci坦n."
 
-#: ../src/protocols/irc/msgs.c:598
+#: ../src/protocols/irc/msgs.c:614
 msgid "Invitation only"
 msgstr "S坦 con invitaci坦n"
 
-#: ../src/protocols/irc/msgs.c:699
+#: ../src/protocols/irc/msgs.c:715
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Foi expulsado por %s: (%s)"
 
 #. Remove user from channel
-#: ../src/protocols/irc/msgs.c:704 ../src/protocols/silc/ops.c:721
+#: ../src/protocols/irc/msgs.c:720 ../src/protocols/silc/ops.c:721
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Expulsado por %s (%s)"
 
-#: ../src/protocols/irc/msgs.c:727
+#: ../src/protocols/irc/msgs.c:743
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "modo (%s %s) por %s"
 
-#: ../src/protocols/irc/msgs.c:812 ../src/protocols/irc/msgs.c:813
+#: ../src/protocols/irc/msgs.c:828 ../src/protocols/irc/msgs.c:829
 msgid "Invalid nickname"
 msgstr "Alcume inv叩lido"
 
-#: ../src/protocols/irc/msgs.c:814
+#: ../src/protocols/irc/msgs.c:830
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -6151,7 +6160,7 @@
 "O servidor rexeitou o alcume que escolleu para a s炭a conta. � posible que "
 "incl炭a caracteres inv叩lidos."
 
-#: ../src/protocols/irc/msgs.c:818
+#: ../src/protocols/irc/msgs.c:834
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -6159,42 +6168,42 @@
 "O servidor rexeitou o nome que escolleu para a s炭a conta. � posible que "
 "incl炭a caracteres inv叩lidos."
 
-#: ../src/protocols/irc/msgs.c:858
+#: ../src/protocols/irc/msgs.c:873
 msgid "Cannot change nick"
 msgstr "Non se pode cambiar o alcume"
 
-#: ../src/protocols/irc/msgs.c:858
+#: ../src/protocols/irc/msgs.c:873
 msgid "Could not change nick"
 msgstr "Non se puido cambiar o alcume"
 
-#: ../src/protocols/irc/msgs.c:879
+#: ../src/protocols/irc/msgs.c:894
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Abadonou o canle %s%s"
 
-#: ../src/protocols/irc/msgs.c:921
+#: ../src/protocols/irc/msgs.c:936
 msgid "Error: invalid PONG from server"
 msgstr "Erro: PONG inv叩lido do servidor"
 
-#: ../src/protocols/irc/msgs.c:923
+#: ../src/protocols/irc/msgs.c:938
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "Reposta PING -- Retraso: %lu segundos"
 
-#: ../src/protocols/irc/msgs.c:998
+#: ../src/protocols/irc/msgs.c:1019
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Non se pode unir a %s:"
 
-#: ../src/protocols/irc/msgs.c:999 ../src/protocols/silc/ops.c:1128
+#: ../src/protocols/irc/msgs.c:1020 ../src/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Non se pode unir ao canle"
 
-#: ../src/protocols/irc/msgs.c:1033
+#: ../src/protocols/irc/msgs.c:1054
 msgid "Nick or channel is temporarily unavailable."
 msgstr "O alcume ou canle non est叩n temporalmente dispo単ibles."
 
-#: ../src/protocols/irc/msgs.c:1045
+#: ../src/protocols/irc/msgs.c:1066
 #, c-format
 msgid "Wallops from %s"
 msgstr "Mensaxes globais de %s"
@@ -6301,7 +6310,7 @@
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [canle]:  Obter a lista dos usuarios que est叩n no canle."
 
-#: ../src/protocols/irc/parse.c:129 ../src/protocols/jabber/jabber.c:1742
+#: ../src/protocols/irc/parse.c:129 ../src/protocols/jabber/jabber.c:1743
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;novo alcume&gt;:  Cambia seu alcume."
 
@@ -6381,8 +6390,7 @@
 
 #: ../src/protocols/irc/parse.c:142
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
-msgstr ""
-"umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Establece ou elimina un modo de usuario."
+msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Establece ou elimina un modo de usuario."
 
 #: ../src/protocols/irc/parse.c:143
 msgid ""
@@ -6396,8 +6404,7 @@
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
-msgstr ""
-"wallops &lt;mensaxe&gt;:  Se non sabe o que 辿 probablemente non poida usalo."
+msgstr "wallops &lt;mensaxe&gt;:  Se non sabe o que 辿 probablemente non poida usalo."
 
 #: ../src/protocols/irc/parse.c:145
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
@@ -6433,8 +6440,7 @@
 
 #: ../src/protocols/jabber/auth.c:53
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
-msgstr ""
-"O servidor require SSL para conectarlle. Non se disp坦n de soporte TLS/SSL."
+msgstr "O servidor require SSL para conectarlle. Non se disp坦n de soporte TLS/SSL."
 
 #: ../src/protocols/jabber/auth.c:114
 msgid "Server requires plaintext authentication over an unencrypted stream"
@@ -6515,12 +6521,11 @@
 msgstr "Rexi坦n"
 
 #: ../src/protocols/jabber/buddy.c:258 ../src/protocols/jabber/buddy.c:745
-#: ../src/protocols/jabber/jabber.c:795
 msgid "Postal Code"
 msgstr "C坦digo postal"
 
 #: ../src/protocols/jabber/buddy.c:259 ../src/protocols/jabber/buddy.c:750
-#: ../src/protocols/silc/silc.c:939
+#: ../src/protocols/silc/silc.c:943
 msgid "Country"
 msgstr "Pa鱈s"
 
@@ -6529,6 +6534,13 @@
 msgid "Telephone"
 msgstr "Tel辿fono"
 
+#: ../src/protocols/jabber/buddy.c:261 ../src/protocols/jabber/buddy.c:779
+#: ../src/protocols/jabber/buddy.c:787 ../src/protocols/silc/ops.c:1075
+#: ../src/protocols/silc/util.c:512
+#: ../src/protocols/yahoo/yahoo_profile.c:1036
+msgid "E-Mail"
+msgstr "Correo electr坦nico"
+
 #: ../src/protocols/jabber/buddy.c:262 ../src/protocols/jabber/buddy.c:802
 msgid "Organization Name"
 msgstr "Nome da organizaci坦n"
@@ -6542,7 +6554,7 @@
 msgstr "Rol"
 
 #: ../src/protocols/jabber/buddy.c:266 ../src/protocols/jabber/buddy.c:698
-#: ../src/protocols/oscar/oscar.c:6198
+#: ../src/protocols/msn/msn.c:1594 ../src/protocols/oscar/oscar.c:6198
 msgid "Birthday"
 msgstr "Ano de nacemento"
 
@@ -6558,7 +6570,7 @@
 "Todos os elementos seguintes son opcionais. Introduza s坦 a informaci坦n coa "
 "que se senta c坦modo."
 
-#: ../src/protocols/jabber/buddy.c:639 ../src/protocols/jabber/jabber.c:1907
+#: ../src/protocols/jabber/buddy.c:639 ../src/protocols/jabber/jabber.c:1908
 msgid "Resource"
 msgstr "Recurso"
 
@@ -6609,12 +6621,12 @@
 msgstr "De-subscribir"
 
 #: ../src/protocols/jabber/buddy.c:1097 ../src/protocols/jabber/chat.c:677
-#: ../src/protocols/jabber/chat.c:688 ../src/protocols/jabber/jabber.c:1164
+#: ../src/protocols/jabber/chat.c:688 ../src/protocols/jabber/jabber.c:1165
 #: ../src/protocols/silc/ops.c:1449
 msgid "Error"
 msgstr "Erro"
 
-#: ../src/protocols/jabber/buddy.c:1103 ../src/protocols/jabber/jabber.c:1189
+#: ../src/protocols/jabber/buddy.c:1103 ../src/protocols/jabber/jabber.c:1190
 msgid "Chatty"
 msgstr "Falador"
 
@@ -6622,8 +6634,8 @@
 msgid "Extended Away"
 msgstr "Ausencia extendida"
 
-#: ../src/protocols/jabber/buddy.c:1109 ../src/protocols/jabber/jabber.c:1219
-#: ../src/protocols/oscar/oscar.c:787 ../src/protocols/oscar/oscar.c:8051
+#: ../src/protocols/jabber/buddy.c:1109 ../src/protocols/jabber/jabber.c:1220
+#: ../src/protocols/oscar/oscar.c:787 ../src/protocols/oscar/oscar.c:8059
 #: ../src/protocols/sametime/sametime.c:3285
 msgid "Do Not Disturb"
 msgstr "Non molestar"
@@ -6638,17 +6650,17 @@
 "Enche un ou m叩is dos campos amosados a continuaci坦n para procurar a un "
 "usuario Jabber que os te単a."
 
-#: ../src/protocols/jabber/buddy.c:1392 ../src/protocols/jabber/jabber.c:770
-#: ../src/protocols/oscar/oscar.c:6175 ../src/protocols/silc/ops.c:1024
+#: ../src/protocols/jabber/buddy.c:1392 ../src/protocols/oscar/oscar.c:6175
+#: ../src/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr "Nome"
 
-#: ../src/protocols/jabber/buddy.c:1397 ../src/protocols/jabber/jabber.c:775
-#: ../src/protocols/oscar/oscar.c:6176
+#: ../src/protocols/jabber/buddy.c:1397 ../src/protocols/oscar/oscar.c:6176
 msgid "Last Name"
 msgstr "Apelidos"
 
-#: ../src/protocols/jabber/buddy.c:1407
+#: ../src/protocols/jabber/buddy.c:1407 ../src/protocols/novell/novell.c:1490
+#: ../src/protocols/oscar/oscar.c:6178 ../src/protocols/oscar/oscar.c:6185
 msgid "E-Mail Address"
 msgstr "Enderezo de correo electr坦nico"
 
@@ -6672,7 +6684,7 @@
 msgid "Search Directory"
 msgstr "Procurar directorio"
 
-#: ../src/protocols/jabber/chat.c:41 ../src/protocols/oscar/oscar.c:7546
+#: ../src/protocols/jabber/chat.c:41 ../src/protocols/oscar/oscar.c:7552
 #: ../src/protocols/yahoo/yahoochat.c:998
 msgid "_Room:"
 msgstr "Sa_la:"
@@ -6787,7 +6799,7 @@
 msgid "Registration Successful"
 msgstr "�xito no rexistro"
 
-#: ../src/protocols/jabber/jabber.c:599 ../src/protocols/jabber/jabber.c:1455
+#: ../src/protocols/jabber/jabber.c:599 ../src/protocols/jabber/jabber.c:1456
 msgid "Unknown Error"
 msgstr "Erro desco単ecido"
 
@@ -6804,8 +6816,12 @@
 msgid "State"
 msgstr "Estado"
 
+#: ../src/protocols/jabber/jabber.c:795
+msgid "Postal code"
+msgstr "C坦digo postal"
+
 #: ../src/protocols/jabber/jabber.c:800 ../src/protocols/silc/ops.c:1069
-#: ../src/protocols/silc/silc.c:697 ../src/protocols/silc/util.c:514
+#: ../src/protocols/silc/silc.c:701 ../src/protocols/silc/util.c:514
 msgid "Phone"
 msgstr "Tel辿fono"
 
@@ -6815,8 +6831,7 @@
 
 #: ../src/protocols/jabber/jabber.c:818
 msgid "Please fill out the information below to register your new account."
-msgstr ""
-"Por favor, encha a informaci坦n abaixo indicada para rexistrar s炭a nova conta."
+msgstr "Por favor, encha a informaci坦n abaixo indicada para rexistrar s炭a nova conta."
 
 #: ../src/protocols/jabber/jabber.c:821 ../src/protocols/jabber/jabber.c:822
 msgid "Register New Jabber Account"
@@ -6834,329 +6849,329 @@
 msgid "Re-initializing Stream"
 msgstr "Reinicializando fluxo"
 
-#: ../src/protocols/jabber/jabber.c:1068 ../src/protocols/jabber/jabber.c:1433
-#: ../src/protocols/jabber/jabber.c:1474 ../src/protocols/jabber/jabber.c:1508
-#: ../src/protocols/oscar/oscar.c:856 ../src/protocols/oscar/oscar.c:7841
+#: ../src/protocols/jabber/jabber.c:1069 ../src/protocols/jabber/jabber.c:1434
+#: ../src/protocols/jabber/jabber.c:1475 ../src/protocols/jabber/jabber.c:1509
+#: ../src/protocols/oscar/oscar.c:856 ../src/protocols/oscar/oscar.c:7849
 msgid "Not Authorized"
 msgstr "Non autorizado"
 
-#: ../src/protocols/jabber/jabber.c:1110
+#: ../src/protocols/jabber/jabber.c:1111
 msgid "Both"
 msgstr "Ambos"
 
-#: ../src/protocols/jabber/jabber.c:1112
+#: ../src/protocols/jabber/jabber.c:1113
 msgid "From (To pending)"
 msgstr "Desde (Destino pendente)"
 
-#: ../src/protocols/jabber/jabber.c:1117
+#: ../src/protocols/jabber/jabber.c:1118
 msgid "To"
 msgstr "A"
 
-#: ../src/protocols/jabber/jabber.c:1119
+#: ../src/protocols/jabber/jabber.c:1120
 msgid "None (To pending)"
 msgstr "Ningu辿n (Destino pendente)"
 
-#: ../src/protocols/jabber/jabber.c:1123
+#: ../src/protocols/jabber/jabber.c:1124
 msgid "Subscription"
 msgstr "Subscrici坦n"
 
-#: ../src/protocols/jabber/jabber.c:1180 ../src/protocols/jabber/jabber.c:1190
-#: ../src/protocols/jabber/jabber.c:1200 ../src/protocols/jabber/jabber.c:1210
-#: ../src/protocols/jabber/jabber.c:1220
+#: ../src/protocols/jabber/jabber.c:1181 ../src/protocols/jabber/jabber.c:1191
+#: ../src/protocols/jabber/jabber.c:1201 ../src/protocols/jabber/jabber.c:1211
+#: ../src/protocols/jabber/jabber.c:1221
 msgid "Priority"
 msgstr "Prioridade"
 
-#: ../src/protocols/jabber/jabber.c:1249
+#: ../src/protocols/jabber/jabber.c:1250
 msgid "Password Changed"
 msgstr "Contrasinal modificado"
 
-#: ../src/protocols/jabber/jabber.c:1250
+#: ../src/protocols/jabber/jabber.c:1251
 msgid "Your password has been changed."
 msgstr "Seu contrasinal foi modificado."
 
-#: ../src/protocols/jabber/jabber.c:1254 ../src/protocols/jabber/jabber.c:1255
+#: ../src/protocols/jabber/jabber.c:1255 ../src/protocols/jabber/jabber.c:1256
 msgid "Error changing password"
 msgstr "Erro ao cambiar o contrasinal"
 
-#: ../src/protocols/jabber/jabber.c:1311
+#: ../src/protocols/jabber/jabber.c:1312
 msgid "Password (again)"
 msgstr "Contrasinal (de novo)"
 
-#: ../src/protocols/jabber/jabber.c:1316 ../src/protocols/jabber/jabber.c:1317
+#: ../src/protocols/jabber/jabber.c:1317 ../src/protocols/jabber/jabber.c:1318
 msgid "Change Jabber Password"
 msgstr "Cambiar contrasinal de Jabber"
 
-#: ../src/protocols/jabber/jabber.c:1317
+#: ../src/protocols/jabber/jabber.c:1318
 msgid "Please enter your new password"
 msgstr "Por favor, introduza o seu novo contrasinal"
 
-#: ../src/protocols/jabber/jabber.c:1327 ../src/protocols/oscar/oscar.c:8475
-#: ../src/protocols/silc/silc.c:1019
+#: ../src/protocols/jabber/jabber.c:1328 ../src/protocols/oscar/oscar.c:8483
+#: ../src/protocols/silc/silc.c:1023
 msgid "Set User Info..."
 msgstr "Establecer s炭a informaci坦n de usuario..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../src/protocols/jabber/jabber.c:1332 ../src/protocols/oscar/oscar.c:8486
-#: ../src/protocols/silc/silc.c:1015
+#: ../src/protocols/jabber/jabber.c:1333 ../src/protocols/oscar/oscar.c:8494
+#: ../src/protocols/silc/silc.c:1019
 msgid "Change Password..."
 msgstr "Trocar contrasinal..."
 
 #. }
-#: ../src/protocols/jabber/jabber.c:1337
+#: ../src/protocols/jabber/jabber.c:1338
 msgid "Search for Users..."
 msgstr "Procurar usuarios..."
 
-#: ../src/protocols/jabber/jabber.c:1413
+#: ../src/protocols/jabber/jabber.c:1414
 msgid "Bad Request"
 msgstr "Solicitude err坦nea"
 
-#: ../src/protocols/jabber/jabber.c:1415
+#: ../src/protocols/jabber/jabber.c:1416
 msgid "Conflict"
 msgstr "Conflicto"
 
-#: ../src/protocols/jabber/jabber.c:1417
+#: ../src/protocols/jabber/jabber.c:1418
 msgid "Feature Not Implemented"
 msgstr "Funcionalidade non implementada"
 
-#: ../src/protocols/jabber/jabber.c:1419
+#: ../src/protocols/jabber/jabber.c:1420
 msgid "Forbidden"
 msgstr "Prohibido"
 
-#: ../src/protocols/jabber/jabber.c:1421
+#: ../src/protocols/jabber/jabber.c:1422
 msgid "Gone"
 msgstr "Foise"
 
-#: ../src/protocols/jabber/jabber.c:1423 ../src/protocols/jabber/jabber.c:1498
+#: ../src/protocols/jabber/jabber.c:1424 ../src/protocols/jabber/jabber.c:1499
 msgid "Internal Server Error"
 msgstr "Erro interno do servidor"
 
-#: ../src/protocols/jabber/jabber.c:1425
+#: ../src/protocols/jabber/jabber.c:1426
 msgid "Item Not Found"
 msgstr "Elemento non atopado"
 
-#: ../src/protocols/jabber/jabber.c:1427
+#: ../src/protocols/jabber/jabber.c:1428
 msgid "Malformed Jabber ID"
 msgstr "ID de Jabber non v叩lido"
 
-#: ../src/protocols/jabber/jabber.c:1429
+#: ../src/protocols/jabber/jabber.c:1430
 msgid "Not Acceptable"
 msgstr "Non aceptable"
 
-#: ../src/protocols/jabber/jabber.c:1431
+#: ../src/protocols/jabber/jabber.c:1432
 msgid "Not Allowed"
 msgstr "Non permitido"
 
-#: ../src/protocols/jabber/jabber.c:1435
+#: ../src/protocols/jabber/jabber.c:1436
 msgid "Payment Required"
 msgstr "Pago necesario"
 
-#: ../src/protocols/jabber/jabber.c:1437
+#: ../src/protocols/jabber/jabber.c:1438
 msgid "Recipient Unavailable"
 msgstr "Destinatario non dispo単ible"
 
-#: ../src/protocols/jabber/jabber.c:1441
+#: ../src/protocols/jabber/jabber.c:1442
 msgid "Registration Required"
 msgstr "Rexistro necesario"
 
-#: ../src/protocols/jabber/jabber.c:1443
+#: ../src/protocols/jabber/jabber.c:1444
 msgid "Remote Server Not Found"
 msgstr "Non se atopou o servidor remoto"
 
-#: ../src/protocols/jabber/jabber.c:1445
+#: ../src/protocols/jabber/jabber.c:1446
 msgid "Remote Server Timeout"
 msgstr "Expirou o tempo do servidor remoto"
 
-#: ../src/protocols/jabber/jabber.c:1447
+#: ../src/protocols/jabber/jabber.c:1448
 msgid "Server Overloaded"
 msgstr "Servidor sobrecargado"
 
-#: ../src/protocols/jabber/jabber.c:1449
+#: ../src/protocols/jabber/jabber.c:1450
 msgid "Service Unavailable"
 msgstr "Servizo non dispo単ible"
 
-#: ../src/protocols/jabber/jabber.c:1451
+#: ../src/protocols/jabber/jabber.c:1452
 msgid "Subscription Required"
 msgstr "Subscrici坦n necesaria"
 
-#: ../src/protocols/jabber/jabber.c:1453
+#: ../src/protocols/jabber/jabber.c:1454
 msgid "Unexpected Request"
 msgstr "Solicitude non esperada"
 
-#: ../src/protocols/jabber/jabber.c:1460
+#: ../src/protocols/jabber/jabber.c:1461
 msgid "Authorization Aborted"
 msgstr "Autorizaci坦n interrumpida"
 
-#: ../src/protocols/jabber/jabber.c:1462
+#: ../src/protocols/jabber/jabber.c:1463
 msgid "Incorrect encoding in authorization"
 msgstr "Codificaci坦n incorrecta na autorizaci坦n"
 
-#: ../src/protocols/jabber/jabber.c:1465
+#: ../src/protocols/jabber/jabber.c:1466
 msgid "Invalid authzid"
 msgstr "Authzid inv叩lido"
 
-#: ../src/protocols/jabber/jabber.c:1468
+#: ../src/protocols/jabber/jabber.c:1469
 msgid "Invalid Authorization Mechanism"
 msgstr "Mecanismo de autorizaci坦n inv叩lido"
 
-#: ../src/protocols/jabber/jabber.c:1471
+#: ../src/protocols/jabber/jabber.c:1472
 msgid "Authorization mechanism too weak"
 msgstr "Mecanismo de autorizaci坦n demasiado d辿bil"
 
-#: ../src/protocols/jabber/jabber.c:1476
+#: ../src/protocols/jabber/jabber.c:1477
 msgid "Temporary Authentication Failure"
 msgstr "Fallo temporal da autenticaci坦n"
 
-#: ../src/protocols/jabber/jabber.c:1479
+#: ../src/protocols/jabber/jabber.c:1480
 msgid "Authentication Failure"
 msgstr "Fallo de autenticaci坦n"
 
-#: ../src/protocols/jabber/jabber.c:1483
+#: ../src/protocols/jabber/jabber.c:1484
 msgid "Bad Format"
 msgstr "Formato err坦neo"
 
-#: ../src/protocols/jabber/jabber.c:1485
+#: ../src/protocols/jabber/jabber.c:1486
 msgid "Bad Namespace Prefix"
 msgstr "Prefixo do espacio de nomes err坦neo"
 
-#: ../src/protocols/jabber/jabber.c:1488
+#: ../src/protocols/jabber/jabber.c:1489
 msgid "Resource Conflict"
 msgstr "Conflicto de recursos"
 
-#: ../src/protocols/jabber/jabber.c:1490 ../src/protocols/silc/ops.c:1728
+#: ../src/protocols/jabber/jabber.c:1491 ../src/protocols/silc/ops.c:1728
 msgid "Connection Timeout"
 msgstr "Expirou a conexi坦n"
 
-#: ../src/protocols/jabber/jabber.c:1492
+#: ../src/protocols/jabber/jabber.c:1493
 msgid "Host Gone"
 msgstr "Servidor desaparecido"
 
-#: ../src/protocols/jabber/jabber.c:1494
+#: ../src/protocols/jabber/jabber.c:1495
 msgid "Host Unknown"
 msgstr "Servidor desco単ecido"
 
-#: ../src/protocols/jabber/jabber.c:1496
+#: ../src/protocols/jabber/jabber.c:1497
 msgid "Improper Addressing"
 msgstr "Direccionamento incorrecto"
 
-#: ../src/protocols/jabber/jabber.c:1500
+#: ../src/protocols/jabber/jabber.c:1501
 msgid "Invalid ID"
 msgstr "ID non v叩lido"
 
-#: ../src/protocols/jabber/jabber.c:1502
+#: ../src/protocols/jabber/jabber.c:1503
 msgid "Invalid Namespace"
 msgstr "Espacio de nomes non v叩lido"
 
-#: ../src/protocols/jabber/jabber.c:1504
+#: ../src/protocols/jabber/jabber.c:1505
 msgid "Invalid XML"
 msgstr "XML inv叩lido"
 
-#: ../src/protocols/jabber/jabber.c:1506
+#: ../src/protocols/jabber/jabber.c:1507
 msgid "Non-matching Hosts"
 msgstr "Non existen servidores coincidintes"
 
-#: ../src/protocols/jabber/jabber.c:1510
+#: ../src/protocols/jabber/jabber.c:1511
 msgid "Policy Violation"
 msgstr "Violaci坦n da pol鱈tica"
 
-#: ../src/protocols/jabber/jabber.c:1512
+#: ../src/protocols/jabber/jabber.c:1513
 msgid "Remote Connection Failed"
 msgstr "Fallou a conexi坦n remota"
 
-#: ../src/protocols/jabber/jabber.c:1514
+#: ../src/protocols/jabber/jabber.c:1515
 msgid "Resource Constraint"
 msgstr "Restricci坦n de recursos"
 
-#: ../src/protocols/jabber/jabber.c:1516
+#: ../src/protocols/jabber/jabber.c:1517
 msgid "Restricted XML"
 msgstr "XML restrinxido"
 
-#: ../src/protocols/jabber/jabber.c:1518
+#: ../src/protocols/jabber/jabber.c:1519
 msgid "See Other Host"
 msgstr "Ver outros servidores"
 
-#: ../src/protocols/jabber/jabber.c:1520
+#: ../src/protocols/jabber/jabber.c:1521
 msgid "System Shutdown"
 msgstr "Parada do sistema"
 
-#: ../src/protocols/jabber/jabber.c:1522
+#: ../src/protocols/jabber/jabber.c:1523
 msgid "Undefined Condition"
 msgstr "Condici坦n non definida"
 
-#: ../src/protocols/jabber/jabber.c:1524
+#: ../src/protocols/jabber/jabber.c:1525
 msgid "Unsupported Encoding"
 msgstr "Codificaci坦n non soportada"
 
-#: ../src/protocols/jabber/jabber.c:1526
+#: ../src/protocols/jabber/jabber.c:1527
 msgid "Unsupported Stanza Type"
 msgstr "Tipo de Stanza non soportado"
 
-#: ../src/protocols/jabber/jabber.c:1528
+#: ../src/protocols/jabber/jabber.c:1529
 msgid "Unsupported Version"
 msgstr "Versi坦n non soportada"
 
-#: ../src/protocols/jabber/jabber.c:1530
+#: ../src/protocols/jabber/jabber.c:1531
 msgid "XML Not Well Formed"
 msgstr "XML mal formado"
 
-#: ../src/protocols/jabber/jabber.c:1532
+#: ../src/protocols/jabber/jabber.c:1533
 msgid "Stream Error"
 msgstr "Erro de fluxo"
 
-#: ../src/protocols/jabber/jabber.c:1599
+#: ../src/protocols/jabber/jabber.c:1600
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Non puido vetar ao usuario %s"
 
-#: ../src/protocols/jabber/jabber.c:1619
+#: ../src/protocols/jabber/jabber.c:1620
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Afiliaci坦n desco単ecida: \"%s\""
 
-#: ../src/protocols/jabber/jabber.c:1624
+#: ../src/protocols/jabber/jabber.c:1625
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Non se puido afiliar ao usuario %s coma \"%s\""
 
-#: ../src/protocols/jabber/jabber.c:1643
+#: ../src/protocols/jabber/jabber.c:1644
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Rol desco単ecido: \"%s\""
 
-#: ../src/protocols/jabber/jabber.c:1650
+#: ../src/protocols/jabber/jabber.c:1651
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "Non se puido establecer o rol \"%s\" para o usuario: %s"
 
-#: ../src/protocols/jabber/jabber.c:1703
+#: ../src/protocols/jabber/jabber.c:1704
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Non puido expulsar ao usuario %s"
 
-#: ../src/protocols/jabber/jabber.c:1734
+#: ../src/protocols/jabber/jabber.c:1735
 msgid "config:  Configure a chat room."
 msgstr "config:  Configurar unha sala de chat."
 
-#: ../src/protocols/jabber/jabber.c:1738
+#: ../src/protocols/jabber/jabber.c:1739
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Configurar unha sala de chat."
 
-#: ../src/protocols/jabber/jabber.c:1747
+#: ../src/protocols/jabber/jabber.c:1748
 msgid "part [room]:  Leave the room."
 msgstr "part [sala]:  Abandonar a sala."
 
-#: ../src/protocols/jabber/jabber.c:1752
+#: ../src/protocols/jabber/jabber.c:1753
 msgid "register:  Register with a chat room."
 msgstr "register: Rexistrarse nunha sala de chat."
 
-#: ../src/protocols/jabber/jabber.c:1758
+#: ../src/protocols/jabber/jabber.c:1759
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [novo t坦pico]:  Ver ou cambiar o t坦pico."
 
-#: ../src/protocols/jabber/jabber.c:1764
+#: ../src/protocols/jabber/jabber.c:1765
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;usuario&gt; [sala]:  Vetar a un usuario da sala."
 
-#: ../src/protocols/jabber/jabber.c:1770
+#: ../src/protocols/jabber/jabber.c:1771
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -7164,7 +7179,7 @@
 "affiliate &lt;usuario&gt; &lt;owner|admin|member|outcast|none&gt;: "
 "Establecer a afiliaci坦n dun usuario 叩 sala."
 
-#: ../src/protocols/jabber/jabber.c:1776
+#: ../src/protocols/jabber/jabber.c:1777
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -7172,22 +7187,20 @@
 "role &lt;usuario&gt; &lt;moderator|participant|visitor|none&gt;: Establecer "
 "o rol dun usuario na sala."
 
-#: ../src/protocols/jabber/jabber.c:1782
+#: ../src/protocols/jabber/jabber.c:1783
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;usuario&gt; [mensaxe]:  Invitar un usuario 叩 sala."
 
-#: ../src/protocols/jabber/jabber.c:1788
+#: ../src/protocols/jabber/jabber.c:1789
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
-msgstr ""
-"join: &lt;sala&gt; [servidor]:  Unirse a unha sala no servidor indicado."
-
-#: ../src/protocols/jabber/jabber.c:1794
+msgstr "join: &lt;sala&gt; [servidor]:  Unirse a unha sala no servidor indicado."
+
+#: ../src/protocols/jabber/jabber.c:1795
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;usuario&gt; [sala]:  Botar a un usuario da sala."
 
-#: ../src/protocols/jabber/jabber.c:1799
-msgid ""
-"msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
+#: ../src/protocols/jabber/jabber.c:1800
+msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 "msg &lt;usuario&gt; &lt;mensaxe&gt;:  Enviar unha mensaxe en privado a un "
 "usuario."
@@ -7202,60 +7215,60 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/jabber/jabber.c:1882 ../src/protocols/jabber/jabber.c:1884
+#: ../src/protocols/jabber/jabber.c:1883 ../src/protocols/jabber/jabber.c:1885
 msgid "Jabber Protocol Plugin"
 msgstr "Complemento de protocolo Jabber"
 
-#: ../src/protocols/jabber/jabber.c:1910
+#: ../src/protocols/jabber/jabber.c:1911
 msgid "Use TLS if available"
 msgstr "Usar TLS se est叩 dispo単ible"
 
-#: ../src/protocols/jabber/jabber.c:1915
+#: ../src/protocols/jabber/jabber.c:1916
 msgid "Require TLS"
 msgstr "Require TLS"
 
-#: ../src/protocols/jabber/jabber.c:1918
+#: ../src/protocols/jabber/jabber.c:1919
 msgid "Force old (port 5223) SSL"
 msgstr "Forzar SSL antigo (porto 5223)"
 
-#: ../src/protocols/jabber/jabber.c:1923
+#: ../src/protocols/jabber/jabber.c:1924
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Permitir autenticaci坦n en claro sobre canles non cifrados"
 
-#: ../src/protocols/jabber/jabber.c:1928 ../src/protocols/simple/simple.c:1759
+#: ../src/protocols/jabber/jabber.c:1929 ../src/protocols/simple/simple.c:1760
 msgid "Connect port"
 msgstr "Conectar co porto"
 
 #. Account options
-#: ../src/protocols/jabber/jabber.c:1932 ../src/protocols/silc/silc.c:1851
+#: ../src/protocols/jabber/jabber.c:1933 ../src/protocols/silc/silc.c:1855
 msgid "Connect server"
 msgstr "Conectar co servidor"
 
-#: ../src/protocols/jabber/message.c:114
+#: ../src/protocols/jabber/message.c:108
 #, c-format
 msgid "Message from %s"
 msgstr "Mensaxe de %s"
 
-#: ../src/protocols/jabber/message.c:178
+#: ../src/protocols/jabber/message.c:172
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s cambiou o t坦pico a: %s"
 
-#: ../src/protocols/jabber/message.c:180
+#: ../src/protocols/jabber/message.c:174
 #, c-format
 msgid "The topic is: %s"
 msgstr "O t坦pico 辿: %s"
 
-#: ../src/protocols/jabber/message.c:230
+#: ../src/protocols/jabber/message.c:224
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Fallou o env鱈o da mensaxe a %s: %s"
 
-#: ../src/protocols/jabber/message.c:233
+#: ../src/protocols/jabber/message.c:227
 msgid "Jabber Message Error"
 msgstr "Mensaxe de erro de Jabber"
 
-#: ../src/protocols/jabber/message.c:300
+#: ../src/protocols/jabber/message.c:295
 #, c-format
 msgid " (Code %s)"
 msgstr " (C坦digo %s)"
@@ -7274,21 +7287,21 @@
 msgstr "O usuario %s quere engadir a %s a s炭a lista de amigos."
 
 #: ../src/protocols/jabber/presence.c:323 ../src/protocols/oscar/oscar.c:4805
-#: ../src/protocols/oscar/oscar.c:7476
+#: ../src/protocols/oscar/oscar.c:7482
 msgid "_Authorize"
 msgstr "_Autorizar"
 
 #: ../src/protocols/jabber/presence.c:324 ../src/protocols/oscar/oscar.c:4807
-#: ../src/protocols/oscar/oscar.c:7477
+#: ../src/protocols/oscar/oscar.c:7483
 msgid "_Deny"
 msgstr "_Denegar"
 
-#: ../src/protocols/jabber/presence.c:380
 #: ../src/protocols/jabber/presence.c:381
+#: ../src/protocols/jabber/presence.c:382
 msgid "Create New Room"
 msgstr "Crear unha sala nova"
 
-#: ../src/protocols/jabber/presence.c:382
+#: ../src/protocols/jabber/presence.c:383
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -7296,32 +7309,32 @@
 "Vai crear unha sala nova. Desexa configurala ou aceptar os valores por "
 "omisi坦n?"
 
-#: ../src/protocols/jabber/presence.c:384
+#: ../src/protocols/jabber/presence.c:386
 msgid "_Configure Room"
 msgstr "_Configurar sala"
 
-#: ../src/protocols/jabber/presence.c:386
+#: ../src/protocols/jabber/presence.c:388
 msgid "_Accept Defaults"
 msgstr "_Aceptar valores por omisi坦n"
 
-#: ../src/protocols/jabber/presence.c:423
+#: ../src/protocols/jabber/presence.c:426
 #, c-format
 msgid "Error in chat %s"
 msgstr "Erro no chat %s"
 
-#: ../src/protocols/jabber/presence.c:426
+#: ../src/protocols/jabber/presence.c:429
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Erro ao unirse ao chat %s"
 
-#: ../src/protocols/jabber/si.c:726
+#: ../src/protocols/jabber/si.c:728
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 "Non se puido enviar o ficheiro %s, o usuario non soporta transferencias de "
 "ficheiros"
 
-#: ../src/protocols/jabber/si.c:727 ../src/protocols/jabber/si.c:728
+#: ../src/protocols/jabber/si.c:729 ../src/protocols/jabber/si.c:730
 msgid "File Send Failed"
 msgstr "Fallou no env鱈o do ficheiro"
 
@@ -7358,7 +7371,7 @@
 
 #: ../src/protocols/msn/error.c:42
 msgid "Invalid e-mail address"
-msgstr "Direcci坦n de correo electr坦nico inv叩lida"
+msgstr "Enderezo de correo electr坦nico inv叩lido"
 
 #: ../src/protocols/msn/error.c:45
 msgid "User does not exist"
@@ -7392,7 +7405,7 @@
 msgid "Not on list"
 msgstr "Non est叩 na lista"
 
-#: ../src/protocols/msn/error.c:70 ../src/protocols/zephyr/zephyr.c:690
+#: ../src/protocols/msn/error.c:70 ../src/protocols/zephyr/zephyr.c:705
 msgid "User is offline"
 msgstr "O usuario est叩 desconectado"
 
@@ -7634,7 +7647,7 @@
 
 #: ../src/protocols/msn/msn.c:550 ../src/protocols/msn/msn.c:557
 #: ../src/protocols/msn/msn.c:566 ../src/protocols/sametime/sametime.c:3247
-#: ../src/protocols/yahoo/yahoo.c:2881 ../src/protocols/yahoo/yahoo.c:2887
+#: ../src/protocols/yahoo/yahoo.c:2882 ../src/protocols/yahoo/yahoo.c:2888
 #, c-format
 msgid ""
 "\n"
@@ -7648,24 +7661,24 @@
 msgstr "Tenlle"
 
 #: ../src/protocols/msn/msn.c:587 ../src/protocols/msn/state.c:33
-#: ../src/protocols/yahoo/yahoo.c:2710 ../src/protocols/yahoo/yahoo.c:3289
+#: ../src/protocols/yahoo/yahoo.c:2711 ../src/protocols/yahoo/yahoo.c:3290
 msgid "Be Right Back"
 msgstr "Volvo enseguida"
 
 #: ../src/protocols/msn/msn.c:591 ../src/protocols/msn/state.c:31
 #: ../src/protocols/novell/novell.c:2851 ../src/protocols/novell/novell.c:2985
 #: ../src/protocols/silc/buddy.c:1473 ../src/protocols/silc/silc.c:53
-#: ../src/protocols/yahoo/yahoo.c:2712 ../src/protocols/yahoo/yahoo.c:3292
+#: ../src/protocols/yahoo/yahoo.c:2713 ../src/protocols/yahoo/yahoo.c:3293
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../src/protocols/msn/msn.c:595 ../src/protocols/yahoo/yahoo.c:2720
-#: ../src/protocols/yahoo/yahoo.c:3304
+#: ../src/protocols/msn/msn.c:595 ../src/protocols/yahoo/yahoo.c:2721
+#: ../src/protocols/yahoo/yahoo.c:3305
 msgid "On the Phone"
 msgstr "Ao tel辿fono"
 
-#: ../src/protocols/msn/msn.c:599 ../src/protocols/yahoo/yahoo.c:2724
-#: ../src/protocols/yahoo/yahoo.c:3310
+#: ../src/protocols/msn/msn.c:599 ../src/protocols/yahoo/yahoo.c:2725
+#: ../src/protocols/yahoo/yahoo.c:3311
 msgid "Out to Lunch"
 msgstr "Sa鱈n a xantar"
 
@@ -7718,80 +7731,225 @@
 msgstr "Non se puido conectar ao servidor."
 
 #: ../src/protocols/msn/msn.c:1366 ../src/protocols/yahoo/yahoo_profile.c:685
-#: ../src/protocols/zephyr/zephyr.c:721 ../src/protocols/zephyr/zephyr.c:1136
+#: ../src/protocols/zephyr/zephyr.c:736 ../src/protocols/zephyr/zephyr.c:1153
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>Alcume:</b> %s<br>"
 
 #. put a link to the actual profile URL
-#: ../src/protocols/msn/msn.c:1373 ../src/protocols/msn/msn.c:1816
-#: ../src/protocols/yahoo/yahoo_profile.c:1202 ../src/util.c:1056
+#: ../src/protocols/msn/msn.c:1373 ../src/protocols/yahoo/yahoo_profile.c:1208
+#: ../src/util.c:1055
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b> "
 
-#: ../src/protocols/msn/msn.c:1456
+#: ../src/protocols/msn/msn.c:1463
 msgid "MSN Profile"
 msgstr "Perfil MSN"
 
-#: ../src/protocols/msn/msn.c:1461 ../src/protocols/msn/msn.c:1800
+#: ../src/protocols/msn/msn.c:1468 ../src/protocols/msn/msn.c:1794
 #: ../src/protocols/yahoo/yahoo_profile.c:795
 msgid "Error retrieving profile"
 msgstr "Erro ao obter o perfil"
 
-#: ../src/protocols/msn/msn.c:1531 ../src/protocols/oscar/oscar.c:6204
-#: ../src/protocols/yahoo/yahoo_profile.c:1050
+#: ../src/protocols/msn/msn.c:1536 ../src/protocols/oscar/oscar.c:6204
+#: ../src/protocols/yahoo/yahoo_profile.c:1056
 msgid "Age"
 msgstr "Edade"
 
-#: ../src/protocols/msn/msn.c:1533 ../src/protocols/yahoo/yahoo_profile.c:1065
+#: ../src/protocols/msn/msn.c:1538 ../src/protocols/yahoo/yahoo_profile.c:1071
 msgid "Occupation"
 msgstr "Ocupaci坦n"
 
-#: ../src/protocols/msn/msn.c:1534 ../src/protocols/novell/novell.c:1480
-#: ../src/protocols/yahoo/yahoo_profile.c:1045
+#: ../src/protocols/msn/msn.c:1539 ../src/protocols/novell/novell.c:1480
+#: ../src/protocols/yahoo/yahoo_profile.c:1051
 msgid "Location"
 msgstr "Ubicaci坦n"
 
-#: ../src/protocols/msn/msn.c:1539 ../src/protocols/msn/msn.c:1729
-#: ../src/protocols/msn/msn.c:1735 ../src/protocols/msn/msn.c:1742
+#: ../src/protocols/msn/msn.c:1544 ../src/protocols/msn/msn.c:1723
+#: ../src/protocols/msn/msn.c:1729 ../src/protocols/msn/msn.c:1736
 msgid "Hobbies and Interests"
 msgstr "Afici坦ns e intereses"
 
-#: ../src/protocols/msn/msn.c:1545 ../src/protocols/msn/msn.c:1663
-#: ../src/protocols/msn/msn.c:1669 ../src/protocols/msn/msn.c:1676
-#: ../src/protocols/msn/msn.c:1684 ../src/protocols/msn/msn.c:1691
+#: ../src/protocols/msn/msn.c:1550 ../src/protocols/msn/msn.c:1657
+#: ../src/protocols/msn/msn.c:1663 ../src/protocols/msn/msn.c:1670
+#: ../src/protocols/msn/msn.c:1678 ../src/protocols/msn/msn.c:1685
 msgid "A Little About Me"
 msgstr "Un pouco sobre min"
 
+#: ../src/protocols/msn/msn.c:1556
+#, c-format
+msgid "%s<b>General</b><br>%s"
+msgstr "%s<b>Xeral</b><br>%s"
+
 #. Social
-#: ../src/protocols/msn/msn.c:1563 ../src/protocols/yahoo/yahoo_profile.c:1055
+#: ../src/protocols/msn/msn.c:1565 ../src/protocols/yahoo/yahoo_profile.c:1061
 msgid "Marital Status"
 msgstr "Estado civil"
 
-#: ../src/protocols/msn/msn.c:1573 ../src/protocols/msn/msn.c:1751
-#: ../src/protocols/msn/msn.c:1757 ../src/protocols/yahoo/yahoo_profile.c:1107
+#: ../src/protocols/msn/msn.c:1566
+msgid "Interests"
+msgstr "Inter辿s"
+
+#: ../src/protocols/msn/msn.c:1567
+msgid "Pets"
+msgstr "Mascotas"
+
+#: ../src/protocols/msn/msn.c:1568
+msgid "Hometown"
+msgstr "Cidade"
+
+#: ../src/protocols/msn/msn.c:1569
+msgid "Places Lived"
+msgstr "Lugares nos que viviu"
+
+#: ../src/protocols/msn/msn.c:1570
+msgid "Fashion"
+msgstr "Moderno"
+
+#: ../src/protocols/msn/msn.c:1571
+msgid "Humor"
+msgstr "Humor"
+
+#: ../src/protocols/msn/msn.c:1572
+msgid "Music"
+msgstr "M炭sica"
+
+#: ../src/protocols/msn/msn.c:1573 ../src/protocols/msn/msn.c:1745
+#: ../src/protocols/msn/msn.c:1751 ../src/protocols/yahoo/yahoo_profile.c:1113
 msgid "Favorite Quote"
 msgstr "Cita preferida"
 
-#: ../src/protocols/msn/msn.c:1700 ../src/protocols/msn/msn.c:1706
-#: ../src/protocols/msn/msn.c:1713 ../src/protocols/msn/msn.c:1720
+#: ../src/protocols/msn/msn.c:1577
+#, c-format
+msgid "%s<b>Social</b><br>%s"
+msgstr "%s<b>Social</b><br>%s"
+
+#: ../src/protocols/msn/msn.c:1586
+msgid "Significant Other"
+msgstr "Outro significativo"
+
+#: ../src/protocols/msn/msn.c:1587
+msgid "Home Phone"
+msgstr "Tel辿fono de casa"
+
+#: ../src/protocols/msn/msn.c:1588
+msgid "Home Phone 2"
+msgstr "Tel辿fono de casa 2"
+
+#: ../src/protocols/msn/msn.c:1589 ../src/protocols/oscar/oscar.c:6216
+msgid "Home Address"
+msgstr "Domicilio"
+
+#: ../src/protocols/msn/msn.c:1590
+msgid "Personal Mobile"
+msgstr "M坦bil persoal"
+
+#: ../src/protocols/msn/msn.c:1591
+msgid "Home Fax"
+msgstr "Fax de casa"
+
+#: ../src/protocols/msn/msn.c:1592
+msgid "Personal E-Mail"
+msgstr "Correo-e persoal"
+
+#: ../src/protocols/msn/msn.c:1593
+msgid "Personal IM"
+msgstr "MI persoal"
+
+#: ../src/protocols/msn/msn.c:1595
+msgid "Anniversary"
+msgstr "Aniversario"
+
+#: ../src/protocols/msn/msn.c:1596 ../src/protocols/msn/msn.c:1620
+msgid "Notes"
+msgstr "Notas"
+
+#: ../src/protocols/msn/msn.c:1600
+#, c-format
+msgid "<br><b>Personal</b><br>%s"
+msgstr "<br><b>Persoal</b><br>%s"
+
+#: ../src/protocols/msn/msn.c:1607 ../src/protocols/silc/ops.c:1044
+msgid "Job Title"
+msgstr "Traballo"
+
+#: ../src/protocols/msn/msn.c:1608 ../src/protocols/oscar/oscar.c:6233
+msgid "Company"
+msgstr "Compa単鱈a"
+
+#: ../src/protocols/msn/msn.c:1609 ../src/protocols/novell/novell.c:1482
+msgid "Department"
+msgstr "Departamento"
+
+#: ../src/protocols/msn/msn.c:1610
+msgid "Profession"
+msgstr "Profesi坦n"
+
+#: ../src/protocols/msn/msn.c:1611
+msgid "Work Phone"
+msgstr "Tel辿fono do traballo"
+
+#: ../src/protocols/msn/msn.c:1612
+msgid "Work Phone 2"
+msgstr "Tel辿fono do traballo"
+
+#: ../src/protocols/msn/msn.c:1613 ../src/protocols/oscar/oscar.c:6224
+msgid "Work Address"
+msgstr "Enderezo do traballo"
+
+#: ../src/protocols/msn/msn.c:1614
+msgid "Work Mobile"
+msgstr "M坦bil do traballo"
+
+#: ../src/protocols/msn/msn.c:1615
+msgid "Work Pager"
+msgstr "Paxinador do traballo"
+
+#: ../src/protocols/msn/msn.c:1616
+msgid "Work Fax"
+msgstr "Fax do traballo"
+
+#: ../src/protocols/msn/msn.c:1617
+msgid "Work E-Mail"
+msgstr "Correo-e do traballo"
+
+#: ../src/protocols/msn/msn.c:1618
+msgid "Work IM"
+msgstr "MI do traballo"
+
+#: ../src/protocols/msn/msn.c:1619
+msgid "Start Date"
+msgstr "Data de inicio"
+
+#: ../src/protocols/msn/msn.c:1624
+#, c-format
+msgid "<br><b>Business</b><br>%s"
+msgstr "<br><b>Ocupaci坦ns</b><br>%s"
+
+#: ../src/protocols/msn/msn.c:1635
+#, c-format
+msgid "<hr><b>Contact Info</b>%s%s"
+msgstr "<hr><b>Info de contacto</b>%s%s"
+
+#: ../src/protocols/msn/msn.c:1694 ../src/protocols/msn/msn.c:1700
+#: ../src/protocols/msn/msn.c:1707 ../src/protocols/msn/msn.c:1714
 msgid "Favorite Things"
 msgstr "Cousas preferidas"
 
-#: ../src/protocols/msn/msn.c:1765
+#: ../src/protocols/msn/msn.c:1759
 msgid "Last Updated"
 msgstr "�ltima actualizaci坦n"
 
-#: ../src/protocols/msn/msn.c:1777 ../src/protocols/silc/ops.c:1060
+#: ../src/protocols/msn/msn.c:1771 ../src/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "P叩xina persoal"
 
-#: ../src/protocols/msn/msn.c:1802
+#: ../src/protocols/msn/msn.c:1796
 msgid "The user has not created a public profile."
 msgstr "O usuario non creou un perfil p炭blico."
 
-#: ../src/protocols/msn/msn.c:1803
+#: ../src/protocols/msn/msn.c:1797
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
@@ -7801,7 +7959,7 @@
 "que ou ben o usuario non existe ou que o usuario existe pero non creou un "
 "perfil p炭blico."
 
-#: ../src/protocols/msn/msn.c:1807
+#: ../src/protocols/msn/msn.c:1801
 msgid ""
 "Gaim could not find any information in the user's profile. The user most "
 "likely does not exist."
@@ -7809,8 +7967,13 @@
 "Gaim non puido atopar informaci坦n no perfil de usuario. � probable que o "
 "usuario non exista."
 
-#: ../src/protocols/msn/msn.c:1813 ../src/protocols/msn/msn.c:1816
-#: ../src/protocols/yahoo/yahoo_profile.c:1202
+#. put a link to the actual profile URL
+#: ../src/protocols/msn/msn.c:1806
+#, c-format
+msgid "<hr><b>%s:</b> "
+msgstr "<hr><b>%s:</b> "
+
+#: ../src/protocols/msn/msn.c:1806 ../src/protocols/yahoo/yahoo_profile.c:1208
 msgid "Profile URL"
 msgstr "URL do perfil"
 
@@ -7824,23 +7987,23 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/msn/msn.c:2022 ../src/protocols/msn/msn.c:2024
+#: ../src/protocols/msn/msn.c:2028 ../src/protocols/msn/msn.c:2030
 msgid "MSN Protocol Plugin"
 msgstr "Complemento de protocolo MSN"
 
-#: ../src/protocols/msn/msn.c:2043
+#: ../src/protocols/msn/msn.c:2049
 msgid "Login server"
 msgstr "Servidor de conexi坦n"
 
-#: ../src/protocols/msn/msn.c:2052
+#: ../src/protocols/msn/msn.c:2058
 msgid "Use HTTP Method"
 msgstr "Usar m辿todo HTTP"
 
-#: ../src/protocols/msn/msn.c:2057
+#: ../src/protocols/msn/msn.c:2063
 msgid "Show custom smileys"
 msgstr "Amosar emotic坦ns personalizados"
 
-#: ../src/protocols/msn/msn.c:2065
+#: ../src/protocols/msn/msn.c:2071
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: Avisar a un contacto para chamar a s炭a atenci坦n"
 
@@ -7981,8 +8144,7 @@
 msgstr "Non se puido autenticar: %s"
 
 #: ../src/protocols/msn/session.c:329
-msgid ""
-"Your MSN buddy list is temporarily unavailable. Please wait and try again."
+msgid "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "S炭a lista de amigos MSN est叩 indispo単ible temporalmente. Por favor, espere e "
 "volva a tentalo m叩is tarde."
@@ -8023,39 +8185,35 @@
 msgid "Out To Lunch"
 msgstr "Sa鱈n a comer"
 
-#: ../src/protocols/msn/switchboard.c:408
+#: ../src/protocols/msn/switchboard.c:406
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "Posiblemente non se puido enviar a mensaxe porque expirou a conexi坦n:"
 
-#: ../src/protocols/msn/switchboard.c:416
+#: ../src/protocols/msn/switchboard.c:414
 msgid "Message could not be sent, not allowed while invisible:"
-msgstr ""
-"Non se puido enviar a mensaxe, non est叩 permitido mentras sexa invisible:"
-
-#: ../src/protocols/msn/switchboard.c:420
+msgstr "Non se puido enviar a mensaxe, non est叩 permitido mentras sexa invisible:"
+
+#: ../src/protocols/msn/switchboard.c:418
 msgid "Message could not be sent because the user is offline:"
 msgstr "Non se puido enviar a mensaxe porque o usuario non est叩 conectado:"
 
-#: ../src/protocols/msn/switchboard.c:424
+#: ../src/protocols/msn/switchboard.c:422
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "Non se puido enviar a mensaxe porque se produciu un erro na conexi坦n:"
 
-#: ../src/protocols/msn/switchboard.c:428
+#: ../src/protocols/msn/switchboard.c:426
 msgid "Message could not be sent because we are sending too quickly:"
-msgstr ""
-"Non se puido enviar a mensaxe porque estamos enviando demasiado r叩pido:"
-
-#: ../src/protocols/msn/switchboard.c:432
-msgid ""
-"Message could not be sent because an error with the switchboard occurred:"
-msgstr ""
-"Non se puido enviar a mensaxe porque se produciu un erro co switchboard:"
-
-#: ../src/protocols/msn/switchboard.c:440
+msgstr "Non se puido enviar a mensaxe porque estamos enviando demasiado r叩pido:"
+
+#: ../src/protocols/msn/switchboard.c:430
+msgid "Message could not be sent because an error with the switchboard occurred:"
+msgstr "Non se puido enviar a mensaxe porque se produciu un erro co switchboard:"
+
+#: ../src/protocols/msn/switchboard.c:438
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Non se puido enviar a mensaxe porque se produciu un erro desco単ecido:"
 
-#: ../src/protocols/msn/switchboard.c:961
+#: ../src/protocols/msn/switchboard.c:959
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s ac叩balle de dar un cobazo!"
@@ -8065,11 +8223,11 @@
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "O usuario %s (%s) quere engadir a %s a s炭a lista de amigos."
 
-#: ../src/protocols/msn/userlist.c:111 ../src/protocols/yahoo/yahoo.c:914
+#: ../src/protocols/msn/userlist.c:111 ../src/protocols/yahoo/yahoo.c:915
 msgid "Authorize"
 msgstr "Autorizar"
 
-#: ../src/protocols/msn/userlist.c:112 ../src/protocols/yahoo/yahoo.c:916
+#: ../src/protocols/msn/userlist.c:112 ../src/protocols/yahoo/yahoo.c:917
 msgid "Deny"
 msgstr "Denegar"
 
@@ -8083,12 +8241,12 @@
 msgid "%s has removed you from his or her buddy list."
 msgstr "O usuario %s quitouno da s炭a lista de amigos."
 
-#: ../src/protocols/msn/userlist.c:678
+#: ../src/protocols/msn/userlist.c:679
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Imposible engadir \"%s\"."
 
-#: ../src/protocols/msn/userlist.c:680
+#: ../src/protocols/msn/userlist.c:681
 msgid "The screen name specified is invalid."
 msgstr "O nome especificado 辿 inv叩lido."
 
@@ -8133,8 +8291,8 @@
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #: ../src/protocols/napster/napster.c:507
 #: ../src/protocols/napster/napster.c:543 ../src/protocols/toc/toc.c:172
-#: ../src/protocols/yahoo/yahoo.c:2238 ../src/protocols/yahoo/yahoo.c:2265
-#: ../src/protocols/yahoo/yahoo.c:2348 ../src/protocols/yahoo/yahoo.c:2363
+#: ../src/protocols/yahoo/yahoo.c:2239 ../src/protocols/yahoo/yahoo.c:2266
+#: ../src/protocols/yahoo/yahoo.c:2349 ../src/protocols/yahoo/yahoo.c:2364
 #: ../src/protocols/yahoo/yahoo_filexfer.c:74
 #: ../src/protocols/yahoo/yahoo_filexfer.c:137
 #: ../src/protocols/yahoo/ycht.c:540
@@ -8320,8 +8478,7 @@
 #: ../src/protocols/novell/novell.c:532
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
-msgstr ""
-"Non se puido enviar unha mensaxe a %s. Non se puido crear a conferencia (%s)."
+msgstr "Non se puido enviar unha mensaxe a %s. Non se puido crear a conferencia (%s)."
 
 #: ../src/protocols/novell/novell.c:537
 #, c-format
@@ -8389,10 +8546,6 @@
 msgid "Telephone Number"
 msgstr "N炭mero de tel辿fono"
 
-#: ../src/protocols/novell/novell.c:1482
-msgid "Department"
-msgstr "Departamento"
-
 #: ../src/protocols/novell/novell.c:1484
 msgid "Personal Title"
 msgstr "T鱈tulo"
@@ -8401,11 +8554,6 @@
 msgid "Mailstop"
 msgstr "Buz坦n de correo"
 
-#: ../src/protocols/novell/novell.c:1490 ../src/protocols/oscar/oscar.c:6178
-#: ../src/protocols/oscar/oscar.c:6185
-msgid "Email Address"
-msgstr "Enderezo electr坦nico"
-
 #: ../src/protocols/novell/novell.c:1506
 msgid "User ID"
 msgstr "ID de usuario"
@@ -8472,8 +8620,7 @@
 
 #: ../src/protocols/novell/novell.c:2070
 #, c-format
-msgid ""
-"%s appears to be offline and did not receive the message that you just sent."
+msgid "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 "Non parece que %s estea conectado e non recibiu a mensaxe que acaba de "
 "enviar."
@@ -8632,12 +8779,12 @@
 msgid "AIM Direct IM"
 msgstr "MI Directo AIM"
 
-#: ../src/protocols/oscar/oscar.c:708 ../src/protocols/silc/silc.c:693
+#: ../src/protocols/oscar/oscar.c:708 ../src/protocols/silc/silc.c:697
 #: ../src/protocols/silc/util.c:510
 msgid "Chat"
 msgstr "Chat"
 
-#: ../src/protocols/oscar/oscar.c:711 ../src/protocols/oscar/oscar.c:8166
+#: ../src/protocols/oscar/oscar.c:711 ../src/protocols/oscar/oscar.c:8174
 msgid "Get File"
 msgstr "Recibir ficheiro"
 
@@ -8709,15 +8856,15 @@
 msgid "Camera"
 msgstr "C叩mara"
 
-#: ../src/protocols/oscar/oscar.c:785 ../src/protocols/oscar/oscar.c:8028
+#: ../src/protocols/oscar/oscar.c:785 ../src/protocols/oscar/oscar.c:8036
 msgid "Free For Chat"
 msgstr "Dispo単ible para conversar"
 
-#: ../src/protocols/oscar/oscar.c:789 ../src/protocols/oscar/oscar.c:8056
+#: ../src/protocols/oscar/oscar.c:789 ../src/protocols/oscar/oscar.c:8064
 msgid "Not Available"
 msgstr "Non dispo単ible"
 
-#: ../src/protocols/oscar/oscar.c:791 ../src/protocols/oscar/oscar.c:8046
+#: ../src/protocols/oscar/oscar.c:791 ../src/protocols/oscar/oscar.c:8054
 msgid "Occupied"
 msgstr "Ocupado"
 
@@ -8842,12 +8989,12 @@
 #, c-format
 msgid ""
 "Transfer of file %s timed out.\n"
-" Try enabling proxy servers for file transfers in Accounts->%s->Edit Account-"
-">Advanced."
+" Try enabling proxy servers for file transfers in Accounts -> %s -> Edit "
+"Account -> Advanced."
 msgstr ""
 "Rematou o tempo da transferencia do ficheiro %s.\n"
 " Tente activar o servidor proxy para as transferencias de ficheiros en "
-"Contas->%s->Editar conta->Avanzado."
+"Contas -> %s -> Editar conta -> Avanzado."
 
 #: ../src/protocols/oscar/oscar.c:2338
 #: ../src/protocols/yahoo/yahoo_filexfer.c:253
@@ -8867,8 +9014,7 @@
 
 #: ../src/protocols/oscar/oscar.c:2668
 msgid "Unable to establish listener socket or no AOL proxy connection present."
-msgstr ""
-"Non se puido crear o socket de escoita ou non hai conexi坦n ao proxy AOL."
+msgstr "Non se puido crear o socket de escoita ou non hai conexi坦n ao proxy AOL."
 
 #: ../src/protocols/oscar/oscar.c:2906 ../src/protocols/toc/toc.c:543
 msgid "Incorrect nickname or password."
@@ -8881,8 +9027,7 @@
 #. service temporarily unavailable
 #: ../src/protocols/oscar/oscar.c:2915
 msgid "The AOL Instant Messenger service is temporarily unavailable."
-msgstr ""
-"O servizo de Mensaxer鱈a Instant叩nea AOL est叩 temporalmente non dispo単ible."
+msgstr "O servizo de Mensaxer鱈a Instant叩nea AOL est叩 temporalmente non dispo単ible."
 
 #: ../src/protocols/oscar/oscar.c:2920
 msgid ""
@@ -8895,8 +9040,7 @@
 #: ../src/protocols/oscar/oscar.c:2925
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr ""
-"A versi坦n do cliente que usa 辿 demasiado antiga. Por favor, actual鱈cea en %s"
+msgstr "A versi坦n do cliente que usa 辿 demasiado antiga. Por favor, actual鱈cea en %s"
 
 #: ../src/protocols/oscar/oscar.c:2953
 msgid "Internal Error"
@@ -8957,8 +9101,7 @@
 
 #: ../src/protocols/oscar/oscar.c:4597
 msgid "Please authorize me so I can add you to my buddy list."
-msgstr ""
-"Por favor, autor鱈ceme para que poida engadirlle a mi単a lista de amigos."
+msgstr "Por favor, autor鱈ceme para que poida engadirlle a mi単a lista de amigos."
 
 #: ../src/protocols/oscar/oscar.c:4605
 msgid "Authorization Request Message:"
@@ -8987,7 +9130,7 @@
 
 #: ../src/protocols/oscar/oscar.c:4681 ../src/protocols/oscar/oscar.c:4687
 #: ../src/protocols/oscar/oscar.c:4791 ../src/protocols/oscar/oscar.c:4815
-#: ../src/protocols/oscar/oscar.c:7462 ../src/protocols/oscar/oscar.c:7514
+#: ../src/protocols/oscar/oscar.c:7468 ../src/protocols/oscar/oscar.c:7520
 msgid "No reason given."
 msgstr "Non se indicou un raz坦n."
 
@@ -9004,7 +9147,7 @@
 "O usuario %u quere engadir a %s 叩 s炭a lista de amigos polo seguinte motivo:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:4803 ../src/protocols/oscar/oscar.c:7474
+#: ../src/protocols/oscar/oscar.c:4803 ../src/protocols/oscar/oscar.c:7480
 msgid "Authorization Request"
 msgstr "Solicitude de autorizaci坦n"
 
@@ -9065,7 +9208,7 @@
 msgstr ""
 "Recibiu unha mensaxe de correo electr坦nico de ICQ de %s [%s]\n"
 "\n"
-"Mensaxe:\n"
+"A mensaxe 辿:\n"
 "%s"
 
 #: ../src/protocols/oscar/oscar.c:4868
@@ -9097,10 +9240,8 @@
 
 #: ../src/protocols/oscar/oscar.c:4980
 #, c-format
-msgid ""
-"You missed %hu message from %s because the rate limit has been exceeded."
-msgid_plural ""
-"You missed %hu messages from %s because the rate limit has been exceeded."
+msgid "You missed %hu message from %s because the rate limit has been exceeded."
+msgid_plural "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "Vostede perdeu %hu mensaxe de %s porque foi mandado damasiado r叩pido"
 msgstr[1] "Perd辿ronse %hu mensaxes de %s porque foron mandadas demasiado r叩pido"
 
@@ -9167,7 +9308,7 @@
 msgstr "Conectado desde"
 
 #: ../src/protocols/oscar/oscar.c:5262
-#: ../src/protocols/yahoo/yahoo_profile.c:1153
+#: ../src/protocols/yahoo/yahoo_profile.c:1159
 msgid "Member Since"
 msgstr "Membro desde"
 
@@ -9231,26 +9372,14 @@
 msgid "Additional Information"
 msgstr "Informaci坦n adicional"
 
-#: ../src/protocols/oscar/oscar.c:6216
-msgid "Home Address"
-msgstr "Domicilio"
-
 #: ../src/protocols/oscar/oscar.c:6220 ../src/protocols/oscar/oscar.c:6228
 msgid "Zip Code"
 msgstr "C坦digo postal"
 
-#: ../src/protocols/oscar/oscar.c:6224
-msgid "Work Address"
-msgstr "Enderezo do traballo"
-
 #: ../src/protocols/oscar/oscar.c:6232
 msgid "Work Information"
 msgstr "Informaci坦n do traballo"
 
-#: ../src/protocols/oscar/oscar.c:6233
-msgid "Company"
-msgstr "Compa単鱈a"
-
 #: ../src/protocols/oscar/oscar.c:6234
 msgid "Division"
 msgstr "Secci坦n"
@@ -9277,12 +9406,12 @@
 #: ../src/protocols/oscar/oscar.c:6366
 #, c-format
 msgid "No results found for e-mail address %s"
-msgstr "Non se atoparon resultados para o enderezo de correo %s"
+msgstr "Non se atoparon resultados para o enderezo de correo-e %s"
 
 #: ../src/protocols/oscar/oscar.c:6387
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
-msgstr "Deber鱈a recibir unha mensaxe solicitando confirmaci坦n de %s."
+msgstr "Deber鱈a recibir un correo-e solicitando confirmaci坦n de %s."
 
 #: ../src/protocols/oscar/oscar.c:6389
 msgid "Account Confirmation Requested"
@@ -9304,8 +9433,7 @@
 #: ../src/protocols/oscar/oscar.c:6426
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
-msgstr ""
-"Erro 0x%04x: Non se pode dar formato ao nome de usuario porque 辿 inv叩lido."
+msgstr "Erro 0x%04x: Non se pode dar formato ao nome de usuario porque 辿 inv叩lido."
 
 #: ../src/protocols/oscar/oscar.c:6429
 #, c-format
@@ -9367,8 +9495,7 @@
 msgstr "O enderezo de correo electr坦nico de %s 辿 %s"
 
 #: ../src/protocols/oscar/oscar.c:6535
-msgid ""
-"Your IM Image was not sent. You must be Direct Connected to send IM Images."
+msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "Non se enviou a s炭a imaxe MI. Debe estar directamente conectado para enviar "
 "imaxes MI."
@@ -9399,14 +9526,14 @@
 "Excedeuse o l鱈mite de %d byte de lonxitude na mensaxe de ausencia. Gaim "
 "truncouno."
 msgstr[1] ""
-"Excedeuse o l鱈mite de %d bytes de lonxitude na mensaxe de "
-"ausencia. Gaim truncouno."
+"Excedeuse o l鱈mite de %d bytes de lonxitude na mensaxe de ausencia. Gaim "
+"truncouno."
 
 #: ../src/protocols/oscar/oscar.c:6795
 msgid "Profile too long."
 msgstr "Perfil demasiado longo."
 
-#: ../src/protocols/oscar/oscar.c:6837
+#: ../src/protocols/oscar/oscar.c:6843
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -9418,14 +9545,14 @@
 "Excedeuse o l鱈mite de %d byte de lonxitude na mensaxe de ausencia. Gaim "
 "truncouno."
 msgstr[1] ""
-"Excedeuse o l鱈mite de %d bytes de lonxitude na mensaxe de "
-"ausencia. Gaim truncouno."
-
-#: ../src/protocols/oscar/oscar.c:6842
+"Excedeuse o l鱈mite de %d bytes de lonxitude na mensaxe de ausencia. Gaim "
+"truncouno."
+
+#: ../src/protocols/oscar/oscar.c:6848
 msgid "Away message too long."
 msgstr "Mensaxe de ausencia demasiado longo."
 
-#: ../src/protocols/oscar/oscar.c:6911
+#: ../src/protocols/oscar/oscar.c:6917
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -9436,16 +9563,16 @@
 "nome de usuario deben comezar con letras s坦 poden conter letras, n炭mero e "
 "espacios, ou conter s坦 n炭meros."
 
-#: ../src/protocols/oscar/oscar.c:6913 ../src/protocols/oscar/oscar.c:7320
-#: ../src/protocols/oscar/oscar.c:7334
+#: ../src/protocols/oscar/oscar.c:6919 ../src/protocols/oscar/oscar.c:7326
+#: ../src/protocols/oscar/oscar.c:7340
 msgid "Unable To Add"
 msgstr "Non se puido engadir"
 
-#: ../src/protocols/oscar/oscar.c:7020
+#: ../src/protocols/oscar/oscar.c:7026
 msgid "Unable To Retrieve Buddy List"
 msgstr "Non se puido obter a lista de amigos"
 
-#: ../src/protocols/oscar/oscar.c:7021
+#: ../src/protocols/oscar/oscar.c:7027
 msgid ""
 "Gaim was temporarily unable to retrieve your buddy list from the AIM "
 "servers.  Your buddy list is not lost, and will probably become available in "
@@ -9454,13 +9581,13 @@
 "Gaim non pode obter neste momento a lista de amigos dos servidores de AIM. A "
 "lista non borrou, e seguramente volver叩 a estar dispo単ible nunhas horas."
 
-#: ../src/protocols/oscar/oscar.c:7218 ../src/protocols/oscar/oscar.c:7219
-#: ../src/protocols/oscar/oscar.c:7224 ../src/protocols/oscar/oscar.c:7378
-#: ../src/protocols/oscar/oscar.c:7379 ../src/protocols/oscar/oscar.c:7384
+#: ../src/protocols/oscar/oscar.c:7224 ../src/protocols/oscar/oscar.c:7225
+#: ../src/protocols/oscar/oscar.c:7230 ../src/protocols/oscar/oscar.c:7384
+#: ../src/protocols/oscar/oscar.c:7385 ../src/protocols/oscar/oscar.c:7390
 msgid "Orphans"
 msgstr "Orfos"
 
-#: ../src/protocols/oscar/oscar.c:7318
+#: ../src/protocols/oscar/oscar.c:7324
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -9469,11 +9596,11 @@
 "Non se puido engadir o amigo %s porque hai demasiados contactos na lista de "
 "amigos. Por favor, elimine un e volva a probar."
 
-#: ../src/protocols/oscar/oscar.c:7318 ../src/protocols/oscar/oscar.c:7332
+#: ../src/protocols/oscar/oscar.c:7324 ../src/protocols/oscar/oscar.c:7338
 msgid "(no name)"
 msgstr "(sen nome)"
 
-#: ../src/protocols/oscar/oscar.c:7332
+#: ../src/protocols/oscar/oscar.c:7338
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -9484,7 +9611,7 @@
 "habitual 辿 que chegou ao m叩ximo n炭mero de amigos permitidos na s炭a lista de "
 "amigos."
 
-#: ../src/protocols/oscar/oscar.c:7415
+#: ../src/protocols/oscar/oscar.c:7421
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -9493,11 +9620,11 @@
 "O usuario %s deulle permiso para engadirlle a s炭a lista de amigos. Desexa "
 "facelo?"
 
-#: ../src/protocols/oscar/oscar.c:7421
+#: ../src/protocols/oscar/oscar.c:7427
 msgid "Authorization Given"
 msgstr "Autorizaci坦n otorgada"
 
-#: ../src/protocols/oscar/oscar.c:7465
+#: ../src/protocols/oscar/oscar.c:7471
 #, c-format
 msgid ""
 "The user %s wants to add %s to their buddy list for the following reason:\n"
@@ -9507,18 +9634,17 @@
 "%s"
 
 #. Granted
-#: ../src/protocols/oscar/oscar.c:7510
+#: ../src/protocols/oscar/oscar.c:7516
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
-msgstr ""
-"O usuario %s autorizou a s炭a solicitude de engadilo a s炭a lista de amigos."
-
-#: ../src/protocols/oscar/oscar.c:7511
+msgstr "O usuario %s autorizou a s炭a solicitude de engadilo a s炭a lista de amigos."
+
+#: ../src/protocols/oscar/oscar.c:7517
 msgid "Authorization Granted"
 msgstr "Autorizaci坦n aceptada"
 
 #. Denied
-#: ../src/protocols/oscar/oscar.c:7514
+#: ../src/protocols/oscar/oscar.c:7520
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -9529,91 +9655,90 @@
 "seguinte raz坦n:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:7515
+#: ../src/protocols/oscar/oscar.c:7521
 msgid "Authorization Denied"
 msgstr "Autorizaci坦n denegada"
 
-#: ../src/protocols/oscar/oscar.c:7552 ../src/protocols/toc/toc.c:1372
+#: ../src/protocols/oscar/oscar.c:7558 ../src/protocols/toc/toc.c:1372
 msgid "_Exchange:"
 msgstr "_Troco:"
 
-#: ../src/protocols/oscar/oscar.c:7588
+#: ../src/protocols/oscar/oscar.c:7594
 msgid "Invalid chat name specified."
 msgstr "Especificouse un nome de chat inv叩lido."
 
-#: ../src/protocols/oscar/oscar.c:7658
+#: ../src/protocols/oscar/oscar.c:7664
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
-msgstr ""
-"Non se enviou s炭a imaxe MI. Non se poden enviar imaxes MI en chats AIM."
-
-#: ../src/protocols/oscar/oscar.c:7813
+msgstr "Non se enviou s炭a imaxe MI. Non se poden enviar imaxes MI en chats AIM."
+
+#: ../src/protocols/oscar/oscar.c:7821
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(obtendo)</i>"
 
-#: ../src/protocols/oscar/oscar.c:8119
+#: ../src/protocols/oscar/oscar.c:8127
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Comentario de amigo para %s"
 
-#: ../src/protocols/oscar/oscar.c:8120
+#: ../src/protocols/oscar/oscar.c:8128
 msgid "Buddy Comment:"
 msgstr "Comentario de amigo:"
 
-#: ../src/protocols/oscar/oscar.c:8139
+#: ../src/protocols/oscar/oscar.c:8147
 msgid "Edit Buddy Comment"
 msgstr "Editar comentario de amigo"
 
-#: ../src/protocols/oscar/oscar.c:8146
+#: ../src/protocols/oscar/oscar.c:8154
 msgid "Get Status Msg"
 msgstr "Obter msx de estado"
 
-#: ../src/protocols/oscar/oscar.c:8159
+#: ../src/protocols/oscar/oscar.c:8167
 msgid "Direct IM"
 msgstr "MI directo"
 
-#: ../src/protocols/oscar/oscar.c:8178
+#: ../src/protocols/oscar/oscar.c:8186
 msgid "Re-request Authorization"
 msgstr "Solicitar autorizaci坦n outra vez"
 
-#: ../src/protocols/oscar/oscar.c:8235
+#: ../src/protocols/oscar/oscar.c:8243
 msgid "Require authorization"
 msgstr "Pedir autorizaci坦n"
 
-#: ../src/protocols/oscar/oscar.c:8238
+#: ../src/protocols/oscar/oscar.c:8246
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Capacidade web (se activa isto far叩 que reciba SPAM!)"
 
-#: ../src/protocols/oscar/oscar.c:8243
+#: ../src/protocols/oscar/oscar.c:8251
 msgid "ICQ Privacy Options"
 msgstr "Opci坦ns de privacidade ICQ"
 
-#: ../src/protocols/oscar/oscar.c:8260
+#: ../src/protocols/oscar/oscar.c:8268
 msgid "The new formatting is invalid."
 msgstr "O novo formato 辿 inv叩lido."
 
-#: ../src/protocols/oscar/oscar.c:8261
+#: ../src/protocols/oscar/oscar.c:8269
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "O formato do nome de usuario s坦 pode cambiar na capitalizaci坦n e espacio en "
 "branco."
 
-#: ../src/protocols/oscar/oscar.c:8268
+#: ../src/protocols/oscar/oscar.c:8276
 msgid "New screen name formatting:"
 msgstr "Novo formato do nome de usuario:"
 
-#: ../src/protocols/oscar/oscar.c:8320
+#: ../src/protocols/oscar/oscar.c:8328
 msgid "Change Address To:"
 msgstr "Cambiar enderezo a:"
 
-#: ../src/protocols/oscar/oscar.c:8365
+#: ../src/protocols/oscar/oscar.c:8373
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>vostede non est叩 agardando autorizaci坦n</i>"
 
-#: ../src/protocols/oscar/oscar.c:8368
+#: ../src/protocols/oscar/oscar.c:8376
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Agardando a autorizaci坦n dos seguintes amigos"
 
-#: ../src/protocols/oscar/oscar.c:8369
+#: ../src/protocols/oscar/oscar.c:8377
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -9621,61 +9746,61 @@
 "Pode volver a pedir autorizaci坦n a estos amigos premendo o bot坦n dereito do "
 "rato sobre eles e escollendo \"Solicitar autorizaci坦n outra vez.\""
 
-#: ../src/protocols/oscar/oscar.c:8386
+#: ../src/protocols/oscar/oscar.c:8394
 msgid "Find Buddy by E-Mail"
-msgstr "Buscar un amigo polo correo electr坦nico"
-
-#: ../src/protocols/oscar/oscar.c:8387
+msgstr "Procurar un amigo polo correo electr坦nico"
+
+#: ../src/protocols/oscar/oscar.c:8395
 msgid "Search for a buddy by e-mail address"
 msgstr "Buscar amigo polo enderezo de correo electr坦nico"
 
-#: ../src/protocols/oscar/oscar.c:8388
+#: ../src/protocols/oscar/oscar.c:8396
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Escriba o enderezo de correo electr坦nico do amigo que est叩 buscando."
 
-#: ../src/protocols/oscar/oscar.c:8481
+#: ../src/protocols/oscar/oscar.c:8489
 msgid "Set User Info (URL)..."
 msgstr "Establecer s炭a informaci坦n de usuario (URL)..."
 
-#: ../src/protocols/oscar/oscar.c:8492
+#: ../src/protocols/oscar/oscar.c:8500
 msgid "Change Password (URL)"
 msgstr "Trocar contrasinal (URL)"
 
-#: ../src/protocols/oscar/oscar.c:8496
+#: ../src/protocols/oscar/oscar.c:8504
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configurar reenv鱈o de MI (URL)"
 
 #. ICQ actions
-#: ../src/protocols/oscar/oscar.c:8506
+#: ../src/protocols/oscar/oscar.c:8514
 msgid "Set Privacy Options..."
 msgstr "Establecer opci坦ns de privacidade..."
 
 #. AIM actions
-#: ../src/protocols/oscar/oscar.c:8513
+#: ../src/protocols/oscar/oscar.c:8521
 msgid "Format Screen Name..."
 msgstr "Formato do nome de usuario..."
 
-#: ../src/protocols/oscar/oscar.c:8517
-msgid "Confirm Account"
-msgstr "Confirmar conta"
-
-#: ../src/protocols/oscar/oscar.c:8521
-msgid "Display Currently Registered Address"
-msgstr "Mostrar enderezo rexistrado actualmente"
-
 #: ../src/protocols/oscar/oscar.c:8525
+msgid "Confirm Account"
+msgstr "Confirmar conta"
+
+#: ../src/protocols/oscar/oscar.c:8529
+msgid "Display Currently Registered Address"
+msgstr "Mostrar enderezo rexistrado actualmente"
+
+#: ../src/protocols/oscar/oscar.c:8533
 msgid "Change Currently Registered Address..."
 msgstr "Cambiar o enderezo rexistrado..."
 
-#: ../src/protocols/oscar/oscar.c:8532
+#: ../src/protocols/oscar/oscar.c:8540
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Amosar amigos pendentes de autorizaci坦n"
 
-#: ../src/protocols/oscar/oscar.c:8538
+#: ../src/protocols/oscar/oscar.c:8546
 msgid "Search for Buddy by E-Mail..."
-msgstr "Buscar amigo por correo electr坦nico..."
-
-#: ../src/protocols/oscar/oscar.c:8543
+msgstr "Procurar un amigo por correo electr坦nico..."
+
+#: ../src/protocols/oscar/oscar.c:8551
 msgid "Search for Buddy by Information"
 msgstr "Buscar un amigo a trav辿s da s炭a informaci坦n"
 
@@ -9689,23 +9814,23 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/oscar/oscar.c:8721 ../src/protocols/oscar/oscar.c:8723
+#: ../src/protocols/oscar/oscar.c:8729 ../src/protocols/oscar/oscar.c:8731
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "Complemento de protocolo AIM/ICQ"
 
-#: ../src/protocols/oscar/oscar.c:8742
+#: ../src/protocols/oscar/oscar.c:8750
 msgid "Auth host"
 msgstr "Servidor de autenticaci坦n"
 
-#: ../src/protocols/oscar/oscar.c:8745
+#: ../src/protocols/oscar/oscar.c:8753
 msgid "Auth port"
 msgstr "Porto de autenticaci坦n"
 
-#: ../src/protocols/oscar/oscar.c:8748 ../src/protocols/zephyr/zephyr.c:2900
+#: ../src/protocols/oscar/oscar.c:8756 ../src/protocols/zephyr/zephyr.c:2920
 msgid "Encoding"
 msgstr "Codificaci坦n"
 
-#: ../src/protocols/oscar/oscar.c:8752
+#: ../src/protocols/oscar/oscar.c:8760
 msgid ""
 "Use AIM/ICQ proxy server\n"
 "(slower, but usually works)"
@@ -9782,8 +9907,7 @@
 
 #: ../src/protocols/sametime/sametime.c:1605
 #, c-format
-msgid ""
-"A Sametime administrator has issued the following announcement on server %s"
+msgid "A Sametime administrator has issued the following announcement on server %s"
 msgstr "Un administrador de Sametime eviou o seguinte anuncio no servidor %s"
 
 #: ../src/protocols/sametime/sametime.c:1610
@@ -10142,8 +10266,7 @@
 #: ../src/protocols/sametime/sametime.c:5485
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
-msgstr ""
-"O identificador '%s' non coincide con ning炭n usuario na comunidade Sametime."
+msgstr "O identificador '%s' non coincide con ning炭n usuario na comunidade Sametime."
 
 #: ../src/protocols/sametime/sametime.c:5489
 msgid "No Matches"
@@ -10379,57 +10502,56 @@
 msgid "Robot"
 msgstr "Robot"
 
-#: ../src/protocols/silc/buddy.c:1486 ../src/protocols/silc/silc.c:668
+#: ../src/protocols/silc/buddy.c:1486 ../src/protocols/silc/silc.c:672
 #: ../src/protocols/silc/util.c:473
 msgid "Happy"
 msgstr "Feliz"
 
-#: ../src/protocols/silc/buddy.c:1488 ../src/protocols/silc/silc.c:670
+#: ../src/protocols/silc/buddy.c:1488 ../src/protocols/silc/silc.c:674
 #: ../src/protocols/silc/util.c:475
 msgid "Sad"
 msgstr "Triste"
 
-#: ../src/protocols/silc/buddy.c:1490 ../src/protocols/silc/silc.c:672
+#: ../src/protocols/silc/buddy.c:1490 ../src/protocols/silc/silc.c:676
 #: ../src/protocols/silc/util.c:477
 msgid "Angry"
 msgstr "Furioso"
 
-#: ../src/protocols/silc/buddy.c:1492 ../src/protocols/silc/silc.c:674
+#: ../src/protocols/silc/buddy.c:1492 ../src/protocols/silc/silc.c:678
 #: ../src/protocols/silc/util.c:479
 msgid "Jealous"
 msgstr "Celoso"
 
-#: ../src/protocols/silc/buddy.c:1494 ../src/protocols/silc/silc.c:676
+#: ../src/protocols/silc/buddy.c:1494 ../src/protocols/silc/silc.c:680
 #: ../src/protocols/silc/util.c:481
 msgid "Ashamed"
 msgstr "Avergo単ado"
 
-#: ../src/protocols/silc/buddy.c:1496 ../src/protocols/silc/silc.c:678
+#: ../src/protocols/silc/buddy.c:1496 ../src/protocols/silc/silc.c:682
 #: ../src/protocols/silc/util.c:483
 msgid "Invincible"
 msgstr "Invencible"
 
-#: ../src/protocols/silc/buddy.c:1498 ../src/protocols/silc/silc.c:680
-#: ../src/protocols/silc/util.c:485
+#: ../src/protocols/silc/buddy.c:1498 ../src/protocols/silc/util.c:485
 msgid "In Love"
 msgstr "Enamorado"
 
-#: ../src/protocols/silc/buddy.c:1500 ../src/protocols/silc/silc.c:682
+#: ../src/protocols/silc/buddy.c:1500 ../src/protocols/silc/silc.c:686
 #: ../src/protocols/silc/util.c:487
 msgid "Sleepy"
 msgstr "Durmido"
 
-#: ../src/protocols/silc/buddy.c:1502 ../src/protocols/silc/silc.c:684
+#: ../src/protocols/silc/buddy.c:1502 ../src/protocols/silc/silc.c:688
 #: ../src/protocols/silc/util.c:489
 msgid "Bored"
 msgstr "Aburrido"
 
-#: ../src/protocols/silc/buddy.c:1504 ../src/protocols/silc/silc.c:686
+#: ../src/protocols/silc/buddy.c:1504 ../src/protocols/silc/silc.c:690
 #: ../src/protocols/silc/util.c:491
 msgid "Excited"
 msgstr "Excitado"
 
-#: ../src/protocols/silc/buddy.c:1506 ../src/protocols/silc/silc.c:688
+#: ../src/protocols/silc/buddy.c:1506 ../src/protocols/silc/silc.c:692
 #: ../src/protocols/silc/util.c:493
 msgid "Anxious"
 msgstr "Ansioso"
@@ -10455,7 +10577,7 @@
 msgstr "Dispositivo"
 
 #: ../src/protocols/silc/buddy.c:1570 ../src/protocols/silc/ops.c:1232
-#: ../src/protocols/silc/silc.c:736 ../src/protocols/silc/silc.c:738
+#: ../src/protocols/silc/silc.c:740 ../src/protocols/silc/silc.c:742
 msgid "Timezone"
 msgstr "Zona horaria"
 
@@ -10594,7 +10716,7 @@
 msgstr "Nome do grupo"
 
 #: ../src/protocols/silc/chat.c:581 ../src/protocols/silc/ops.c:1908
-#: ../src/protocols/silc/silc.c:944
+#: ../src/protocols/silc/silc.c:948
 msgid "Passphrase"
 msgstr "Contrasinal"
 
@@ -10681,8 +10803,7 @@
 
 #: ../src/protocols/silc/chat.c:1096
 #, c-format
-msgid ""
-"You have to join the %s channel before you are able to join the private group"
+msgid "You have to join the %s channel before you are able to join the private group"
 msgstr "Ten que unirse ao canle %s antes de poder unirse ao grupo privado"
 
 #: ../src/protocols/silc/chat.c:1098
@@ -10693,15 +10814,15 @@
 msgid "Cannot join private group"
 msgstr "Non se pode unir a un grupo privado"
 
-#: ../src/protocols/silc/chat.c:1293 ../src/protocols/silc/silc.c:1152
+#: ../src/protocols/silc/chat.c:1293 ../src/protocols/silc/silc.c:1156
 msgid "Call Command"
 msgstr "Comando de chamada"
 
-#: ../src/protocols/silc/chat.c:1293 ../src/protocols/silc/silc.c:1152
+#: ../src/protocols/silc/chat.c:1293 ../src/protocols/silc/silc.c:1156
 msgid "Cannot call command"
 msgstr "Non se pode chamar o comando"
 
-#: ../src/protocols/silc/chat.c:1294 ../src/protocols/silc/silc.c:1153
+#: ../src/protocols/silc/chat.c:1294 ../src/protocols/silc/silc.c:1157
 msgid "Unknown command"
 msgstr "Comando desco単ecido"
 
@@ -10808,15 +10929,11 @@
 msgid "Birth Day"
 msgstr "D鱈a de nacemento"
 
-#: ../src/protocols/silc/ops.c:1044
-msgid "Job Title"
-msgstr "Traballo"
-
 #: ../src/protocols/silc/ops.c:1048
 msgid "Job Role"
 msgstr "Rol laboral"
 
-#: ../src/protocols/silc/ops.c:1052 ../src/protocols/silc/silc.c:937
+#: ../src/protocols/silc/ops.c:1052 ../src/protocols/silc/silc.c:941
 msgid "Organization"
 msgstr "Organizaci坦n"
 
@@ -10824,10 +10941,6 @@
 msgid "Unit"
 msgstr "Unidade"
 
-#: ../src/protocols/silc/ops.c:1075
-msgid "EMail"
-msgstr "Correo electr坦nico"
-
 #: ../src/protocols/silc/ops.c:1080
 msgid "Note"
 msgstr "Nota"
@@ -10836,6 +10949,11 @@
 msgid "Join Chat"
 msgstr "Unirse a un Chat"
 
+#: ../src/protocols/silc/ops.c:1183 ../src/protocols/silc/ops.c:1332
+#: ../src/protocols/yahoo/yahoo_profile.c:1046
+msgid "Real Name"
+msgstr "Nome real"
+
 #: ../src/protocols/silc/ops.c:1211
 msgid "Status Text"
 msgstr "Texto de estado"
@@ -10852,7 +10970,7 @@
 msgid "_More..."
 msgstr "_M叩is..."
 
-#: ../src/protocols/silc/ops.c:1369 ../src/protocols/silc/silc.c:1003
+#: ../src/protocols/silc/ops.c:1369 ../src/protocols/silc/silc.c:1007
 msgid "Detach From Server"
 msgstr "Desligar do servidor"
 
@@ -10964,8 +11082,7 @@
 msgstr "Fallou o troco de claves"
 
 #: ../src/protocols/silc/ops.c:1722
-msgid ""
-"Resuming detached session failed. Press Reconnect to create new connection."
+msgid "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 "Produciuse un erro ao retomar a sesi坦n desligada. Prema Reconectar para "
 "crear unha nova conexi坦n."
@@ -10975,7 +11092,7 @@
 msgstr "Desconectado polo servidor"
 
 #: ../src/protocols/silc/ops.c:1819 ../src/protocols/silc/ops.c:1866
-#: ../src/protocols/silc/silc.c:195
+#: ../src/protocols/silc/silc.c:199
 msgid "Resuming session"
 msgstr "Reanudando a sesi坦n"
 
@@ -10993,8 +11110,7 @@
 
 #: ../src/protocols/silc/ops.c:1938
 msgid "Failure: Version mismatch, upgrade your client"
-msgstr ""
-"Fallo: Existe unha diferencia nas versi坦ns, por favor, actualice seu cliente"
+msgstr "Fallo: Existe unha diferencia nas versi坦ns, por favor, actualice seu cliente"
 
 #: ../src/protocols/silc/ops.c:1941
 msgid "Failure: Remote does not trust/support your public key"
@@ -11071,49 +11187,53 @@
 msgid "Unsupported public key type"
 msgstr "Tipo de clave p炭blica non sopotada"
 
-#: ../src/protocols/silc/silc.c:155
+#: ../src/protocols/silc/silc.c:158
 msgid "Connection failed"
 msgstr "Fallou a conexi坦n"
 
-#: ../src/protocols/silc/silc.c:187
+#: ../src/protocols/silc/silc.c:191
 msgid "Cannot initialize SILC Client connection"
 msgstr "Non se puido inicializar a conexi坦n do cliente SILC"
 
-#: ../src/protocols/silc/silc.c:198
+#: ../src/protocols/silc/silc.c:202
 msgid "Performing key exchange"
 msgstr "Realizando troco de claves"
 
-#: ../src/protocols/silc/silc.c:283
+#: ../src/protocols/silc/silc.c:287
 msgid "Out of memory"
 msgstr "Sen memoria"
 
-#: ../src/protocols/silc/silc.c:324
+#: ../src/protocols/silc/silc.c:328
 msgid "Cannot initialize SILC protocol"
 msgstr "Non se puido inicializar o protocolo SILC"
 
-#: ../src/protocols/silc/silc.c:331
+#: ../src/protocols/silc/silc.c:335
 msgid "Cannot find/access ~/.silc directory"
 msgstr "Non se pode atopar ou acceder ao directorio ~/.silc"
 
 #. Progress
-#: ../src/protocols/silc/silc.c:336
+#: ../src/protocols/silc/silc.c:340
 msgid "Connecting to SILC Server"
 msgstr "Conectando co servidor SILC"
 
-#: ../src/protocols/silc/silc.c:345
+#: ../src/protocols/silc/silc.c:349
 #, c-format
 msgid "Could not load SILC key pair: %s"
 msgstr "Non se puido cargar a chave p炭blica SILC: %s"
 
-#: ../src/protocols/silc/silc.c:365
+#: ../src/protocols/silc/silc.c:369
 msgid "Unable to create connection"
 msgstr "Imposible crear a conexi坦n"
 
-#: ../src/protocols/silc/silc.c:664
+#: ../src/protocols/silc/silc.c:668
 msgid "Your Current Mood"
 msgstr "Seu estado de 叩nimo actual"
 
-#: ../src/protocols/silc/silc.c:691
+#: ../src/protocols/silc/silc.c:684
+msgid "In love"
+msgstr "Enamorado"
+
+#: ../src/protocols/silc/silc.c:695
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -11121,43 +11241,43 @@
 "\n"
 "Seus m辿todos de contacto preferidos"
 
-#: ../src/protocols/silc/silc.c:699 ../src/protocols/silc/util.c:518
+#: ../src/protocols/silc/silc.c:703 ../src/protocols/silc/util.c:518
 msgid "SMS"
 msgstr "SMS"
 
-#: ../src/protocols/silc/silc.c:701 ../src/protocols/silc/util.c:520
+#: ../src/protocols/silc/silc.c:705 ../src/protocols/silc/util.c:520
 msgid "MMS"
 msgstr "MMS"
 
-#: ../src/protocols/silc/silc.c:703 ../src/protocols/silc/util.c:522
-msgid "Video Conferencing"
+#: ../src/protocols/silc/silc.c:707
+msgid "Video conferencing"
 msgstr "V鱈deo conferencia"
 
-#: ../src/protocols/silc/silc.c:708
+#: ../src/protocols/silc/silc.c:712
 msgid "Your Current Status"
 msgstr "Seu estado actual"
 
-#: ../src/protocols/silc/silc.c:715
+#: ../src/protocols/silc/silc.c:719
 msgid "Online Services"
 msgstr "Servizos en li単a"
 
-#: ../src/protocols/silc/silc.c:718
+#: ../src/protocols/silc/silc.c:722
 msgid "Let others see what services you are using"
 msgstr "Permitir que outros consulten que servizos est叩 empregando"
 
-#: ../src/protocols/silc/silc.c:724
+#: ../src/protocols/silc/silc.c:728
 msgid "Let others see what computer you are using"
 msgstr "Permitir que outros consulten qu辿 ordenador est叩 empregando"
 
-#: ../src/protocols/silc/silc.c:731
+#: ../src/protocols/silc/silc.c:735
 msgid "Your VCard File"
 msgstr "Seu ficheiro VCard"
 
-#: ../src/protocols/silc/silc.c:743 ../src/protocols/silc/silc.c:744
+#: ../src/protocols/silc/silc.c:747 ../src/protocols/silc/silc.c:748
 msgid "User Online Status Attributes"
 msgstr "Atributos do estado do usuario en li単a"
 
-#: ../src/protocols/silc/silc.c:745
+#: ../src/protocols/silc/silc.c:749
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
@@ -11167,172 +11287,167 @@
 "li単a as鱈 como s炭a informaci坦n persoal. Por favor, encha a informaci坦n que "
 "desexa que outros usuarios vexan de vostede."
 
-#: ../src/protocols/silc/silc.c:785 ../src/protocols/silc/silc.c:791
-#: ../src/protocols/silc/silc.c:1431
+#: ../src/protocols/silc/silc.c:789 ../src/protocols/silc/silc.c:795
+#: ../src/protocols/silc/silc.c:1435
 msgid "Message of the Day"
 msgstr "Mensaxe do d鱈a"
 
-#: ../src/protocols/silc/silc.c:785
+#: ../src/protocols/silc/silc.c:789
 msgid "No Message of the Day available"
 msgstr "Non hai dispo単ible un mensaxe do d鱈a"
 
-#: ../src/protocols/silc/silc.c:786 ../src/protocols/silc/silc.c:1426
+#: ../src/protocols/silc/silc.c:790 ../src/protocols/silc/silc.c:1430
 msgid "There is no Message of the Day associated with this connection"
 msgstr "Non hai unha mensaxe do d鱈a asociada con esta conexi坦n"
 
-#: ../src/protocols/silc/silc.c:837 ../src/protocols/silc/silc.c:881
-#: ../src/protocols/silc/silc.c:952 ../src/protocols/silc/silc.c:953
+#: ../src/protocols/silc/silc.c:841 ../src/protocols/silc/silc.c:885
+#: ../src/protocols/silc/silc.c:956 ../src/protocols/silc/silc.c:957
 msgid "Create New SILC Key Pair"
 msgstr "Creando o novo par de claves SILC..."
 
-#: ../src/protocols/silc/silc.c:837
+#: ../src/protocols/silc/silc.c:841
 msgid "Passphrases do not match"
 msgstr "Os contrasinais non coinciden."
 
-#: ../src/protocols/silc/silc.c:881
+#: ../src/protocols/silc/silc.c:885
 msgid "Key Pair Generation failed"
 msgstr "Fallou a xeneraci坦n de claves"
 
-#: ../src/protocols/silc/silc.c:920
+#: ../src/protocols/silc/silc.c:924
 msgid "Key length"
 msgstr "Lonxitude da clave"
 
-#: ../src/protocols/silc/silc.c:922
+#: ../src/protocols/silc/silc.c:926
 msgid "Public key file"
 msgstr "Ficheiro de clave p炭blica"
 
-#: ../src/protocols/silc/silc.c:924
+#: ../src/protocols/silc/silc.c:928
 msgid "Private key file"
 msgstr "Ficheiro de clave privada"
 
-#: ../src/protocols/silc/silc.c:933
-msgid "Real Name"
-msgstr "Nome real"
-
-#: ../src/protocols/silc/silc.c:947
-msgid "Re-type Passphrase"
-msgstr "Reescribir contrasinal"
-
-#: ../src/protocols/silc/silc.c:954
+#: ../src/protocols/silc/silc.c:951
+msgid "Passphrase (retype)"
+msgstr "Contrasinal (reescribir)"
+
+#: ../src/protocols/silc/silc.c:958
 msgid "Generate Key Pair"
 msgstr "Xerar par de claves"
 
-#: ../src/protocols/silc/silc.c:998
+#: ../src/protocols/silc/silc.c:1002
 msgid "Online Status"
 msgstr "Estado en li単a"
 
-#: ../src/protocols/silc/silc.c:1007
+#: ../src/protocols/silc/silc.c:1011
 msgid "View Message of the Day"
 msgstr "Amosar mensaxe do s鱈a"
 
-#: ../src/protocols/silc/silc.c:1011
+#: ../src/protocols/silc/silc.c:1015
 msgid "Create SILC Key Pair..."
 msgstr "Crear par de claves SILC..."
 
-#: ../src/protocols/silc/silc.c:1110
+#: ../src/protocols/silc/silc.c:1114
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "O usuario <I>%s</I> non est叩 na rede"
 
-#: ../src/protocols/silc/silc.c:1302
+#: ../src/protocols/silc/silc.c:1306
 msgid "Topic too long"
 msgstr "T坦pico demasiado longo"
 
-#: ../src/protocols/silc/silc.c:1383
+#: ../src/protocols/silc/silc.c:1387
 msgid "You must specify a nick"
 msgstr "Debe especificar un alcume"
 
-#: ../src/protocols/silc/silc.c:1485
+#: ../src/protocols/silc/silc.c:1489
 #, c-format
 msgid "channel %s not found"
 msgstr "non se atopou o canle %s"
 
-#: ../src/protocols/silc/silc.c:1490
+#: ../src/protocols/silc/silc.c:1494
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "os modos do canle de %s son: %s"
 
-#: ../src/protocols/silc/silc.c:1492
+#: ../src/protocols/silc/silc.c:1496
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "non se definiron modos de canle para %s"
 
-#: ../src/protocols/silc/silc.c:1505
+#: ../src/protocols/silc/silc.c:1509
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Non se puideron fixar os modos de canle para %s"
 
-#: ../src/protocols/silc/silc.c:1535
+#: ../src/protocols/silc/silc.c:1539
 #, c-format
 msgid "Unknown command: %s, (may be a Gaim bug)"
 msgstr "Comando desco単ecido: %s, (pode ser un erro de Gaim)"
 
-#: ../src/protocols/silc/silc.c:1598
+#: ../src/protocols/silc/silc.c:1602
 msgid "part [channel]:  Leave the chat"
 msgstr "part [canle]:  Abandonar un chat"
 
-#: ../src/protocols/silc/silc.c:1602
+#: ../src/protocols/silc/silc.c:1606
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [canle]:  Abandonar o chat"
 
-#: ../src/protocols/silc/silc.c:1606
+#: ../src/protocols/silc/silc.c:1610
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;novo t坦pico&gt;]:  Ver ou trocar o t坦pico"
 
-#: ../src/protocols/silc/silc.c:1611
+#: ../src/protocols/silc/silc.c:1615
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join &lt;canle&gt; [&lt;contrasinal&gt;]:  Unirse a un chat nesta rede"
 
-#: ../src/protocols/silc/silc.c:1615
+#: ../src/protocols/silc/silc.c:1619
 msgid "list:  List channels on this network"
 msgstr "list:  Amosar os canles nesta rede"
 
-#: ../src/protocols/silc/silc.c:1619
+#: ../src/protocols/silc/silc.c:1623
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;alcume&gt;:  Ver informaci坦n do alcume"
 
-#: ../src/protocols/silc/silc.c:1623 ../src/protocols/zephyr/zephyr.c:2602
+#: ../src/protocols/silc/silc.c:1627 ../src/protocols/zephyr/zephyr.c:2622
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
-msgstr ""
-"msg &lt;alcume&gt; &lt;mensaxe&gt;:  Enviar unha mensaxe privada a un usuario"
-
-#: ../src/protocols/silc/silc.c:1627
+msgstr "msg &lt;alcume&gt; &lt;mensaxe&gt;:  Enviar unha mensaxe privada a un usuario"
+
+#: ../src/protocols/silc/silc.c:1631
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 "query &lt;alcume&gt; [&lt;mensaxe&gt;]:  Enviar unha mensaxe privada ao "
 "usuario"
 
-#: ../src/protocols/silc/silc.c:1631
+#: ../src/protocols/silc/silc.c:1635
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  Amosar a mensaxe do d鱈a do servidor"
 
-#: ../src/protocols/silc/silc.c:1635
+#: ../src/protocols/silc/silc.c:1639
 msgid "detach:  Detach this session"
 msgstr "detach:  Desligar esta sesi坦n"
 
-#: ../src/protocols/silc/silc.c:1639
+#: ../src/protocols/silc/silc.c:1643
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr ""
 "quit [mensaxe]:  Desconecta do servidor actual opcionalmente indicando unha "
 "mensaxe"
 
-#: ../src/protocols/silc/silc.c:1643
+#: ../src/protocols/silc/silc.c:1647
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;comando&gt;:  Executar un comando calquera do cliente silc"
 
-#: ../src/protocols/silc/silc.c:1649
-msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
-msgstr "kill &lt;alcume&gt; [-pubkey|&lt;raz坦n&gt;]:  Matar un alcume"
-
 #: ../src/protocols/silc/silc.c:1653
-msgid "nick &lt;newnick&gt;:  Change your nickname"
-msgstr "nick &lt;novo alcume&gt;:  Troca seu alcume"
+msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
+msgstr "kill &lt;alcume&gt; [-pubkey|&lt;raz坦n&gt;]:  Matar un alcume"
 
 #: ../src/protocols/silc/silc.c:1657
+msgid "nick &lt;newnick&gt;:  Change your nickname"
+msgstr "nick &lt;novo alcume&gt;:  Troca seu alcume"
+
+#: ../src/protocols/silc/silc.c:1661
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;alcume&gt;:  Amosar informaci坦n do alcume"
 
-#: ../src/protocols/silc/silc.c:1661
+#: ../src/protocols/silc/silc.c:1665
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -11340,7 +11455,7 @@
 "cmode &lt;canle&gt; [+|-&lt;modos&gt;] [argumentos]:  Cambia ou mostra os "
 "modos do canle"
 
-#: ../src/protocols/silc/silc.c:1665
+#: ../src/protocols/silc/silc.c:1669
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -11348,15 +11463,15 @@
 "cumode &lt;canle&gt; +|-&lt;modos&gt; &lt;alcume&gt;:  Cambio os modos do "
 "usuario ou do canle"
 
-#: ../src/protocols/silc/silc.c:1669
+#: ../src/protocols/silc/silc.c:1673
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;modos de usuario&gt;:  Establecer seus modos na rede"
 
-#: ../src/protocols/silc/silc.c:1673
+#: ../src/protocols/silc/silc.c:1677
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;alcume&gt; [-pubkey]:  Obter privilexios de operador"
 
-#: ../src/protocols/silc/silc.c:1677
+#: ../src/protocols/silc/silc.c:1681
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -11364,38 +11479,37 @@
 "invite &lt;canle&gt; [-|+]&lt;alcume&gt;:  invita un alcume ou engade/"
 "elimina o alcume da lista de invitados para o canle"
 
-#: ../src/protocols/silc/silc.c:1681
+#: ../src/protocols/silc/silc.c:1685
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
-msgstr ""
-"kick &lt;canle&gt; &lt;alcume&gt; [comentario]:  Botar a un cliente do canle"
-
-#: ../src/protocols/silc/silc.c:1685
+msgstr "kick &lt;canle&gt; &lt;alcume&gt; [comentario]:  Botar a un cliente do canle"
+
+#: ../src/protocols/silc/silc.c:1689
 msgid "info [server]:  View server administrative details"
 msgstr "info [servidor]:  Consulta detalles administrativos do servidor"
 
-#: ../src/protocols/silc/silc.c:1689
+#: ../src/protocols/silc/silc.c:1693
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;canle&gt; +|-&lt;alcume&gt;]:  Vetar a un cliente do canle"
 
-#: ../src/protocols/silc/silc.c:1693
+#: ../src/protocols/silc/silc.c:1697
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 "getkey &lt;alcume|servidor&gt;:  Obt辿n a clave p炭blica do servidor ou do "
 "cliente"
 
-#: ../src/protocols/silc/silc.c:1697
+#: ../src/protocols/silc/silc.c:1701
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Amosa as estat鱈sticas do servidor e da rede"
 
-#: ../src/protocols/silc/silc.c:1701
+#: ../src/protocols/silc/silc.c:1705
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Enviar un PING ao servidor ao que est叩 conectado"
 
-#: ../src/protocols/silc/silc.c:1706
+#: ../src/protocols/silc/silc.c:1710
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;canle&gt;:  Obt辿n a lista dos usuarios que est叩n no canle"
 
-#: ../src/protocols/silc/silc.c:1710
+#: ../src/protocols/silc/silc.c:1714
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -11412,60 +11526,60 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../src/protocols/silc/silc.c:1819
+#: ../src/protocols/silc/silc.c:1823
 msgid "SILC Protocol Plugin"
 msgstr "Complemento de protocolo SILC"
 
 #. *  description
-#: ../src/protocols/silc/silc.c:1821
+#: ../src/protocols/silc/silc.c:1825
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Protocolo de conferencia segura en vivo en Internet (SILC)"
 
-#: ../src/protocols/silc/silc.c:1858
+#: ../src/protocols/silc/silc.c:1862
 msgid "Public Key file"
 msgstr "Ficheiro de clave p炭blica"
 
-#: ../src/protocols/silc/silc.c:1862
+#: ../src/protocols/silc/silc.c:1866
 msgid "Private Key file"
 msgstr "Ficheiro de clave privada"
 
-#: ../src/protocols/silc/silc.c:1872
+#: ../src/protocols/silc/silc.c:1876
 msgid "Cipher"
 msgstr "Cipher"
 
-#: ../src/protocols/silc/silc.c:1882
+#: ../src/protocols/silc/silc.c:1886
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../src/protocols/silc/silc.c:1885
+#: ../src/protocols/silc/silc.c:1889
 msgid "Public key authentication"
 msgstr "Autenticaci坦n de clave p炭blica"
 
-#: ../src/protocols/silc/silc.c:1888
+#: ../src/protocols/silc/silc.c:1892
 msgid "Reject watching by other users"
 msgstr "Impedir que outros usuarios vexan"
 
-#: ../src/protocols/silc/silc.c:1891
+#: ../src/protocols/silc/silc.c:1895
 msgid "Block invites"
 msgstr "Bloquear invitaci坦ns"
 
-#: ../src/protocols/silc/silc.c:1894
+#: ../src/protocols/silc/silc.c:1898
 msgid "Block IMs without Key Exchange"
 msgstr "Bloquear MIs que non fagan un troco de claves"
 
-#: ../src/protocols/silc/silc.c:1897
+#: ../src/protocols/silc/silc.c:1901
 msgid "Reject online status attribute requests"
 msgstr "Rexeitar solicitudes dos atributos do estado de li単a"
 
-#: ../src/protocols/silc/silc.c:1900
+#: ../src/protocols/silc/silc.c:1904
 msgid "Block messages to whiteboard"
 msgstr "Bloquear mensaxes ao encerado"
 
-#: ../src/protocols/silc/silc.c:1903
+#: ../src/protocols/silc/silc.c:1907
 msgid "Automatically open whiteboard"
 msgstr "Abrir o encerado automaticamente"
 
-#: ../src/protocols/silc/silc.c:1906
+#: ../src/protocols/silc/silc.c:1910
 msgid "Digitally sign and verify all messages"
 msgstr "Asinar dixitalmente todas as mensaxes instant叩neas"
 
@@ -11488,8 +11602,8 @@
 
 #: ../src/protocols/silc/util.c:318
 #, c-format
-msgid "EMail: \t\t%s\n"
-msgstr "EMail: \t\t%s\n"
+msgid "E-Mail: \t\t%s\n"
+msgstr "E-Mail: \t\t%s\n"
 
 #: ../src/protocols/silc/util.c:320
 #, c-format
@@ -11513,7 +11627,7 @@
 
 #: ../src/protocols/silc/util.c:326
 #, c-format
-msgid "Key length: \t%d bits\n"
+msgid "Key Length: \t%d bits\n"
 msgstr "Lonxitude da clave: \t%d bits\n"
 
 #: ../src/protocols/silc/util.c:328
@@ -11544,6 +11658,10 @@
 msgid "Paging"
 msgstr "Enviar"
 
+#: ../src/protocols/silc/util.c:522
+msgid "Video Conferencing"
+msgstr "V鱈deo conferencia"
+
 #: ../src/protocols/silc/util.c:540
 msgid "Computer"
 msgstr "Ordenador"
@@ -11606,36 +11724,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../src/protocols/simple/simple.c:1733
+#: ../src/protocols/simple/simple.c:1734
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "Complemento de protocolo SIP/SIMPLE"
 
 #. *  summary
-#: ../src/protocols/simple/simple.c:1734
+#: ../src/protocols/simple/simple.c:1735
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "O complemento de protocolo SIP/SIMPLE"
 
-#: ../src/protocols/simple/simple.c:1756
+#: ../src/protocols/simple/simple.c:1757
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Estado p炭blico (nota: todos poder叩n velo)"
 
-#: ../src/protocols/simple/simple.c:1762
+#: ../src/protocols/simple/simple.c:1763
 msgid "Use UDP"
 msgstr "Usar UDP"
 
-#: ../src/protocols/simple/simple.c:1764
+#: ../src/protocols/simple/simple.c:1765
 msgid "Use proxy"
 msgstr "Usar proxy"
 
-#: ../src/protocols/simple/simple.c:1766
+#: ../src/protocols/simple/simple.c:1767
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../src/protocols/simple/simple.c:1768
+#: ../src/protocols/simple/simple.c:1769
 msgid "Auth User"
 msgstr "Usuario de autenticaci坦n"
 
-#: ../src/protocols/simple/simple.c:1770
+#: ../src/protocols/simple/simple.c:1771
 msgid "Auth Domain"
 msgstr "Dominio de autenticaci坦n"
 
@@ -11886,11 +12004,11 @@
 msgid "Your Yahoo! message did not get sent."
 msgstr "S炭a mensaxe Yahoo! non se enviou."
 
-#: ../src/protocols/yahoo/yahoo.c:765 ../src/protocols/yahoo/yahoo.c:3562
+#: ../src/protocols/yahoo/yahoo.c:766 ../src/protocols/yahoo/yahoo.c:3563
 msgid "Buzz!!"
 msgstr "Buzz!!"
 
-#: ../src/protocols/yahoo/yahoo.c:810
+#: ../src/protocols/yahoo/yahoo.c:811
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Mensaxe do sistema Yahoo! para %s:"
@@ -11898,23 +12016,23 @@
 #. TODO: this is almost exactly the same as what MSN does,
 #. * this should probably be moved to the core.
 #.
-#: ../src/protocols/yahoo/yahoo.c:906
+#: ../src/protocols/yahoo/yahoo.c:907
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list%s%s."
 msgstr "O usuario %s quere engadir a %s a s炭a lista de amigos %s%s."
 
-#: ../src/protocols/yahoo/yahoo.c:912
+#: ../src/protocols/yahoo/yahoo.c:913
 msgid "Message (optional) :"
 msgstr "Mensaxe (opcional) :"
 
-#: ../src/protocols/yahoo/yahoo.c:954
+#: ../src/protocols/yahoo/yahoo.c:955
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 "O usuario %s rechazou s炭a solicitude de engadilo a s炭a lista de amigos (de "
 "forma retroactiva)."
 
-#: ../src/protocols/yahoo/yahoo.c:957
+#: ../src/protocols/yahoo/yahoo.c:958
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -11923,11 +12041,11 @@
 "O usuario %s negou (de forma retroactiva) s炭a solicitude de engadilo a s炭a "
 "lista de amigos pola seguinte raz坦n: %s."
 
-#: ../src/protocols/yahoo/yahoo.c:960
+#: ../src/protocols/yahoo/yahoo.c:961
 msgid "Add buddy rejected"
 msgstr "Rechazouse a adici坦n do amigo"
 
-#: ../src/protocols/yahoo/yahoo.c:1703
+#: ../src/protocols/yahoo/yahoo.c:1704
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -11938,11 +12056,11 @@
 "Esta versi坦n de Gaim posiblemente non sexa capaz de conectarse a Yahoo. "
 "Comprobe %s para obter unha actualizaci坦n."
 
-#: ../src/protocols/yahoo/yahoo.c:1706
+#: ../src/protocols/yahoo/yahoo.c:1707
 msgid "Failed Yahoo! Authentication"
 msgstr "Fallou a autenticaci坦n en Yahoo!"
 
-#: ../src/protocols/yahoo/yahoo.c:1772
+#: ../src/protocols/yahoo/yahoo.c:1773
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -11951,19 +12069,19 @@
 "Intentou ignorar a %s, pero o usuario est叩 na s炭a lista de amigos. Se "
 "selecciona \"Si\" eliminar叩selle e ignorarase a este amigo."
 
-#: ../src/protocols/yahoo/yahoo.c:1775
+#: ../src/protocols/yahoo/yahoo.c:1776
 msgid "Ignore buddy?"
 msgstr "Ignorar amigo?"
 
-#: ../src/protocols/yahoo/yahoo.c:1809
+#: ../src/protocols/yahoo/yahoo.c:1810
 msgid "Invalid username."
 msgstr "Nome de usuario inv叩lido."
 
-#: ../src/protocols/yahoo/yahoo.c:1820
+#: ../src/protocols/yahoo/yahoo.c:1821
 msgid "Normal authentication failed!"
 msgstr "Fallou a autenticaci坦n habitual!"
 
-#: ../src/protocols/yahoo/yahoo.c:1821
+#: ../src/protocols/yahoo/yahoo.c:1822
 msgid ""
 "The normal authentication method has failed. This means either your password "
 "is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
@@ -11975,139 +12093,138 @@
 "cambiou. Gaim tentar叩 conectarse a trav辿s da autenticaci坦n de Mensaxer鱈a web "
 "que poder叩 dar lugar a un acceso a menos funcionalidades e funci坦ns."
 
-#: ../src/protocols/yahoo/yahoo.c:1829
+#: ../src/protocols/yahoo/yahoo.c:1830
 msgid "Incorrect password."
 msgstr "Contrasinal incorrecto."
 
-#: ../src/protocols/yahoo/yahoo.c:1832
+#: ../src/protocols/yahoo/yahoo.c:1833
 msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr ""
-"S炭a conta est叩 bloqueada. Por favor, con辿ctese ao servidor de web de Yahoo!."
-
-#: ../src/protocols/yahoo/yahoo.c:1835
+msgstr "S炭a conta est叩 bloqueada. Por favor, con辿ctese ao servidor de web de Yahoo!."
+
+#: ../src/protocols/yahoo/yahoo.c:1836
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Erro desco単ecido n炭mero %d. Se se conecta ao servidor de web de Yahoo! 辿 "
 "posible que isto arr辿grese."
 
-#: ../src/protocols/yahoo/yahoo.c:1889
+#: ../src/protocols/yahoo/yahoo.c:1890
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Non se puido engadir ao amigo %s ao grupo %s da lista no servidor para a "
 "conta %s."
 
-#: ../src/protocols/yahoo/yahoo.c:1892
+#: ../src/protocols/yahoo/yahoo.c:1893
 msgid "Could not add buddy to server list"
 msgstr "Non se puido engadir o amigo 叩 lista do servidor"
 
-#: ../src/protocols/yahoo/yahoo.c:2011
+#: ../src/protocols/yahoo/yahoo.c:2012
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audible %s/%s/%s.swf ] %s"
 
-#: ../src/protocols/yahoo/yahoo.c:2150 ../src/protocols/yahoo/yahoo.c:2297
-#: ../src/protocols/yahoo/yahoo.c:2312 ../src/protocols/yahoo/ycht.c:472
+#: ../src/protocols/yahoo/yahoo.c:2151 ../src/protocols/yahoo/yahoo.c:2298
+#: ../src/protocols/yahoo/yahoo.c:2313 ../src/protocols/yahoo/ycht.c:472
 msgid "Unable to read"
 msgstr "Non se puido ler"
 
-#: ../src/protocols/yahoo/yahoo.c:2336 ../src/protocols/yahoo/yahoo.c:2493
-#: ../src/protocols/yahoo/yahoo.c:2595 ../src/protocols/yahoo/yahoo.c:2605
+#: ../src/protocols/yahoo/yahoo.c:2337 ../src/protocols/yahoo/yahoo.c:2494
+#: ../src/protocols/yahoo/yahoo.c:2596 ../src/protocols/yahoo/yahoo.c:2606
 #: ../src/protocols/yahoo/yahoochat.c:1447
 #: ../src/protocols/yahoo/yahoochat.c:1517 ../src/protocols/yahoo/ycht.c:576
 msgid "Connection problem"
 msgstr "Problema de conexi坦n"
 
-#: ../src/protocols/yahoo/yahoo.c:2714 ../src/protocols/yahoo/yahoo.c:3295
+#: ../src/protocols/yahoo/yahoo.c:2715 ../src/protocols/yahoo/yahoo.c:3296
 msgid "Not at Home"
 msgstr "Fora da casa"
 
-#: ../src/protocols/yahoo/yahoo.c:2716 ../src/protocols/yahoo/yahoo.c:3298
+#: ../src/protocols/yahoo/yahoo.c:2717 ../src/protocols/yahoo/yahoo.c:3299
 msgid "Not at Desk"
 msgstr "Lexos do escritorio"
 
-#: ../src/protocols/yahoo/yahoo.c:2718 ../src/protocols/yahoo/yahoo.c:3301
+#: ../src/protocols/yahoo/yahoo.c:2719 ../src/protocols/yahoo/yahoo.c:3302
 msgid "Not in Office"
 msgstr "Fora da oficina"
 
-#: ../src/protocols/yahoo/yahoo.c:2722 ../src/protocols/yahoo/yahoo.c:3307
+#: ../src/protocols/yahoo/yahoo.c:2723 ../src/protocols/yahoo/yahoo.c:3308
 msgid "On Vacation"
 msgstr "De vacaci坦ns"
 
-#: ../src/protocols/yahoo/yahoo.c:2726 ../src/protocols/yahoo/yahoo.c:3313
+#: ../src/protocols/yahoo/yahoo.c:2727 ../src/protocols/yahoo/yahoo.c:3314
 msgid "Stepped Out"
 msgstr "Abandonou"
 
-#: ../src/protocols/yahoo/yahoo.c:2819 ../src/protocols/yahoo/yahoo.c:2849
+#: ../src/protocols/yahoo/yahoo.c:2820 ../src/protocols/yahoo/yahoo.c:2850
 msgid "Not on server list"
 msgstr "Non est叩 na lista do servidor"
 
-#: ../src/protocols/yahoo/yahoo.c:2866 ../src/protocols/yahoo/yahoo.c:2925
+#: ../src/protocols/yahoo/yahoo.c:2867 ../src/protocols/yahoo/yahoo.c:2926
 msgid "Appear Online"
 msgstr "Parecer conectado"
 
-#: ../src/protocols/yahoo/yahoo.c:2869 ../src/protocols/yahoo/yahoo.c:2946
+#: ../src/protocols/yahoo/yahoo.c:2870 ../src/protocols/yahoo/yahoo.c:2947
 msgid "Appear Permanently Offline"
 msgstr "Parecer permanentemente desconectado"
 
-#: ../src/protocols/yahoo/yahoo.c:2888
+#: ../src/protocols/yahoo/yahoo.c:2889
 msgid "Presence"
 msgstr "Presencia"
 
-#: ../src/protocols/yahoo/yahoo.c:2931
+#: ../src/protocols/yahoo/yahoo.c:2932
 msgid "Appear Offline"
 msgstr "Parecer desconectado"
 
-#: ../src/protocols/yahoo/yahoo.c:2940
+#: ../src/protocols/yahoo/yahoo.c:2941
 msgid "Don't Appear Permanently Offline"
 msgstr "Non aparecer sempre desconectado"
 
-#: ../src/protocols/yahoo/yahoo.c:2988
+#: ../src/protocols/yahoo/yahoo.c:2989
 msgid "Join in Chat"
 msgstr "Unirse a un chat"
 
-#: ../src/protocols/yahoo/yahoo.c:2994
+#: ../src/protocols/yahoo/yahoo.c:2995
 msgid "Initiate Conference"
 msgstr "Iniciar conferencia"
 
-#: ../src/protocols/yahoo/yahoo.c:3022
+#: ../src/protocols/yahoo/yahoo.c:3023
 msgid "Presence Settings"
 msgstr "Configuraci坦n do entorno"
 
-#: ../src/protocols/yahoo/yahoo.c:3028
+#: ../src/protocols/yahoo/yahoo.c:3029
 msgid "Start Doodling"
 msgstr "Iniciar Doodle"
 
-#: ../src/protocols/yahoo/yahoo.c:3060
+#: ../src/protocols/yahoo/yahoo.c:3061
 msgid "Active which ID?"
 msgstr "Que ID quere activar?"
 
-#: ../src/protocols/yahoo/yahoo.c:3069
+#: ../src/protocols/yahoo/yahoo.c:3070
 msgid "Join who in chat?"
 msgstr "Xuntarse con quen nun chat?"
 
-#: ../src/protocols/yahoo/yahoo.c:3079
+#: ../src/protocols/yahoo/yahoo.c:3080
 msgid "Activate ID..."
 msgstr "Activar ID..."
 
-#: ../src/protocols/yahoo/yahoo.c:3083
+#: ../src/protocols/yahoo/yahoo.c:3084
 msgid "Join User in Chat..."
 msgstr "Xuntarse cun usuario nun chat..."
 
-#: ../src/protocols/yahoo/yahoo.c:3621
+#: ../src/protocols/yahoo/yahoo.c:3622
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;sala&gt;:  Unirse a unha sala na rede de Yahoo"
 
-#: ../src/protocols/yahoo/yahoo.c:3626
+#: ../src/protocols/yahoo/yahoo.c:3627
 msgid "list: List rooms on the Yahoo network"
 msgstr "list:  Amosar as canles da rede Yahoo"
 
-#: ../src/protocols/yahoo/yahoo.c:3630
+#: ../src/protocols/yahoo/yahoo.c:3631
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Avisar a un contacto para chamar s炭a atenci坦n"
 
-#: ../src/protocols/yahoo/yahoo.c:3634
+#: ../src/protocols/yahoo/yahoo.c:3635
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Solicitar ao usuario o comezo dunha sesi坦n Doodle"
 
@@ -12121,58 +12238,65 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/yahoo/yahoo.c:3727 ../src/protocols/yahoo/yahoo.c:3729
+#: ../src/protocols/yahoo/yahoo.c:3728 ../src/protocols/yahoo/yahoo.c:3730
 msgid "Yahoo Protocol Plugin"
 msgstr "Complemento de protocolo Yahoo"
 
-#: ../src/protocols/yahoo/yahoo.c:3746
+#: ../src/protocols/yahoo/yahoo.c:3747
 msgid "Yahoo Japan"
 msgstr "Yahoo Xap坦n"
 
-#: ../src/protocols/yahoo/yahoo.c:3749
+#: ../src/protocols/yahoo/yahoo.c:3750
 msgid "Pager host"
 msgstr "Servidor de buscapersoas"
 
-#: ../src/protocols/yahoo/yahoo.c:3752
+#: ../src/protocols/yahoo/yahoo.c:3753
 msgid "Japan Pager host"
 msgstr "Servidor de buscapersoas xapon辿s"
 
-#: ../src/protocols/yahoo/yahoo.c:3755
+#: ../src/protocols/yahoo/yahoo.c:3756
 msgid "Pager port"
 msgstr "Porto do buscapersoas"
 
-#: ../src/protocols/yahoo/yahoo.c:3758
+#: ../src/protocols/yahoo/yahoo.c:3759
 msgid "File transfer host"
 msgstr "Servidor de transferencia de ficheiros"
 
-#: ../src/protocols/yahoo/yahoo.c:3761
+#: ../src/protocols/yahoo/yahoo.c:3762
 msgid "Japan file transfer host"
 msgstr "Servidor de transferencia de ficheiros xapon辿s"
 
-#: ../src/protocols/yahoo/yahoo.c:3764
+#: ../src/protocols/yahoo/yahoo.c:3765
 msgid "File transfer port"
 msgstr "Porto de transferencia de ficheiros"
 
-#: ../src/protocols/yahoo/yahoo.c:3767
+#: ../src/protocols/yahoo/yahoo.c:3768
 msgid "Chat room locale"
 msgstr "Ubicaci坦n da sala de chat"
 
-#: ../src/protocols/yahoo/yahoo.c:3770
+#: ../src/protocols/yahoo/yahoo.c:3771
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignorar as invitaci坦ns a salas de conferencias ou chat"
 
-#: ../src/protocols/yahoo/yahoo.c:3774
+#: ../src/protocols/yahoo/yahoo.c:3775
 msgid "Chat room list URL"
 msgstr "Url de lista de salas de chat"
 
-#: ../src/protocols/yahoo/yahoo.c:3777
+#: ../src/protocols/yahoo/yahoo.c:3778
 msgid "YCHT host"
 msgstr "Servidor YCHT"
 
-#: ../src/protocols/yahoo/yahoo.c:3780
+#: ../src/protocols/yahoo/yahoo.c:3781
 msgid "YCHT port"
 msgstr "Porto YCHT"
 
+#. Write a local message to this conversation showing that a request for a
+#. * Doodle session has been made
+#.
+#: ../src/protocols/yahoo/yahoo_doodle.c:96
+msgid "Sent Doodle request."
+msgstr "Enviar petici坦n Doodle."
+
 #. TODO: what to do here - do we really have to disconnect?
 #: ../src/protocols/yahoo/yahoo_packet.c:265
 msgid "Write Error"
@@ -12195,64 +12319,61 @@
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
-msgstr ""
-"S鱈ntoo, os perfiles con contido s坦 para adultos non est叩n soportados a鱈nda."
+msgstr "S鱈ntoo, os perfiles con contido s坦 para adultos non est叩n soportados a鱈nda."
 
 #: ../src/protocols/yahoo/yahoo_profile.c:830
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser"
-msgstr ""
-"Se desexa ver este perfil, deber鱈a visitar este ligaz坦n co seu navegador web"
-
-#: ../src/protocols/yahoo/yahoo_profile.c:1006
+msgstr "Se desexa ver este perfil, deber鱈a visitar este ligaz坦n co seu navegador web"
+
+#: ../src/protocols/yahoo/yahoo_profile.c:1012
 msgid "Yahoo! ID"
 msgstr "ID Yahoo!"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1078
-#: ../src/protocols/yahoo/yahoo_profile.c:1082
-#: ../src/protocols/yahoo/yahoo_profile.c:1086
+#: ../src/protocols/yahoo/yahoo_profile.c:1084
+#: ../src/protocols/yahoo/yahoo_profile.c:1088
+#: ../src/protocols/yahoo/yahoo_profile.c:1092
 msgid "Hobbies"
 msgstr "Afici坦ns"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1096
-#: ../src/protocols/yahoo/yahoo_profile.c:1100
+#: ../src/protocols/yahoo/yahoo_profile.c:1102
+#: ../src/protocols/yahoo/yahoo_profile.c:1106
 msgid "Latest News"
 msgstr "�ltimas noticias"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1121
+#: ../src/protocols/yahoo/yahoo_profile.c:1127
 msgid "Home Page"
 msgstr "P叩xina persoal"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1136
+#: ../src/protocols/yahoo/yahoo_profile.c:1142
 msgid "Cool Link 1"
 msgstr "Ligaz坦n interesante 1"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1141
+#: ../src/protocols/yahoo/yahoo_profile.c:1147
 msgid "Cool Link 2"
 msgstr "Ligaz坦n interesante 2"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1145
+#: ../src/protocols/yahoo/yahoo_profile.c:1151
 msgid "Cool Link 3"
 msgstr "Ligaz坦n interesante 3"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1158
+#: ../src/protocols/yahoo/yahoo_profile.c:1164
 msgid "Last Update"
 msgstr "�ltima actualizaci坦n"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1164
+#: ../src/protocols/yahoo/yahoo_profile.c:1170
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "Informaci坦n de usuario de %s non dispo単ible"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1170
+#: ../src/protocols/yahoo/yahoo_profile.c:1176
 msgid ""
 "Sorry, this profile seems to be in a language or format that is not "
 "supported at this time."
-msgstr ""
-"S鱈ntoo, este perfil parece estar nun idioma ou formato a鱈nda non soportado."
-
-#: ../src/protocols/yahoo/yahoo_profile.c:1186
+msgstr "S鱈ntoo, este perfil parece estar nun idioma ou formato a鱈nda non soportado."
+
+#: ../src/protocols/yahoo/yahoo_profile.c:1192
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
@@ -12260,7 +12381,7 @@
 "Non se puido obter o perfil do usuario. Isto 辿 usualmente un problema "
 "temporal no lado do servidor. Por favor, probe de novo m叩is tarde."
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1189
+#: ../src/protocols/yahoo/yahoo_profile.c:1195
 msgid ""
 "Could not retrieve the user's profile. This most likely means that the user "
 "does not exist; however, Yahoo! sometimes does fail to find a user's "
@@ -12270,15 +12391,14 @@
 "usuario non existe. Nembargantes, a vece Yahoo! faia ao buscar un perfil de "
 "usuario. Se est叩 seguro de que o usuario existe int辿nteo de novo m叩is tarde."
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1197
+#: ../src/protocols/yahoo/yahoo_profile.c:1203
 msgid "The user's profile is empty."
 msgstr "O perfil do usuario est叩 baleiro."
 
 #: ../src/protocols/yahoo/yahoochat.c:203
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr ""
-"%s declinou s炭a invitaci坦n de conferencia na sala \"%s\" porque \"%s\"."
+msgstr "%s declinou s炭a invitaci坦n de conferencia na sala \"%s\" porque \"%s\"."
 
 #: ../src/protocols/yahoo/yahoochat.c:205
 msgid "Invitation Rejected"
@@ -12350,7 +12470,7 @@
 msgid "Connection problem with the YCHT server."
 msgstr "Produciuse un problema ao conectarse co servidor YCHT."
 
-#: ../src/protocols/zephyr/zephyr.c:331
+#: ../src/protocols/zephyr/zephyr.c:346
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -12358,80 +12478,79 @@
 "(Houbo un erro convertindo esta mensaxe.\tComprobe a opci坦n de "
 "'Codificaci坦n' no Editor de contas)"
 
-#: ../src/protocols/zephyr/zephyr.c:686
+#: ../src/protocols/zephyr/zephyr.c:701
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "Non se puido enviar ao chat %s,%s,%s"
 
-#: ../src/protocols/zephyr/zephyr.c:719 ../src/protocols/zephyr/zephyr.c:1134
+#: ../src/protocols/zephyr/zephyr.c:734 ../src/protocols/zephyr/zephyr.c:1151
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>Usuario:</b> %s<br>"
 
-#: ../src/protocols/zephyr/zephyr.c:723 ../src/protocols/zephyr/zephyr.c:1139
+#: ../src/protocols/zephyr/zephyr.c:738 ../src/protocols/zephyr/zephyr.c:1156
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>Agochado ou non conectado"
 
-#: ../src/protocols/zephyr/zephyr.c:728 ../src/protocols/zephyr/zephyr.c:1141
+#: ../src/protocols/zephyr/zephyr.c:743 ../src/protocols/zephyr/zephyr.c:1158
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>En %s desde %s"
 
-#: ../src/protocols/zephyr/zephyr.c:1472 ../src/protocols/zephyr/zephyr.c:1473
+#: ../src/protocols/zephyr/zephyr.c:1490 ../src/protocols/zephyr/zephyr.c:1491
 msgid "Anyone"
 msgstr "Calquera"
 
-#: ../src/protocols/zephyr/zephyr.c:2278
+#: ../src/protocols/zephyr/zephyr.c:2298
 msgid "_Class:"
 msgstr "_Clase"
 
-#: ../src/protocols/zephyr/zephyr.c:2284
+#: ../src/protocols/zephyr/zephyr.c:2304
 msgid "_Instance:"
 msgstr "_Instancia:"
 
-#: ../src/protocols/zephyr/zephyr.c:2290
+#: ../src/protocols/zephyr/zephyr.c:2310
 msgid "_Recipient:"
 msgstr "_Destinatario:"
 
-#: ../src/protocols/zephyr/zephyr.c:2301
+#: ../src/protocols/zephyr/zephyr.c:2321
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "Fallou o intento de suscrici坦n a %s,%s,%s"
 
-#: ../src/protocols/zephyr/zephyr.c:2607
+#: ../src/protocols/zephyr/zephyr.c:2627
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;alcume&gt;: Localiza un usuario"
 
-#: ../src/protocols/zephyr/zephyr.c:2612
+#: ../src/protocols/zephyr/zephyr.c:2632
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;alcume&gt;: Localiza un usuario"
 
-#: ../src/protocols/zephyr/zephyr.c:2617
+#: ../src/protocols/zephyr/zephyr.c:2637
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "instance &lt;instancia&gt;: Fixar a instancia a empregar nesta clase"
 
-#: ../src/protocols/zephyr/zephyr.c:2622
+#: ../src/protocols/zephyr/zephyr.c:2642
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;instancia&gt;: Fixar a instancia a empregar nesta clase"
 
-#: ../src/protocols/zephyr/zephyr.c:2627
+#: ../src/protocols/zephyr/zephyr.c:2647
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "topic &lt;instancia&gt;: Fixar a instancia a empregar nesta clase"
 
-#: ../src/protocols/zephyr/zephyr.c:2633
+#: ../src/protocols/zephyr/zephyr.c:2653
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 "sub &lt;clase&gt; &lt;instancia&gt; &lt;destinatario&gt;: Unirse a un novo "
 "chat"
 
-#: ../src/protocols/zephyr/zephyr.c:2638
-msgid ""
-"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+#: ../src/protocols/zephyr/zephyr.c:2658
+msgid "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 "zi &lt;instancia&gt;: Enviar unha mensaxe a &lt;mensaxe,<i>instancia</i>,"
 "*&gt;"
 
-#: ../src/protocols/zephyr/zephyr.c:2644
+#: ../src/protocols/zephyr/zephyr.c:2664
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
@@ -12439,7 +12558,7 @@
 "zci &lt;clase&gt; &lt;instance&gt;: Enviar unha mensaxe a &lt;<i>clase</i>,"
 "<i>instancia</i>,*&gt;"
 
-#: ../src/protocols/zephyr/zephyr.c:2650
+#: ../src/protocols/zephyr/zephyr.c:2670
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
@@ -12447,7 +12566,7 @@
 "zcir &lt;clase&gt; &lt;instancia&gt; &lt;destinatario&gt;: Enviar unha "
 "mensaxe a &lt;<i>clase</i>,<i>instancia</i>,<i>destinatario</i>&gt;"
 
-#: ../src/protocols/zephyr/zephyr.c:2656
+#: ../src/protocols/zephyr/zephyr.c:2676
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -12455,15 +12574,15 @@
 "zir &lt;instancia&gt; &lt;destinatario&gt;: Enviar unha mensaxe a &lt;"
 "MENSAXE,<i>instancia</i>,<i>destinatario</i>&gt;"
 
-#: ../src/protocols/zephyr/zephyr.c:2661
+#: ../src/protocols/zephyr/zephyr.c:2681
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr "zc &lt;clase&gt;: Enviar unha mensaxe a &lt;<i>clase</i>,PERSOAL,*&gt;"
 
-#: ../src/protocols/zephyr/zephyr.c:2767
+#: ../src/protocols/zephyr/zephyr.c:2787
 msgid "Resubscribe"
 msgstr "Re-suscribir"
 
-#: ../src/protocols/zephyr/zephyr.c:2770
+#: ../src/protocols/zephyr/zephyr.c:2790
 msgid "Retrieve subscriptions from server"
 msgstr "Obter as suscrici坦ns do servidor"
 
@@ -12477,58 +12596,46 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/zephyr/zephyr.c:2855 ../src/protocols/zephyr/zephyr.c:2857
+#: ../src/protocols/zephyr/zephyr.c:2875 ../src/protocols/zephyr/zephyr.c:2877
 msgid "Zephyr Protocol Plugin"
 msgstr "Complemento de protocolo Zephyr"
 
-#: ../src/protocols/zephyr/zephyr.c:2882
+#: ../src/protocols/zephyr/zephyr.c:2902
 msgid "Export to .anyone"
 msgstr "Exportar a .anyone"
 
-#: ../src/protocols/zephyr/zephyr.c:2885
+#: ../src/protocols/zephyr/zephyr.c:2905
 msgid "Export to .zephyr.subs"
 msgstr "Exportar a .zephyr.subs"
 
-#: ../src/protocols/zephyr/zephyr.c:2888
+#: ../src/protocols/zephyr/zephyr.c:2908
 msgid "Import from .anyone"
 msgstr "Importar desde .anyone"
 
-#: ../src/protocols/zephyr/zephyr.c:2891
+#: ../src/protocols/zephyr/zephyr.c:2911
 msgid "Import from .zephyr.subs"
 msgstr "Importar desde .zephyr.subs"
 
-#: ../src/protocols/zephyr/zephyr.c:2894
+#: ../src/protocols/zephyr/zephyr.c:2914
 msgid "Realm"
 msgstr "Reino"
 
-#: ../src/protocols/zephyr/zephyr.c:2897
+#: ../src/protocols/zephyr/zephyr.c:2917
 msgid "Exposure"
 msgstr "Exposici坦n"
 
-#: ../src/proxy.c:1205 ../src/proxy.c:1261 ../src/proxy.c:1309
-#: ../src/proxy.c:1336
+#: ../src/proxy.c:1216 ../src/proxy.c:1272 ../src/proxy.c:1320
+#: ../src/proxy.c:1347
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "Erro de conexi坦n no proxy %d"
 
 #. Forbidden
-#: ../src/proxy.c:1325
+#: ../src/proxy.c:1336
 #, c-format
 msgid "Access denied: proxy server forbids port %d tunnelling."
 msgstr "Acceso denegado: o servidor proxy non permite t炭neles no porto %d."
 
-#: ../src/proxy.c:2325
-msgid "Invalid proxy settings"
-msgstr "Configuraci坦n inv叩lida de proxy"
-
-#: ../src/proxy.c:2325
-msgid ""
-"Either the host name or port number specified for your given proxy type is "
-"invalid."
-msgstr ""
-"O nome do servidor ou o porto especificados non son v叩lidos para seu tipo de "
-"proxy."
-
 #: ../src/savedstatuses.c:514
 msgid "saved statuses"
 msgstr "estados gardados"
@@ -12537,12 +12644,12 @@
 msgid "I'm not here right now"
 msgstr "Non estou aqu鱈 agora"
 
-#: ../src/server.c:225
+#: ../src/server.c:227
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s agora se chama %s.\n"
 
-#: ../src/server.c:675
+#: ../src/server.c:681
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -12551,12 +12658,12 @@
 "%s invitou a %s 叩 sala de chat %s:\n"
 "%s"
 
-#: ../src/server.c:680
+#: ../src/server.c:686
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s invitou a %s 叩 sala de chat %s\n"
 
-#: ../src/server.c:684
+#: ../src/server.c:690
 msgid "Accept chat invitation?"
 msgstr "Aceptar a invitaci坦n de chat?"
 
@@ -12572,57 +12679,52 @@
 msgid "Mobile"
 msgstr "M坦bil"
 
-#: ../src/status.c:623
-#, c-format
-msgid "%s signed on"
-msgstr "%s conectouse"
-
-#: ../src/status.c:627
-#, c-format
-msgid "%s came back"
-msgstr "%s volveu"
-
-#: ../src/status.c:634
-#, c-format
-msgid "%s signed off"
-msgstr "%s desconectouse"
-
-#: ../src/status.c:638
-#, c-format
-msgid "%s went away"
-msgstr "%s marchouse"
-
-#: ../src/status.c:1317
+#: ../src/status.c:622
+#, c-format
+msgid "%s changed status from %s to %s"
+msgstr "%s cambiou o estado de %s a %s"
+
+#: ../src/status.c:632
+#, c-format
+msgid "%s is now %s"
+msgstr "%s ch叩mase agora %s"
+
+#: ../src/status.c:637
+#, fuzzy, c-format
+msgid "%s is no longer %s"
+msgstr "%s xa non est叩 inactivo."
+
+#: ../src/status.c:1320
 #, c-format
 msgid "%s became idle"
 msgstr "%s agora est叩 inactivo"
 
-#: ../src/status.c:1330
+#: ../src/status.c:1337
 #, c-format
 msgid "%s became unidle"
 msgstr "%s agora est叩 activo"
 
-#: ../src/status.c:1392
+#: ../src/status.c:1403
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s agora est叩 inactivo"
 
-#: ../src/status.c:1394
+#: ../src/status.c:1405
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s agora est叩 activo"
 
-#: ../src/util.c:670
+#: ../src/util.c:679
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../src/util.c:2460
+#: ../src/util.c:2455
 #, c-format
 msgid "Error Reading %s"
 msgstr "Erro lendo %s"
 
-#: ../src/util.c:2461
+#: ../src/util.c:2456
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -12631,158 +12733,57 @@
 "Atopouse un erro ao ler o seu %s. Non se cargou e o ficheiro antigo foi "
 "renomeado a %s~."
 
-#: ../src/util.c:2900
+#: ../src/util.c:2895
 msgid "Calculating..."
 msgstr "Calculando..."
 
-#: ../src/util.c:2903
+#: ../src/util.c:2898
 msgid "Unknown."
 msgstr "Desco単ecido."
 
-#: ../src/util.c:2929
+#: ../src/util.c:2924
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: ../src/util.c:2941
+#: ../src/util.c:2936
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d d鱈a"
 msgstr[1] "%d d鱈as"
 
-#: ../src/util.c:2949
+#: ../src/util.c:2944
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d hora"
 msgstr[1] "%s, %d horas"
 
-#: ../src/util.c:2955
+#: ../src/util.c:2950
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: ../src/util.c:2963
+#: ../src/util.c:2958
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minuto"
 msgstr[1] "%s, %d minutos"
 
-#: ../src/util.c:2969
+#: ../src/util.c:2964
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: ../src/util.c:3444
+#: ../src/util.c:3431
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Erro abrindo a conexi坦n.\n"
 
-#~ msgid ""
-#~ "You missed %hu message from %s because the rate limit has been exceeded."
-#~ "You missed %hu messages from %s because the rate limit has been exceeded."
-#~ msgstr ""
-#~ "Perdeu %hu mensaxe de %s porque foi mandado demasiado r叩pido.Perd辿ronse %"
-#~ "hu mensaxes de %s porque foron mandadas demasiado r叩pido."
-
-#~ msgid ""
-#~ "You are about to remove the contact containing %s and %d other buddy from "
-#~ "your buddy list.  Do you want to continue?You are about to remove the "
-#~ "contact containing %s and %d other buddies from your buddy list.  Do you "
-#~ "want to continue?"
-#~ msgstr ""
-#~ "Est叩 a punto de borrar o contacto que cont辿n a %s e a outro %d amigo da "
-#~ "s炭a lista de amigos. Quere continuar?Est叩 a punto de borrar o contacto "
-#~ "que cont辿n a %s e a outros %d amigos da s炭a lista de amigos. Quere "
-#~ "continuar?"
-
-#, fuzzy
-#~ msgid "%s<b>General</b><br>%s"
-#~ msgstr "<b>Usuario externo</b><br>"
-
-#, fuzzy
-#~ msgid "Interested in"
-#~ msgstr "Inserir ligaz坦n"
-
-#, fuzzy
-#~ msgid "Pets"
-#~ msgstr "Portos"
-
-#, fuzzy
-#~ msgid "Hometown"
-#~ msgstr "Servidor desco単ecido"
-
-#, fuzzy
-#~ msgid "Places lived"
-#~ msgstr "Lugar pechado"
-
-#, fuzzy
-#~ msgid "%s<b>Social</b><br>%s"
-#~ msgstr "<b>Alcume:</b> %s<br>"
-
-#, fuzzy
-#~ msgid "Home phone"
-#~ msgstr "P叩xina persoal"
-
-#, fuzzy
-#~ msgid "Home phone 2"
-#~ msgstr "P叩xina persoal"
-
-#, fuzzy
-#~ msgid "Home address"
-#~ msgstr "Domicilio"
-
-#, fuzzy
-#~ msgid "Personal Mobile"
-#~ msgstr "T鱈tulo"
-
-#, fuzzy
-#~ msgid "Home fax"
-#~ msgstr "P叩xina persoal"
-
-#, fuzzy
-#~ msgid "Personal e-mail"
-#~ msgstr "T鱈tulo"
-
-#, fuzzy
-#~ msgid "Personal IM"
-#~ msgstr "T鱈tulo"
-
-#, fuzzy
-#~ msgid "Notes"
-#~ msgstr "Nota"
-
-#, fuzzy
-#~ msgid "<br><b>Personal</b><br>%s"
-#~ msgstr "<br><b>T坦pico do canle:</b><br>%s"
-
-#, fuzzy
-#~ msgid "Job title"
-#~ msgstr "Traballo"
-
-#, fuzzy
-#~ msgid "Profession"
-#~ msgstr "Cargo"
-
-#, fuzzy
-#~ msgid "Work address"
-#~ msgstr "Enderezo do traballo"
-
-#, fuzzy
-#~ msgid "Start date"
-#~ msgstr "�ltima actualizaci坦n"
-
-#, fuzzy
-#~ msgid "<br><b>Business</b><br>%s"
-#~ msgstr "<br><b>T坦pico do canle:</b><br>%s"
-
-#, fuzzy
-#~ msgid "<hr><b>%s:</b> "
-#~ msgstr "<b>%s:</b> "
--- a/po/he.po	Thu Mar 23 14:20:56 2006 +0000
+++ b/po/he.po	Thu Mar 23 16:38:36 2006 +0000
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: he\n"
-"POT-Creation-Date: 2006-03-08 00:00-0500\n"
-"PO-Revision-Date: 2006-03-08 09:36+0200\n"
+"POT-Creation-Date: 2006-03-21 00:00-0500\n"
+"PO-Revision-Date: 2006-03-21 08:51+0200\n"
 "Last-Translator: Shalom Craimer <scraimer at gmail dot com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -208,9 +208,9 @@
 #. Away stuff
 #: ../plugins/docklet/docklet.c:439 ../src/gtkprefs.c:1759
 #: ../src/gtkstatusbox.c:674 ../src/protocols/irc/irc.c:520
-#: ../src/protocols/irc/msgs.c:219 ../src/protocols/jabber/buddy.c:1105
+#: ../src/protocols/irc/msgs.c:223 ../src/protocols/jabber/buddy.c:1105
 #: ../src/protocols/novell/novell.c:2848 ../src/protocols/oscar/oscar.c:793
-#: ../src/protocols/oscar/oscar.c:6830 ../src/protocols/oscar/oscar.c:7873
+#: ../src/protocols/oscar/oscar.c:6836 ../src/protocols/oscar/oscar.c:7879
 #: ../src/protocols/silc/buddy.c:1469 ../src/protocols/yahoo/yahoo.c:3189
 #: ../src/status.c:158
 msgid "Away"
@@ -225,7 +225,7 @@
 #: ../plugins/docklet/docklet.c:447 ../src/gtkblist.c:2968
 #: ../src/gtkstatusbox.c:676 ../src/protocols/jabber/buddy.c:1099
 #: ../src/protocols/novell/novell.c:2857 ../src/protocols/oscar/oscar.c:859
-#: ../src/protocols/oscar/oscar.c:7845 ../src/protocols/yahoo/yahoo.c:2733
+#: ../src/protocols/oscar/oscar.c:7851 ../src/protocols/yahoo/yahoo.c:2733
 #: ../src/status.c:154
 msgid "Offline"
 msgstr "���廬廡"
@@ -242,7 +242,7 @@
 msgid "Show Buddy List"
 msgstr "�廢� �廬 廨廩��廬 ��廩� 廡廩廨"
 
-#: ../plugins/docklet/docklet.c:489
+#: ../plugins/docklet/docklet.c:489 ../src/gtkconv.c:5640
 msgid "Unread Messages"
 msgstr "���廣�廬 廩�� �廡廨��"
 
@@ -389,7 +389,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/filectl.c:245
+#: ../plugins/filectl.c:248
 msgid "Gaim File Control"
 msgstr "����� �廡廨廬 廡�廢��"
 
@@ -397,7 +397,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/filectl.c:248 ../plugins/filectl.c:250
+#: ../plugins/filectl.c:251 ../plugins/filectl.c:253
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "��廚廩廨 �� �廩��� ����� 廣\"� ���廖廬 廚廡���廬 �廡��廛."
 
@@ -590,10 +590,14 @@
 "�廨�廨/� �廣�� ��� ����� �廣��廨 �廩��� ����."
 
 #. Extract their Name and put it in
+#. Contact Info
+#. Personal
+#. Business
 #: ../plugins/gevolution/add_buddy_dialog.c:131
 #: ../plugins/gevolution/assoc-buddy.c:119 ../src/gtkplugin.c:587
 #: ../src/gtkroomlist.c:604 ../src/protocols/jabber/jabber.c:755
-#: ../src/protocols/msn/msn.c:1525
+#: ../src/protocols/msn/msn.c:1532 ../src/protocols/msn/msn.c:1585
+#: ../src/protocols/msn/msn.c:1606
 msgid "Name"
 msgstr "廩�"
 
@@ -609,14 +613,14 @@
 #. "Search"
 #: ../plugins/gevolution/add_buddy_dialog.c:467
 #: ../plugins/gevolution/assoc-buddy.c:353
-#: ../src/protocols/jabber/buddy.c:1418 ../src/protocols/oscar/oscar.c:8393
+#: ../src/protocols/jabber/buddy.c:1418 ../src/protocols/oscar/oscar.c:8399
 #: ../src/protocols/sametime/sametime.c:5532
 msgid "Search"
 msgstr "��廚�廩"
 
 #: ../plugins/gevolution/add_buddy_dialog.c:548
-#: ../plugins/gevolution/new_person_dialog.c:306 ../src/gtkblist.c:4534
-#: ../src/gtkblist.c:4898
+#: ../plugins/gevolution/new_person_dialog.c:306 ../src/gtkblist.c:4612
+#: ../src/gtkblist.c:4976
 msgid "Group:"
 msgstr "廡��廢�:"
 
@@ -651,13 +655,13 @@
 msgstr "廩��� ��廩 _廡廩廨"
 
 #: ../plugins/gevolution/eds-utils.c:73 ../plugins/gevolution/eds-utils.c:86
-#: ../src/protocols/jabber/jabber.c:1121
+#: ../src/protocols/jabber/jabber.c:1122
 msgid "None"
 msgstr "���"
 
 #: ../plugins/gevolution/gevo-util.c:64 ../plugins/gevolution/gevolution.c:96
-#: ../src/blist.c:516 ../src/blist.c:1271 ../src/blist.c:1498
-#: ../src/gtkblist.c:4343 ../src/protocols/jabber/roster.c:65
+#: ../src/blist.c:516 ../src/blist.c:1278 ../src/blist.c:1505
+#: ../src/gtkblist.c:4421 ../src/protocols/jabber/roster.c:65
 msgid "Buddies"
 msgstr "��廩� 廡廩廨"
 
@@ -729,6 +733,7 @@
 msgstr "廖�� �廩���:"
 
 #: ../plugins/gevolution/new_person_dialog.c:294 ../src/gtkaccount.c:784
+#: ../src/gtkblist.c:4574
 msgid "Screen name:"
 msgstr "廩� �廬廢���:"
 
@@ -918,79 +923,79 @@
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr "���廡 �廬 廬�廖廝 �廬���� �-IPC, �廬�廨 廩廨廬. �� 廨�廩� �廬 廚廡���廬 �-IPC."
 
-#: ../plugins/log_reader.c:1407
+#: ../plugins/log_reader.c:1405
 msgid "User is offline."
 msgstr "��廩廬�廩 �� ����廨"
 
-#: ../plugins/log_reader.c:1413
+#: ../plugins/log_reader.c:1411
 msgid "Auto-response sent:"
 msgstr "�廩��� 廬���� �������廬:"
 
-#: ../plugins/log_reader.c:1423 ../plugins/log_reader.c:1426
-#: ../plugins/statenotify.c:79
+#: ../plugins/log_reader.c:1421 ../plugins/log_reader.c:1424
+#: ../plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s �廬�廬廡."
 
-#: ../plugins/log_reader.c:1440
+#: ../plugins/log_reader.c:1438
 msgid "One or more messages may have been undeliverable."
 msgstr "��廬 �� ��廬廨 �� ����廣�廬 �� ��廬�� �廩����."
 
 #. MSG_SERVER_DISCONNECTING
 #. we have been kicked off =^(
-#: ../plugins/log_reader.c:1450 ../src/protocols/napster/napster.c:363
+#: ../plugins/log_reader.c:1448 ../src/protocols/napster/napster.c:363
 msgid "You were disconnected from the server."
 msgstr "��廬廡廬 ��廩廨廬."
 
-#: ../plugins/log_reader.c:1458
+#: ../plugins/log_reader.c:1456
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
 msgstr "�廬/� �廨�廣 ���廬廡/廬. ���廣�廬 �� �廬廡��� ��� 廨廡 ���� 廩�廬/� ����廨/廬."
 
-#: ../plugins/log_reader.c:1473
+#: ../plugins/log_reader.c:1471
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr "�� ��廬� �廩��� �廬 ����廣� ����� 廩��廨� ����廣廬 ��廬廨 ����廬廨."
 
-#: ../plugins/log_reader.c:1478
+#: ../plugins/log_reader.c:1476
 msgid "Message could not be sent."
 msgstr "����廣� �� �廩���."
 
-#: ../plugins/log_reader.c:1837 ../plugins/log_reader.c:1930
+#: ../plugins/log_reader.c:1835 ../plugins/log_reader.c:1928
 msgid "Adium"
 msgstr "Adium"
 
-#: ../plugins/log_reader.c:1846 ../plugins/log_reader.c:1934
+#: ../plugins/log_reader.c:1844 ../plugins/log_reader.c:1932
 msgid "Fire"
 msgstr "Fire"
 
-#: ../plugins/log_reader.c:1855 ../plugins/log_reader.c:1938
+#: ../plugins/log_reader.c:1853 ../plugins/log_reader.c:1936
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
-#: ../plugins/log_reader.c:1864 ../plugins/log_reader.c:1942
+#: ../plugins/log_reader.c:1862 ../plugins/log_reader.c:1940
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: ../plugins/log_reader.c:1873 ../plugins/log_reader.c:1946
+#: ../plugins/log_reader.c:1871 ../plugins/log_reader.c:1944
 msgid "Trillian"
 msgstr "Trillian"
 
 #. Add general preferences.
-#: ../plugins/log_reader.c:1912
+#: ../plugins/log_reader.c:1910
 msgid "General Log Reading Configuration"
 msgstr "���廨�廬 �����廬 �廡廨��廬 ���� ��廨�廣��"
 
-#: ../plugins/log_reader.c:1916
+#: ../plugins/log_reader.c:1914
 msgid "Fast size calculations"
 msgstr "��廩��� ���� ���廨��"
 
-#: ../plugins/log_reader.c:1920
+#: ../plugins/log_reader.c:1918
 msgid "Use name heuristics"
 msgstr "�廩廬�廩 ����廨�廖��廡� �廩��廬"
 
 #. Add Log Directory preferences.
-#: ../plugins/log_reader.c:1926
+#: ../plugins/log_reader.c:1924
 msgid "Log Directory"
 msgstr "廖廚廨��廬 ���� ��廨�廣��"
 
@@ -1000,19 +1005,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/log_reader.c:1969
+#: ../plugins/log_reader.c:1967
 msgid "Log Reader"
 msgstr "�廢�廚� �������"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../plugins/log_reader.c:1973
+#: ../plugins/log_reader.c:1971
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "���� ������ 廩� 廬����廬 廢'�� ��廨�廬 �廢�廚�-�������."
 
 #. * description
-#: ../plugins/log_reader.c:1977
+#: ../plugins/log_reader.c:1975
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, Fire, Messenger Plus!, MSN Messenger, and "
@@ -1346,68 +1351,68 @@
 msgid "Tests to see that most things are working."
 msgstr "���廡 �� 廨�� ���廨�� 廣�����"
 
-#: ../plugins/spellchk.c:1917
+#: ../plugins/spellchk.c:1918
 msgid "Duplicate Correction"
 msgstr "�廚���廬 �廬�廡����"
 
-#: ../plugins/spellchk.c:1918
+#: ../plugins/spellchk.c:1919
 msgid "The specified word already exists in the correction list."
 msgstr "����� ��廬��� ��廨 廡���廬 �廨廩��廬 �廬�廡����"
 
-#: ../plugins/spellchk.c:2127
+#: ../plugins/spellchk.c:2128
 msgid "Text Replacements"
 msgstr "���廚�廬 �廡廖�"
 
-#: ../plugins/spellchk.c:2150
+#: ../plugins/spellchk.c:2151
 msgid "You type"
 msgstr "�廬� 廨�廩�"
 
-#: ../plugins/spellchk.c:2164
+#: ../plugins/spellchk.c:2165
 msgid "You send"
 msgstr "�廬� 廩���"
 
-#: ../plugins/spellchk.c:2178
+#: ../plugins/spellchk.c:2179
 msgid "Whole words only"
 msgstr "����� 廩���廬 ����"
 
-#: ../plugins/spellchk.c:2190
+#: ../plugins/spellchk.c:2191
 msgid "Case sensitive"
 msgstr "����� ��� �����廬/廡���廬"
 
-#: ../plugins/spellchk.c:2216
+#: ../plugins/spellchk.c:2217
 msgid "Add a new text replacement"
 msgstr "��廖廝 �廡廖� ����廚�"
 
-#: ../plugins/spellchk.c:2232
+#: ../plugins/spellchk.c:2233
 msgid "You _type:"
 msgstr "�廬� 廨_�廩�:"
 
-#: ../plugins/spellchk.c:2249
+#: ../plugins/spellchk.c:2250
 msgid "You _send:"
 msgstr "�廬� _廩���:"
 
 #. Created here so it can be passed to whole_words_button_toggled.
-#: ../plugins/spellchk.c:2261
+#: ../plugins/spellchk.c:2262
 msgid "_Exact case match (uncheck for automatic case handling)"
 msgstr "_�廬��� ����廡廬 (�廖廨 廖���� ���廚�� �������)"
 
-#: ../plugins/spellchk.c:2263
+#: ../plugins/spellchk.c:2264
 msgid "Only replace _whole words"
 msgstr "廨廡 ���廝 ����� 廩_���廬"
 
-#: ../plugins/spellchk.c:2288
+#: ../plugins/spellchk.c:2289
 msgid "General Text Replacement Options"
 msgstr "�廚廩廨���廬 �����廬 ����廚廬 �廡廖�"
 
-#: ../plugins/spellchk.c:2289
+#: ../plugins/spellchk.c:2290
 msgid "Enable replacement of last word on send"
 msgstr "�廚廩廨 ���廚� 廩� ����� ���廨��� �廣廬 廩����"
 
-#: ../plugins/spellchk.c:2314
+#: ../plugins/spellchk.c:2315
 msgid "Text replacement"
 msgstr "���廚廬 ��廡廖�"
 
-#: ../plugins/spellchk.c:2316 ../plugins/spellchk.c:2317
+#: ../plugins/spellchk.c:2317 ../plugins/spellchk.c:2318
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "����廝 �廡廖� ����廣�廬 ��廢��廬 廣廚\"� ��廡�� 廩�廡�廣�� 廣\"� ��廩廬�廩."
 
@@ -1465,44 +1470,44 @@
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "�廖廚廡 廩���廬 �廣�廚廬 廖��� 廖廚廨��廬 �廬���� �-SSL."
 
-#: ../plugins/statenotify.c:49
+#: ../plugins/statenotify.c:50
 #, c-format
 msgid "%s is no longer away."
 msgstr "%s ��廨 �� �廨��廡/廬 ����廩�"
 
-#: ../plugins/statenotify.c:51
+#: ../plugins/statenotify.c:52
 #, c-format
 msgid "%s has gone away."
 msgstr "%s �廬廨�廡/� ����廩�"
 
-#: ../plugins/statenotify.c:61
+#: ../plugins/statenotify.c:62
 #, c-format
 msgid "%s has become idle."
 msgstr "%s �廖廨/廬 廚廣���廬"
 
-#: ../plugins/statenotify.c:63
+#: ../plugins/statenotify.c:64
 #, c-format
 msgid "%s is no longer idle."
 msgstr "%s ��廨 �� �廖廨/廬 廚廣���廬"
 
-#: ../plugins/statenotify.c:72
+#: ../plugins/statenotify.c:73
 #, c-format
 msgid "%s has signed on."
 msgstr "%s �廬��廨."
 
-#: ../plugins/statenotify.c:90
+#: ../plugins/statenotify.c:91
 msgid "Notify When"
 msgstr "�廬廨廣 ��廩廨"
 
-#: ../plugins/statenotify.c:93
+#: ../plugins/statenotify.c:94
 msgid "Buddy Goes _Away"
 msgstr "�廬廨�廡/� ����廩� ��廩 �廡廩廨"
 
-#: ../plugins/statenotify.c:96
+#: ../plugins/statenotify.c:97
 msgid "Buddy Goes _Idle"
 msgstr "��廩 �廡廩廨 �廖廨 廚廣���廬"
 
-#: ../plugins/statenotify.c:99
+#: ../plugins/statenotify.c:100
 msgid "Buddy _Signs On/Off"
 msgstr "��廩 廡廩廨 _�廬��廨/�廬�廬廡"
 
@@ -1512,7 +1517,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/statenotify.c:141
+#: ../plugins/statenotify.c:142
 msgid "Buddy State Notification"
 msgstr "�廬廨廣�廬 廣� �廢� ��廩� �廡廩廨"
 
@@ -1520,7 +1525,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/statenotify.c:144 ../plugins/statenotify.c:147
+#: ../plugins/statenotify.c:145 ../plugins/statenotify.c:148
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
@@ -1720,7 +1725,7 @@
 msgstr "�廚廣� �廬 Gaim �廣廬 �廚廣�廬 �����廬"
 
 #. Buddy List
-#: ../plugins/win32/winprefs/winprefs.c:417 ../src/gtkblist.c:3587
+#: ../plugins/win32/winprefs/winprefs.c:417 ../src/gtkblist.c:3665
 msgid "Buddy List"
 msgstr "廨廩��廬 ��廩� 廡廩廨"
 
@@ -1785,17 +1790,17 @@
 msgid "Save password"
 msgstr "廩��廨 ��廩�"
 
-#: ../src/account.c:968 ../src/account.c:1139 ../src/gtkblist.c:3471
-#: ../src/gtkdialogs.c:584 ../src/gtkdialogs.c:721 ../src/gtkdialogs.c:785
-#: ../src/gtkrequest.c:271 ../src/protocols/gg/gg.c:454
-#: ../src/protocols/gg/gg.c:595 ../src/protocols/gg/gg.c:731
-#: ../src/protocols/jabber/jabber.c:1318 ../src/protocols/jabber/xdata.c:337
+#: ../src/account.c:968 ../src/account.c:1139 ../src/gtkblist.c:3549
+#: ../src/gtkdialogs.c:588 ../src/gtkdialogs.c:725 ../src/gtkdialogs.c:789
+#: ../src/gtkrequest.c:269 ../src/protocols/gg/gg.c:497
+#: ../src/protocols/gg/gg.c:638 ../src/protocols/gg/gg.c:774
+#: ../src/protocols/jabber/jabber.c:1319 ../src/protocols/jabber/xdata.c:337
 #: ../src/protocols/msn/msn.c:250 ../src/protocols/msn/msn.c:265
 #: ../src/protocols/msn/msn.c:280 ../src/protocols/msn/msn.c:295
 #: ../src/protocols/oscar/oscar.c:3064 ../src/protocols/oscar/oscar.c:4607
-#: ../src/protocols/oscar/oscar.c:4688 ../src/protocols/oscar/oscar.c:8124
-#: ../src/protocols/oscar/oscar.c:8247 ../src/protocols/oscar/oscar.c:8272
-#: ../src/protocols/oscar/oscar.c:8324 ../src/protocols/silc/buddy.c:466
+#: ../src/protocols/oscar/oscar.c:4688 ../src/protocols/oscar/oscar.c:8130
+#: ../src/protocols/oscar/oscar.c:8253 ../src/protocols/oscar/oscar.c:8278
+#: ../src/protocols/oscar/oscar.c:8330 ../src/protocols/silc/buddy.c:466
 #: ../src/protocols/silc/buddy.c:1182 ../src/protocols/silc/chat.c:423
 #: ../src/protocols/silc/chat.c:461 ../src/protocols/silc/chat.c:724
 #: ../src/protocols/silc/ops.c:1297 ../src/protocols/silc/ops.c:1910
@@ -1805,28 +1810,28 @@
 msgstr "��廩�廨"
 
 #: ../src/account.c:969 ../src/account.c:1140 ../src/account.c:1177
-#: ../src/gtkaccount.c:2171 ../src/gtkaccount.c:2638 ../src/gtkblist.c:4939
-#: ../src/gtkdialogs.c:585 ../src/gtkdialogs.c:722 ../src/gtkdialogs.c:786
-#: ../src/gtkdialogs.c:805 ../src/gtkdialogs.c:827 ../src/gtkdialogs.c:847
-#: ../src/gtkdialogs.c:891 ../src/gtkdialogs.c:946 ../src/gtkdialogs.c:983
-#: ../src/gtkdialogs.c:1008 ../src/gtkimhtmltoolbar.c:419
+#: ../src/gtkaccount.c:2171 ../src/gtkaccount.c:2638 ../src/gtkblist.c:5017
+#: ../src/gtkdialogs.c:589 ../src/gtkdialogs.c:726 ../src/gtkdialogs.c:790
+#: ../src/gtkdialogs.c:809 ../src/gtkdialogs.c:831 ../src/gtkdialogs.c:851
+#: ../src/gtkdialogs.c:895 ../src/gtkdialogs.c:950 ../src/gtkdialogs.c:987
+#: ../src/gtkdialogs.c:1012 ../src/gtkimhtmltoolbar.c:419
 #: ../src/gtkplugin.c:296 ../src/gtkpounce.c:1095 ../src/gtkprivacy.c:568
 #: ../src/gtkprivacy.c:581 ../src/gtkprivacy.c:606 ../src/gtkprivacy.c:617
-#: ../src/gtkrequest.c:272 ../src/gtksavedstatuses.c:296
-#: ../src/protocols/gg/gg.c:455 ../src/protocols/gg/gg.c:596
-#: ../src/protocols/gg/gg.c:732 ../src/protocols/gg/gg.c:812
+#: ../src/gtkrequest.c:270 ../src/gtksavedstatuses.c:296
+#: ../src/protocols/gg/gg.c:498 ../src/protocols/gg/gg.c:639
+#: ../src/protocols/gg/gg.c:775 ../src/protocols/gg/gg.c:854
 #: ../src/protocols/jabber/buddy.c:573 ../src/protocols/jabber/buddy.c:1419
 #: ../src/protocols/jabber/buddy.c:1453 ../src/protocols/jabber/chat.c:780
-#: ../src/protocols/jabber/jabber.c:824 ../src/protocols/jabber/jabber.c:1319
+#: ../src/protocols/jabber/jabber.c:824 ../src/protocols/jabber/jabber.c:1320
 #: ../src/protocols/jabber/xdata.c:338 ../src/protocols/msn/msn.c:251
 #: ../src/protocols/msn/msn.c:266 ../src/protocols/msn/msn.c:281
 #: ../src/protocols/msn/msn.c:296 ../src/protocols/msn/msn.c:313
 #: ../src/protocols/oscar/oscar.c:1705 ../src/protocols/oscar/oscar.c:3065
 #: ../src/protocols/oscar/oscar.c:4565 ../src/protocols/oscar/oscar.c:4608
 #: ../src/protocols/oscar/oscar.c:4645 ../src/protocols/oscar/oscar.c:4689
-#: ../src/protocols/oscar/oscar.c:8125 ../src/protocols/oscar/oscar.c:8248
-#: ../src/protocols/oscar/oscar.c:8273 ../src/protocols/oscar/oscar.c:8325
-#: ../src/protocols/oscar/oscar.c:8394
+#: ../src/protocols/oscar/oscar.c:8131 ../src/protocols/oscar/oscar.c:8254
+#: ../src/protocols/oscar/oscar.c:8279 ../src/protocols/oscar/oscar.c:8331
+#: ../src/protocols/oscar/oscar.c:8400
 #: ../src/protocols/sametime/sametime.c:3376
 #: ../src/protocols/sametime/sametime.c:3461
 #: ../src/protocols/sametime/sametime.c:3631
@@ -1846,13 +1851,13 @@
 msgid "Missing protocol plugin for %s"
 msgstr "�廖廨 廬�廖廝 �廚廨���廡�� 廣��廨 %s"
 
-#: ../src/account.c:996 ../src/connection.c:99 ../src/gtkblist.c:3463
-#: ../src/gtkblist.c:3469
+#: ../src/account.c:996 ../src/connection.c:99 ../src/gtkblist.c:3541
+#: ../src/gtkblist.c:3547
 msgid "Connection Error"
 msgstr "廩��廣廬 �廬��廨�廬"
 
-#: ../src/account.c:1076 ../src/protocols/gg/gg.c:636
-#: ../src/protocols/jabber/jabber.c:1271
+#: ../src/account.c:1076 ../src/protocols/gg/gg.c:679
+#: ../src/protocols/jabber/jabber.c:1272
 msgid "New passwords do not match."
 msgstr "�廖�廖�� ���廩� ������� ���� 廬�����."
 
@@ -1886,7 +1891,7 @@
 msgid "Change user information for %s"
 msgstr "廩�� 廚廨�� �廩廬�廩 廣��廨 %s"
 
-#: ../src/account.c:1176 ../src/gtkdebug.c:684 ../src/gtkrequest.c:278
+#: ../src/account.c:1176 ../src/gtkdebug.c:684 ../src/gtkrequest.c:276
 #: ../src/protocols/jabber/buddy.c:572
 msgid "Save"
 msgstr "廩��廨"
@@ -1901,11 +1906,11 @@
 msgid "buddy list"
 msgstr "廨廩��廬 ��廩� 廡廩廨"
 
-#: ../src/blist.c:1173
+#: ../src/blist.c:1179
 msgid "Chats"
 msgstr "廩���廬"
 
-#: ../src/blist.c:1894
+#: ../src/blist.c:1901
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because it belongs to an account "
@@ -1921,7 +1926,7 @@
 "%d ��廩� 廡廩廨 ��廡��廢� %s �� ��廖廨� ������ 廩��廩����廬 ����� �� 廩�����.��廩� �� "
 "����廨��. ��廩� 廡廩廨 ��� ��廡��廢� �� ��廖廨�.\n"
 
-#: ../src/blist.c:1904
+#: ../src/blist.c:1911
 msgid "Group not removed"
 msgstr "�廡��廢� �� ��廖廨�"
 
@@ -1934,7 +1939,7 @@
 msgid "+++ %s signed on"
 msgstr "+++ %s �廬��廨"
 
-#: ../src/connection.c:322
+#: ../src/connection.c:313
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s �廬�廬廡"
@@ -2138,7 +2143,7 @@
 msgid "Password:"
 msgstr "廖�廖��:"
 
-#: ../src/gtkaccount.c:863 ../src/gtkblist.c:4517 ../src/gtkblist.c:4883
+#: ../src/gtkaccount.c:863 ../src/gtkblist.c:4595 ../src/gtkblist.c:4961
 msgid "Alias:"
 msgstr "廬���廨:"
 
@@ -2225,7 +2230,7 @@
 msgid "Add Account"
 msgstr "��廖廚廬 �廩���"
 
-#: ../src/gtkaccount.c:1738 ../src/gtkblist.c:3472
+#: ../src/gtkaccount.c:1738 ../src/gtkblist.c:3550
 msgid "Modify Account"
 msgstr "廣廨��廬 ��廩���"
 
@@ -2247,7 +2252,7 @@
 msgid "Are you sure you want to delete %s?"
 msgstr "��� �廬� ���� 廩�廨廢��� ����廡 �廬 %s?"
 
-#: ../src/gtkaccount.c:2170 ../src/gtkpounce.c:1094 ../src/gtkrequest.c:275
+#: ../src/gtkaccount.c:2170 ../src/gtkpounce.c:1094 ../src/gtkrequest.c:273
 #: ../src/gtksavedstatuses.c:295
 msgid "Delete"
 msgstr "��廡"
@@ -2270,104 +2275,104 @@
 msgid "Add buddy to your list?"
 msgstr "���廖�廝 �廬 ��廩 �廡廩廨 �廨廩��� 廩��?"
 
-#: ../src/gtkaccount.c:2637 ../src/gtkblist.c:4938 ../src/gtkconv.c:1597
-#: ../src/gtkrequest.c:276 ../src/protocols/gg/gg.c:811
+#: ../src/gtkaccount.c:2637 ../src/gtkblist.c:5016 ../src/gtkconv.c:1625
+#: ../src/gtkrequest.c:274 ../src/protocols/gg/gg.c:853
 #: ../src/protocols/oscar/oscar.c:4877
 #: ../src/protocols/sametime/sametime.c:5408 ../src/protocols/silc/chat.c:595
 msgid "Add"
 msgstr "��廖廝"
 
-#: ../src/gtkblist.c:669
+#: ../src/gtkblist.c:672
 msgid "Join a Chat"
 msgstr "�廢�廨廝 �廩���"
 
-#: ../src/gtkblist.c:690
+#: ../src/gtkblist.c:693
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "�廩 ����� �廬 ����廣 ��廬��� 廣� �廢'�� 廩�廨廢��� ��廢�廨廝 ����.\n"
 
-#: ../src/gtkblist.c:701 ../src/gtkpounce.c:527 ../src/gtkroomlist.c:377
+#: ../src/gtkblist.c:704 ../src/gtkpounce.c:527 ../src/gtkroomlist.c:377
 msgid "_Account:"
 msgstr "�廩_���:"
 
-#: ../src/gtkblist.c:945
+#: ../src/gtkblist.c:948
 msgid "Get _Info"
 msgstr "�廢� _廚廨���"
 
-#: ../src/gtkblist.c:948 ../src/gtkstock.c:141
+#: ../src/gtkblist.c:951 ../src/gtkstock.c:141
 msgid "I_M"
 msgstr "���廣�"
 
-#: ../src/gtkblist.c:954
+#: ../src/gtkblist.c:957
 msgid "_Send File"
 msgstr "廩�� 廡��廛"
 
-#: ../src/gtkblist.c:961
+#: ../src/gtkblist.c:964
 msgid "Add Buddy _Pounce"
 msgstr "���廖�_廝 廬���� �廚廣��廬 ��廩 廡廩廨?"
 
-#: ../src/gtkblist.c:965 ../src/gtkblist.c:969 ../src/gtkblist.c:1068
-#: ../src/gtkblist.c:1091
+#: ../src/gtkblist.c:968 ../src/gtkblist.c:972 ../src/gtkblist.c:1071
+#: ../src/gtkblist.c:1094
 msgid "View _Log"
 msgstr "�廢_� 廨�廩��"
 
-#: ../src/gtkblist.c:980
+#: ../src/gtkblist.c:983
 msgid "Alias..."
 msgstr "廩� ��廖廝..."
 
-#: ../src/gtkblist.c:983 ../src/gtkconv.c:1594 ../src/gtkrequest.c:277
+#: ../src/gtkblist.c:986 ../src/gtkconv.c:1622 ../src/gtkrequest.c:275
 msgid "Remove"
 msgstr "�廖廨"
 
-#: ../src/gtkblist.c:989 ../src/gtkblist.c:1076 ../src/gtkblist.c:1097
+#: ../src/gtkblist.c:992 ../src/gtkblist.c:1079 ../src/gtkblist.c:1100
 msgid "_Alias..."
 msgstr "_廩� ��廖廝..."
 
-#: ../src/gtkblist.c:991 ../src/gtkblist.c:1078 ../src/gtkblist.c:1099
+#: ../src/gtkblist.c:994 ../src/gtkblist.c:1081 ../src/gtkblist.c:1102
 msgid "_Remove"
 msgstr "_�廖廨"
 
-#: ../src/gtkblist.c:1039
+#: ../src/gtkblist.c:1042
 msgid "Add a _Buddy"
 msgstr "��廖廚廬 _��廩 廡廩廨"
 
-#: ../src/gtkblist.c:1041
+#: ../src/gtkblist.c:1044
 msgid "Add a C_hat"
 msgstr "��廖廝 _廩���"
 
-#: ../src/gtkblist.c:1044
+#: ../src/gtkblist.c:1047
 msgid "_Delete Group"
 msgstr "�廖廨 _廡��廢�"
 
-#: ../src/gtkblist.c:1046
+#: ../src/gtkblist.c:1049
 msgid "_Rename"
 msgstr "_廩�� 廩�"
 
 #. join button
-#: ../src/gtkblist.c:1064 ../src/gtkroomlist.c:285 ../src/gtkroomlist.c:441
+#: ../src/gtkblist.c:1067 ../src/gtkroomlist.c:285 ../src/gtkroomlist.c:441
 #: ../src/gtkstock.c:139
 msgid "_Join"
 msgstr "�廢_�廨廝"
 
-#: ../src/gtkblist.c:1066
+#: ../src/gtkblist.c:1069
 msgid "Auto-Join"
 msgstr "�廢�廨廝 �������廬"
 
-#: ../src/gtkblist.c:1104 ../src/gtkblist.c:1127
+#: ../src/gtkblist.c:1107 ../src/gtkblist.c:1130
 msgid "_Collapse"
 msgstr "_廡廚�"
 
-#: ../src/gtkblist.c:1132
+#: ../src/gtkblist.c:1135
 msgid "_Expand"
 msgstr "�_廨��"
 
-#: ../src/gtkblist.c:1378 ../src/gtkblist.c:1390 ../src/gtkblist.c:3732
-#: ../src/gtkblist.c:3742
+#: ../src/gtkblist.c:1381 ../src/gtkblist.c:1393 ../src/gtkblist.c:3810
+#: ../src/gtkblist.c:3820
 msgid "/Tools/Mute Sounds"
 msgstr "/����/�廩廬廡 廢�����"
 
-#: ../src/gtkblist.c:1853 ../src/gtkconv.c:4197 ../src/gtkpounce.c:426
+#: ../src/gtkblist.c:1853 ../src/gtkconv.c:4209 ../src/gtkpounce.c:426
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "���� ����廨/廬 �廨�廣 廣� ��廩��� 廩�廖��� ���廖�廝 ��廩 廡廩廨 ��."
@@ -2434,7 +2439,7 @@
 msgid "/_Accounts"
 msgstr "/_�廩����廬"
 
-#: ../src/gtkblist.c:2447 ../src/gtkblist.c:5517
+#: ../src/gtkblist.c:2447 ../src/gtkblist.c:5595
 msgid "/Accounts/Add\\/Edit"
 msgstr "/_�廩����廬/��廖廝/\\廣廨��"
 
@@ -2649,54 +2654,54 @@
 msgid "By log size"
 msgstr "�廚� ���� ���� �廩���廬"
 
-#: ../src/gtkblist.c:3457 ../src/gtkconn.c:196
+#: ../src/gtkblist.c:3535 ../src/gtkconn.c:196
 #, c-format
 msgid "%s disconnected"
 msgstr "%s ���廬廡"
 
-#: ../src/gtkblist.c:3473 ../src/protocols/sametime/sametime.c:3630
+#: ../src/gtkblist.c:3551 ../src/protocols/sametime/sametime.c:3630
 msgid "Connect"
 msgstr "�廬��廨"
 
-#: ../src/gtkblist.c:3473 ../src/gtkblist.c:5616
-msgid "Enable Account"
-msgstr "�廚廣� �廩���"
-
-#: ../src/gtkblist.c:3494
+#: ../src/gtkblist.c:3551
+msgid "Re-enable Account"
+msgstr "�廚廣� ���廩 �廩���"
+
+#: ../src/gtkblist.c:3572
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s ��廬廡: %s</span>"
 
-#: ../src/gtkblist.c:3621
+#: ../src/gtkblist.c:3699
 msgid "/Accounts"
 msgstr "/�廩����廬"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../src/gtkblist.c:3726
+#: ../src/gtkblist.c:3804
 msgid "/Buddies/Show Offline Buddies"
 msgstr "�廢� �� _�廩廬�廩�� ���廬廡�� �廨廩���"
 
-#: ../src/gtkblist.c:3729
+#: ../src/gtkblist.c:3807
 msgid "/Buddies/Show Empty Groups"
 msgstr "/��廩� 廡廩廨/�廢� 廡��廢�廬 廨�廡�廬"
 
-#: ../src/gtkblist.c:3735
+#: ../src/gtkblist.c:3813
 msgid "/Buddies/Show Buddy Details"
 msgstr "/��廩� 廡廩廨/�廢� 廚廨�� ��廩�-廡廩廨"
 
-#: ../src/gtkblist.c:3738
+#: ../src/gtkblist.c:3816
 msgid "/Buddies/Show Idle Times"
 msgstr "/��廩� 廡廩廨/�廢� ���� ��廖廨 廚廣���廬"
 
-#: ../src/gtkblist.c:4450 ../src/protocols/silc/buddy.c:736
+#: ../src/gtkblist.c:4528 ../src/protocols/silc/buddy.c:736
 #: ../src/protocols/silc/buddy.c:1030 ../src/protocols/silc/buddy.c:1075
 #: ../src/protocols/silc/buddy.c:1174 ../src/protocols/yahoo/yahoo.c:2978
 msgid "Add Buddy"
 msgstr "��廖廝 ��廩 廡廩廨"
 
-#: ../src/gtkblist.c:4474
+#: ../src/gtkblist.c:4552
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
@@ -2705,62 +2710,62 @@
 "�廩 ����� �廬 廩� ��廩廬�廩 廩� ��廬� �廬� 廨�廢�� ���廖�廝 �廨廩��廬 �廡廩廨..�廩�� �� �廚廩廨�廬 "
 "�廬廬 ����� �廩廨 ��廢� ��廡�� 廩� ��廩廬�廩\n"
 
-#: ../src/gtkblist.c:4496
-msgid "Screen Name:"
-msgstr "廩� �廬廢���:"
-
 #. Set up stuff for the account box
-#: ../src/gtkblist.c:4544 ../src/gtkblist.c:4863
+#: ../src/gtkblist.c:4622 ../src/gtkblist.c:4941
 msgid "Account:"
 msgstr "�廩���:"
 
-#: ../src/gtkblist.c:4796
+#: ../src/gtkblist.c:4874
 msgid "This protocol does not support chat rooms."
 msgstr "廚廨���廡�� �� ���� 廬��� ���廨� 廢'��"
 
-#: ../src/gtkblist.c:4812
+#: ../src/gtkblist.c:4890
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "���� ����廨/廬 �廚廨���廡�� ��廩�� ���廚廩廨 廩���廩 �廢'��."
 
-#: ../src/gtkblist.c:4829
+#: ../src/gtkblist.c:4907
 msgid "Add Chat"
 msgstr "��廖廝 廩���"
 
-#: ../src/gtkblist.c:4853
+#: ../src/gtkblist.c:4931
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr ""
 "�廩 ����� 廩� ��廖廝, ����廣 �廬��� 廣� �廢'�� 廩�廨廢��� ���廖�廝 �廨廩��廬 ��廩� �廡廩廨 廩��.\n"
 
-#: ../src/gtkblist.c:4935 ../src/protocols/sametime/sametime.c:5319
+#: ../src/gtkblist.c:5013 ../src/protocols/sametime/sametime.c:5319
 #: ../src/protocols/sametime/sametime.c:5406
 msgid "Add Group"
 msgstr "��廖廝 廡��廢�"
 
-#: ../src/gtkblist.c:4936
+#: ../src/gtkblist.c:5014
 msgid "Please enter the name of the group to be added."
 msgstr "�廩 ����� �廬 廩� �廡��廢� ���廩�."
 
-#: ../src/gtkblist.c:5557
+#: ../src/gtkblist.c:5635
 msgid "_Edit Account"
 msgstr "_廣廨�� �廩���"
 
-#: ../src/gtkblist.c:5590 ../src/gtkblist.c:5596
+#: ../src/gtkblist.c:5668 ../src/gtkblist.c:5674
 msgid "No actions available"
 msgstr "�� ��廬� ��廢廣 廚廣���廬"
 
-#: ../src/gtkblist.c:5604
+#: ../src/gtkblist.c:5682
 msgid "_Disable"
 msgstr "_���"
 
-#: ../src/gtkblist.c:5669
+#: ../src/gtkblist.c:5694
+msgid "Enable Account"
+msgstr "�廚廣� �廩���"
+
+#: ../src/gtkblist.c:5747
 msgid "/Tools"
 msgstr "/_����"
 
-#: ../src/gtkblist.c:5755
+#: ../src/gtkblist.c:5833
 msgid "/Buddies/Sort Buddies"
 msgstr "/��廩� 廡廩廨/���� ��廩�-廡廩廨"
 
@@ -2843,7 +2848,7 @@
 msgid "_Message:"
 msgstr "�_��廣�:"
 
-#: ../src/gtkconv.c:945 ../src/gtkconv.c:2380 ../src/gtkdebug.c:217
+#: ../src/gtkconv.c:945 ../src/gtkconv.c:2392 ../src/gtkdebug.c:217
 #: ../src/gtkft.c:488
 msgid "Unable to open file."
 msgstr "��� �廚廩廨�廬 �廚廬�� �廬 �廡��廛."
@@ -2874,326 +2879,342 @@
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr "廨�廩�� ��廚廖廡. ���廣�廬 �廩��� �� �� ��廨廩�� �廣廬�."
 
-#: ../src/gtkconv.c:1559
+#: ../src/gtkconv.c:1562
 msgid "IM"
 msgstr "���廣�"
 
-#: ../src/gtkconv.c:1565 ../src/protocols/oscar/oscar.c:714
+#: ../src/gtkconv.c:1573 ../src/protocols/oscar/oscar.c:714
 msgid "Send File"
 msgstr "廩�� 廡��廛"
 
-#: ../src/gtkconv.c:1572
+#: ../src/gtkconv.c:1588
 msgid "Un-Ignore"
 msgstr "��� �� �廬廣���廬"
 
-#: ../src/gtkconv.c:1575
+#: ../src/gtkconv.c:1591
 msgid "Ignore"
 msgstr "�廬廣��"
 
-#: ../src/gtkconv.c:1581
+#: ../src/gtkconv.c:1601
 msgid "Info"
 msgstr "���廣"
 
-#: ../src/gtkconv.c:1587
+#: ../src/gtkconv.c:1611
 msgid "Get Away Message"
 msgstr "�廩� �廬 ���廣廬 ��廬廨�廡�廬"
 
-#: ../src/gtkconv.c:1602
+#: ../src/gtkconv.c:1634
 msgid "Last said"
 msgstr "���廨 ���廨���"
 
-#: ../src/gtkconv.c:2388
+#: ../src/gtkconv.c:2400
 msgid "Unable to save icon file to disk."
 msgstr "�� ��廬� �廩��廨 �廬 �廖�� ���廖廡."
 
-#: ../src/gtkconv.c:2412
+#: ../src/gtkconv.c:2424
 msgid "Save Icon"
 msgstr "廩��廨廬 廖��"
 
-#: ../src/gtkconv.c:2461
+#: ../src/gtkconv.c:2473
 msgid "Animate"
 msgstr "��廚廩"
 
-#: ../src/gtkconv.c:2466
+#: ../src/gtkconv.c:2478
 msgid "Hide Icon"
 msgstr "�廖廬廨 廖��"
 
-#: ../src/gtkconv.c:2472
+#: ../src/gtkconv.c:2484
 msgid "Save Icon As..."
 msgstr "廩��廨廬 廖�� �廩�..."
 
 #. Conversation menu
-#: ../src/gtkconv.c:2613
+#: ../src/gtkconv.c:2625
 msgid "/_Conversation"
 msgstr "/_廩���"
 
-#: ../src/gtkconv.c:2615
+#: ../src/gtkconv.c:2627
 msgid "/Conversation/New Instant _Message..."
 msgstr "/廩���/���_廣� ��廩�..."
 
-#: ../src/gtkconv.c:2620
-msgid "/Conversation/_Find..."
-msgstr "/廩���/_�廚廩..."
-
-#: ../src/gtkconv.c:2622
-msgid "/Conversation/View _Log"
-msgstr "/廩���/�_廢� ���� 廩���廬"
-
-#: ../src/gtkconv.c:2623
-msgid "/Conversation/_Save As..."
-msgstr "/廩���/_廩��廨 �廩�..."
-
-#: ../src/gtkconv.c:2625
-msgid "/Conversation/Clea_r Scrollback"
-msgstr "/廩���/�_廡� ����� ����廨"
-
-#: ../src/gtkconv.c:2629
-msgid "/Conversation/Se_nd File..."
-msgstr "/廩���/廩_�� 廡��廛..."
-
-#: ../src/gtkconv.c:2630
-msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/廩���/��廖廝 廚_廣��廬 廬����..."
-
 #: ../src/gtkconv.c:2632
+msgid "/Conversation/_Find..."
+msgstr "/廩���/_�廚廩..."
+
+#: ../src/gtkconv.c:2634
+msgid "/Conversation/View _Log"
+msgstr "/廩���/�_廢� ���� 廩���廬"
+
+#: ../src/gtkconv.c:2635
+msgid "/Conversation/_Save As..."
+msgstr "/廩���/_廩��廨 �廩�..."
+
+#: ../src/gtkconv.c:2637
+msgid "/Conversation/Clea_r Scrollback"
+msgstr "/廩���/�_廡� ����� ����廨"
+
+#: ../src/gtkconv.c:2641
+msgid "/Conversation/Se_nd File..."
+msgstr "/廩���/廩_�� 廡��廛..."
+
+#: ../src/gtkconv.c:2642
+msgid "/Conversation/Add Buddy _Pounce..."
+msgstr "/廩���/��廖廝 廚_廣��廬 廬����..."
+
+#: ../src/gtkconv.c:2644
 msgid "/Conversation/_Get Info"
 msgstr "/廩���/�廢� ���廣"
 
-#: ../src/gtkconv.c:2634
+#: ../src/gtkconv.c:2646
 msgid "/Conversation/In_vite..."
 msgstr "/廩���/��_��..."
 
-#: ../src/gtkconv.c:2639
+#: ../src/gtkconv.c:2651
 msgid "/Conversation/Al_ias..."
 msgstr "/廩���/�_����..."
 
-#: ../src/gtkconv.c:2641
+#: ../src/gtkconv.c:2653
 msgid "/Conversation/_Block..."
 msgstr "/廩���/�廖�_�..."
 
-#: ../src/gtkconv.c:2643
+#: ../src/gtkconv.c:2655
 msgid "/Conversation/_Add..."
 msgstr "/廩���/��廖_廝"
 
-#: ../src/gtkconv.c:2645
+#: ../src/gtkconv.c:2657
 msgid "/Conversation/_Remove..."
 msgstr "/廩���/�廖_廨..."
 
-#: ../src/gtkconv.c:2650
+#: ../src/gtkconv.c:2662
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/廩���/���廖 廡�廩_�廨..."
 
-#: ../src/gtkconv.c:2652
+#: ../src/gtkconv.c:2664
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/廩���/���廖 廬_����..."
 
-#: ../src/gtkconv.c:2657
+#: ../src/gtkconv.c:2669
 msgid "/Conversation/_Close"
 msgstr "/廩���/_廖��廨"
 
 #. Options
-#: ../src/gtkconv.c:2661
+#: ../src/gtkconv.c:2673
 msgid "/_Options"
 msgstr "/_�廚廩廨���廬"
 
-#: ../src/gtkconv.c:2662
+#: ../src/gtkconv.c:2674
 msgid "/Options/Enable _Logging"
 msgstr "/�廚廩廨���廬/�廚廩廨 廨�廩��"
 
-#: ../src/gtkconv.c:2663
+#: ../src/gtkconv.c:2675
 msgid "/Options/Enable _Sounds"
 msgstr "/�廚廩廨���廬/�廚廩廨 _廢�����"
 
-#: ../src/gtkconv.c:2664
+#: ../src/gtkconv.c:2676
 msgid "/Options/Show Buddy _Icon"
 msgstr "/�廚廩廨���廬/�廢_� 廖�� 廩� ��廩 �廡廩廨"
 
-#: ../src/gtkconv.c:2666
+#: ../src/gtkconv.c:2678
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/�廚廩廨���廬/_�廢� 廖廨���� 廩� ��� �廚�廨���"
 
-#: ../src/gtkconv.c:2667
+#: ../src/gtkconv.c:2679
 msgid "/Options/Show Ti_mestamps"
 msgstr "/�廚廩廨���廬/���廣 _��廬�廬 ��� 廣� 廩���廬"
 
-#: ../src/gtkconv.c:2759
+#: ../src/gtkconv.c:2771
 msgid "/Conversation/View Log"
 msgstr "廩���/�廢� ���� 廩���廬/"
 
-#: ../src/gtkconv.c:2765
+#: ../src/gtkconv.c:2777
 msgid "/Conversation/Send File..."
 msgstr "廩���/廩�� 廡��廛.../"
 
-#: ../src/gtkconv.c:2769
+#: ../src/gtkconv.c:2781
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "廩���/��廖廝 廚廣��廬 廬���� ���廨�廣� ��廩 廡廩廨.../"
 
-#: ../src/gtkconv.c:2775
+#: ../src/gtkconv.c:2787
 msgid "/Conversation/Get Info"
 msgstr "/廩���/�廢� ���廣"
 
-#: ../src/gtkconv.c:2779
+#: ../src/gtkconv.c:2791
 msgid "/Conversation/Invite..."
 msgstr "/廩���/����..."
 
-#: ../src/gtkconv.c:2785
+#: ../src/gtkconv.c:2797
 msgid "/Conversation/Alias..."
 msgstr "/廩���/�����..."
 
-#: ../src/gtkconv.c:2789
+#: ../src/gtkconv.c:2801
 msgid "/Conversation/Block..."
 msgstr "/廩���/�廖��..."
 
-#: ../src/gtkconv.c:2793
+#: ../src/gtkconv.c:2805
 msgid "/Conversation/Add..."
 msgstr "/廩���/��廖廝..."
 
-#: ../src/gtkconv.c:2797
+#: ../src/gtkconv.c:2809
 msgid "/Conversation/Remove..."
 msgstr "/廩���/�廖廨..."
 
-#: ../src/gtkconv.c:2803
+#: ../src/gtkconv.c:2815
 msgid "/Conversation/Insert Link..."
 msgstr "/廩���/���廖 廡_�廩�廨..."
 
-#: ../src/gtkconv.c:2807
+#: ../src/gtkconv.c:2819
 msgid "/Conversation/Insert Image..."
 msgstr "/廩���/���廖 廬����..."
 
-#: ../src/gtkconv.c:2813
+#: ../src/gtkconv.c:2825
 msgid "/Options/Enable Logging"
 msgstr "/�廚廩廨���廬/�廚廩廨 廨�廩��"
 
-#: ../src/gtkconv.c:2816
+#: ../src/gtkconv.c:2828
 msgid "/Options/Enable Sounds"
 msgstr "/�廚廩廨���廬/�廚廩廨 廢�����"
 
-#: ../src/gtkconv.c:2829
+#: ../src/gtkconv.c:2841
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/�廚廩廨���廬/_�廢� 廖廨���� 廩� ��� �廚�廨���"
 
-#: ../src/gtkconv.c:2832
+#: ../src/gtkconv.c:2844
 msgid "/Options/Show Timestamps"
 msgstr "/�廚廩廨���廬/���廣 _��廬�廬 ��� 廣� 廩���廬"
 
-#: ../src/gtkconv.c:2835
+#: ../src/gtkconv.c:2847
 msgid "/Options/Show Buddy Icon"
 msgstr "/�廚廩廨���廬/�廢_� 廖�� 廩� ��廩 �廡廩廨"
 
-#: ../src/gtkconv.c:2915
+#: ../src/gtkconv.c:2927
 msgid "User is typing..."
 msgstr "��廩廬�廩 ��廬� �廨�廣..."
 
-#: ../src/gtkconv.c:2918
+#: ../src/gtkconv.c:2930
 msgid "User has typed something and stopped"
 msgstr "��廩廬�廩 �廬� �廩�� �廣廢廨"
 
 #. Build the Send To menu
-#: ../src/gtkconv.c:3101
+#: ../src/gtkconv.c:3113
 msgid "_Send To"
 msgstr "廩�� _��"
 
-#: ../src/gtkconv.c:3753
+#: ../src/gtkconv.c:3765
 msgid "_Send"
 msgstr "廩_��"
 
-#: ../src/gtkconv.c:3808 ../src/protocols/sametime/sametime.c:3572
+#: ../src/gtkconv.c:3820 ../src/protocols/sametime/sametime.c:3572
 msgid "Topic:"
 msgstr "��廬廨廬:"
 
 #. Setup the label telling how many people are in the room.
-#: ../src/gtkconv.c:3860
+#: ../src/gtkconv.c:3872
 msgid "0 people in room"
 msgstr "0 ��廩�� ���廨 ��"
 
-#: ../src/gtkconv.c:3939
+#: ../src/gtkconv.c:3951
 msgid "IM the user"
 msgstr "廩�� ���廣� �����廬 ��廩廬�廩 ��"
 
-#: ../src/gtkconv.c:3952
+#: ../src/gtkconv.c:3964
 msgid "Ignore the user"
 msgstr "�廬廣�� ���廩廬�廩"
 
-#: ../src/gtkconv.c:3964
+#: ../src/gtkconv.c:3976
 msgid "Get the user's information"
 msgstr "�廢� ���廣 廣� ��廩廬�廩"
 
-#: ../src/gtkconv.c:4938 ../src/gtkconv.c:5047
+#: ../src/gtkconv.c:4958 ../src/gtkconv.c:5067
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "��廩 %d ���廨 ��"
 msgstr[1] "%d ��廩�� ���廨 ��"
 
-#: ../src/gtkconv.c:6520
+#: ../src/gtkconv.c:5624 ../src/gtkstatusbox.c:366
+msgid "Typing"
+msgstr "�廡���/�"
+
+#: ../src/gtkconv.c:5630
+msgid "Stopped Typing"
+msgstr "�廚廖�廡/� ��廡��� "
+
+#: ../src/gtkconv.c:5635
+msgid "Nick Said"
+msgstr "廩� ���廨"
+
+#: ../src/gtkconv.c:5645
+msgid "New Event"
+msgstr "��廨�廣 ��廩"
+
+#: ../src/gtkconv.c:6547
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr "say &lt;message&gt;:  廩�� ���廣� �廨���, ����� �� �廨� 廚廡���."
 
-#: ../src/gtkconv.c:6523
+#: ../src/gtkconv.c:6550
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;action&gt;:  廩�� ��廩廬�廩 �� 廢'�� 廚廣��� ��廖� IRC."
 
-#: ../src/gtkconv.c:6526
+#: ../src/gtkconv.c:6553
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr "debug &lt;option&gt;:  廩�� �� ���� 廨廖�廖� ���廣 ����� 廩��� ������."
 
-#: ../src/gtkconv.c:6529
+#: ../src/gtkconv.c:6556
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: �廡� �廬 廬��� ���� �廩���."
 
-#: ../src/gtkconv.c:6532
+#: ../src/gtkconv.c:6559
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;command&gt;:  廣�廨� 廣� 廚廡��� 廖廚廢�廚�廬."
 
-#: ../src/gtkconv.c:6691
+#: ../src/gtkconv.c:6718
 msgid "Confirm close"
 msgstr "�廩廨 廖��廨�"
 
-#: ../src/gtkconv.c:6723
+#: ../src/gtkconv.c:6750
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "�廩 �� ���廣�廬 廩�� �廡廨��. ��� �廨廢��� �廖��廨 �廬 �����?"
 
-#: ../src/gtkconv.c:7245
+#: ../src/gtkconv.c:7272
 msgid "Close other tabs"
 msgstr "廖��廨 �廬 廩�廨 ������"
 
-#: ../src/gtkconv.c:7251
+#: ../src/gtkconv.c:7278
 msgid "Close all tabs"
 msgstr "廖��廨 �廬 �� ������"
 
-#: ../src/gtkconv.c:7259
+#: ../src/gtkconv.c:7286
 msgid "Detach this tab"
 msgstr "�廬廡 ��� ��"
 
-#: ../src/gtkconv.c:7265
+#: ../src/gtkconv.c:7292
 msgid "Close this tab"
 msgstr "廖��廨 ��� ��"
 
-#: ../src/gtkconv.c:7527
+#: ../src/gtkconv.c:7554
 msgid "Close conversation"
 msgstr "廖��廨 ����"
 
-#: ../src/gtkconv.c:7991
+#: ../src/gtkconv.c:8018
 msgid "Last created window"
 msgstr "���� ��廨�� 廩��廢廨"
 
-#: ../src/gtkconv.c:7993
+#: ../src/gtkconv.c:8020
 msgid "Separate IM and Chat windows"
 msgstr "�廚廨� ��� �����廬 廩� ���廣�廬 �廢'����"
 
-#: ../src/gtkconv.c:7995 ../src/gtkprefs.c:1243
+#: ../src/gtkconv.c:8022 ../src/gtkprefs.c:1243
 msgid "New window"
 msgstr "���� ��廩"
 
-#: ../src/gtkconv.c:7997
+#: ../src/gtkconv.c:8024
 msgid "By group"
 msgstr "�廚� 廡��廢�廬"
 
-#: ../src/gtkconv.c:7999
+#: ../src/gtkconv.c:8026
 msgid "By account"
 msgstr "�廚� �廩���"
 
@@ -3233,14 +3254,15 @@
 msgid "Right click for more options."
 msgstr "���廢� ����廬 �廣�� �廚廩廨���廬."
 
-#: ../src/gtkdialogs.c:61 ../src/gtkdialogs.c:100
+#: ../src/gtkdialogs.c:61 ../src/gtkdialogs.c:103
 msgid "lead developer"
 msgstr "�廚廬� 廨�廩�"
 
 #: ../src/gtkdialogs.c:62 ../src/gtkdialogs.c:63 ../src/gtkdialogs.c:65
-#: ../src/gtkdialogs.c:67 ../src/gtkdialogs.c:68 ../src/gtkdialogs.c:69
-#: ../src/gtkdialogs.c:70 ../src/gtkdialogs.c:71 ../src/gtkdialogs.c:73
-#: ../src/gtkdialogs.c:74
+#: ../src/gtkdialogs.c:66 ../src/gtkdialogs.c:68 ../src/gtkdialogs.c:69
+#: ../src/gtkdialogs.c:70 ../src/gtkdialogs.c:71 ../src/gtkdialogs.c:72
+#: ../src/gtkdialogs.c:73 ../src/gtkdialogs.c:75 ../src/gtkdialogs.c:76
+#: ../src/gtkdialogs.c:77
 msgid "developer"
 msgstr "�廚廬�"
 
@@ -3248,218 +3270,222 @@
 msgid "win32 port"
 msgstr "��廨廖� ������廬"
 
-#: ../src/gtkdialogs.c:66
+#: ../src/gtkdialogs.c:67
 msgid "developer & webmaster"
 msgstr "�廚廬� ����� �廬廨"
 
-#: ../src/gtkdialogs.c:72
+#: ../src/gtkdialogs.c:74
 msgid "support"
 msgstr "廬����"
 
-#: ../src/gtkdialogs.c:94 ../src/gtkdialogs.c:95
+#: ../src/gtkdialogs.c:97 ../src/gtkdialogs.c:98
 msgid "maintainer"
 msgstr "�廬��廡"
 
-#: ../src/gtkdialogs.c:96
-msgid "libfaim maintainer"
-msgstr "�廬��廡 libfaim"
-
-#: ../src/gtkdialogs.c:97
-msgid "hacker and designated driver [lazy bum]"
-msgstr "�廬��廬 ���� 廚��� - 廣廢��"
-
-#: ../src/gtkdialogs.c:98
-msgid "Jabber developer"
-msgstr "�廚廬� Jabber"
-
 #: ../src/gtkdialogs.c:99
+msgid "libfaim maintainer"
+msgstr "�廬��廡 libfaim"
+
+#: ../src/gtkdialogs.c:100
+msgid "hacker and designated driver [lazy bum]"
+msgstr "�廬��廬 ���� 廚��� - 廣廢��"
+
+#: ../src/gtkdialogs.c:101
+msgid "Jabber developer"
+msgstr "�廚廬� Jabber"
+
+#: ../src/gtkdialogs.c:102
 msgid "original author"
 msgstr "�廬��廬 �廡�廨�"
 
-#: ../src/gtkdialogs.c:106 ../src/gtkdialogs.c:107 ../src/gtkdialogs.c:160
+#: ../src/gtkdialogs.c:109 ../src/gtkdialogs.c:110 ../src/gtkdialogs.c:164
 msgid "Bulgarian"
 msgstr "����廨�廬"
 
-#: ../src/gtkdialogs.c:108 ../src/gtkdialogs.c:109
+#: ../src/gtkdialogs.c:111 ../src/gtkdialogs.c:112
 msgid "Bengali"
 msgstr "������廬"
 
-#: ../src/gtkdialogs.c:110
+#: ../src/gtkdialogs.c:113
 msgid "Bosnian"
 msgstr "��廖��廬"
 
-#: ../src/gtkdialogs.c:111 ../src/gtkdialogs.c:161 ../src/gtkdialogs.c:162
+#: ../src/gtkdialogs.c:114 ../src/gtkdialogs.c:165 ../src/gtkdialogs.c:166
 msgid "Catalan"
 msgstr "廡����廬"
 
-#: ../src/gtkdialogs.c:112 ../src/gtkdialogs.c:163
+#: ../src/gtkdialogs.c:115
+msgid "Valencian"
+msgstr "����廖�廬"
+
+#: ../src/gtkdialogs.c:116 ../src/gtkdialogs.c:167
 msgid "Czech"
 msgstr "廢'��廬"
 
-#: ../src/gtkdialogs.c:113
+#: ../src/gtkdialogs.c:117
 msgid "Danish"
 msgstr "���廬"
 
-#: ../src/gtkdialogs.c:114 ../src/gtkdialogs.c:164
+#: ../src/gtkdialogs.c:118 ../src/gtkdialogs.c:168
 msgid "German"
 msgstr "�廨���廬"
 
-#: ../src/gtkdialogs.c:115 ../src/gtkdialogs.c:116
+#: ../src/gtkdialogs.c:119 ../src/gtkdialogs.c:120
 msgid "Greek"
 msgstr "�����廬"
 
-#: ../src/gtkdialogs.c:117
+#: ../src/gtkdialogs.c:121
 msgid "Australian English"
 msgstr "�����廬 �廨���廬"
 
-#: ../src/gtkdialogs.c:118
+#: ../src/gtkdialogs.c:122
 msgid "Canadian English"
 msgstr "�����廬 廡���廬"
 
-#: ../src/gtkdialogs.c:119
+#: ../src/gtkdialogs.c:123
 msgid "British English"
 msgstr "�����廬 �廨���廬"
 
-#: ../src/gtkdialogs.c:120 ../src/gtkdialogs.c:165 ../src/gtkdialogs.c:166
-#: ../src/gtkdialogs.c:167 ../src/gtkdialogs.c:168
+#: ../src/gtkdialogs.c:124 ../src/gtkdialogs.c:169 ../src/gtkdialogs.c:170
+#: ../src/gtkdialogs.c:171 ../src/gtkdialogs.c:172
 msgid "Spanish"
 msgstr "廖廚廨��廬"
 
-#: ../src/gtkdialogs.c:121 ../src/gtkdialogs.c:122
+#: ../src/gtkdialogs.c:125 ../src/gtkdialogs.c:126
 msgid "Persian"
 msgstr "廚廨廖�廬"
 
-#: ../src/gtkdialogs.c:123 ../src/gtkdialogs.c:169 ../src/gtkdialogs.c:170
+#: ../src/gtkdialogs.c:127 ../src/gtkdialogs.c:173 ../src/gtkdialogs.c:174
 msgid "Finnish"
 msgstr "廚���廬"
 
-#: ../src/gtkdialogs.c:124 ../src/gtkdialogs.c:171 ../src/gtkdialogs.c:172
-#: ../src/gtkdialogs.c:173 ../src/gtkdialogs.c:174
+#: ../src/gtkdialogs.c:128 ../src/gtkdialogs.c:175 ../src/gtkdialogs.c:176
+#: ../src/gtkdialogs.c:177 ../src/gtkdialogs.c:178
 msgid "French"
 msgstr "廢廨廚廬�廬"
 
-#: ../src/gtkdialogs.c:125
+#: ../src/gtkdialogs.c:129
 msgid "Hebrew"
 msgstr "廣�廨�廬"
 
-#: ../src/gtkdialogs.c:126
+#: ../src/gtkdialogs.c:130
 msgid "Hindi"
 msgstr "�����廬"
 
-#: ../src/gtkdialogs.c:127
+#: ../src/gtkdialogs.c:131
 msgid "Hungarian"
 msgstr "����廨�廬"
 
-#: ../src/gtkdialogs.c:128 ../src/gtkdialogs.c:175
+#: ../src/gtkdialogs.c:132 ../src/gtkdialogs.c:179
 msgid "Italian"
 msgstr "����廡�廬"
 
-#: ../src/gtkdialogs.c:129 ../src/gtkdialogs.c:176 ../src/gtkdialogs.c:177
-#: ../src/gtkdialogs.c:178
+#: ../src/gtkdialogs.c:133 ../src/gtkdialogs.c:180 ../src/gtkdialogs.c:181
+#: ../src/gtkdialogs.c:182
 msgid "Japanese"
 msgstr "�廚��廬"
 
-#: ../src/gtkdialogs.c:130 ../src/gtkdialogs.c:179
+#: ../src/gtkdialogs.c:134 ../src/gtkdialogs.c:183
 msgid "Georgian"
 msgstr "�廨���廬"
 
-#: ../src/gtkdialogs.c:131 ../src/gtkdialogs.c:180
+#: ../src/gtkdialogs.c:135 ../src/gtkdialogs.c:184
 msgid "Korean"
 msgstr "廡�廨����廬"
 
-#: ../src/gtkdialogs.c:132
+#: ../src/gtkdialogs.c:136
 msgid "Kurdish"
 msgstr "��廨��廬"
 
-#: ../src/gtkdialogs.c:133 ../src/gtkdialogs.c:181 ../src/gtkdialogs.c:182
+#: ../src/gtkdialogs.c:137 ../src/gtkdialogs.c:185 ../src/gtkdialogs.c:186
 msgid "Lithuanian"
 msgstr "�������廬"
 
-#: ../src/gtkdialogs.c:134
+#: ../src/gtkdialogs.c:138
 msgid "Macedonian"
 msgstr "�廡����廬"
 
-#: ../src/gtkdialogs.c:135
+#: ../src/gtkdialogs.c:139
 msgid "Dutch, Flemish"
 msgstr "������廬, 廚���廬"
 
-#: ../src/gtkdialogs.c:136
+#: ../src/gtkdialogs.c:140
 msgid "Norwegian"
 msgstr "��廨���廬"
 
-#: ../src/gtkdialogs.c:137 ../src/gtkdialogs.c:138 ../src/gtkdialogs.c:183
+#: ../src/gtkdialogs.c:141 ../src/gtkdialogs.c:142 ../src/gtkdialogs.c:187
 msgid "Polish"
 msgstr "廚����廬"
 
-#: ../src/gtkdialogs.c:139
+#: ../src/gtkdialogs.c:143
 msgid "Portuguese"
 msgstr "廚�廨�����廬"
 
-#: ../src/gtkdialogs.c:140
+#: ../src/gtkdialogs.c:144
 msgid "Portuguese-Brazil"
 msgstr "廚�廨�����廬 �廨�����廬"
 
-#: ../src/gtkdialogs.c:141
+#: ../src/gtkdialogs.c:145
 msgid "Romanian"
 msgstr "廨����廬"
 
-#: ../src/gtkdialogs.c:142 ../src/gtkdialogs.c:184 ../src/gtkdialogs.c:185
+#: ../src/gtkdialogs.c:146 ../src/gtkdialogs.c:188 ../src/gtkdialogs.c:189
 msgid "Russian"
 msgstr "廨�廖�廬"
 
-#: ../src/gtkdialogs.c:143 ../src/gtkdialogs.c:144
+#: ../src/gtkdialogs.c:147 ../src/gtkdialogs.c:148
 msgid "Serbian"
 msgstr "廖廨��廬"
 
-#: ../src/gtkdialogs.c:145
+#: ../src/gtkdialogs.c:149
 msgid "Slovenian"
 msgstr "廖���廡�廬"
 
-#: ../src/gtkdialogs.c:146 ../src/gtkdialogs.c:187
+#: ../src/gtkdialogs.c:150 ../src/gtkdialogs.c:191
 msgid "Swedish"
 msgstr "廩����廬"
 
-#: ../src/gtkdialogs.c:147
+#: ../src/gtkdialogs.c:151
 msgid "Tamil"
 msgstr "廬���"
 
-#: ../src/gtkdialogs.c:148
+#: ../src/gtkdialogs.c:152
 msgid "Telugu"
 msgstr "�����"
 
-#: ../src/gtkdialogs.c:149
+#: ../src/gtkdialogs.c:153
 msgid "Turkish"
 msgstr "廬�廨��廬"
 
-#: ../src/gtkdialogs.c:150
+#: ../src/gtkdialogs.c:154
 msgid "Vietnamese"
 msgstr "�������廬"
 
-#: ../src/gtkdialogs.c:150
+#: ../src/gtkdialogs.c:154
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "廢��廬 VI 廩� ����"
 
-#: ../src/gtkdialogs.c:151 ../src/gtkdialogs.c:188
+#: ../src/gtkdialogs.c:155 ../src/gtkdialogs.c:192
 msgid "Simplified Chinese"
 msgstr "廖���廬 廚廩���"
 
-#: ../src/gtkdialogs.c:152 ../src/gtkdialogs.c:153 ../src/gtkdialogs.c:189
+#: ../src/gtkdialogs.c:156 ../src/gtkdialogs.c:157 ../src/gtkdialogs.c:193
 msgid "Traditional Chinese"
 msgstr "廖���廬 �廖�廨廬�廬"
 
-#: ../src/gtkdialogs.c:159
+#: ../src/gtkdialogs.c:163
 msgid "Amharic"
 msgstr "���廨�廬"
 
-#: ../src/gtkdialogs.c:186
+#: ../src/gtkdialogs.c:190
 msgid "Slovak"
 msgstr "廖���廡�廬"
 
-#: ../src/gtkdialogs.c:230
+#: ../src/gtkdialogs.c:234
 msgid "About Gaim"
 msgstr "����廬 Gaim"
 
-#: ../src/gtkdialogs.c:254
+#: ../src/gtkdialogs.c:258
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, "
@@ -3478,107 +3504,107 @@
 "�����廬 ��廚廬��� ��廬�廨��� �廚�廬��. 廨�� �廬 �廡��廛 'COPYRIGHT' �廨廩��� ���� 廩� "
 "�廬�廨���. ����� �廖廚廡�� 廩�� ��廨��廬 �廬���� ��.<BR><BR>"
 
-#: ../src/gtkdialogs.c:268
+#: ../src/gtkdialogs.c:272
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #wingaim �- irc.freenode.net<BR><BR>"
 
-#: ../src/gtkdialogs.c:271
+#: ../src/gtkdialogs.c:275
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #gaim �- irc.freenode.net<BR><BR>"
 
-#: ../src/gtkdialogs.c:277
+#: ../src/gtkdialogs.c:281
 msgid "Current Developers"
 msgstr "�廚廬���"
 
-#: ../src/gtkdialogs.c:292
+#: ../src/gtkdialogs.c:296
 msgid "Crazy Patch Writers"
 msgstr "���廨� 廬�廡���� ���廨廚��"
 
-#: ../src/gtkdialogs.c:307
+#: ../src/gtkdialogs.c:311
 msgid "Retired Developers"
 msgstr "�廚廬��� 廩廬廨�� �廣�廨"
 
-#: ../src/gtkdialogs.c:322
+#: ../src/gtkdialogs.c:326
 msgid "Current Translators"
 msgstr "�廬廨���� 廚廣����"
 
-#: ../src/gtkdialogs.c:342
+#: ../src/gtkdialogs.c:346
 msgid "Past Translators"
 msgstr "�廬廨���� �廩廣�廨"
 
-#: ../src/gtkdialogs.c:360
+#: ../src/gtkdialogs.c:364
 msgid "Debugging Information"
 msgstr "���廣 ���廚�� �����"
 
-#: ../src/gtkdialogs.c:566 ../src/gtkdialogs.c:703 ../src/gtkdialogs.c:766
+#: ../src/gtkdialogs.c:570 ../src/gtkdialogs.c:707 ../src/gtkdialogs.c:770
 msgid "_Name"
 msgstr "廩�_"
 
-#: ../src/gtkdialogs.c:571 ../src/gtkdialogs.c:708 ../src/gtkdialogs.c:771
+#: ../src/gtkdialogs.c:575 ../src/gtkdialogs.c:712 ../src/gtkdialogs.c:775
 msgid "_Account"
 msgstr " �廩���"
 
-#: ../src/gtkdialogs.c:579
+#: ../src/gtkdialogs.c:583
 msgid "New Instant Message"
 msgstr "���廣� ����廬 ��廩�"
 
-#: ../src/gtkdialogs.c:581
+#: ../src/gtkdialogs.c:585
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr "�� ��� �廬 廩� ���廣� ���� �廨廢��� �廩��� ���廣�."
 
-#: ../src/gtkdialogs.c:716
+#: ../src/gtkdialogs.c:720
 msgid "Get User Info"
 msgstr "���廣 ���� 廣� ��廩廬�廩"
 
-#: ../src/gtkdialogs.c:718
+#: ../src/gtkdialogs.c:722
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
 msgstr "�廩 ����� �廬 廩� ��廩廬�廩 �� ������ 廩� ���� 廩�廨廢���� �廡廨�� �廬 廚廨���."
 
-#: ../src/gtkdialogs.c:780
+#: ../src/gtkdialogs.c:784
 msgid "View User Log"
 msgstr "�廢� ���� 廩���廬 廣� ��廩廬�廩"
 
-#: ../src/gtkdialogs.c:782
+#: ../src/gtkdialogs.c:786
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
 msgstr ""
 "�廩 ����� �廬 廩� ��廩廬�廩 �� ������ 廩� ���� 廩�廨廢���� �廡廨�� ���� �廩���廬 ��廬�."
 
-#: ../src/gtkdialogs.c:801
+#: ../src/gtkdialogs.c:805
 msgid "Alias Contact"
 msgstr "廩� ��廖廝 ���廩 廡廩廨"
 
-#: ../src/gtkdialogs.c:802
+#: ../src/gtkdialogs.c:806
 msgid "Enter an alias for this contact."
 msgstr "��� 廩� ��廖廝 廣��廨 ��廩 廡廩廨 ��."
 
-#: ../src/gtkdialogs.c:804 ../src/gtkdialogs.c:826 ../src/gtkdialogs.c:846
-#: ../src/gtkrequest.c:279 ../src/protocols/silc/chat.c:586
+#: ../src/gtkdialogs.c:808 ../src/gtkdialogs.c:830 ../src/gtkdialogs.c:850
+#: ../src/gtkrequest.c:277 ../src/protocols/silc/chat.c:586
 msgid "Alias"
 msgstr "廩� ��廖廝"
 
-#: ../src/gtkdialogs.c:822
+#: ../src/gtkdialogs.c:826
 #, c-format
 msgid "Enter an alias for %s."
 msgstr ".%s ��� ����� ��廩 廣��廨"
 
-#: ../src/gtkdialogs.c:824
+#: ../src/gtkdialogs.c:828
 msgid "Alias Buddy"
 msgstr "廩� ��廖廝 ���廩 �廡廩廨"
 
-#: ../src/gtkdialogs.c:843
+#: ../src/gtkdialogs.c:847
 msgid "Alias Chat"
 msgstr "廩� ��廖廝 �廩���"
 
-#: ../src/gtkdialogs.c:844
+#: ../src/gtkdialogs.c:848
 msgid "Enter an alias for this chat."
 msgstr "��� 廩� ��廖廝 �廩��� ��."
 
-#: ../src/gtkdialogs.c:881
+#: ../src/gtkdialogs.c:885
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -3593,55 +3619,55 @@
 "��� �廨廢��� ���廩�� ���廖�廨 �廬 ��廩 �廡廩廨 ����� �廬 %s �廣�� %d ��廩� 廡廩廨 ��廨�� "
 "�廬��� �廬�� 廨廩��廬 ��廩� �廡廩廨 廩��?"
 
-#: ../src/gtkdialogs.c:889
+#: ../src/gtkdialogs.c:893
 msgid "Remove Contact"
 msgstr "�廖廨 ��廩 廡廩廨"
 
-#: ../src/gtkdialogs.c:890
+#: ../src/gtkdialogs.c:894
 msgid "_Remove Contact"
 msgstr "�_廖廨 ��廩 廡廩廨"
 
-#: ../src/gtkdialogs.c:941
+#: ../src/gtkdialogs.c:945
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
 "list.  Do you want to continue?"
 msgstr "��� �廨廢��� ���廩�� ���廖�廨 �廬 �廡��廢� %s ��� ��廨�� �廨廩��廬 ��廩� �廡廩廨 廩��?"
 
-#: ../src/gtkdialogs.c:944
+#: ../src/gtkdialogs.c:948
 msgid "Remove Group"
 msgstr "�廖廨 廡��廢�"
 
-#: ../src/gtkdialogs.c:945
+#: ../src/gtkdialogs.c:949
 msgid "_Remove Group"
 msgstr "�廖廨 _廡��廢�"
 
-#: ../src/gtkdialogs.c:978
+#: ../src/gtkdialogs.c:982
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "��� �廨廢��� ���廩�� ���廖�廨 �廬 %s �廨廩��廬 ��廩� �廡廩廨 廩��?"
 
-#: ../src/gtkdialogs.c:981
+#: ../src/gtkdialogs.c:985
 msgid "Remove Buddy"
 msgstr "�廖廨 ��廩 廡廩廨"
 
-#: ../src/gtkdialogs.c:982
+#: ../src/gtkdialogs.c:986
 msgid "_Remove Buddy"
 msgstr "�廖廨 ��廩 廡廩廨"
 
-#: ../src/gtkdialogs.c:1003
+#: ../src/gtkdialogs.c:1007
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "��� �廨廢��� ���廩�� ���廖�廨 �廬 �廢'�� %s �廨廩��廬 ��廩� �廡廩廨 廩��?"
 
-#: ../src/gtkdialogs.c:1006
+#: ../src/gtkdialogs.c:1010
 msgid "Remove Chat"
 msgstr "�廖廨 廩���"
 
-#: ../src/gtkdialogs.c:1007
+#: ../src/gtkdialogs.c:1011
 msgid "_Remove Chat"
 msgstr "�廖_廨 廩���"
 
@@ -3776,40 +3802,39 @@
 msgid "Paste as Plain _Text"
 msgstr "���廡 �廬�廨 _�廡廖� 廨���"
 
-#. XXX: make this new with mnemonic, and HIG-happy after string thaw
-#: ../src/gtkimhtml.c:834 ../src/gtkimhtmltoolbar.c:1030
-msgid "Clear formatting"
+#: ../src/gtkimhtml.c:833
+msgid "_Reset formatting"
 msgstr "�廡� 廚�廨��� �廡廖�"
 
+#: ../src/gtkimhtml.c:1327
+msgid "Hyperlink color"
+msgstr "廢�廣 廡�廩�廨��"
+
 #: ../src/gtkimhtml.c:1328
-msgid "Hyperlink color"
-msgstr "廢�廣 廡�廩�廨��"
-
-#: ../src/gtkimhtml.c:1329
 msgid "Color to draw hyperlinks."
 msgstr "廢�廣 �廢��廣 �� 廡�廩�廨��."
 
-#: ../src/gtkimhtml.c:1332
+#: ../src/gtkimhtml.c:1331
 msgid "Hyperlink prelight color"
 msgstr "廢�廣 廡�廩�廨�� �廚�� ���廢�"
 
-#: ../src/gtkimhtml.c:1333
+#: ../src/gtkimhtml.c:1332
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "�廢�廣 �廢��廣 �� 廡�廩�廨�� ��廩廨 �廣��廨 �廣����."
 
-#: ../src/gtkimhtml.c:1554
+#: ../src/gtkimhtml.c:1553
 msgid "_Copy E-Mail Address"
 msgstr "�廣廬廡 _�廬��廬 ����\"�"
 
-#: ../src/gtkimhtml.c:1566
+#: ../src/gtkimhtml.c:1565
 msgid "_Open Link in Browser"
 msgstr "_廚廬� �廬 �廡�廩�廨 ��廚�廚�"
 
-#: ../src/gtkimhtml.c:1576
+#: ../src/gtkimhtml.c:1575
 msgid "_Copy Link Location"
 msgstr "�_廣廬廡 ��廡�� �廡�廩�廨"
 
-#: ../src/gtkimhtml.c:3273
+#: ../src/gtkimhtml.c:3272
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -3819,7 +3844,7 @@
 "\n"
 "���� 廩�� �廖�� PNG."
 
-#: ../src/gtkimhtml.c:3276
+#: ../src/gtkimhtml.c:3275
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -3829,7 +3854,7 @@
 "\n"
 "���� 廩�� �廖�� PNG."
 
-#: ../src/gtkimhtml.c:3289
+#: ../src/gtkimhtml.c:3288
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -3840,7 +3865,7 @@
 "\n"
 "%s"
 
-#: ../src/gtkimhtml.c:3292
+#: ../src/gtkimhtml.c:3291
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -3851,11 +3876,11 @@
 "\n"
 "%s"
 
-#: ../src/gtkimhtml.c:3372 ../src/gtkimhtml.c:3384
+#: ../src/gtkimhtml.c:3371 ../src/gtkimhtml.c:3383
 msgid "Save Image"
 msgstr "廩��廨 廬����"
 
-#: ../src/gtkimhtml.c:3412
+#: ../src/gtkimhtml.c:3411
 msgid "_Save Image..."
 msgstr "廩��廨 _廬����..."
 
@@ -3947,6 +3972,10 @@
 msgid "Background color"
 msgstr "廢�廣 �廨廡廣"
 
+#: ../src/gtkimhtmltoolbar.c:1030
+msgid "Reset formatting"
+msgstr "�廡� 廚�廨��� �廡廖�"
+
 #: ../src/gtkimhtmltoolbar.c:1045
 msgid "Insert link"
 msgstr "���廖 廡�廩�廨"
@@ -4086,7 +4115,7 @@
 msgid "Open All Messages"
 msgstr "廚廬� �廬 �� ����廣�廬"
 
-#: ../src/gtknotify.c:409 ../src/protocols/jabber/jabber.c:1114
+#: ../src/gtknotify.c:409 ../src/protocols/jabber/jabber.c:1115
 msgid "From"
 msgstr "��廬"
 
@@ -4128,22 +4157,22 @@
 msgid "Buddy Information"
 msgstr "���廣 廣��廨 ��廩 �廡廩廨"
 
-#: ../src/gtknotify.c:882
-#, c-format
-msgid "The browser command <b>%s</b> is invalid."
-msgstr "�廚廡��� <b>%s</b> ��廚�廚�, ���� 廬廡廚�."
-
-#: ../src/gtknotify.c:884 ../src/gtknotify.c:896 ../src/gtknotify.c:909
-#: ../src/gtknotify.c:1034
+#: ../src/gtknotify.c:881
+#, c-format
+msgid "The browser command \"%s\" is invalid."
+msgstr "�廚廡��� \"%s\" ��廚�廚�, ���� 廬廡廚�."
+
+#: ../src/gtknotify.c:883 ../src/gtknotify.c:895 ../src/gtknotify.c:908
+#: ../src/gtknotify.c:1031
 msgid "Unable to open URL"
 msgstr "URL�� ��廬� �廚廬�� �廬 �-"
 
-#: ../src/gtknotify.c:894 ../src/gtknotify.c:907
-#, c-format
-msgid "Error launching <b>%s</b>: %s"
-msgstr "廩���� ��廚廣�廬 �廚廡��� <b>%s</b>: %s"
-
-#: ../src/gtknotify.c:1035
+#: ../src/gtknotify.c:893 ../src/gtknotify.c:906
+#, c-format
+msgid "Error launching \"%s\": %s"
+msgstr "廩���� ��廚廣�廬 �廚廡��� \"%s\": %s"
+
+#: ../src/gtknotify.c:1032
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "���廨� ���廢�廣 �廚廡��� '�����廬' 廩� ��廚�廚�, ��� �� �廡�廣� ��廨�� ���廢�廣."
@@ -4880,45 +4909,57 @@
 msgid "Are you sure you want to block %s?"
 msgstr "��� �廬/� ����/� 廩�廨廢��� ��廖�� �廬 %s?"
 
-#: ../src/gtkrequest.c:269 ../src/protocols/msn/dialog.c:114
+#: ../src/gtkrequest.c:267 ../src/protocols/msn/dialog.c:114
 #: ../src/protocols/msn/msn.c:559 ../src/protocols/msn/msn.c:568
 #: ../src/protocols/novell/novell.c:1921 ../src/protocols/silc/buddy.c:313
 #: ../src/protocols/silc/pk.c:117 ../src/protocols/silc/wb.c:303
 msgid "Yes"
 msgstr "��"
 
-#: ../src/gtkrequest.c:270 ../src/protocols/msn/dialog.c:115
+#: ../src/gtkrequest.c:268 ../src/protocols/msn/dialog.c:115
 #: ../src/protocols/msn/msn.c:559 ../src/protocols/msn/msn.c:568
 #: ../src/protocols/novell/novell.c:1922 ../src/protocols/silc/buddy.c:314
 #: ../src/protocols/silc/pk.c:118 ../src/protocols/silc/wb.c:304
 msgid "No"
 msgstr "��"
 
-#: ../src/gtkrequest.c:273
+#: ../src/gtkrequest.c:271
 msgid "Apply"
 msgstr "���"
 
-#: ../src/gtkrequest.c:274 ../src/protocols/msn/msn.c:357
+#: ../src/gtkrequest.c:272 ../src/protocols/msn/msn.c:357
 #: ../src/protocols/silc/util.c:336
 msgid "Close"
 msgstr "廖��廨"
 
-#: ../src/gtkrequest.c:1469
+#: ../src/gtkrequest.c:1467
 msgid "That file already exists"
 msgstr "�廡��廛 ��廨 廡���"
 
-#: ../src/gtkrequest.c:1470
+#: ../src/gtkrequest.c:1468
 msgid "Would you like to overwrite it?"
 msgstr "�廩�廬�?"
 
-#: ../src/gtkrequest.c:1514 ../src/gtkrequest.c:1555
+#: ../src/gtkrequest.c:1469
+msgid "Overwrite"
+msgstr "�廬�� �廣�"
+
+#: ../src/gtkrequest.c:1470
+msgid "Choose New Name"
+msgstr "��廨 廩� ��廩"
+
+#: ../src/gtkrequest.c:1512 ../src/gtkrequest.c:1553
 msgid "Save File..."
 msgstr "廩��廨� �廩�..."
 
-#: ../src/gtkrequest.c:1515 ../src/gtkrequest.c:1556
+#: ../src/gtkrequest.c:1513 ../src/gtkrequest.c:1554
 msgid "Open File..."
 msgstr "廚廬�..."
 
+#: ../src/gtkrequest.c:1601 ../src/gtkrequest.c:1615
+msgid "Select Folder..."
+msgstr "���廨廬 廬�廡��..."
+
 #: ../src/gtkroomlist.c:287
 msgid "_Add"
 msgstr "��廖廝"
@@ -4949,17 +4990,17 @@
 #. Available status messages are plain text
 #: ../src/gtksavedstatuses.c:459 ../src/gtksavedstatuses.c:920
 #: ../src/protocols/bonjour/bonjour.c:256
-#: ../src/protocols/bonjour/bonjour.c:263 ../src/protocols/gg/gg.c:1417
-#: ../src/protocols/gg/gg.c:1427 ../src/protocols/gg/gg.c:1433
-#: ../src/protocols/gg/gg.c:1442 ../src/protocols/gg/gg.c:1447
-#: ../src/protocols/irc/irc.c:227 ../src/protocols/jabber/jabber.c:1181
-#: ../src/protocols/jabber/jabber.c:1191 ../src/protocols/jabber/jabber.c:1201
-#: ../src/protocols/jabber/jabber.c:1211 ../src/protocols/jabber/jabber.c:1221
-#: ../src/protocols/jabber/jabber.c:1233 ../src/protocols/novell/novell.c:2868
+#: ../src/protocols/bonjour/bonjour.c:263 ../src/protocols/gg/gg.c:1461
+#: ../src/protocols/gg/gg.c:1471 ../src/protocols/gg/gg.c:1477
+#: ../src/protocols/gg/gg.c:1486 ../src/protocols/gg/gg.c:1491
+#: ../src/protocols/irc/irc.c:227 ../src/protocols/jabber/jabber.c:1182
+#: ../src/protocols/jabber/jabber.c:1192 ../src/protocols/jabber/jabber.c:1202
+#: ../src/protocols/jabber/jabber.c:1212 ../src/protocols/jabber/jabber.c:1222
+#: ../src/protocols/jabber/jabber.c:1234 ../src/protocols/novell/novell.c:2868
 #: ../src/protocols/novell/novell.c:2974 ../src/protocols/novell/novell.c:2980
-#: ../src/protocols/novell/novell.c:2986 ../src/protocols/oscar/oscar.c:7795
-#: ../src/protocols/oscar/oscar.c:7810 ../src/protocols/oscar/oscar.c:7815
-#: ../src/protocols/oscar/oscar.c:8024 ../src/protocols/oscar/oscar.c:8036
+#: ../src/protocols/novell/novell.c:2986 ../src/protocols/oscar/oscar.c:7801
+#: ../src/protocols/oscar/oscar.c:7816 ../src/protocols/oscar/oscar.c:7821
+#: ../src/protocols/oscar/oscar.c:8030 ../src/protocols/oscar/oscar.c:8042
 #: ../src/protocols/sametime/sametime.c:3274
 #: ../src/protocols/sametime/sametime.c:3280
 #: ../src/protocols/sametime/sametime.c:3286
@@ -4988,9 +5029,9 @@
 msgstr "廩���"
 
 #: ../src/gtksavedstatuses.c:909 ../src/gtksavedstatuses.c:1056
-#: ../src/protocols/gg/gg.c:1400 ../src/protocols/gg/gg.c:1404
+#: ../src/protocols/gg/gg.c:1444 ../src/protocols/gg/gg.c:1448
 #: ../src/protocols/jabber/buddy.c:623 ../src/protocols/jabber/buddy.c:630
-#: ../src/protocols/jabber/buddy.c:641 ../src/protocols/jabber/jabber.c:1152
+#: ../src/protocols/jabber/buddy.c:641 ../src/protocols/jabber/jabber.c:1153
 #: ../src/protocols/msn/msn.c:550 ../src/protocols/novell/novell.c:2867
 #: ../src/protocols/novell/novell.c:2871 ../src/protocols/oscar/oscar.c:849
 #: ../src/protocols/oscar/oscar.c:855 ../src/protocols/oscar/oscar.c:858
@@ -5061,19 +5102,19 @@
 msgid "Someone says your name in chat"
 msgstr "��廩�� ����廨 �廬 廩�� �廩���"
 
-#: ../src/gtksound.c:489
+#: ../src/gtksound.c:485
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr "�� ��廬� ��廩��廣 廢���, ����� 廩廡��廛 \"%s\" �� 廡���."
 
-#: ../src/gtksound.c:505
+#: ../src/gtksound.c:501
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
 msgstr ""
 "�� ��廬� ��廩��廣 廢��� ����� 廩���廨� ��廚廢�� \"廚廡���\", �� �廚廡��� �� ����廖�."
 
-#: ../src/gtksound.c:517
+#: ../src/gtksound.c:513
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
@@ -5081,10 +5122,6 @@
 msgstr ""
 "�� ��廬� ��廩��廣 �廬 �廢��� ����� 廩�� ��廬� ��廨�廛 �廬 廚廡��廬 ��廩�廣� 廩�廡�廣�: %s"
 
-#: ../src/gtkstatusbox.c:366
-msgid "Typing"
-msgstr "�廡���/�"
-
 #. connect to the server
 #: ../src/gtkstatusbox.c:368 ../src/protocols/irc/irc.c:313
 #: ../src/protocols/jabber/jabber.c:979 ../src/protocols/msn/session.c:349
@@ -5199,13 +5236,6 @@
 "�廨廨廬 廡��廛 �廚廣�� 廩� 廩���� �廣����. 廡廨�� ����� 廩廨廢�廬 �廩��� �廬 �� 廩��廚廣�� "
 "�廢��廣廣���, ��� �廬 ��廚廣�� 廣廢��."
 
-#. Write a local message to this conversation showing that a request for a
-#. * Doodle session has been made
-#.
-#: ../src/gtkwhiteboard.c:343 ../src/protocols/yahoo/yahoo_doodle.c:96
-msgid "Sent Doodle request."
-msgstr "�廩��� �廡廩廨 �廡廩廡廩."
-
 #: ../src/log.c:167
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">�廬���廬 �廨�廩�� ��� 廚��廡廢�廬 廡廨���</font></b>"
@@ -5230,7 +5260,7 @@
 msgid "XML"
 msgstr "XML"
 
-#: ../src/log.c:1077
+#: ../src/log.c:1083
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -5239,7 +5269,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;�廣�� "
 "�������&gt;:</b></font> %s<br/>\n"
 
-#: ../src/log.c:1079
+#: ../src/log.c:1085
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -5248,16 +5278,16 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;�廣�� "
 "�������&gt;:</b></font> %s<br/>\n"
 
-#: ../src/log.c:1136 ../src/log.c:1262
+#: ../src/log.c:1142 ../src/log.c:1273
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>�� ��廬� ��廢�� �廬 �廬�� �廨�廩��!</b></font>"
 
-#: ../src/log.c:1148 ../src/log.c:1276
+#: ../src/log.c:1154 ../src/log.c:1287
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>�� ��廬� �廡廨�� 廡��廛: %s</b></font>"
 
-#: ../src/log.c:1205
+#: ../src/log.c:1216
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <�廣��-�������>: %s\n"
@@ -5368,26 +5398,25 @@
 #. Creating the options for the protocol
 #. port to connect to
 #: ../src/protocols/bonjour/bonjour.c:579 ../src/protocols/irc/irc.c:900
-#: ../src/protocols/msn/msn.c:2048 ../src/protocols/napster/napster.c:724
+#: ../src/protocols/msn/msn.c:2054 ../src/protocols/napster/napster.c:724
 #: ../src/protocols/sametime/sametime.c:5643 ../src/protocols/silc/silc.c:1859
 msgid "Port"
 msgstr "�_廢���"
 
-#: ../src/protocols/bonjour/bonjour.c:582 ../src/protocols/gg/gg.c:562
-#: ../src/protocols/gg/gg.c:971
+#: ../src/protocols/bonjour/bonjour.c:582 ../src/protocols/gg/gg.c:605
+#: ../src/protocols/gg/gg.c:1015 ../src/protocols/jabber/jabber.c:770
 msgid "First name"
 msgstr "廩� 廚廨��"
 
-#: ../src/protocols/bonjour/bonjour.c:585 ../src/protocols/gg/gg.c:557
+#: ../src/protocols/bonjour/bonjour.c:585 ../src/protocols/gg/gg.c:600
+#: ../src/protocols/jabber/jabber.c:775
 msgid "Last name"
 msgstr "廩� �廩廚��"
 
-#: ../src/protocols/bonjour/bonjour.c:588 ../src/protocols/jabber/buddy.c:261
-#: ../src/protocols/jabber/buddy.c:779 ../src/protocols/jabber/buddy.c:787
-#: ../src/protocols/silc/silc.c:699 ../src/protocols/silc/silc.c:939
-#: ../src/protocols/silc/util.c:512
-#: ../src/protocols/yahoo/yahoo_profile.c:1030
-msgid "Email"
+#: ../src/protocols/bonjour/bonjour.c:588 ../src/protocols/gg/gg.c:468
+#: ../src/protocols/jabber/jabber.c:760 ../src/protocols/silc/silc.c:699
+#: ../src/protocols/silc/silc.c:939
+msgid "E-mail"
 msgstr "���\"�"
 
 #: ../src/protocols/bonjour/jabber.c:357
@@ -5415,307 +5444,314 @@
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "�� ��廬� �廩��� �廬 ����廣�, �� ��� �廚廩廨 ��廬��� �廬 �廩���."
 
-#: ../src/protocols/gg/gg.c:80 ../src/protocols/gg/gg.c:102
-#: ../src/protocols/gg/gg.c:137
+#: ../src/protocols/gg/gg.c:76 ../src/proxy.c:2345
+msgid "Invalid proxy settings"
+msgstr "���廨�廬 �� 廬廡廚�廬 廩� �廬�����"
+
+#: ../src/protocols/gg/gg.c:77 ../src/proxy.c:2345
+msgid ""
+"Either the host name or port number specified for your given proxy type is "
+"invalid."
+msgstr "�� �廬��廬 �廩廨廬 �� �廢��廬 �廩廨廬 廩��廬�� 廣��廨 廖�� ��廬��� 廩����廨�� 廬廡廚��."
+
+#: ../src/protocols/gg/gg.c:115 ../src/protocols/gg/gg.c:137
+#: ../src/protocols/gg/gg.c:180
 msgid "Token Error"
 msgstr "廩���廬 廣廨�"
 
-#: ../src/protocols/gg/gg.c:81 ../src/protocols/gg/gg.c:103
-#: ../src/protocols/gg/gg.c:138
+#: ../src/protocols/gg/gg.c:116 ../src/protocols/gg/gg.c:138
+#: ../src/protocols/gg/gg.c:181
 msgid "Unable to fetch the token.\n"
 msgstr "�� ��廬� ��廩�� �廬 �廣廨�.\n"
 
-#: ../src/protocols/gg/gg.c:226 ../src/protocols/gg/gg.c:245
+#: ../src/protocols/gg/gg.c:269 ../src/protocols/gg/gg.c:288
 msgid "Save Buddylist..."
 msgstr "廩��廨 �廬 廨廩��廬 ��廩� �廡廩廨..."
 
-#: ../src/protocols/gg/gg.c:227
+#: ../src/protocols/gg/gg.c:270
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "廨廩��廬 ��廩� �廡廩廨 廩�� 廨�廡�, �� ��廬� ���廣 �廡��廛."
 
-#: ../src/protocols/gg/gg.c:233 ../src/protocols/gg/gg.c:235
+#: ../src/protocols/gg/gg.c:276 ../src/protocols/gg/gg.c:278
 msgid "Couldn't open file"
 msgstr "�� ��廬� �廚廬�� �廬 �廡��廛"
 
-#: ../src/protocols/gg/gg.c:246
+#: ../src/protocols/gg/gg.c:289
 msgid "Buddylist saved successfully!"
 msgstr "廨廩��廬 ��廩� �廡廩廨 �廩�廨� ��廢���!"
 
-#: ../src/protocols/gg/gg.c:264 ../src/protocols/gg/gg.c:265
+#: ../src/protocols/gg/gg.c:307 ../src/protocols/gg/gg.c:308
 msgid "Couldn't load buddylist"
 msgstr "�� ��廬� ��廣�� �廬 廨廩��廬 ��廩� �廡廩廨"
 
-#: ../src/protocols/gg/gg.c:281
+#: ../src/protocols/gg/gg.c:324
 msgid "Load Buddylist..."
 msgstr "廚廬� 廨廩��廬 ��廩� 廡廩廨..."
 
-#: ../src/protocols/gg/gg.c:282
+#: ../src/protocols/gg/gg.c:325
 msgid "Buddylist loaded successfully!"
 msgstr "廨廩��廬 ��廩� �廡廩廨 ��廣�� ��廢���!"
 
-#: ../src/protocols/gg/gg.c:293
+#: ../src/protocols/gg/gg.c:336
 msgid "Save buddylist..."
 msgstr "廩��廨 �廬 廨廩��廬 ��廩� �廡廩廨..."
 
-#: ../src/protocols/gg/gg.c:337
+#: ../src/protocols/gg/gg.c:380
 msgid "Fill in the registration fields."
 msgstr "�廩 ���� �廬 廩��廬 ��廨廩��."
 
-#: ../src/protocols/gg/gg.c:342
+#: ../src/protocols/gg/gg.c:385
 msgid "Passwords do not match."
 msgstr "�廖�廖���廬 ���� 廬����廬."
 
-#: ../src/protocols/gg/gg.c:351
+#: ../src/protocols/gg/gg.c:394
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "�� ��廬� ��廢廣 �廨廩�� ��廩��� ��廩. ��廨廣� 廩����.\n"
 
-#: ../src/protocols/gg/gg.c:364
+#: ../src/protocols/gg/gg.c:407
 msgid "New Gadu-Gadu Account Registered"
 msgstr "��廩��� ��廨廩�� ��廩��� ���廩 廩� Gadu-Gadu"
 
-#: ../src/protocols/gg/gg.c:365
+#: ../src/protocols/gg/gg.c:408
 msgid "Registration completed successfully!"
 msgstr "�廨�廩�� ��廢廣 ��廢���"
 
-#: ../src/protocols/gg/gg.c:425 ../src/protocols/jabber/jabber.c:760
-msgid "E-Mail"
-msgstr "���廨"
-
-#: ../src/protocols/gg/gg.c:430 ../src/protocols/gg/gg.c:704
-#: ../src/protocols/jabber/jabber.c:749 ../src/protocols/jabber/jabber.c:1306
+#: ../src/protocols/gg/gg.c:473 ../src/protocols/gg/gg.c:747
+#: ../src/protocols/jabber/jabber.c:749 ../src/protocols/jabber/jabber.c:1307
 msgid "Password"
 msgstr "廖�廖��"
 
-#: ../src/protocols/gg/gg.c:435 ../src/protocols/gg/gg.c:709
+#: ../src/protocols/gg/gg.c:478 ../src/protocols/gg/gg.c:752
 msgid "Password (retype)"
 msgstr "廖�廖�� )廩��("
 
-#: ../src/protocols/gg/gg.c:440 ../src/protocols/gg/gg.c:714
+#: ../src/protocols/gg/gg.c:483 ../src/protocols/gg/gg.c:757
 msgid "Enter current token"
 msgstr "��� 廣廨� �����"
 
-#: ../src/protocols/gg/gg.c:446 ../src/protocols/gg/gg.c:720
+#: ../src/protocols/gg/gg.c:489 ../src/protocols/gg/gg.c:763
 msgid "Current token"
 msgstr "廣廨� �����"
 
-#: ../src/protocols/gg/gg.c:450 ../src/protocols/gg/gg.c:451
+#: ../src/protocols/gg/gg.c:493 ../src/protocols/gg/gg.c:494
 msgid "Register New Gadu-Gadu Account"
 msgstr "�廢廣 廨�廩�� ��廩��� ��廩 廩� Gadu-Gadu"
 
-#: ../src/protocols/gg/gg.c:452
+#: ../src/protocols/gg/gg.c:495
 msgid "Please, fill in the following fields"
 msgstr "�廩 ���� �廬 �廩��廬 �����"
 
-#: ../src/protocols/gg/gg.c:547 ../src/protocols/gg/gg.c:1606
+#: ../src/protocols/gg/gg.c:590 ../src/protocols/gg/gg.c:1657
 msgid "Unable to initiate a new search"
 msgstr "�� ��廬� ��廬�� ��廚�廩 ��廩"
 
-#: ../src/protocols/gg/gg.c:548 ../src/protocols/gg/gg.c:1607
+#: ../src/protocols/gg/gg.c:591 ../src/protocols/gg/gg.c:1658
 msgid "You have a pending search. Please wait for it to finish."
 msgstr "�廩 �� ��廚�廩 �廚廣���. �廩 ����廬 �廖����."
 
-#: ../src/protocols/gg/gg.c:567 ../src/protocols/gg/gg.c:974
-#: ../src/protocols/gg/gg.c:1997 ../src/protocols/jabber/buddy.c:252
+#. General
+#: ../src/protocols/gg/gg.c:610 ../src/protocols/gg/gg.c:1018
+#: ../src/protocols/gg/gg.c:2048 ../src/protocols/jabber/buddy.c:252
 #: ../src/protocols/jabber/buddy.c:695 ../src/protocols/jabber/buddy.c:1402
 #: ../src/protocols/jabber/jabber.c:765 ../src/protocols/msn/msn.c:1373
-#: ../src/protocols/silc/buddy.c:1528 ../src/protocols/silc/ops.c:1036
-#: ../src/protocols/silc/ops.c:1179 ../src/protocols/silc/ops.c:1328
-#: ../src/protocols/yahoo/yahoo_profile.c:1035
+#: ../src/protocols/msn/msn.c:1535 ../src/protocols/silc/buddy.c:1528
+#: ../src/protocols/silc/ops.c:1036 ../src/protocols/silc/ops.c:1179
+#: ../src/protocols/silc/ops.c:1328
+#: ../src/protocols/yahoo/yahoo_profile.c:1041
 msgid "Nickname"
 msgstr "�����"
 
-#: ../src/protocols/gg/gg.c:572 ../src/protocols/gg/gg.c:977
+#: ../src/protocols/gg/gg.c:615 ../src/protocols/gg/gg.c:1021
 #: ../src/protocols/jabber/jabber.c:785 ../src/protocols/oscar/oscar.c:6218
 #: ../src/protocols/oscar/oscar.c:6226
 msgid "City"
 msgstr "廣�廨"
 
-#: ../src/protocols/gg/gg.c:577
+#: ../src/protocols/gg/gg.c:620
 msgid "Year of birth"
 msgstr "廩�廬 ����"
 
-#: ../src/protocols/gg/gg.c:580 ../src/protocols/msn/msn.c:1532
+#: ../src/protocols/gg/gg.c:623 ../src/protocols/msn/msn.c:1537
 #: ../src/protocols/oscar/oscar.c:6192
-#: ../src/protocols/yahoo/yahoo_profile.c:1060
+#: ../src/protocols/yahoo/yahoo_profile.c:1066
 msgid "Gender"
 msgstr "���"
 
-#: ../src/protocols/gg/gg.c:581
+#: ../src/protocols/gg/gg.c:624
 msgid "Male or female"
 msgstr "��廨 �� �廡��"
 
-#: ../src/protocols/gg/gg.c:582 ../src/protocols/oscar/oscar.c:6192
+#: ../src/protocols/gg/gg.c:625 ../src/protocols/oscar/oscar.c:6192
 msgid "Male"
 msgstr "��廨"
 
-#: ../src/protocols/gg/gg.c:583 ../src/protocols/oscar/oscar.c:6192
+#: ../src/protocols/gg/gg.c:626 ../src/protocols/oscar/oscar.c:6192
 msgid "Female"
 msgstr "�廡��"
 
-#: ../src/protocols/gg/gg.c:587
+#: ../src/protocols/gg/gg.c:630
 msgid "Only online"
 msgstr "廨廡 �廩����廨"
 
-#: ../src/protocols/gg/gg.c:591 ../src/protocols/gg/gg.c:592
+#: ../src/protocols/gg/gg.c:634 ../src/protocols/gg/gg.c:635
 msgid "Find buddies"
 msgstr "�廚廩 ��廩� 廡廩廨"
 
-#: ../src/protocols/gg/gg.c:593
+#: ../src/protocols/gg/gg.c:636
 msgid "Please, enter your search criteria below"
 msgstr "�廩 ����� �廬 ���廨�廬 ���廚�廩 ����"
 
-#: ../src/protocols/gg/gg.c:630
+#: ../src/protocols/gg/gg.c:673
 msgid "Fill in the fields."
 msgstr "�廩 ���� �廬 �廩��廬."
 
-#: ../src/protocols/gg/gg.c:642
+#: ../src/protocols/gg/gg.c:685
 msgid "Your current password is different from the one that you specified."
 msgstr "�廖�廖�� ������廬 廩�� 廩��� ��� 廩�����."
 
-#: ../src/protocols/gg/gg.c:656
+#: ../src/protocols/gg/gg.c:699
 msgid "Unable to change password. Error occured.\n"
 msgstr "�� ��廬� �廩��廬 �廬 �廖�廖��. ��廨廣� 廩����.\n"
 
-#: ../src/protocols/gg/gg.c:665
+#: ../src/protocols/gg/gg.c:708
 msgid "Change password for the Gadu-Gadu account"
 msgstr "廩�� 廖�廖�� 廣��廨 �廩��� �-Gadu-Gadu."
 
-#: ../src/protocols/gg/gg.c:666
+#: ../src/protocols/gg/gg.c:709
 msgid "Password was changed successfully!"
 msgstr "�廖�廖�� 廩��廬� ��廢���!"
 
-#: ../src/protocols/gg/gg.c:699
+#: ../src/protocols/gg/gg.c:742
 msgid "Current password"
 msgstr "廖�廖�� �����廬"
 
-#: ../src/protocols/gg/gg.c:724
+#: ../src/protocols/gg/gg.c:767
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "�廩 ����� �廬 廖�廖�廬� ������廬 �廖�廖�廬� ���廩� 廣��廨 �廩廬�廩 �廖廚廨: "
 
-#: ../src/protocols/gg/gg.c:728 ../src/protocols/gg/gg.c:729
+#: ../src/protocols/gg/gg.c:771 ../src/protocols/gg/gg.c:772
 msgid "Change Gadu-Gadu Password"
 msgstr "廩���� 廖�廖�廬 Gadu-Gadu"
 
-#. TODO: s/screenname/alias/
-#: ../src/protocols/gg/gg.c:804
+#: ../src/protocols/gg/gg.c:846
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "��廨 廢'�� 廣��廨 ��廩 �廡廩廨: %s"
 
-#: ../src/protocols/gg/gg.c:807 ../src/protocols/gg/gg.c:808
+#: ../src/protocols/gg/gg.c:849 ../src/protocols/gg/gg.c:850
 msgid "Add to chat..."
 msgstr "��廖廝 �廩���..."
 
-#: ../src/protocols/gg/gg.c:950
+#: ../src/protocols/gg/gg.c:993
 msgid "No matching users found"
 msgstr "�� ��廢�� �廩廬�廩�� 廬�����"
 
-#: ../src/protocols/gg/gg.c:951
+#: ../src/protocols/gg/gg.c:994
 msgid "There are no users matching your search criteria."
 msgstr "�� ��廢�� �廩廬�廩�� �廬����� �廡廨��廨���� ���廚�廩 廩��."
 
-#: ../src/protocols/gg/gg.c:962 ../src/protocols/gg/gg.c:1029
+#: ../src/protocols/gg/gg.c:1006 ../src/protocols/gg/gg.c:1073
 #: ../src/protocols/oscar/oscar.c:6329
 msgid "Unable to display the search results."
 msgstr "�� ��廬� ��廢�� �廬 廬�廢��廬 ���廚�廩."
 
-#: ../src/protocols/gg/gg.c:968 ../src/protocols/oscar/oscar.c:6164
+#: ../src/protocols/gg/gg.c:1012 ../src/protocols/oscar/oscar.c:6164
 msgid "UIN"
 msgstr "�廖廚廨 �����"
 
-#: ../src/protocols/gg/gg.c:980
+#: ../src/protocols/gg/gg.c:1024
 msgid "Birth year"
 msgstr "廩�廬 ����"
 
-#: ../src/protocols/gg/gg.c:1020
+#: ../src/protocols/gg/gg.c:1064
 msgid "Gadu-Gadu Public Directory"
 msgstr "��廨�� 廢���廨� �-Gadu-Gadu"
 
-#: ../src/protocols/gg/gg.c:1021
+#: ../src/protocols/gg/gg.c:1065
 msgid "Search results"
 msgstr "廬�廢��廬 ��廚�廩"
 
-#: ../src/protocols/gg/gg.c:1118 ../src/protocols/gg/gg.c:1265
+#: ../src/protocols/gg/gg.c:1162 ../src/protocols/gg/gg.c:1309
 msgid "Unable to read socket"
 msgstr "��� �廚廩廨�廬 �廡廨�� �廬 �廩廡廣"
 
-#: ../src/protocols/gg/gg.c:1201
+#: ../src/protocols/gg/gg.c:1245
 msgid "Buddy list downloaded"
 msgstr "廨廩��廬 ��廩� �廡廩廨 ��廣廬廡�"
 
-#: ../src/protocols/gg/gg.c:1202
+#: ../src/protocols/gg/gg.c:1246
 msgid "Your buddy list was downloaded from the server."
 msgstr "廨廩��廬 ��廩� �廡廩廨 廩�� ��廣廬廡� �� �廩廨廬."
 
-#: ../src/protocols/gg/gg.c:1209
+#: ../src/protocols/gg/gg.c:1253
 msgid "Buddy list uploaded"
 msgstr "廨廩��廬 ��廩� �廡廩廨 �廩���"
 
-#: ../src/protocols/gg/gg.c:1210
+#: ../src/protocols/gg/gg.c:1254
 msgid "Your buddy list was stored on the server."
 msgstr "廨廩��廬 ��廩� �廡廩廨 廩�� ���廖�� 廣� �廩廨廬"
 
-#: ../src/protocols/gg/gg.c:1311 ../src/protocols/gg/gg.c:1528
+#: ../src/protocols/gg/gg.c:1355 ../src/protocols/gg/gg.c:1579
 msgid "Connection failed."
 msgstr "��廬��廨�廬 ��廩��."
 
-#: ../src/protocols/gg/gg.c:1441 ../src/protocols/msn/msn.c:566
+#: ../src/protocols/gg/gg.c:1485 ../src/protocols/msn/msn.c:566
 msgid "Blocked"
 msgstr "�廖��"
 
-#: ../src/protocols/gg/gg.c:1464
+#: ../src/protocols/gg/gg.c:1508
 msgid "Add to chat"
 msgstr "��廖廝 �廩���"
 
-#: ../src/protocols/gg/gg.c:1473
+#: ../src/protocols/gg/gg.c:1517
 msgid "Unblock"
 msgstr "�廖廨 �廖���"
 
-#: ../src/protocols/gg/gg.c:1477
+#: ../src/protocols/gg/gg.c:1521
 msgid "Block"
 msgstr "�廖��"
 
-#: ../src/protocols/gg/gg.c:1494
+#: ../src/protocols/gg/gg.c:1538
 msgid "Chat _name:"
 msgstr "廩� _廢'��:"
 
-#: ../src/protocols/gg/gg.c:1718
+#: ../src/protocols/gg/gg.c:1769
 msgid "Chat error"
 msgstr "廩���� �廢'��"
 
-#: ../src/protocols/gg/gg.c:1719
+#: ../src/protocols/gg/gg.c:1770
 msgid "This chat name is already in use"
 msgstr "廩� �廢'�� ��� ��廨 �廩���廩"
 
-#: ../src/protocols/gg/gg.c:1802
+#: ../src/protocols/gg/gg.c:1853
 msgid "Not connected to the server."
 msgstr "�� ����廨 �廩廨廬."
 
-#: ../src/protocols/gg/gg.c:1825
+#: ../src/protocols/gg/gg.c:1876
 msgid "Find buddies..."
 msgstr "�廚廩 ��廩� 廡廩廨..."
 
-#: ../src/protocols/gg/gg.c:1831
+#: ../src/protocols/gg/gg.c:1882
 msgid "Change password..."
 msgstr "廩�� 廖�廖��..."
 
-#: ../src/protocols/gg/gg.c:1837
+#: ../src/protocols/gg/gg.c:1888
 msgid "Upload buddylist to Server"
 msgstr "廩�� �廬 廨廩��廬 ��廩� �廡廩廨 �廩廨廬"
 
-#: ../src/protocols/gg/gg.c:1841
+#: ../src/protocols/gg/gg.c:1892
 msgid "Download buddylist from Server"
 msgstr "廩��廝 �廬 廨廩��廬 ��廩� �廡廩廨 ��廩廨廬"
 
-#: ../src/protocols/gg/gg.c:1845
+#: ../src/protocols/gg/gg.c:1896
 msgid "Delete buddylist from Server"
 msgstr "��廡 �廬 廨廩��廬 ��廩� 廡廩廨 ��廩廨廬"
 
-#: ../src/protocols/gg/gg.c:1849
+#: ../src/protocols/gg/gg.c:1900
 msgid "Save buddylist to file..."
 msgstr "廩��廨 �廬 廨廩��廬 ��廩� �廡廩廨 �廡��廛..."
 
-#: ../src/protocols/gg/gg.c:1853
+#: ../src/protocols/gg/gg.c:1904
 msgid "Load buddylist from file..."
 msgstr "�廣� �廬 廨廩��廬 ��廩� �廡廩廨 �廡��廛..."
 
@@ -5730,16 +5766,16 @@
 #. id
 #. name
 #. version
-#: ../src/protocols/gg/gg.c:1949
+#: ../src/protocols/gg/gg.c:2000
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "廬�廖廝 廚廨���廡�� Gadu-Gadu"
 
 #. summary
-#: ../src/protocols/gg/gg.c:1950
+#: ../src/protocols/gg/gg.c:2001
 msgid "Polish popular IM"
 msgstr "�廣廨�廬 ���廣�廬 廚�廚��廨�廬 �廚����"
 
-#: ../src/protocols/gg/gg.c:1998
+#: ../src/protocols/gg/gg.c:2049
 msgid "Gadu-Gadu User"
 msgstr "�廩廬�廩 Gadu-Gadu"
 
@@ -5864,8 +5900,8 @@
 msgstr "廬�廖廝 廚廨���廡�� IRC 廩廚��廬 ���廖"
 
 #. host to connect to
-#: ../src/protocols/irc/irc.c:897 ../src/protocols/irc/msgs.c:231
-#: ../src/protocols/jabber/jabber.c:1904
+#: ../src/protocols/irc/irc.c:897 ../src/protocols/irc/msgs.c:235
+#: ../src/protocols/jabber/jabber.c:1905
 #: ../src/protocols/napster/napster.c:719
 #: ../src/protocols/sametime/sametime.c:5638 ../src/protocols/silc/ops.c:1242
 #: ../src/protocols/silc/ops.c:1344 ../src/protocols/simple/simple.c:1754
@@ -5876,7 +5912,7 @@
 msgid "Encodings"
 msgstr "廡����"
 
-#: ../src/protocols/irc/irc.c:906 ../src/protocols/irc/msgs.c:225
+#: ../src/protocols/irc/irc.c:906 ../src/protocols/irc/msgs.c:229
 #: ../src/protocols/jabber/jabber.c:745 ../src/protocols/silc/buddy.c:1531
 #: ../src/protocols/silc/ops.c:1189 ../src/protocols/silc/ops.c:1191
 #: ../src/protocols/silc/ops.c:1338 ../src/protocols/silc/ops.c:1340
@@ -5884,7 +5920,8 @@
 msgid "Username"
 msgstr "廩� �廩廬�廩"
 
-#: ../src/protocols/irc/irc.c:909
+#: ../src/protocols/irc/irc.c:909 ../src/protocols/irc/msgs.c:230
+#: ../src/protocols/silc/silc.c:937
 msgid "Real name"
 msgstr "廩� ���廬�"
 
@@ -5896,207 +5933,206 @@
 msgid "Use SSL"
 msgstr "�廩廬�廩 �-SSL"
 
-#: ../src/protocols/irc/msgs.c:103
+#: ../src/protocols/irc/msgs.c:107
 msgid "Bad mode"
 msgstr "�廢� �� 廬廡��"
 
-#: ../src/protocols/irc/msgs.c:114
+#: ../src/protocols/irc/msgs.c:118
 #, c-format
 msgid "You are banned from %s."
 msgstr "��廖�� ��廩廬� � %s/"
 
-#: ../src/protocols/irc/msgs.c:115
+#: ../src/protocols/irc/msgs.c:119
 msgid "Banned"
 msgstr "�廖��"
 
-#: ../src/protocols/irc/msgs.c:132
+#: ../src/protocols/irc/msgs.c:136
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "�� ��廬� ��廖�� %s: 廨廩��廬 ��廖��� ����"
 
-#: ../src/protocols/irc/msgs.c:211 ../src/protocols/irc/msgs.c:231
-#: ../src/protocols/irc/msgs.c:244
+#: ../src/protocols/irc/msgs.c:215 ../src/protocols/irc/msgs.c:235
+#: ../src/protocols/irc/msgs.c:248
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../src/protocols/irc/msgs.c:211 ../src/protocols/oscar/oscar.c:6165
+#: ../src/protocols/irc/msgs.c:215 ../src/protocols/oscar/oscar.c:6165
 #: ../src/protocols/silc/ops.c:1412
 msgid "Nick"
 msgstr "�����"
 
-#: ../src/protocols/irc/msgs.c:214
+#: ../src/protocols/irc/msgs.c:218
 msgid " <i>(ircop)</i>"
 msgstr " <i>(廩��廨 廢�'�)</i>"
 
-#: ../src/protocols/irc/msgs.c:215
+#: ../src/protocols/irc/msgs.c:219
 msgid " <i>(identified)</i>"
 msgstr " <i>(�����)</i>"
 
-#: ../src/protocols/irc/msgs.c:219 ../src/protocols/irc/msgs.c:225
-#: ../src/protocols/irc/msgs.c:226 ../src/protocols/irc/msgs.c:237
+#: ../src/protocols/irc/msgs.c:223 ../src/protocols/irc/msgs.c:229
+#: ../src/protocols/irc/msgs.c:230 ../src/protocols/irc/msgs.c:241
 #: ../src/protocols/yahoo/yahoo_profile.c:691
 #, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s:</b> %s<br>"
 
-#: ../src/protocols/irc/msgs.c:226 ../src/protocols/silc/ops.c:1183
-#: ../src/protocols/silc/ops.c:1332
-#: ../src/protocols/yahoo/yahoo_profile.c:1040
-msgid "Realname"
-msgstr "廩� ���廬�"
-
-#: ../src/protocols/irc/msgs.c:237 ../src/protocols/silc/ops.c:1255
+#: ../src/protocols/irc/msgs.c:241 ../src/protocols/silc/ops.c:1255
 msgid "Currently on"
 msgstr "�廨�廣 �-"
 
-#: ../src/protocols/irc/msgs.c:242
+#: ../src/protocols/irc/msgs.c:246
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
 msgstr "<b>�� 廚廣�� ��廨:</b> %s<br>"
 
-#: ../src/protocols/irc/msgs.c:244
+#: ../src/protocols/irc/msgs.c:248
 msgid "Online since"
 msgstr "����廨 ���"
 
-#: ../src/protocols/irc/msgs.c:248
+#: ../src/protocols/irc/msgs.c:252
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr "<br><b>廩� �廬��廨 �����廨:</b> ����<br>"
 
-#: ../src/protocols/irc/msgs.c:318
+#: ../src/protocols/irc/msgs.c:326
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s 廩��� �廬 ���廩� ����廬: %s"
 
-#: ../src/protocols/irc/msgs.c:325
+#: ../src/protocols/irc/msgs.c:328
+#, c-format
+msgid "%s has cleared the topic."
+msgstr "%s ��廚廖 �廬 ���廩�."
+
+#: ../src/protocols/irc/msgs.c:336
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "���廩� 廩� %s ���: %s"
 
-#: ../src/protocols/irc/msgs.c:343
+#: ../src/protocols/irc/msgs.c:354
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "���廣廬 �� ���廨廬 '%s'"
 
-#: ../src/protocols/irc/msgs.c:344
+#: ../src/protocols/irc/msgs.c:355
 msgid "Unknown message"
 msgstr "���廣廬 �� ���廨廬"
 
-#: ../src/protocols/irc/msgs.c:344
+#: ../src/protocols/irc/msgs.c:355
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "���� 廩�� ���廣� 廩廩廨廬 �-IRC �� ����."
 
-#: ../src/protocols/irc/msgs.c:367
+#: ../src/protocols/irc/msgs.c:378
 #, c-format
 msgid "Users on %s: %s"
 msgstr "�廩廬�廩�� �-%s: %s"
 
-#: ../src/protocols/irc/msgs.c:495
+#: ../src/protocols/irc/msgs.c:506
 msgid "Time Response"
 msgstr "�廣�� ���"
 
-#: ../src/protocols/irc/msgs.c:496
+#: ../src/protocols/irc/msgs.c:507
 msgid "The IRC server's local time is:"
 msgstr "�廩廣� �廡���廬 �廢� 廩廨廬 �-IRC ���:"
 
-#: ../src/protocols/irc/msgs.c:507
+#: ../src/protocols/irc/msgs.c:518
 msgid "No such channel"
 msgstr "��� ��� 廣廨�廛"
 
 #. does this happen?
-#: ../src/protocols/irc/msgs.c:518
+#: ../src/protocols/irc/msgs.c:529
 msgid "no such channel"
 msgstr "��� ��� 廣廨�廛"
 
-#: ../src/protocols/irc/msgs.c:521
+#: ../src/protocols/irc/msgs.c:532
 msgid "User is not logged in"
 msgstr "��廩廬�廩 �� ����廨"
 
-#: ../src/protocols/irc/msgs.c:526
+#: ../src/protocols/irc/msgs.c:537
 msgid "No such nick or channel"
 msgstr "�� 廡��� ��� �廩廬�廩 �� 廣廨�廛"
 
-#: ../src/protocols/irc/msgs.c:546
+#: ../src/protocols/irc/msgs.c:557
 msgid "Could not send"
 msgstr "廩���廬 ��廖廨 ��廩��"
 
-#: ../src/protocols/irc/msgs.c:602
+#: ../src/protocols/irc/msgs.c:613
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "�廢�廨廚�廬 � %s ��廨廩廬 �����."
 
-#: ../src/protocols/irc/msgs.c:603
+#: ../src/protocols/irc/msgs.c:614
 msgid "Invitation only"
 msgstr "������ ����"
 
-#: ../src/protocols/irc/msgs.c:704
+#: ../src/protocols/irc/msgs.c:715
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "��廣�廬 廣\"�: %s (%s)"
 
 #. Remove user from channel
-#: ../src/protocols/irc/msgs.c:709 ../src/protocols/silc/ops.c:721
+#: ../src/protocols/irc/msgs.c:720 ../src/protocols/silc/ops.c:721
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "��廣� 廣\"� %s (%s)"
 
-#: ../src/protocols/irc/msgs.c:732
+#: ../src/protocols/irc/msgs.c:743
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "�廢� (%s %s) 廣\"� %s"
 
-#: ../src/protocols/irc/msgs.c:817 ../src/protocols/irc/msgs.c:818
+#: ../src/protocols/irc/msgs.c:828 ../src/protocols/irc/msgs.c:829
 msgid "Invalid nickname"
 msgstr "廩� ��廩廬�廩 �� ��廡�"
 
-#: ../src/protocols/irc/msgs.c:819
+#: ../src/protocols/irc/msgs.c:830
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr "������ 廩��廨廬 ���� 廣\"� �廩廨廬. ��廨�� ��� ���� ��廬��廬 �� ��廡��廬."
 
-#: ../src/protocols/irc/msgs.c:823
+#: ../src/protocols/irc/msgs.c:834
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr "廩� ��廩��� 廩��廨廬 ���� 廣\"� �廩廨廬. ��廨�� ��� ���� ��廬��廬 �� ��廡��廬."
 
-#: ../src/protocols/irc/msgs.c:863
+#: ../src/protocols/irc/msgs.c:873
 msgid "Cannot change nick"
 msgstr "�廩� �廩���� ������"
 
-#: ../src/protocols/irc/msgs.c:863
+#: ../src/protocols/irc/msgs.c:873
 msgid "Could not change nick"
 msgstr "��� �廚廩廨�廬 �廩��廬 �����"
 
-#: ../src/protocols/irc/msgs.c:884
+#: ../src/protocols/irc/msgs.c:894
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "廣��廬 �廬 �廣廨�廛%s%s"
 
-#: ../src/protocols/irc/msgs.c:926
+#: ../src/protocols/irc/msgs.c:936
 msgid "Error: invalid PONG from server"
 msgstr "廩����: �廬廡�� PONG �� 廬廡廝 ��廩廨廬"
 
-#: ../src/protocols/irc/msgs.c:928
+#: ../src/protocols/irc/msgs.c:938
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "�廣�� PING �� ��廩���� 廩�: %lu 廩���廬"
 
-#: ../src/protocols/irc/msgs.c:1003
+#: ../src/protocols/irc/msgs.c:1019
 #, c-format
 msgid "Cannot join %s:"
 msgstr "�� ��廬� ��廢�廨廝 � %s:"
 
-#: ../src/protocols/irc/msgs.c:1004 ../src/protocols/silc/ops.c:1128
+#: ../src/protocols/irc/msgs.c:1020 ../src/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "�� ��廬� ��廢�廨廝 �廣廨�廛"
 
-#: ../src/protocols/irc/msgs.c:1038
+#: ../src/protocols/irc/msgs.c:1054
 msgid "Nick or channel is temporarily unavailable."
 msgstr "廩� ������ �� �廣廨�廛 �� ������ �廨�廣."
 
-#: ../src/protocols/irc/msgs.c:1050
+#: ../src/protocols/irc/msgs.c:1066
 #, c-format
 msgid "Wallops from %s"
 msgstr "��廚� �-%s"
@@ -6201,7 +6237,7 @@
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [廣廨�廛]:  �廢� �廬 廨廩��廬 ��廩廬�廩�� 廩�廨�廣 �廣廨�廛."
 
-#: ../src/protocols/irc/parse.c:129 ../src/protocols/jabber/jabber.c:1742
+#: ../src/protocols/irc/parse.c:129 ../src/protocols/jabber/jabber.c:1743
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;����� ��廩&gt;:  廩���� 廩� ������ 廩��."
 
@@ -6406,7 +6442,6 @@
 msgstr "����廨"
 
 #: ../src/protocols/jabber/buddy.c:258 ../src/protocols/jabber/buddy.c:745
-#: ../src/protocols/jabber/jabber.c:795
 msgid "Postal Code"
 msgstr "��廡��"
 
@@ -6420,6 +6455,13 @@
 msgid "Telephone"
 msgstr "��廚��"
 
+#: ../src/protocols/jabber/buddy.c:261 ../src/protocols/jabber/buddy.c:779
+#: ../src/protocols/jabber/buddy.c:787 ../src/protocols/silc/ops.c:1075
+#: ../src/protocols/silc/util.c:512
+#: ../src/protocols/yahoo/yahoo_profile.c:1036
+msgid "E-Mail"
+msgstr "���廨"
+
 #: ../src/protocols/jabber/buddy.c:262 ../src/protocols/jabber/buddy.c:802
 msgid "Organization Name"
 msgstr "廩� ���廨���"
@@ -6433,7 +6475,7 @@
 msgstr "廬廚廡��"
 
 #: ../src/protocols/jabber/buddy.c:266 ../src/protocols/jabber/buddy.c:698
-#: ../src/protocols/oscar/oscar.c:6198
+#: ../src/protocols/msn/msn.c:1594 ../src/protocols/oscar/oscar.c:6198
 msgid "Birthday"
 msgstr "��� ����廬"
 
@@ -6447,7 +6489,7 @@
 "comfortable."
 msgstr "�� �廚廨���� ���� �� ���廨�. �廩 ����� 廨廡 �廬 ����廣 廩�廬/� �廨��廩/� ��� �廬廬."
 
-#: ../src/protocols/jabber/buddy.c:639 ../src/protocols/jabber/jabber.c:1907
+#: ../src/protocols/jabber/buddy.c:639 ../src/protocols/jabber/jabber.c:1908
 msgid "Resource"
 msgstr "�廩��"
 
@@ -6498,12 +6540,12 @@
 msgstr "��� �廬 ����� "
 
 #: ../src/protocols/jabber/buddy.c:1097 ../src/protocols/jabber/chat.c:677
-#: ../src/protocols/jabber/chat.c:688 ../src/protocols/jabber/jabber.c:1164
+#: ../src/protocols/jabber/chat.c:688 ../src/protocols/jabber/jabber.c:1165
 #: ../src/protocols/silc/ops.c:1449
 msgid "Error"
 msgstr "廩����"
 
-#: ../src/protocols/jabber/buddy.c:1103 ../src/protocols/jabber/jabber.c:1189
+#: ../src/protocols/jabber/buddy.c:1103 ../src/protocols/jabber/jabber.c:1190
 msgid "Chatty"
 msgstr "廚�廚��"
 
@@ -6511,8 +6553,8 @@
 msgid "Extended Away"
 msgstr "�廣�廨�廬 ���廩�廬"
 
-#: ../src/protocols/jabber/buddy.c:1109 ../src/protocols/jabber/jabber.c:1219
-#: ../src/protocols/oscar/oscar.c:787 ../src/protocols/oscar/oscar.c:8053
+#: ../src/protocols/jabber/buddy.c:1109 ../src/protocols/jabber/jabber.c:1220
+#: ../src/protocols/oscar/oscar.c:787 ../src/protocols/oscar/oscar.c:8059
 #: ../src/protocols/sametime/sametime.c:3285
 msgid "Do Not Disturb"
 msgstr "�� �� ��廚廨�廣"
@@ -6525,17 +6567,17 @@
 msgid "Fill in one or more fields to search for any matching Jabber users."
 msgstr "�廩 ����� ��� �� ��廬廨 �� �廩��廬 ���廢�廣 ��廚�廩 廩� �廩廬�廩� Jabber �廬�����."
 
-#: ../src/protocols/jabber/buddy.c:1392 ../src/protocols/jabber/jabber.c:770
-#: ../src/protocols/oscar/oscar.c:6175 ../src/protocols/silc/ops.c:1024
+#: ../src/protocols/jabber/buddy.c:1392 ../src/protocols/oscar/oscar.c:6175
+#: ../src/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr "廩� 廚廨��"
 
-#: ../src/protocols/jabber/buddy.c:1397 ../src/protocols/jabber/jabber.c:775
-#: ../src/protocols/oscar/oscar.c:6176
+#: ../src/protocols/jabber/buddy.c:1397 ../src/protocols/oscar/oscar.c:6176
 msgid "Last Name"
 msgstr "廩� �廩廚��"
 
-#: ../src/protocols/jabber/buddy.c:1407
+#: ../src/protocols/jabber/buddy.c:1407 ../src/protocols/novell/novell.c:1490
+#: ../src/protocols/oscar/oscar.c:6178 ../src/protocols/oscar/oscar.c:6185
 msgid "E-Mail Address"
 msgstr "�廬��廬 ���\"�"
 
@@ -6559,7 +6601,7 @@
 msgid "Search Directory"
 msgstr "�廚廩 �廖廚廨���"
 
-#: ../src/protocols/jabber/chat.c:41 ../src/protocols/oscar/oscar.c:7546
+#: ../src/protocols/jabber/chat.c:41 ../src/protocols/oscar/oscar.c:7552
 #: ../src/protocols/yahoo/yahoochat.c:998
 msgid "_Room:"
 msgstr "_��廨:"
@@ -6674,7 +6716,7 @@
 msgid "Registration Successful"
 msgstr "廨�廩�� ��廢廣 ��廢���"
 
-#: ../src/protocols/jabber/jabber.c:599 ../src/protocols/jabber/jabber.c:1455
+#: ../src/protocols/jabber/jabber.c:599 ../src/protocols/jabber/jabber.c:1456
 msgid "Unknown Error"
 msgstr "廩���� �� ���廣�"
 
@@ -6691,6 +6733,10 @@
 msgid "State"
 msgstr "����"
 
+#: ../src/protocols/jabber/jabber.c:795
+msgid "Postal code"
+msgstr "��廡��"
+
 #: ../src/protocols/jabber/jabber.c:800 ../src/protocols/silc/ops.c:1069
 #: ../src/protocols/silc/silc.c:701 ../src/protocols/silc/util.c:514
 msgid "Phone"
@@ -6720,329 +6766,329 @@
 msgid "Re-initializing Stream"
 msgstr "��廬�� �廬 ��廨� ���廩"
 
-#: ../src/protocols/jabber/jabber.c:1068 ../src/protocols/jabber/jabber.c:1433
-#: ../src/protocols/jabber/jabber.c:1474 ../src/protocols/jabber/jabber.c:1508
-#: ../src/protocols/oscar/oscar.c:856 ../src/protocols/oscar/oscar.c:7843
+#: ../src/protocols/jabber/jabber.c:1069 ../src/protocols/jabber/jabber.c:1434
+#: ../src/protocols/jabber/jabber.c:1475 ../src/protocols/jabber/jabber.c:1509
+#: ../src/protocols/oscar/oscar.c:856 ../src/protocols/oscar/oscar.c:7849
 msgid "Not Authorized"
 msgstr "�� ��廨廩�"
 
-#: ../src/protocols/jabber/jabber.c:1110
+#: ../src/protocols/jabber/jabber.c:1111
 msgid "Both"
 msgstr "廩����"
 
-#: ../src/protocols/jabber/jabber.c:1112
+#: ../src/protocols/jabber/jabber.c:1113
 msgid "From (To pending)"
 msgstr "��廬 (�� ��廩��)"
 
-#: ../src/protocols/jabber/jabber.c:1117
+#: ../src/protocols/jabber/jabber.c:1118
 msgid "To"
 msgstr "��"
 
-#: ../src/protocols/jabber/jabber.c:1119
+#: ../src/protocols/jabber/jabber.c:1120
 msgid "None (To pending)"
 msgstr "��� (�� ��廩��)"
 
-#: ../src/protocols/jabber/jabber.c:1123
+#: ../src/protocols/jabber/jabber.c:1124
 msgid "Subscription"
 msgstr "����"
 
-#: ../src/protocols/jabber/jabber.c:1180 ../src/protocols/jabber/jabber.c:1190
-#: ../src/protocols/jabber/jabber.c:1200 ../src/protocols/jabber/jabber.c:1210
-#: ../src/protocols/jabber/jabber.c:1220
+#: ../src/protocols/jabber/jabber.c:1181 ../src/protocols/jabber/jabber.c:1191
+#: ../src/protocols/jabber/jabber.c:1201 ../src/protocols/jabber/jabber.c:1211
+#: ../src/protocols/jabber/jabber.c:1221
 msgid "Priority"
 msgstr "廣��廚�廬"
 
-#: ../src/protocols/jabber/jabber.c:1249
+#: ../src/protocols/jabber/jabber.c:1250
 msgid "Password Changed"
 msgstr "廖�廖�� 廩��廬�"
 
-#: ../src/protocols/jabber/jabber.c:1250
+#: ../src/protocols/jabber/jabber.c:1251
 msgid "Your password has been changed."
 msgstr "�廖�廖�� 廩�� 廩��廬�."
 
-#: ../src/protocols/jabber/jabber.c:1254 ../src/protocols/jabber/jabber.c:1255
+#: ../src/protocols/jabber/jabber.c:1255 ../src/protocols/jabber/jabber.c:1256
 msgid "Error changing password"
 msgstr "廩���� ����� 廩���� �廖�廖��"
 
-#: ../src/protocols/jabber/jabber.c:1311
+#: ../src/protocols/jabber/jabber.c:1312
 msgid "Password (again)"
 msgstr "廖�廖�� (廩��廬)"
 
-#: ../src/protocols/jabber/jabber.c:1316 ../src/protocols/jabber/jabber.c:1317
+#: ../src/protocols/jabber/jabber.c:1317 ../src/protocols/jabber/jabber.c:1318
 msgid "Change Jabber Password"
 msgstr "�廖�廖�� 廩�� 廩��廬� ��廢���"
 
-#: ../src/protocols/jabber/jabber.c:1317
+#: ../src/protocols/jabber/jabber.c:1318
 msgid "Please enter your new password"
 msgstr "��� �廬 �廖�廖�� ���廩� 廩��."
 
-#: ../src/protocols/jabber/jabber.c:1327 ../src/protocols/oscar/oscar.c:8477
+#: ../src/protocols/jabber/jabber.c:1328 ../src/protocols/oscar/oscar.c:8483
 #: ../src/protocols/silc/silc.c:1023
 msgid "Set User Info..."
 msgstr "廡�廣 �廬 ����廣 廣� ��廩廬�廩..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../src/protocols/jabber/jabber.c:1332 ../src/protocols/oscar/oscar.c:8488
+#: ../src/protocols/jabber/jabber.c:1333 ../src/protocols/oscar/oscar.c:8494
 #: ../src/protocols/silc/silc.c:1019
 msgid "Change Password..."
 msgstr "廩�� 廖�廖��..."
 
 #. }
-#: ../src/protocols/jabber/jabber.c:1337
+#: ../src/protocols/jabber/jabber.c:1338
 msgid "Search for Users..."
 msgstr "_�廚廩 �廩廬�廩��..."
 
-#: ../src/protocols/jabber/jabber.c:1413
+#: ../src/protocols/jabber/jabber.c:1414
 msgid "Bad Request"
 msgstr "�廡廩� 廩����"
 
-#: ../src/protocols/jabber/jabber.c:1415
+#: ../src/protocols/jabber/jabber.c:1416
 msgid "Conflict"
 msgstr "�廬��廩�廬"
 
-#: ../src/protocols/jabber/jabber.c:1417
+#: ../src/protocols/jabber/jabber.c:1418
 msgid "Feature Not Implemented"
 msgstr "�廨� ��廩�."
 
-#: ../src/protocols/jabber/jabber.c:1419
+#: ../src/protocols/jabber/jabber.c:1420
 msgid "Forbidden"
 msgstr "�廖�廨"
 
-#: ../src/protocols/jabber/jabber.c:1421
+#: ../src/protocols/jabber/jabber.c:1422
 msgid "Gone"
 msgstr "��-��廢�"
 
-#: ../src/protocols/jabber/jabber.c:1423 ../src/protocols/jabber/jabber.c:1498
+#: ../src/protocols/jabber/jabber.c:1424 ../src/protocols/jabber/jabber.c:1499
 msgid "Internal Server Error"
 msgstr "廩���� 廚����廬 �廩廨廬"
 
-#: ../src/protocols/jabber/jabber.c:1425
+#: ../src/protocols/jabber/jabber.c:1426
 msgid "Item Not Found"
 msgstr "廚廨�� �� ��廢�"
 
-#: ../src/protocols/jabber/jabber.c:1427
+#: ../src/protocols/jabber/jabber.c:1428
 msgid "Malformed Jabber ID"
 msgstr "����� �廩廬�廩 Jabber �� 廬廡��"
 
-#: ../src/protocols/jabber/jabber.c:1429
+#: ../src/protocols/jabber/jabber.c:1430
 msgid "Not Acceptable"
 msgstr "�� 廡���"
 
-#: ../src/protocols/jabber/jabber.c:1431
+#: ../src/protocols/jabber/jabber.c:1432
 msgid "Not Allowed"
 msgstr "�� ��廨廩�"
 
-#: ../src/protocols/jabber/jabber.c:1435
+#: ../src/protocols/jabber/jabber.c:1436
 msgid "Payment Required"
 msgstr "��廨廩 廬廩���"
 
-#: ../src/protocols/jabber/jabber.c:1437
+#: ../src/protocols/jabber/jabber.c:1438
 msgid "Recipient Unavailable"
 msgstr "��廣� �� ����"
 
-#: ../src/protocols/jabber/jabber.c:1441
+#: ../src/protocols/jabber/jabber.c:1442
 msgid "Registration Required"
 msgstr "��廨廩廬 �廨廩��"
 
-#: ../src/protocols/jabber/jabber.c:1443
+#: ../src/protocols/jabber/jabber.c:1444
 msgid "Remote Server Not Found"
 msgstr "廩廨廬 �� ��廢�"
 
-#: ../src/protocols/jabber/jabber.c:1445
+#: ../src/protocols/jabber/jabber.c:1446
 msgid "Remote Server Timeout"
 msgstr "廬� ���� ���廡廢� �廬廡廩�廨廬 廩廨廬"
 
-#: ../src/protocols/jabber/jabber.c:1447
+#: ../src/protocols/jabber/jabber.c:1448
 msgid "Server Overloaded"
 msgstr "廣��廖 �廬廨 廣� �廩廨廬"
 
-#: ../src/protocols/jabber/jabber.c:1449
+#: ../src/protocols/jabber/jabber.c:1450
 msgid "Service Unavailable"
 msgstr "�廩�廨�廬 ���� ����"
 
-#: ../src/protocols/jabber/jabber.c:1451
+#: ../src/protocols/jabber/jabber.c:1452
 msgid "Subscription Required"
 msgstr "��廨廩 ����"
 
-#: ../src/protocols/jabber/jabber.c:1453
+#: ../src/protocols/jabber/jabber.c:1454
 msgid "Unexpected Request"
 msgstr "�廡廩� �� 廢廚����"
 
-#: ../src/protocols/jabber/jabber.c:1460
+#: ../src/protocols/jabber/jabber.c:1461
 msgid "Authorization Aborted"
 msgstr "����廬 ����"
 
-#: ../src/protocols/jabber/jabber.c:1462
+#: ../src/protocols/jabber/jabber.c:1463
 msgid "Incorrect encoding in authorization"
 msgstr "廡���� 廩��� �����廬"
 
-#: ../src/protocols/jabber/jabber.c:1465
+#: ../src/protocols/jabber/jabber.c:1466
 msgid "Invalid authzid"
 msgstr "authzid �� 廬廡廝"
 
-#: ../src/protocols/jabber/jabber.c:1468
+#: ../src/protocols/jabber/jabber.c:1469
 msgid "Invalid Authorization Mechanism"
 msgstr "������ �����廬 �� 廬廡廝"
 
-#: ../src/protocols/jabber/jabber.c:1471
+#: ../src/protocols/jabber/jabber.c:1472
 msgid "Authorization mechanism too weak"
 msgstr "������ �����廬 ��廩 ���"
 
-#: ../src/protocols/jabber/jabber.c:1476
+#: ../src/protocols/jabber/jabber.c:1477
 msgid "Temporary Authentication Failure"
 msgstr "�廩� ���� �����廬"
 
-#: ../src/protocols/jabber/jabber.c:1479
+#: ../src/protocols/jabber/jabber.c:1480
 msgid "Authentication Failure"
 msgstr "�廩� �����廬"
 
-#: ../src/protocols/jabber/jabber.c:1483
+#: ../src/protocols/jabber/jabber.c:1484
 msgid "Bad Format"
 msgstr "���� �� 廬廡��"
 
-#: ../src/protocols/jabber/jabber.c:1485
+#: ../src/protocols/jabber/jabber.c:1486
 msgid "Bad Namespace Prefix"
 msgstr "�廬�� �廡廩廨-廩� 廩���"
 
-#: ../src/protocols/jabber/jabber.c:1488
+#: ../src/protocols/jabber/jabber.c:1489
 msgid "Resource Conflict"
 msgstr "�廬��廩���廬 �廩����"
 
-#: ../src/protocols/jabber/jabber.c:1490 ../src/protocols/silc/ops.c:1728
+#: ../src/protocols/jabber/jabber.c:1491 ../src/protocols/silc/ops.c:1728
 msgid "Connection Timeout"
 msgstr "��� ���� ���廡廢� �����廨"
 
-#: ../src/protocols/jabber/jabber.c:1492
+#: ../src/protocols/jabber/jabber.c:1493
 msgid "Host Gone"
 msgstr "���廨� �廣��"
 
-#: ../src/protocols/jabber/jabber.c:1494
+#: ../src/protocols/jabber/jabber.c:1495
 msgid "Host Unknown"
 msgstr "��廨� �� ���廨"
 
-#: ../src/protocols/jabber/jabber.c:1496
+#: ../src/protocols/jabber/jabber.c:1497
 msgid "Improper Addressing"
 msgstr "��廬��廬 �� �����"
 
-#: ../src/protocols/jabber/jabber.c:1500
+#: ../src/protocols/jabber/jabber.c:1501
 msgid "Invalid ID"
 msgstr "����� �� 廬廡��"
 
-#: ../src/protocols/jabber/jabber.c:1502
+#: ../src/protocols/jabber/jabber.c:1503
 msgid "Invalid Namespace"
 msgstr "�廡廩廨-廩� �� 廬廡廝"
 
-#: ../src/protocols/jabber/jabber.c:1504
+#: ../src/protocols/jabber/jabber.c:1505
 msgid "Invalid XML"
 msgstr "XML 廩���"
 
-#: ../src/protocols/jabber/jabber.c:1506
+#: ../src/protocols/jabber/jabber.c:1507
 msgid "Non-matching Hosts"
 msgstr "��廨��� �� 廬�����"
 
-#: ../src/protocols/jabber/jabber.c:1510
+#: ../src/protocols/jabber/jabber.c:1511
 msgid "Policy Violation"
 msgstr "����� ��廖��"
 
-#: ../src/protocols/jabber/jabber.c:1512
+#: ../src/protocols/jabber/jabber.c:1513
 msgid "Remote Connection Failed"
 msgstr "廩���廬 廬廡廩�廨廬 �廢� ��廨��廡"
 
-#: ../src/protocols/jabber/jabber.c:1514
+#: ../src/protocols/jabber/jabber.c:1515
 msgid "Resource Constraint"
 msgstr "����廬 �廩����"
 
-#: ../src/protocols/jabber/jabber.c:1516
+#: ../src/protocols/jabber/jabber.c:1517
 msgid "Restricted XML"
 msgstr "XML �����"
 
-#: ../src/protocols/jabber/jabber.c:1518
+#: ../src/protocols/jabber/jabber.c:1519
 msgid "See Other Host"
 msgstr "廢廚� ���廨� ��廨"
 
-#: ../src/protocols/jabber/jabber.c:1520
+#: ../src/protocols/jabber/jabber.c:1521
 msgid "System Shutdown"
 msgstr "����� ��廣廨�廬"
 
-#: ../src/protocols/jabber/jabber.c:1522
+#: ../src/protocols/jabber/jabber.c:1523
 msgid "Undefined Condition"
 msgstr "�廡廨� �� ����廨 �廨�廩"
 
-#: ../src/protocols/jabber/jabber.c:1524
+#: ../src/protocols/jabber/jabber.c:1525
 msgid "Unsupported Encoding"
 msgstr "廡���� 廩�� �廬��"
 
-#: ../src/protocols/jabber/jabber.c:1526
+#: ../src/protocols/jabber/jabber.c:1527
 msgid "Unsupported Stanza Type"
 msgstr "廖�� 廖���� 廩�� �廬��廬"
 
-#: ../src/protocols/jabber/jabber.c:1528
+#: ../src/protocols/jabber/jabber.c:1529
 msgid "Unsupported Version"
 msgstr "��廨廖� ��� 廬����"
 
-#: ../src/protocols/jabber/jabber.c:1530
+#: ../src/protocols/jabber/jabber.c:1531
 msgid "XML Not Well Formed"
 msgstr "XML �� ����� ����"
 
-#: ../src/protocols/jabber/jabber.c:1532
+#: ../src/protocols/jabber/jabber.c:1533
 msgid "Stream Error"
 msgstr "廩���� ��廨�"
 
-#: ../src/protocols/jabber/jabber.c:1599
+#: ../src/protocols/jabber/jabber.c:1600
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "�� ��廬� ��廖�� �廩廬�廩 %s"
 
-#: ../src/protocols/jabber/jabber.c:1619
+#: ../src/protocols/jabber/jabber.c:1620
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "����廖 �� ���廨: %s"
 
-#: ../src/protocols/jabber/jabber.c:1624
+#: ../src/protocols/jabber/jabber.c:1625
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "�� ��廬� ����廖 �廬 �廩廬�廩 %s �廬�廨 \"%s\""
 
-#: ../src/protocols/jabber/jabber.c:1643
+#: ../src/protocols/jabber/jabber.c:1644
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "廬廚廡�� �� ���廨: \"%s\""
 
-#: ../src/protocols/jabber/jabber.c:1650
+#: ../src/protocols/jabber/jabber.c:1651
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "�� ��廬� �廡��廣 廬廚廡�� \"%s\" 廣��廨 �廩廬�廩: %s"
 
-#: ../src/protocols/jabber/jabber.c:1703
+#: ../src/protocols/jabber/jabber.c:1704
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "�� ��廬� ��廣�� ��廩廬�廩 %s"
 
-#: ../src/protocols/jabber/jabber.c:1734
+#: ../src/protocols/jabber/jabber.c:1735
 msgid "config:  Configure a chat room."
 msgstr "config:  廡�廣 ���廨�廬 ��廨 廢'��."
 
-#: ../src/protocols/jabber/jabber.c:1738
+#: ../src/protocols/jabber/jabber.c:1739
 msgid "configure:  Configure a chat room."
 msgstr "configure:  廡�廣 ���廨�廬 ��廨 廢'��."
 
-#: ../src/protocols/jabber/jabber.c:1747
+#: ../src/protocols/jabber/jabber.c:1748
 msgid "part [room]:  Leave the room."
 msgstr "part [��廨]:  廣��� �廬 ���廨."
 
-#: ../src/protocols/jabber/jabber.c:1752
+#: ../src/protocols/jabber/jabber.c:1753
 msgid "register:  Register with a chat room."
 msgstr "register:  �廨廩� ���廨 廢'��."
 
-#: ../src/protocols/jabber/jabber.c:1758
+#: ../src/protocols/jabber/jabber.c:1759
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [��廩� ��廩]:  �廢� �� 廩�� �廬 ���廩�."
 
-#: ../src/protocols/jabber/jabber.c:1764
+#: ../src/protocols/jabber/jabber.c:1765
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;�廩廬�廩&gt; [��廨]:  �廖�� �廩廬�廩 �� ���廨."
 
-#: ../src/protocols/jabber/jabber.c:1770
+#: ../src/protocols/jabber/jabber.c:1771
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -7050,7 +7096,7 @@
 "affiliate &lt;�廩廬�廩&gt; &lt;�廣���|�廚廣��|��廨|����廬|���&gt;: 廡��廣廬 ����廖 �廩廬�廩 "
 "廣� ���廨."
 
-#: ../src/protocols/jabber/jabber.c:1776
+#: ../src/protocols/jabber/jabber.c:1777
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -7058,19 +7104,19 @@
 "role &lt;�廩廬�廩&gt; &lt;�廣���|�廚廣��|��廨|����廬|���&gt;: 廡��廣廬 ����廖 �廩廬�廩 廣� "
 "���廨."
 
-#: ../src/protocols/jabber/jabber.c:1782
+#: ../src/protocols/jabber/jabber.c:1783
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;�廩廬�廩&gt; [��廨]:  ���� �廩廬�廩 ���廨."
 
-#: ../src/protocols/jabber/jabber.c:1788
+#: ../src/protocols/jabber/jabber.c:1789
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;��廨&gt; [廩廨廬]:  �廢�廨廝 �廢'�� �廩廨廬 ��."
 
-#: ../src/protocols/jabber/jabber.c:1794
+#: ../src/protocols/jabber/jabber.c:1795
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;�廩廬�廩&gt; [��廨]:  �廣� �廩廬�廩 ����廨."
 
-#: ../src/protocols/jabber/jabber.c:1799
+#: ../src/protocols/jabber/jabber.c:1800
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr "msg &lt;�廩廬�廩&gt; &lt;���廣�&gt;:  廩�� ���廣� 廚廨��廬 ��廩廬�廩 ��廨."
@@ -7085,60 +7131,60 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/jabber/jabber.c:1882 ../src/protocols/jabber/jabber.c:1884
+#: ../src/protocols/jabber/jabber.c:1883 ../src/protocols/jabber/jabber.c:1885
 msgid "Jabber Protocol Plugin"
 msgstr "廬�廖廝 廚廨���廡�� Jabber"
 
-#: ../src/protocols/jabber/jabber.c:1910
+#: ../src/protocols/jabber/jabber.c:1911
 msgid "Use TLS if available"
 msgstr "�廩廬�廩 �-TLS ����� �����"
 
-#: ../src/protocols/jabber/jabber.c:1915
+#: ../src/protocols/jabber/jabber.c:1916
 msgid "Require TLS"
 msgstr "�廨�廩 TLS"
 
-#: ../src/protocols/jabber/jabber.c:1918
+#: ../src/protocols/jabber/jabber.c:1919
 msgid "Force old (port 5223) SSL"
 msgstr "��廛 廩���廩 �-SSL �廩� )�廢��� 5223("
 
-#: ../src/protocols/jabber/jabber.c:1923
+#: ../src/protocols/jabber/jabber.c:1924
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "�廚廩廨 ��廩廨�廨 �� ��廢廚� �廬廡廩�廨廬 �� ��廢廚�廬"
 
-#: ../src/protocols/jabber/jabber.c:1928 ../src/protocols/simple/simple.c:1760
+#: ../src/protocols/jabber/jabber.c:1929 ../src/protocols/simple/simple.c:1760
 msgid "Connect port"
 msgstr "�廢��廬 ��廬��廨�廬"
 
 #. Account options
-#: ../src/protocols/jabber/jabber.c:1932 ../src/protocols/silc/silc.c:1855
+#: ../src/protocols/jabber/jabber.c:1933 ../src/protocols/silc/silc.c:1855
 msgid "Connect server"
 msgstr "廩廨廬 ��廬��廨�廬"
 
-#: ../src/protocols/jabber/message.c:114
+#: ../src/protocols/jabber/message.c:108
 #, c-format
 msgid "Message from %s"
 msgstr "���廣� �-%s"
 
-#: ../src/protocols/jabber/message.c:178
+#: ../src/protocols/jabber/message.c:172
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s 廩��� �廬 ���廩� ����廬: %s"
 
-#: ../src/protocols/jabber/message.c:180
+#: ../src/protocols/jabber/message.c:174
 #, c-format
 msgid "The topic is: %s"
 msgstr "���廩� ���: %s"
 
-#: ../src/protocols/jabber/message.c:230
+#: ../src/protocols/jabber/message.c:224
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "廬廡�� ��廩��� ���廣� �� %s: %s"
 
-#: ../src/protocols/jabber/message.c:233
+#: ../src/protocols/jabber/message.c:227
 msgid "Jabber Message Error"
 msgstr "���廣廬 廩���� �� ���廨廬 (Jabber)"
 
-#: ../src/protocols/jabber/message.c:300
+#: ../src/protocols/jabber/message.c:295
 #, c-format
 msgid " (Code %s)"
 msgstr "(廡�� %s)"
@@ -7157,12 +7203,12 @@
 msgstr "��廩廬�廩 %s 廨�廢� ���廖�廝 %s �廨廩��廬 ��廩� �廡廩廨 廩��."
 
 #: ../src/protocols/jabber/presence.c:323 ../src/protocols/oscar/oscar.c:4805
-#: ../src/protocols/oscar/oscar.c:7476
+#: ../src/protocols/oscar/oscar.c:7482
 msgid "_Authorize"
 msgstr "�廩廨"
 
 #: ../src/protocols/jabber/presence.c:324 ../src/protocols/oscar/oscar.c:4807
-#: ../src/protocols/oscar/oscar.c:7477
+#: ../src/protocols/oscar/oscar.c:7483
 msgid "_Deny"
 msgstr "���"
 
@@ -7196,12 +7242,12 @@
 msgid "Error joining chat %s"
 msgstr "廩���� ��廢�廨廚�廬 �廢'�� %s"
 
-#: ../src/protocols/jabber/si.c:727
+#: ../src/protocols/jabber/si.c:728
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr "�� ��廬� �廩��� �廬 �廡��廛 �� %s, ��廩廬�廩 �� 廬��� ��廣�廨�廬 廡�廢��"
 
-#: ../src/protocols/jabber/si.c:728 ../src/protocols/jabber/si.c:729
+#: ../src/protocols/jabber/si.c:729 ../src/protocols/jabber/si.c:730
 msgid "File Send Failed"
 msgstr "�廩� �廩���廬 廡��廛"
 
@@ -7602,74 +7648,219 @@
 msgstr "<b>�����:</b> %s<br>"
 
 #. put a link to the actual profile URL
-#: ../src/protocols/msn/msn.c:1373 ../src/protocols/msn/msn.c:1816
-#: ../src/protocols/yahoo/yahoo_profile.c:1202 ../src/util.c:1055
+#: ../src/protocols/msn/msn.c:1373 ../src/protocols/yahoo/yahoo_profile.c:1208
+#: ../src/util.c:1055
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b> "
 
-#: ../src/protocols/msn/msn.c:1456
+#: ../src/protocols/msn/msn.c:1463
 msgid "MSN Profile"
 msgstr "廚廨�廚�� MSN"
 
-#: ../src/protocols/msn/msn.c:1461 ../src/protocols/msn/msn.c:1800
+#: ../src/protocols/msn/msn.c:1468 ../src/protocols/msn/msn.c:1794
 #: ../src/protocols/yahoo/yahoo_profile.c:795
 msgid "Error retrieving profile"
 msgstr "廩���� �廩��廚廬 �廚廨�廚��"
 
-#: ../src/protocols/msn/msn.c:1531 ../src/protocols/oscar/oscar.c:6204
-#: ../src/protocols/yahoo/yahoo_profile.c:1050
+#: ../src/protocols/msn/msn.c:1536 ../src/protocols/oscar/oscar.c:6204
+#: ../src/protocols/yahoo/yahoo_profile.c:1056
 msgid "Age"
 msgstr "���"
 
-#: ../src/protocols/msn/msn.c:1533 ../src/protocols/yahoo/yahoo_profile.c:1065
+#: ../src/protocols/msn/msn.c:1538 ../src/protocols/yahoo/yahoo_profile.c:1071
 msgid "Occupation"
 msgstr "廣�廖�廡"
 
-#: ../src/protocols/msn/msn.c:1534 ../src/protocols/novell/novell.c:1480
-#: ../src/protocols/yahoo/yahoo_profile.c:1045
+#: ../src/protocols/msn/msn.c:1539 ../src/protocols/novell/novell.c:1480
+#: ../src/protocols/yahoo/yahoo_profile.c:1051
 msgid "Location"
 msgstr "��廡��"
 
-#: ../src/protocols/msn/msn.c:1539 ../src/protocols/msn/msn.c:1729
-#: ../src/protocols/msn/msn.c:1735 ../src/protocols/msn/msn.c:1742
+#: ../src/protocols/msn/msn.c:1544 ../src/protocols/msn/msn.c:1723
+#: ../src/protocols/msn/msn.c:1729 ../src/protocols/msn/msn.c:1736
 msgid "Hobbies and Interests"
 msgstr "廬������ �廬���� 廣����"
 
-#: ../src/protocols/msn/msn.c:1545 ../src/protocols/msn/msn.c:1663
-#: ../src/protocols/msn/msn.c:1669 ../src/protocols/msn/msn.c:1676
-#: ../src/protocols/msn/msn.c:1684 ../src/protocols/msn/msn.c:1691
+#: ../src/protocols/msn/msn.c:1550 ../src/protocols/msn/msn.c:1657
+#: ../src/protocols/msn/msn.c:1663 ../src/protocols/msn/msn.c:1670
+#: ../src/protocols/msn/msn.c:1678 ../src/protocols/msn/msn.c:1685
 msgid "A Little About Me"
 msgstr "廡廢廬 ����廬��"
 
+#: ../src/protocols/msn/msn.c:1556
+#, c-format
+msgid "%s<b>General</b><br>%s"
+msgstr "%s<b>����</b><br>%s "
+
 #. Social
-#: ../src/protocols/msn/msn.c:1563 ../src/protocols/yahoo/yahoo_profile.c:1055
+#: ../src/protocols/msn/msn.c:1565 ../src/protocols/yahoo/yahoo_profile.c:1061
 msgid "Marital Status"
 msgstr "�廢� �廩廚�廬�"
 
-#: ../src/protocols/msn/msn.c:1573 ../src/protocols/msn/msn.c:1751
-#: ../src/protocols/msn/msn.c:1757 ../src/protocols/yahoo/yahoo_profile.c:1107
+#: ../src/protocols/msn/msn.c:1566
+msgid "Interests"
+msgstr "廬���� 廣����"
+
+#: ../src/protocols/msn/msn.c:1567
+msgid "Pets"
+msgstr "���廬 ����"
+
+#: ../src/protocols/msn/msn.c:1568
+msgid "Hometown"
+msgstr "廣�廨 �����廬"
+
+#: ../src/protocols/msn/msn.c:1569
+msgid "Places Lived"
+msgstr "廣廨� ���廨��"
+
+#: ../src/protocols/msn/msn.c:1570
+msgid "Fashion"
+msgstr "��廚��"
+
+#: ../src/protocols/msn/msn.c:1571
+msgid "Humor"
+msgstr "����廨"
+
+#: ../src/protocols/msn/msn.c:1572
+msgid "Music"
+msgstr "��廖�廡�"
+
+#: ../src/protocols/msn/msn.c:1573 ../src/protocols/msn/msn.c:1745
+#: ../src/protocols/msn/msn.c:1751 ../src/protocols/yahoo/yahoo_profile.c:1113
 msgid "Favorite Quote"
-msgstr "廢����"
-
-#: ../src/protocols/msn/msn.c:1700 ../src/protocols/msn/msn.c:1706
-#: ../src/protocols/msn/msn.c:1713 ../src/protocols/msn/msn.c:1720
+msgstr "廢���� ����"
+
+#: ../src/protocols/msn/msn.c:1577
+#, c-format
+msgid "%s<b>Social</b><br>%s"
+msgstr "%s<b>��廨廬�</b><br>%s "
+
+#: ../src/protocols/msn/msn.c:1586
+msgid "Significant Other"
+msgstr "��/�廬-���"
+
+#: ../src/protocols/msn/msn.c:1587
+msgid "Home Phone"
+msgstr "��廚�� ���廬"
+
+#: ../src/protocols/msn/msn.c:1588
+msgid "Home Phone 2"
+msgstr "��廚�� ���廬 2"
+
+#: ../src/protocols/msn/msn.c:1589 ../src/protocols/oscar/oscar.c:6216
+msgid "Home Address"
+msgstr "�廬��廬 ���廬"
+
+#: ../src/protocols/msn/msn.c:1590
+msgid "Personal Mobile"
+msgstr "��廚�� ����"
+
+#: ../src/protocols/msn/msn.c:1591
+msgid "Home Fax"
+msgstr "廚廡廖 ���廬"
+
+#: ../src/protocols/msn/msn.c:1592
+msgid "Personal E-Mail"
+msgstr "���\"� ��廩�"
+
+#: ../src/protocols/msn/msn.c:1593
+msgid "Personal IM"
+msgstr "IM ��廩�"
+
+#: ../src/protocols/msn/msn.c:1595
+msgid "Anniversary"
+msgstr "��� ��廩����"
+
+#: ../src/protocols/msn/msn.c:1596 ../src/protocols/msn/msn.c:1620
+msgid "Notes"
+msgstr "�廣廨�廬"
+
+#: ../src/protocols/msn/msn.c:1600
+#, c-format
+msgid "<br><b>Personal</b><br>%s"
+msgstr "<br><b>��廩�</b><br>%s"
+
+#: ../src/protocols/msn/msn.c:1607 ../src/protocols/silc/ops.c:1044
+msgid "Job Title"
+msgstr "廬��廨"
+
+#: ../src/protocols/msn/msn.c:1608 ../src/protocols/oscar/oscar.c:6233
+msgid "Company"
+msgstr "��廨�"
+
+#: ../src/protocols/msn/msn.c:1609 ../src/protocols/novell/novell.c:1482
+msgid "Department"
+msgstr "���廡�"
+
+#: ../src/protocols/msn/msn.c:1610
+msgid "Profession"
+msgstr "�廡廢�廣"
+
+#: ../src/protocols/msn/msn.c:1611
+msgid "Work Phone"
+msgstr "��廚�� �廣����"
+
+#: ../src/protocols/msn/msn.c:1612
+msgid "Work Phone 2"
+msgstr "��廚�� �廣���� 2"
+
+#: ../src/protocols/msn/msn.c:1613 ../src/protocols/oscar/oscar.c:6224
+msgid "Work Address"
+msgstr "�廬��廬 �廣����"
+
+#: ../src/protocols/msn/msn.c:1614
+msgid "Work Mobile"
+msgstr "��廚�� ���� �廣����"
+
+#: ../src/protocols/msn/msn.c:1615
+msgid "Work Pager"
+msgstr "��廚廨 �廣����"
+
+#: ../src/protocols/msn/msn.c:1616
+msgid "Work Fax"
+msgstr "廚廡廖 �廣����"
+
+#: ../src/protocols/msn/msn.c:1617
+msgid "Work E-Mail"
+msgstr "���\"� �廣����"
+
+#: ../src/protocols/msn/msn.c:1618
+msgid "Work IM"
+msgstr "IM �廣����"
+
+#: ../src/protocols/msn/msn.c:1619
+msgid "Start Date"
+msgstr "廬�廨�� 廬����"
+
+#: ../src/protocols/msn/msn.c:1624
+#, c-format
+msgid "<br><b>Business</b><br>%s"
+msgstr "<br><b>廣廖廡�</b><br>%s"
+
+#: ../src/protocols/msn/msn.c:1635
+#, c-format
+msgid "<hr><b>Contact Info</b>%s%s"
+msgstr "<hr><b>���廣 ��廢�廨廬 廡廩廨</b>%s%s"
+
+#: ../src/protocols/msn/msn.c:1694 ../src/protocols/msn/msn.c:1700
+#: ../src/protocols/msn/msn.c:1707 ../src/protocols/msn/msn.c:1714
 msgid "Favorite Things"
 msgstr "��廨�� ��廣�廚��"
 
-#: ../src/protocols/msn/msn.c:1765
+#: ../src/protocols/msn/msn.c:1759
 msgid "Last Updated"
 msgstr "廣���� ���廨���"
 
-#: ../src/protocols/msn/msn.c:1777 ../src/protocols/silc/ops.c:1060
+#: ../src/protocols/msn/msn.c:1771 ../src/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "�廬��廬 �廬廨 ��廬"
 
-#: ../src/protocols/msn/msn.c:1802
+#: ../src/protocols/msn/msn.c:1796
 msgid "The user has not created a public profile."
 msgstr "��廩廬�廩 �� �廢廨 廚廨�廚�� 廢���廨�."
 
-#: ../src/protocols/msn/msn.c:1803
+#: ../src/protocols/msn/msn.c:1797
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
@@ -7678,14 +7869,19 @@
 "MSN ������ 廩�� ���� ��廢�� �廬 廚廨�廚�� ��廩廬�廩. ��廬 ���廨廬 廩��廩廬�廩 �� 廡���, �� "
 "廩��廩廬�廩 廡��� �� �� �廢廨 廚廨�廚�� 廢���廨�."
 
-#: ../src/protocols/msn/msn.c:1807
+#: ../src/protocols/msn/msn.c:1801
 msgid ""
 "Gaim could not find any information in the user's profile. The user most "
 "likely does not exist."
 msgstr "���� �� ���� ��廢�� ���廣 �廬�� 廚廨�廚�� ��廩廬�廩. ��� ��廨�� ��廩廬�廩 �� 廡���."
 
-#: ../src/protocols/msn/msn.c:1813 ../src/protocols/msn/msn.c:1816
-#: ../src/protocols/yahoo/yahoo_profile.c:1202
+#. put a link to the actual profile URL
+#: ../src/protocols/msn/msn.c:1806
+#, c-format
+msgid "<hr><b>%s:</b> "
+msgstr "<hr><b>%s:</b> "
+
+#: ../src/protocols/msn/msn.c:1806 ../src/protocols/yahoo/yahoo_profile.c:1208
 msgid "Profile URL"
 msgstr "URL �廚廨�廚��"
 
@@ -7699,23 +7895,23 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/msn/msn.c:2022 ../src/protocols/msn/msn.c:2024
+#: ../src/protocols/msn/msn.c:2028 ../src/protocols/msn/msn.c:2030
 msgid "MSN Protocol Plugin"
 msgstr "廬�廖廝 廚廨���廡�� MSN"
 
-#: ../src/protocols/msn/msn.c:2043
+#: ../src/protocols/msn/msn.c:2049
 msgid "Login server"
 msgstr "廩廨廬 ��廬��廨�廬"
 
-#: ../src/protocols/msn/msn.c:2052
+#: ../src/protocols/msn/msn.c:2058
 msgid "Use HTTP Method"
 msgstr "�廩廬�廩 �廩��廬 HTTP"
 
-#: ../src/protocols/msn/msn.c:2057
+#: ../src/protocols/msn/msn.c:2063
 msgid "Show custom smileys"
 msgstr "�廢� 廖������� 廩��"
 
-#: ../src/protocols/msn/msn.c:2065
+#: ../src/protocols/msn/msn.c:2071
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: 廩�� ���廚� ���廩 廡廩廨 ��� ��廩�� �廬 廬廩��廬 ����"
 
@@ -8244,10 +8440,6 @@
 msgid "Telephone Number"
 msgstr "��廚廨 ��廚��"
 
-#: ../src/protocols/novell/novell.c:1482
-msgid "Department"
-msgstr "���廡�"
-
 #: ../src/protocols/novell/novell.c:1484
 msgid "Personal Title"
 msgstr "廩� 廬廚廡��"
@@ -8256,11 +8448,6 @@
 msgid "Mailstop"
 msgstr "廬��廬 ���廨"
 
-#: ../src/protocols/novell/novell.c:1490 ../src/protocols/oscar/oscar.c:6178
-#: ../src/protocols/oscar/oscar.c:6185
-msgid "Email Address"
-msgstr "�廬��廬 ���\"�"
-
 #: ../src/protocols/novell/novell.c:1506
 msgid "User ID"
 msgstr "廩� �廩廬�廩"
@@ -8486,7 +8673,7 @@
 msgid "Chat"
 msgstr "廩���"
 
-#: ../src/protocols/oscar/oscar.c:711 ../src/protocols/oscar/oscar.c:8168
+#: ../src/protocols/oscar/oscar.c:711 ../src/protocols/oscar/oscar.c:8174
 msgid "Get File"
 msgstr "廡�� 廡��廛"
 
@@ -8558,15 +8745,15 @@
 msgid "Camera"
 msgstr "�廢���"
 
-#: ../src/protocols/oscar/oscar.c:785 ../src/protocols/oscar/oscar.c:8030
+#: ../src/protocols/oscar/oscar.c:785 ../src/protocols/oscar/oscar.c:8036
 msgid "Free For Chat"
 msgstr "廚��� �廩���"
 
-#: ../src/protocols/oscar/oscar.c:789 ../src/protocols/oscar/oscar.c:8058
+#: ../src/protocols/oscar/oscar.c:789 ../src/protocols/oscar/oscar.c:8064
 msgid "Not Available"
 msgstr "�� ����"
 
-#: ../src/protocols/oscar/oscar.c:791 ../src/protocols/oscar/oscar.c:8048
+#: ../src/protocols/oscar/oscar.c:791 ../src/protocols/oscar/oscar.c:8054
 msgid "Occupied"
 msgstr "廣廖�廡"
 
@@ -8691,12 +8878,12 @@
 #, c-format
 msgid ""
 "Transfer of file %s timed out.\n"
-" Try enabling proxy servers for file transfers in Accounts->%s->Edit Account-"
-">Advanced."
+" Try enabling proxy servers for file transfers in Accounts -> %s -> Edit "
+"Account -> Advanced."
 msgstr ""
 "���� ���廡廢� ��廣�廨廬 �廡��廛 %s ���.\n"
-" �廩 ��廖�廬 ��廚廣�� 廩���廩 �廩廨廬� 廬���� 廣��廨 �廣�廨廬 廡�廢�� 廬�廬 �廩����廬->%s->廣廨�� "
-"�廩���->�廬廡��."
+" �廩 ��廖�廬 ��廚廣�� 廩���廩 �廩廨廬� 廬���� 廣��廨 �廣�廨廬 廡�廢�� 廬�廬 �廩����廬 -> %s -> 廣廨�� "
+"�廩��� -> �廬廡��."
 
 #: ../src/protocols/oscar/oscar.c:2338
 #: ../src/protocols/yahoo/yahoo_filexfer.c:253
@@ -8831,7 +9018,7 @@
 
 #: ../src/protocols/oscar/oscar.c:4681 ../src/protocols/oscar/oscar.c:4687
 #: ../src/protocols/oscar/oscar.c:4791 ../src/protocols/oscar/oscar.c:4815
-#: ../src/protocols/oscar/oscar.c:7462 ../src/protocols/oscar/oscar.c:7514
+#: ../src/protocols/oscar/oscar.c:7468 ../src/protocols/oscar/oscar.c:7520
 msgid "No reason given."
 msgstr "�� ��廬�� 廖���."
 
@@ -8848,7 +9035,7 @@
 "��廩廬�廩 %u 廨�廢� ���廖�廝 �廬 %s �廨廩��廬 ��廩� �廡廩廨 廩�� ��廖��� ����:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:4803 ../src/protocols/oscar/oscar.c:7474
+#: ../src/protocols/oscar/oscar.c:4803 ../src/protocols/oscar/oscar.c:7480
 msgid "Authorization Request"
 msgstr "�廡廩廬 �廨廩��"
 
@@ -9010,7 +9197,7 @@
 msgstr "����廨 ���"
 
 #: ../src/protocols/oscar/oscar.c:5262
-#: ../src/protocols/yahoo/yahoo_profile.c:1153
+#: ../src/protocols/yahoo/yahoo_profile.c:1159
 msgid "Member Since"
 msgstr "��廨 ���"
 
@@ -9071,26 +9258,14 @@
 msgid "Additional Information"
 msgstr "���廣 ��廖廝"
 
-#: ../src/protocols/oscar/oscar.c:6216
-msgid "Home Address"
-msgstr "�廬��廬 ���廬"
-
 #: ../src/protocols/oscar/oscar.c:6220 ../src/protocols/oscar/oscar.c:6228
 msgid "Zip Code"
 msgstr "��廡��"
 
-#: ../src/protocols/oscar/oscar.c:6224
-msgid "Work Address"
-msgstr "�廬��廬 �廣����"
-
 #: ../src/protocols/oscar/oscar.c:6232
 msgid "Work Information"
 msgstr "廚廨�� 廣����"
 
-#: ../src/protocols/oscar/oscar.c:6233
-msgid "Company"
-msgstr "��廨�"
-
 #: ../src/protocols/oscar/oscar.c:6234
 msgid "Division"
 msgstr "���廡�"
@@ -9236,7 +9411,7 @@
 msgid "Profile too long."
 msgstr "�廚廨�廚�� �廨�� ���."
 
-#: ../src/protocols/oscar/oscar.c:6837
+#: ../src/protocols/oscar/oscar.c:6843
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -9249,11 +9424,11 @@
 msgstr[1] ""
 "廣�廨廬 �廬 ��廨� ���廣廬 �廨���廡 ��廡廖���� 廩� %d ������. ���� 廡�廢廨 ��廬� 廣��廨�."
 
-#: ../src/protocols/oscar/oscar.c:6842
+#: ../src/protocols/oscar/oscar.c:6848
 msgid "Away message too long."
 msgstr "���廣廬 �廨���廡 ����廩� �廨��� ���."
 
-#: ../src/protocols/oscar/oscar.c:6911
+#: ../src/protocols/oscar/oscar.c:6917
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -9263,16 +9438,16 @@
 "�� ��廬� ���廖�廝 �廬 ��廩 �廡廩廨 %s ������ 廩廩� ��廩廬�廩 廩�� �� ��廡�. 廩��廬 �廩廬�廩�� "
 "������ ��廬��� ���廬 ������ 廨廡 ��廬��廬, �廖廚廨�� �廨�����, �� 廨廡 ����� �廖廚廨��."
 
-#: ../src/protocols/oscar/oscar.c:6913 ../src/protocols/oscar/oscar.c:7320
-#: ../src/protocols/oscar/oscar.c:7334
+#: ../src/protocols/oscar/oscar.c:6919 ../src/protocols/oscar/oscar.c:7326
+#: ../src/protocols/oscar/oscar.c:7340
 msgid "Unable To Add"
 msgstr "�� ��廬� ���廖�廝"
 
-#: ../src/protocols/oscar/oscar.c:7020
+#: ../src/protocols/oscar/oscar.c:7026
 msgid "Unable To Retrieve Buddy List"
 msgstr "�廩��� �廩��廚廬 廨廩��廬 ��廩� �廡廩廨"
 
-#: ../src/protocols/oscar/oscar.c:7021
+#: ../src/protocols/oscar/oscar.c:7027
 msgid ""
 "Gaim was temporarily unable to retrieve your buddy list from the AIM "
 "servers.  Your buddy list is not lost, and will probably become available in "
@@ -9281,13 +9456,13 @@
 "���� ����廬 �� �廢��� �廩��廝 �廬 廨廩��廬 ��廩� �廡廩廨 廩�� �廩廨廬� AIM. �廨廩��� �� ����, "
 "���� ��廨�� 廬���� ����� �廩廣�廬 �廡廨���廬."
 
-#: ../src/protocols/oscar/oscar.c:7218 ../src/protocols/oscar/oscar.c:7219
-#: ../src/protocols/oscar/oscar.c:7224 ../src/protocols/oscar/oscar.c:7378
-#: ../src/protocols/oscar/oscar.c:7379 ../src/protocols/oscar/oscar.c:7384
+#: ../src/protocols/oscar/oscar.c:7224 ../src/protocols/oscar/oscar.c:7225
+#: ../src/protocols/oscar/oscar.c:7230 ../src/protocols/oscar/oscar.c:7384
+#: ../src/protocols/oscar/oscar.c:7385 ../src/protocols/oscar/oscar.c:7390
 msgid "Orphans"
 msgstr "�廬����"
 
-#: ../src/protocols/oscar/oscar.c:7318
+#: ../src/protocols/oscar/oscar.c:7324
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -9296,11 +9471,11 @@
 "�� ��廬� ���廖�廝 �廬 %s �廨廩��廬 ��廩� �廡廩廨 廩��, ����� 廩�廩 ��廬廨 ��� ��廩� 廡廩廨 "
 "�廨廩���. �廩 ��廖�廨 ��� ���廖�廬 廩��廬."
 
-#: ../src/protocols/oscar/oscar.c:7318 ../src/protocols/oscar/oscar.c:7332
+#: ../src/protocols/oscar/oscar.c:7324 ../src/protocols/oscar/oscar.c:7338
 msgid "(no name)"
 msgstr "(��� 廩�)"
 
-#: ../src/protocols/oscar/oscar.c:7332
+#: ../src/protocols/oscar/oscar.c:7338
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -9310,7 +9485,7 @@
 "�� ��廬� ���廖�廝 �廬 %s �廖��� �� ���廣�. �廖��� ��� �廚�廢� ��� 廩��廣廬 ��廖廚廨 ���廨�� "
 "���廬廨 廩� ��廩� 廡廩廨 �廨廩��廬�."
 
-#: ../src/protocols/oscar/oscar.c:7415
+#: ../src/protocols/oscar/oscar.c:7421
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -9318,11 +9493,11 @@
 msgstr ""
 "��廩廬�廩 %s �廬�廨 �� ���廖�廝 ��廬� �廨廩��廬 ��廩� �廡廩廨 廩��. ��� �廨廢��� ���廖�廝 ��廬�?"
 
-#: ../src/protocols/oscar/oscar.c:7421
+#: ../src/protocols/oscar/oscar.c:7427
 msgid "Authorization Given"
 msgstr "��廨廩�� ��廬��"
 
-#: ../src/protocols/oscar/oscar.c:7465
+#: ../src/protocols/oscar/oscar.c:7471
 #, c-format
 msgid ""
 "The user %s wants to add %s to their buddy list for the following reason:\n"
@@ -9332,17 +9507,17 @@
 "%s"
 
 #. Granted
-#: ../src/protocols/oscar/oscar.c:7510
+#: ../src/protocols/oscar/oscar.c:7516
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "��廩廬�廩 %s �廬�廨 �� ���廖�廝 ��廬� �廨廩��廬 ��廩� �廡廩廨 廩��."
 
-#: ../src/protocols/oscar/oscar.c:7511
+#: ../src/protocols/oscar/oscar.c:7517
 msgid "Authorization Granted"
 msgstr "��廨廩�� ��廬��"
 
 #. Denied
-#: ../src/protocols/oscar/oscar.c:7514
+#: ../src/protocols/oscar/oscar.c:7520
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -9352,88 +9527,88 @@
 "��廩廬�廩 %s ��� �廬 �廡廩廬� ���廖�廝 ��廬� �廨廩��廬 ��廩� �廡廩廨 廩�� ��廖��� ����:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:7515
+#: ../src/protocols/oscar/oscar.c:7521
 msgid "Authorization Denied"
 msgstr "��廨廩�� ����廬"
 
-#: ../src/protocols/oscar/oscar.c:7552 ../src/protocols/toc/toc.c:1372
+#: ../src/protocols/oscar/oscar.c:7558 ../src/protocols/toc/toc.c:1372
 msgid "_Exchange:"
 msgstr "���廚�:"
 
-#: ../src/protocols/oscar/oscar.c:7588
+#: ../src/protocols/oscar/oscar.c:7594
 msgid "Invalid chat name specified."
 msgstr "廩� �廢'�� 廩廢���� ���� 廬廡廝."
 
-#: ../src/protocols/oscar/oscar.c:7658
+#: ../src/protocols/oscar/oscar.c:7664
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "���廣廬 �廬���� �� �廩���. �� ��廬� �廩��� 廬����廬 �廢'���� �-AIM."
 
-#: ../src/protocols/oscar/oscar.c:7815
+#: ../src/protocols/oscar/oscar.c:7821
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(廩��廝)</i>"
 
-#: ../src/protocols/oscar/oscar.c:8121
+#: ../src/protocols/oscar/oscar.c:8127
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "�廣廨廬 ��廩 廡廩廨 廣��廨 %s"
 
-#: ../src/protocols/oscar/oscar.c:8122
+#: ../src/protocols/oscar/oscar.c:8128
 msgid "Buddy Comment:"
 msgstr "�廣廨廬 ��廩 廡廩廨:"
 
-#: ../src/protocols/oscar/oscar.c:8141
+#: ../src/protocols/oscar/oscar.c:8147
 msgid "Edit Buddy Comment"
 msgstr "廣廨�� �廣廨廬 ��廩 廡廩廨"
 
-#: ../src/protocols/oscar/oscar.c:8148
+#: ../src/protocols/oscar/oscar.c:8154
 msgid "Get Status Msg"
 msgstr "��廨� ���廣廬 �廢�"
 
-#: ../src/protocols/oscar/oscar.c:8161
+#: ../src/protocols/oscar/oscar.c:8167
 msgid "Direct IM"
 msgstr "廬廡廩�廨廬 �廩�廨� ����廣�廬"
 
-#: ../src/protocols/oscar/oscar.c:8180
+#: ../src/protocols/oscar/oscar.c:8186
 msgid "Re-request Authorization"
 msgstr "�廡廩 �廨廩�� 廩��"
 
-#: ../src/protocols/oscar/oscar.c:8237
+#: ../src/protocols/oscar/oscar.c:8243
 msgid "Require authorization"
 msgstr "�廨�廩 �廨廩��"
 
-#: ../src/protocols/oscar/oscar.c:8240
+#: ../src/protocols/oscar/oscar.c:8246
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "���廨-����廨�� (�廚廣�� 廩� �� 廬��� ����廨 廩�� SPAM!)"
 
-#: ../src/protocols/oscar/oscar.c:8245
+#: ../src/protocols/oscar/oscar.c:8251
 msgid "ICQ Privacy Options"
 msgstr "�廚廩廨���廬 廚廨���廬 廩� ICQ"
 
-#: ../src/protocols/oscar/oscar.c:8262
+#: ../src/protocols/oscar/oscar.c:8268
 msgid "The new formatting is invalid."
 msgstr "�廚�廨�� ���廩 ���� 廬廡��."
 
-#: ../src/protocols/oscar/oscar.c:8263
+#: ../src/protocols/oscar/oscar.c:8269
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "廚�廨��� 廩� 廩� �廩廬�廩 廨廡 ����� �廩��廬 ��廬��廬 �����廬/廡���廬 �廨�����."
 
-#: ../src/protocols/oscar/oscar.c:8270
+#: ../src/protocols/oscar/oscar.c:8276
 msgid "New screen name formatting:"
 msgstr "廚�廨�� ��廩 �廩� ��廩廬�廩:"
 
-#: ../src/protocols/oscar/oscar.c:8322
+#: ../src/protocols/oscar/oscar.c:8328
 msgid "Change Address To:"
 msgstr "廩�� �廬��廬 �:"
 
-#: ../src/protocols/oscar/oscar.c:8367
+#: ../src/protocols/oscar/oscar.c:8373
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>���� ���� ��廨廩��</i>"
 
-#: ../src/protocols/oscar/oscar.c:8370
+#: ../src/protocols/oscar/oscar.c:8376
 msgid "You are awaiting authorization from the following buddies"
 msgstr "�廬� ���� ��廨廩�� ���廩� �廡廩廨 ����"
 
-#: ../src/protocols/oscar/oscar.c:8371
+#: ../src/protocols/oscar/oscar.c:8377
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -9441,61 +9616,61 @@
 "�廩 ��廚廩廨�廬� ��廡廩 廩�� �廨廩�� ���廩� 廡廩廨 ��� 廣\"� ���廢� ����廬 廣� �廣��廨 廣���� "
 "�����廨 \"�廡廩 �廨廩�� 廩��\"."
 
-#: ../src/protocols/oscar/oscar.c:8388
+#: ../src/protocols/oscar/oscar.c:8394
 msgid "Find Buddy by E-Mail"
 msgstr "�廢� ��廩 廡廩廨 �廚� ���\"�"
 
-#: ../src/protocols/oscar/oscar.c:8389
+#: ../src/protocols/oscar/oscar.c:8395
 msgid "Search for a buddy by e-mail address"
 msgstr "�廚廩 ��廩 廡廩廨 �廚� �廬��廬 ����廨 ���廨廡�廨��� 廩��"
 
-#: ../src/protocols/oscar/oscar.c:8390
+#: ../src/protocols/oscar/oscar.c:8396
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "�廡�� �廬 �廬��廬 ����\"� 廩� ��廩 �廡廩廨 ��廬� �廬� ��廚廩."
 
-#: ../src/protocols/oscar/oscar.c:8483
+#: ../src/protocols/oscar/oscar.c:8489
 msgid "Set User Info (URL)..."
 msgstr "廡�廣 �廬 ����廣 廣� ��廩廬�廩 (URL)..."
 
-#: ../src/protocols/oscar/oscar.c:8494
+#: ../src/protocols/oscar/oscar.c:8500
 msgid "Change Password (URL)"
 msgstr "廩�� 廖�廖�� (URL)"
 
-#: ../src/protocols/oscar/oscar.c:8498
+#: ../src/protocols/oscar/oscar.c:8504
 msgid "Configure IM Forwarding (URL)"
 msgstr "���廨�廬 廣廡��-��廨� ����廣�廬 (URL)"
 
 #. ICQ actions
-#: ../src/protocols/oscar/oscar.c:8508
+#: ../src/protocols/oscar/oscar.c:8514
 msgid "Set Privacy Options..."
 msgstr "廡�廣 �廚廩廨���廬 廚廨���廬..."
 
 #. AIM actions
-#: ../src/protocols/oscar/oscar.c:8515
+#: ../src/protocols/oscar/oscar.c:8521
 msgid "Format Screen Name..."
 msgstr "廚廨�� �廬 廩� ��廩廬�廩..."
 
-#: ../src/protocols/oscar/oscar.c:8519
+#: ../src/protocols/oscar/oscar.c:8525
 msgid "Confirm Account"
 msgstr "�廩廨 �廩���"
 
-#: ../src/protocols/oscar/oscar.c:8523
+#: ../src/protocols/oscar/oscar.c:8529
 msgid "Display Currently Registered Address"
 msgstr "�廢� �廬 ��廬��廬 �廨廩��� �廨�廣"
 
-#: ../src/protocols/oscar/oscar.c:8527
+#: ../src/protocols/oscar/oscar.c:8533
 msgid "Change Currently Registered Address..."
 msgstr "廩�� �廬 ��廬��廬 �廨廩��� �廨�廣"
 
-#: ../src/protocols/oscar/oscar.c:8534
+#: ../src/protocols/oscar/oscar.c:8540
 msgid "Show Buddies Awaiting Authorization"
 msgstr "�廢� �廬 ��廩� �廡廩廨 廩����� ���廩�廨"
 
-#: ../src/protocols/oscar/oscar.c:8540
+#: ../src/protocols/oscar/oscar.c:8546
 msgid "Search for Buddy by E-Mail..."
 msgstr "�廚廩 ��廩-廡廩廨 廣廚\"� �廬��廬 ���\"�..."
 
-#: ../src/protocols/oscar/oscar.c:8545
+#: ../src/protocols/oscar/oscar.c:8551
 msgid "Search for Buddy by Information"
 msgstr "�廚廩 ��廩-廡廩廨 廣廚\"� ���廣"
 
@@ -9509,23 +9684,23 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/oscar/oscar.c:8723 ../src/protocols/oscar/oscar.c:8725
+#: ../src/protocols/oscar/oscar.c:8729 ../src/protocols/oscar/oscar.c:8731
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "廬�廖廝 廚廨���廡���� Aim/ICQ"
 
-#: ../src/protocols/oscar/oscar.c:8744
+#: ../src/protocols/oscar/oscar.c:8750
 msgid "Auth host"
 msgstr "廩廨廬 �廨廩��"
 
-#: ../src/protocols/oscar/oscar.c:8747
+#: ../src/protocols/oscar/oscar.c:8753
 msgid "Auth port"
 msgstr "�廢��廬 �廨廩��"
 
-#: ../src/protocols/oscar/oscar.c:8750 ../src/protocols/zephyr/zephyr.c:2920
+#: ../src/protocols/oscar/oscar.c:8756 ../src/protocols/zephyr/zephyr.c:2920
 msgid "Encoding"
 msgstr "廡����"
 
-#: ../src/protocols/oscar/oscar.c:8754
+#: ../src/protocols/oscar/oscar.c:8760
 msgid ""
 "Use AIM/ICQ proxy server\n"
 "(slower, but usually works)"
@@ -10219,8 +10394,7 @@
 msgid "Invincible"
 msgstr "��廬� ���廢�"
 
-#: ../src/protocols/silc/buddy.c:1498 ../src/protocols/silc/silc.c:684
-#: ../src/protocols/silc/util.c:485
+#: ../src/protocols/silc/buddy.c:1498 ../src/protocols/silc/util.c:485
 msgid "In Love"
 msgstr "�����"
 
@@ -10613,10 +10787,6 @@
 msgid "Birth Day"
 msgstr "��� ����廬"
 
-#: ../src/protocols/silc/ops.c:1044
-msgid "Job Title"
-msgstr "廬��廨"
-
 #: ../src/protocols/silc/ops.c:1048
 msgid "Job Role"
 msgstr "廬廚廡��"
@@ -10629,10 +10799,6 @@
 msgid "Unit"
 msgstr "�����"
 
-#: ../src/protocols/silc/ops.c:1075
-msgid "EMail"
-msgstr "���\"�"
-
 #: ../src/protocols/silc/ops.c:1080
 msgid "Note"
 msgstr "�廣廨�"
@@ -10641,6 +10807,11 @@
 msgid "Join Chat"
 msgstr "�廢�廨廝 �廢'��"
 
+#: ../src/protocols/silc/ops.c:1183 ../src/protocols/silc/ops.c:1332
+#: ../src/protocols/yahoo/yahoo_profile.c:1046
+msgid "Real Name"
+msgstr "廩� ���廬�"
+
 #: ../src/protocols/silc/ops.c:1211
 msgid "Status Text"
 msgstr "�廡廖� �廢�"
@@ -10915,6 +11086,10 @@
 msgid "Your Current Mood"
 msgstr "�廢� �廨�� ������ 廩��"
 
+#: ../src/protocols/silc/silc.c:684
+msgid "In love"
+msgstr "�����"
+
 #: ../src/protocols/silc/silc.c:695
 msgid ""
 "\n"
@@ -10931,8 +11106,8 @@
 msgid "MMS"
 msgstr "MMS"
 
-#: ../src/protocols/silc/silc.c:707 ../src/protocols/silc/util.c:522
-msgid "Video Conferencing"
+#: ../src/protocols/silc/silc.c:707
+msgid "Video conferencing"
 msgstr "�廣��廬 �����"
 
 #: ../src/protocols/silc/silc.c:712
@@ -11006,13 +11181,9 @@
 msgid "Private key file"
 msgstr "廡��廛 �廚廬� 廚廨��"
 
-#: ../src/protocols/silc/silc.c:937
-msgid "Real Name"
-msgstr "廩� ���廬�"
-
 #: ../src/protocols/silc/silc.c:951
-msgid "Re-type Passphrase"
-msgstr "廨廩�� 廖�廖�� �廩��廬"
+msgid "Passphrase (retype)"
+msgstr "廖�廖�� (廩��)"
 
 #: ../src/protocols/silc/silc.c:958
 msgid "Generate Key Pair"
@@ -11279,7 +11450,7 @@
 
 #: ../src/protocols/silc/util.c:318
 #, c-format
-msgid "EMail: \t\t%s\n"
+msgid "E-Mail: \t\t%s\n"
 msgstr "���\"�: \t\t%s\n"
 
 #: ../src/protocols/silc/util.c:320
@@ -11304,7 +11475,7 @@
 
 #: ../src/protocols/silc/util.c:326
 #, c-format
-msgid "Key length: \t%d bits\n"
+msgid "Key Length: \t%d bits\n"
 msgstr "��廨� �廚廬�: \t%d �����\n"
 
 #: ../src/protocols/silc/util.c:328
@@ -11335,6 +11506,10 @@
 msgid "Paging"
 msgstr "��廚�廝"
 
+#: ../src/protocols/silc/util.c:522
+msgid "Video Conferencing"
+msgstr "�廣��廬 �����"
+
 #: ../src/protocols/silc/util.c:540
 msgid "Computer"
 msgstr "��廩�"
@@ -11948,6 +12123,13 @@
 msgid "YCHT port"
 msgstr "�廢��� �-YCHT"
 
+#. Write a local message to this conversation showing that a request for a
+#. * Doodle session has been made
+#.
+#: ../src/protocols/yahoo/yahoo_doodle.c:96
+msgid "Sent Doodle request."
+msgstr "�廩��� �廡廩廨 �廡廩廡廩."
+
 #. TODO: what to do here - do we really have to disconnect?
 #: ../src/protocols/yahoo/yahoo_packet.c:265
 msgid "Write Error"
@@ -11978,53 +12160,53 @@
 "web browser"
 msgstr "�� �廨廢��� �廨��廬 廚廨�廚�� ��, �廩 ��廩廬�廩 �廡�廩�廨 ��� ��廚�廚� �����廨�� 廩��."
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1006
+#: ../src/protocols/yahoo/yahoo_profile.c:1012
 msgid "Yahoo! ID"
 msgstr "����� Yahoo"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1078
-#: ../src/protocols/yahoo/yahoo_profile.c:1082
-#: ../src/protocols/yahoo/yahoo_profile.c:1086
+#: ../src/protocols/yahoo/yahoo_profile.c:1084
+#: ../src/protocols/yahoo/yahoo_profile.c:1088
+#: ../src/protocols/yahoo/yahoo_profile.c:1092
 msgid "Hobbies"
 msgstr "廬������"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1096
-#: ../src/protocols/yahoo/yahoo_profile.c:1100
+#: ../src/protocols/yahoo/yahoo_profile.c:1102
+#: ../src/protocols/yahoo/yahoo_profile.c:1106
 msgid "Latest News"
 msgstr "��廨���廬 ��廩�廬"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1121
+#: ../src/protocols/yahoo/yahoo_profile.c:1127
 msgid "Home Page"
 msgstr "�廝 ���廬"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1136
+#: ../src/protocols/yahoo/yahoo_profile.c:1142
 msgid "Cool Link 1"
 msgstr "廡�廩�廨 ����� 1"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1141
+#: ../src/protocols/yahoo/yahoo_profile.c:1147
 msgid "Cool Link 2"
 msgstr "廡�廩�廨 ����� 2"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1145
+#: ../src/protocols/yahoo/yahoo_profile.c:1151
 msgid "Cool Link 3"
 msgstr "廡�廩�廨 ����� 3"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1158
+#: ../src/protocols/yahoo/yahoo_profile.c:1164
 msgid "Last Update"
 msgstr "廣���� ���廨���"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1164
+#: ../src/protocols/yahoo/yahoo_profile.c:1170
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "廚廨�� ��廩廬�廩 %s���� ������ "
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1170
+#: ../src/protocols/yahoo/yahoo_profile.c:1176
 msgid ""
 "Sorry, this profile seems to be in a language or format that is not "
 "supported at this time."
 msgstr "廖����, �� �廨�� �� 廚廨�廚�� �� ��� �廩廚� �� 廚�廨�� 廩�� �廬���� �廨�廣."
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1186
+#: ../src/protocols/yahoo/yahoo_profile.c:1192
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
@@ -12032,7 +12214,7 @@
 "�� ��廬� �廩��廝 �廬 廚廨�廚�� ��廩廬�廩. ��� ��廨�� ���� 廬廡�� ����廬 �廩廨廬. �廩 ��廖�廬 "
 "廩��廬 ����廨 ��廬廨."
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1189
+#: ../src/protocols/yahoo/yahoo_profile.c:1195
 msgid ""
 "Could not retrieve the user's profile. This most likely means that the user "
 "does not exist; however, Yahoo! sometimes does fail to find a user's "
@@ -12042,7 +12224,7 @@
 "�廣�廬�� Yahoo! �� �廢��� ��廢�� 廚廨�廚�� �廩廬�廩. �� �廬/� ����/� 廩��廩廬�廩 廡���, �廖/� "
 "廩��廬 ����廨 ��廬廨."
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1197
+#: ../src/protocols/yahoo/yahoo_profile.c:1203
 msgid "The user's profile is empty."
 msgstr "廚廨�廚�� ��廩廬�廩 廨�廡."
 
@@ -12269,28 +12451,18 @@
 msgid "Exposure"
 msgstr "�廩�廚�"
 
-#: ../src/proxy.c:1207 ../src/proxy.c:1263 ../src/proxy.c:1311
-#: ../src/proxy.c:1338
+#: ../src/proxy.c:1216 ../src/proxy.c:1272 ../src/proxy.c:1320
+#: ../src/proxy.c:1347
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "廩���� �廩廨廬 �廬���� %d"
 
 #. Forbidden
-#: ../src/proxy.c:1327
+#: ../src/proxy.c:1336
 #, c-format
 msgid "Access denied: proxy server forbids port %d tunnelling."
 msgstr "��� �廨廩��: 廩廨廬 �廬���� ��廖廨 廣� 廬�廣�� ��廢��� %d."
 
-#: ../src/proxy.c:2327
-msgid "Invalid proxy settings"
-msgstr "���廨�廬 �� 廬廡廚�廬 廩� �廬�����"
-
-#: ../src/proxy.c:2327
-msgid ""
-"Either the host name or port number specified for your given proxy type is "
-"invalid."
-msgstr "�� �廬��廬 �廩廨廬 �� �廢��廬 �廩廨廬 廩��廬�� 廣��廨 廖�� ��廬��� 廩����廨�� 廬廡廚��."
-
 #: ../src/savedstatuses.c:514
 msgid "saved statuses"
 msgstr "廖���廖�� �廩�廨�"
@@ -12334,42 +12506,37 @@
 msgid "Mobile"
 msgstr "����"
 
-#: ../src/status.c:623
-#, c-format
-msgid "%s signed on"
-msgstr "%s �廬��廨"
-
-#: ../src/status.c:627
-#, c-format
-msgid "%s came back"
-msgstr "%s ��廨"
-
-#: ../src/status.c:634
-#, c-format
-msgid "%s signed off"
-msgstr "%s �廬�廬廡"
-
-#: ../src/status.c:638
-#, c-format
-msgid "%s went away"
-msgstr "%s �廬廨�廡 ����廩�"
-
-#: ../src/status.c:1317
+#: ../src/status.c:622
+#, c-format
+msgid "%s changed status from %s to %s"
+msgstr "%s 廩��� �廬 ���廩� �-%s �-%s"
+
+#: ../src/status.c:632
+#, c-format
+msgid "%s is now %s"
+msgstr "%s �廣廬 %s"
+
+#: ../src/status.c:637
+#, c-format
+msgid "%s is no longer %s"
+msgstr "%s ��廨 �� %s"
+
+#: ../src/status.c:1320
 #, c-format
 msgid "%s became idle"
 msgstr "%s �廖廨 廚廣���廬"
 
-#: ../src/status.c:1330
+#: ../src/status.c:1337
 #, c-format
 msgid "%s became unidle"
 msgstr "%s ��� �廚廣���廬"
 
-#: ../src/status.c:1392
+#: ../src/status.c:1403
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s �廖廨 廚廣���廬"
 
-#: ../src/status.c:1394
+#: ../src/status.c:1405
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s ��� �廚廣���廬"
@@ -12379,12 +12546,12 @@
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../src/util.c:2457
+#: ../src/util.c:2455
 #, c-format
 msgid "Error Reading %s"
 msgstr "廩���� �廡廨��廬 %s"
 
-#: ../src/util.c:2458
+#: ../src/util.c:2456
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -12392,60 +12559,99 @@
 msgstr ""
 "��� 廩���� �廣廬 廡廨��廬 �-%s 廩��.  �� �� ��廣��, �廩� �廡��廛 ��廩� ����廝 �-%s~."
 
-#: ../src/util.c:2897
+#: ../src/util.c:2895
 msgid "Calculating..."
 msgstr "��廩�..."
 
-#: ../src/util.c:2900
+#: ../src/util.c:2898
 msgid "Unknown."
 msgstr "�� ���廣"
 
-#: ../src/util.c:2926
+#: ../src/util.c:2924
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d 廩����"
 msgstr[1] "%d 廩���廬"
 
-#: ../src/util.c:2938
+#: ../src/util.c:2936
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d ���"
 msgstr[1] "%d ����"
 
-#: ../src/util.c:2946
+#: ../src/util.c:2944
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d 廩廣�"
 msgstr[1] "%s, %d 廩廣�廬"
 
-#: ../src/util.c:2952
+#: ../src/util.c:2950
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d 廩廣�"
 msgstr[1] "%d 廩廣�廬"
 
-#: ../src/util.c:2960
+#: ../src/util.c:2958
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d �廡�"
 msgstr[1] "%s, %d �廡�廬"
 
-#: ../src/util.c:2966
+#: ../src/util.c:2964
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d �廡�"
 msgstr[1] "%d �廡�廬"
 
-#: ../src/util.c:3441
+#: ../src/util.c:3431
 msgid "g003: Error opening connection.\n"
 msgstr "g003: 廩���� �廣廬 廚廬��廬 ����廨 廬廡廩�廨廬.\n"
 
+#~ msgid "Screen Name:"
+#~ msgstr "廩� �廬廢���:"
+
+#~ msgid "Error launching <b>%s</b>: %s"
+#~ msgstr "廩���� ��廚廣�廬 �廚廡��� <b>%s</b>: %s"
+
+#~ msgid "Email"
+#~ msgstr "���\"�"
+
+#~ msgid "Realname"
+#~ msgstr "廩� ���廬�"
+
+#~ msgid "Email Address"
+#~ msgstr "�廬��廬 ���\"�"
+
+#~ msgid "EMail"
+#~ msgstr "���\"�"
+
+#~ msgid "Public Key File"
+#~ msgstr "廡��廛 �廚廬� 廢���廨�"
+
+#~ msgid "Private Key File"
+#~ msgstr "廡��廛 �廚廬� 廚廨��"
+
+#~ msgid "Re-type Passphrase"
+#~ msgstr "廨廩�� 廖�廖�� �廩��廬"
+
+#~ msgid "%s signed on"
+#~ msgstr "%s �廬��廨"
+
+#~ msgid "%s came back"
+#~ msgstr "%s ��廨"
+
+#~ msgid "%s signed off"
+#~ msgstr "%s �廬�廬廡"
+
+#~ msgid "%s went away"
+#~ msgstr "%s �廬廨�廡 ����廩�"
+
 #~ msgid "%s logged out."
 #~ msgstr "%s �廬�廬廡."
 
@@ -12600,13 +12806,6 @@
 #~ msgid "/Tools/A_ccounts"
 #~ msgstr "/����/_�廩����廬"
 
-#~ msgid ""
-#~ "\n"
-#~ "<b>Contact Alias:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>廩� ��廖廝 ���廩 �廡廩廨:</b> %s"
-
 #~ msgid "Idle "
 #~ msgstr "��廖廨 廚廣���廬 "
 
@@ -13007,7 +13206,7 @@
 #~ msgid "Check Mail"
 #~ msgstr "���廡 ���廨"
 
-#~ msgid "Check e-mail every X seconds.\n"
+#~ msgid "Check email every X seconds.\n"
 #~ msgstr "���廡 ���廨 �� �廖廚廨 廩���廬. \n"
 
 #~ msgid "Auto-login"
@@ -13296,9 +13495,6 @@
 #~ msgid "Vladimira Girginova and Vladimir (Kaladan) Petkov"
 #~ msgstr "������廨� ��廨������� ������廨 (廡����) 廚�廨��"
 
-#~ msgid "Galician"
-#~ msgstr "���廖����廬"
-
 #~ msgid "Burmese"
 #~ msgstr "��廨��廬"
 
--- a/po/ja.po	Thu Mar 23 14:20:56 2006 +0000
+++ b/po/ja.po	Thu Mar 23 16:38:36 2006 +0000
@@ -1,5 +1,5 @@
 # gaim ja.po.
-# Copyright (C) 2002, Ryosuke Kutsuna <ryosuke@cool.e-mail.ne.jp>
+# Copyright (C) 2002, Ryosuke Kutsuna <ryosuke@cool.email.ne.jp>
 # Copyright (C) 2002, Taku YASUI <tach@debian.or.jp>
 # Copyright (C) 2003, Junichi Uekawa <dancer@debian.org>
 # Copyright (C) 2003-2006, Takeshi AIHANA <aihana@gnome.gr.jp>
@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: gaim 2.0.0cvs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-17 22:01+0900\n"
-"PO-Revision-Date: 2006-02-17 22:00+0900\n"
+"POT-Creation-Date: 2006-03-21 23:44+0900\n"
+"PO-Revision-Date: 2006-03-21 23:44+0900\n"
 "Last-Translator: Takeshi AIHANA <aihana@gnome.gr.jp>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
 "MIME-Version: 1.0\n"
@@ -159,7 +159,7 @@
 
 #. add enabled / disabled
 #: ../plugins/crazychat/cc_gaim_plugin.c:345 ../src/gtkaccount.c:2251
-#: ../src/gtkplugin.c:577
+#: ../src/gtkplugin.c:574
 msgid "Enabled"
 msgstr "����"
 
@@ -189,7 +189,7 @@
 msgid "Right-click for more unread messages...\n"
 msgstr "������������<���祉�若�吾��茵�ず�����翫����劻�����������������...\n"
 
-#: ../plugins/docklet/docklet.c:157 ../src/gtkblist.c:3274
+#: ../plugins/docklet/docklet.c:157 ../src/gtkblist.c:3238
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
@@ -200,44 +200,44 @@
 msgid "Change Status"
 msgstr "�倶�������"
 
-#: ../plugins/docklet/docklet.c:435 ../src/gtkstatusbox.c:663
+#: ../plugins/docklet/docklet.c:435 ../src/gtkstatusbox.c:673
 #: ../src/protocols/jabber/buddy.c:1101 ../src/protocols/msn/state.c:29
 #: ../src/protocols/msn/state.c:30 ../src/protocols/msn/state.c:37
 #: ../src/protocols/msn/state.c:38 ../src/protocols/novell/novell.c:2845
-#: ../src/protocols/yahoo/yahoo.c:2733 ../src/status.c:155
+#: ../src/protocols/yahoo/yahoo.c:2735 ../src/status.c:155
 msgid "Available"
 msgstr "��賢�������障��"
 
 #. Away stuff
 #: ../plugins/docklet/docklet.c:439 ../src/gtkprefs.c:1759
-#: ../src/gtkstatusbox.c:664 ../src/protocols/irc/irc.c:520
-#: ../src/protocols/irc/msgs.c:219 ../src/protocols/jabber/buddy.c:1105
-#: ../src/protocols/novell/novell.c:2848 ../src/protocols/oscar/oscar.c:729
-#: ../src/protocols/oscar/oscar.c:6759 ../src/protocols/oscar/oscar.c:7800
-#: ../src/protocols/silc/buddy.c:1469 ../src/protocols/yahoo/yahoo.c:3187
+#: ../src/gtkstatusbox.c:674 ../src/protocols/irc/irc.c:520
+#: ../src/protocols/irc/msgs.c:223 ../src/protocols/jabber/buddy.c:1105
+#: ../src/protocols/novell/novell.c:2848 ../src/protocols/oscar/oscar.c:793
+#: ../src/protocols/oscar/oscar.c:6836 ../src/protocols/oscar/oscar.c:7879
+#: ../src/protocols/silc/buddy.c:1469 ../src/protocols/yahoo/yahoo.c:3189
 #: ../src/status.c:158
 msgid "Away"
 msgstr "�√賢筝�"
 
-#: ../plugins/docklet/docklet.c:443 ../src/gtkstatusbox.c:665
-#: ../src/protocols/oscar/oscar.c:733 ../src/protocols/yahoo/yahoo.c:2727
+#: ../plugins/docklet/docklet.c:443 ../src/gtkstatusbox.c:675
+#: ../src/protocols/oscar/oscar.c:797 ../src/protocols/yahoo/yahoo.c:2729
 #: ../src/status.c:157
 msgid "Invisible"
 msgstr "���������障��"
 
-#: ../plugins/docklet/docklet.c:447 ../src/gtkblist.c:3004
-#: ../src/gtkstatusbox.c:666 ../src/protocols/jabber/buddy.c:1099
-#: ../src/protocols/novell/novell.c:2857 ../src/protocols/oscar/oscar.c:795
-#: ../src/protocols/oscar/oscar.c:7772 ../src/protocols/yahoo/yahoo.c:2731
+#: ../plugins/docklet/docklet.c:447 ../src/gtkblist.c:2968
+#: ../src/gtkstatusbox.c:676 ../src/protocols/jabber/buddy.c:1099
+#: ../src/protocols/novell/novell.c:2857 ../src/protocols/oscar/oscar.c:859
+#: ../src/protocols/oscar/oscar.c:7851 ../src/protocols/yahoo/yahoo.c:2733
 #: ../src/status.c:154
 msgid "Offline"
 msgstr "�������ゃ��"
 
-#: ../plugins/docklet/docklet.c:467 ../src/gtkstatusbox.c:671
+#: ../plugins/docklet/docklet.c:467 ../src/gtkstatusbox.c:681
 msgid "New..."
 msgstr "�倶����申��..."
 
-#: ../plugins/docklet/docklet.c:468 ../src/gtkstatusbox.c:672
+#: ../plugins/docklet/docklet.c:468 ../src/gtkstatusbox.c:682
 msgid "Saved..."
 msgstr "篁����倶��..."
 
@@ -245,7 +245,7 @@
 msgid "Show Buddy List"
 msgstr "篁臥�����鴻����;腓�"
 
-#: ../plugins/docklet/docklet.c:489
+#: ../plugins/docklet/docklet.c:489 ../src/gtkconv.c:5640
 msgid "Unread Messages"
 msgstr "�<���祉�若�吾����篆�"
 
@@ -257,7 +257,7 @@
 msgid "Accounts"
 msgstr "�≪�����潟��"
 
-#: ../plugins/docklet/docklet.c:520 ../src/gtkplugin.c:541
+#: ../plugins/docklet/docklet.c:520 ../src/gtkplugin.c:538
 msgid "Plugins"
 msgstr "�����違�ゃ��"
 
@@ -394,7 +394,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/filectl.c:245
+#: ../plugins/filectl.c:248
 msgid "Gaim File Control"
 msgstr "Gaim �����<�ゃ���九勝"
 
@@ -402,7 +402,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/filectl.c:248 ../plugins/filectl.c:250
+#: ../plugins/filectl.c:251 ../plugins/filectl.c:253
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "Gaime ���潟���潟�������<�ゃ�����菴違������������� Gaim ������九勝�с���障��"
 
@@ -595,10 +595,15 @@
 "筝���綏����������違�����������荅宴��Щ�����障����\n"
 "筝����潟���������違����������荅宴��Щ�����障����"
 
+#. Extract their Name and put it in
+#. Contact Info
+#. Personal
+#. Business
 #: ../plugins/gevolution/add_buddy_dialog.c:131
-#: ../plugins/gevolution/assoc-buddy.c:119 ../src/gtkplugin.c:590
+#: ../plugins/gevolution/assoc-buddy.c:119 ../src/gtkplugin.c:587
 #: ../src/gtkroomlist.c:604 ../src/protocols/jabber/jabber.c:755
-#: ../src/protocols/msn/msn.c:1524
+#: ../src/protocols/msn/msn.c:1532 ../src/protocols/msn/msn.c:1585
+#: ../src/protocols/msn/msn.c:1606
 msgid "Name"
 msgstr "����"
 
@@ -615,14 +620,14 @@
 #. "Search"
 #: ../plugins/gevolution/add_buddy_dialog.c:467
 #: ../plugins/gevolution/assoc-buddy.c:353
-#: ../src/protocols/jabber/buddy.c:1411 ../src/protocols/oscar/oscar.c:8320
+#: ../src/protocols/jabber/buddy.c:1418 ../src/protocols/oscar/oscar.c:8399
 #: ../src/protocols/sametime/sametime.c:5532
 msgid "Search"
 msgstr "罎�膣�"
 
 #: ../plugins/gevolution/add_buddy_dialog.c:548
-#: ../plugins/gevolution/new_person_dialog.c:306 ../src/gtkblist.c:4543
-#: ../src/gtkblist.c:4907
+#: ../plugins/gevolution/new_person_dialog.c:306 ../src/gtkblist.c:4612
+#: ../src/gtkblist.c:4976
 msgid "Group:"
 msgstr "�違���若��:"
 
@@ -657,13 +662,13 @@
 msgstr "篁臥�������f��(_A)"
 
 #: ../plugins/gevolution/eds-utils.c:73 ../plugins/gevolution/eds-utils.c:86
-#: ../src/protocols/jabber/jabber.c:1125
+#: ../src/protocols/jabber/jabber.c:1122
 msgid "None"
 msgstr "����"
 
 #: ../plugins/gevolution/gevo-util.c:64 ../plugins/gevolution/gevolution.c:96
-#: ../src/blist.c:516 ../src/blist.c:1270 ../src/blist.c:1495
-#: ../src/gtkblist.c:4352 ../src/protocols/jabber/roster.c:65
+#: ../src/blist.c:516 ../src/blist.c:1278 ../src/blist.c:1505
+#: ../src/gtkblist.c:4421 ../src/protocols/jabber/roster.c:65
 msgid "Buddies"
 msgstr "篁臥��"
 
@@ -699,7 +704,7 @@
 msgstr "��������参��������申�������≪�����潟���������御�����������:"
 
 #: ../plugins/gevolution/gevolution.c:450 ../plugins/idle.c:147
-#: ../plugins/idle.c:183 ../src/gtknotify.c:371 ../src/gtkpounce.c:1260
+#: ../plugins/idle.c:183 ../src/gtknotify.c:397 ../src/gtkpounce.c:1262
 msgid "Account"
 msgstr "�≪�����潟��"
 
@@ -735,6 +740,7 @@
 msgstr "�≪�����潟����┏蕁�:"
 
 #: ../plugins/gevolution/new_person_dialog.c:294 ../src/gtkaccount.c:784
+#: ../src/gtkblist.c:4574
 msgid "Screen name:"
 msgstr "�鴻�����若�喝��:"
 
@@ -745,7 +751,7 @@
 
 #. Label
 #: ../plugins/gevolution/new_person_dialog.c:337 ../src/gtkaccount.c:424
-#: ../src/gtkaccount.c:446 ../src/protocols/oscar/oscar.c:635
+#: ../src/gtkaccount.c:446 ../src/protocols/oscar/oscar.c:699
 msgid "Buddy Icon"
 msgstr "篁臥���≪�ゃ�潟��"
 
@@ -779,11 +785,16 @@
 msgid "Test to see that all ui signals are working properly."
 msgstr "������ UI �激�違������罩e幻����篏��������������鴻�����障��"
 
-#: ../plugins/history.c:143
+#: ../plugins/history.c:120
+#, c-format
+msgid "<b>Conversation with %s on %s:</b><br>"
+msgstr "<b>%s ������ %s ���荅�</b><br>"
+
+#: ../plugins/history.c:147
 msgid "History Plugin Requires Logging"
 msgstr "�㏍�井��純�� \"絮ユ⑳�����違�ゃ��\" �у�荀��с��"
 
-#: ../plugins/history.c:144
+#: ../plugins/history.c:148
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
@@ -795,15 +806,15 @@
 "�ゃ�潟�鴻�帥�潟���祉�<���祉�若�吾�����c�������㏍�違��荐��蚊�����������絮ユ⑳�����違�ゃ�潟���"
 "�純�������с���������������障����"
 
-#: ../plugins/history.c:184
+#: ../plugins/history.c:188
 msgid "History"
 msgstr "絮ユ⑳"
 
-#: ../plugins/history.c:186
+#: ../plugins/history.c:190
 msgid "Shows recently logged conversations in new conversations."
 msgstr "�違����篌�荅宴��紮�����������菴��㏍�違����蚊����篌�荅宴���水�ャ���障��"
 
-#: ../plugins/history.c:187
+#: ../plugins/history.c:191
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -923,101 +934,102 @@
 "�泣�若���眼�� IPC ���泣���若���������鴻���������違�ゃ�潟�с���������� IPC �潟���潟������"
 "�蚊���障����"
 
-#: ../plugins/log_reader.c:1407
+#: ../plugins/log_reader.c:1405
 msgid "User is offline."
 msgstr "���若�吟���������ゃ�潟�с��"
 
-#: ../plugins/log_reader.c:1413
+#: ../plugins/log_reader.c:1411
 msgid "Auto-response sent:"
 msgstr "����綽�膈�����篆�:"
 
-#: ../plugins/log_reader.c:1423 ../plugins/log_reader.c:1426
-#, c-format
-msgid "%s logged out."
-msgstr "%s �������㏍�違�≪�������障����"
-
-#: ../plugins/log_reader.c:1440
+#: ../plugins/log_reader.c:1421 ../plugins/log_reader.c:1424
+#: ../plugins/statenotify.c:80
+#, c-format
+msgid "%s has signed off."
+msgstr "%s �������泣�ゃ�潟�祉�≪�������障������"
+
+#: ../plugins/log_reader.c:1438
 msgid "One or more messages may have been undeliverable."
 msgstr "筝��や札筝����<���祉�若�吾������筝����純���倶�������c�����障��"
 
 #. MSG_SERVER_DISCONNECTING
 #. we have been kicked off =^(
-#: ../plugins/log_reader.c:1450 ../src/protocols/napster/napster.c:363
+#: ../plugins/log_reader.c:1448 ../src/protocols/napster/napster.c:363
 msgid "You were disconnected from the server."
 msgstr "�泣�若�����ョ��������障����"
 
-#: ../plugins/log_reader.c:1458
+#: ../plugins/log_reader.c:1456
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
 msgstr ""
 "�上��・膓��������障�������㏍�違�ゃ�潟�����障�с�<���祉�若�吾�����������������с���障������"
 
-#: ../plugins/log_reader.c:1473
+#: ../plugins/log_reader.c:1471
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr "�<���祉�若�吾����紊с�泣�ゃ�冴��莇�����������篆<�с���障�����с����"
 
-#: ../plugins/log_reader.c:1478
+#: ../plugins/log_reader.c:1476
 msgid "Message could not be sent."
 msgstr "�<���祉�若�吾����篆<�����������с���障�����с����"
 
+#: ../plugins/log_reader.c:1835 ../plugins/log_reader.c:1928
+msgid "Adium"
+msgstr "Adium"
+
+#: ../plugins/log_reader.c:1844 ../plugins/log_reader.c:1932
+msgid "Fire"
+msgstr "Fire"
+
+#: ../plugins/log_reader.c:1853 ../plugins/log_reader.c:1936
+msgid "Messenger Plus!"
+msgstr "�<���祉�潟�吾�c�� Plus!"
+
+#: ../plugins/log_reader.c:1862 ../plugins/log_reader.c:1940
+msgid "MSN Messenger"
+msgstr "MSN �<���祉�潟�吾�c��"
+
+#: ../plugins/log_reader.c:1871 ../plugins/log_reader.c:1944
+msgid "Trillian"
+msgstr "Trillian"
+
 #. Add general preferences.
-#: ../plugins/log_reader.c:1912
+#: ../plugins/log_reader.c:1910
 msgid "General Log Reading Configuration"
 msgstr "����"
 
-#: ../plugins/log_reader.c:1916
+#: ../plugins/log_reader.c:1914
 msgid "Fast size calculations"
 msgstr "�泣�ゃ�冴��蕭������膊�����"
 
-#: ../plugins/log_reader.c:1920
+#: ../plugins/log_reader.c:1918
 msgid "Use name heuristics"
 msgstr "����綵√������ャ�若���鴻���c������篏帥��"
 
 #. Add Log Directory preferences.
-#: ../plugins/log_reader.c:1926
+#: ../plugins/log_reader.c:1924
 msgid "Log Directory"
 msgstr "�㏍�違��荐��蚊������������"
 
-#: ../plugins/log_reader.c:1930
-msgid "Adium"
-msgstr "Adium"
-
-#: ../plugins/log_reader.c:1934
-msgid "Fire"
-msgstr "Fire"
-
-#: ../plugins/log_reader.c:1938
-msgid "Messenger Plus!"
-msgstr "�<���祉�潟�吾�c�� Plus!"
-
-#: ../plugins/log_reader.c:1942
-msgid "MSN Messenger"
-msgstr "MSN �<���祉�潟�吾�c��"
-
-#: ../plugins/log_reader.c:1946
-msgid "Trillian"
-msgstr "Trillian"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/log_reader.c:1969
+#: ../plugins/log_reader.c:1967
 msgid "Log Reader"
 msgstr "�㏍�違�祉���若��"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../plugins/log_reader.c:1973
+#: ../plugins/log_reader.c:1971
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "篁��� IM �����ゃ�≪�潟�����㏍�違���㏍�違�祉���ャ�若�≪�ц;腓冴���障��"
 
 #. * description
-#: ../plugins/log_reader.c:1977
+#: ../plugins/log_reader.c:1975
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, Fire, Messenger Plus!, MSN Messenger, and "
@@ -1357,68 +1369,68 @@
 msgid "Tests to see that most things are working."
 msgstr "筝肢�����純����篏��������������������鴻�����障��"
 
-#: ../plugins/spellchk.c:1917
+#: ../plugins/spellchk.c:1918
 msgid "Duplicate Correction"
 msgstr "��絖�������茲��������障��"
 
-#: ../plugins/spellchk.c:1918
+#: ../plugins/spellchk.c:1919
 msgid "The specified word already exists in the correction list."
 msgstr "��絎�������絖������≪���荀с�������障��"
 
-#: ../plugins/spellchk.c:2127
+#: ../plugins/spellchk.c:2128
 msgid "Text Replacements"
 msgstr "��絖�����舟��"
 
-#: ../plugins/spellchk.c:2150
+#: ../plugins/spellchk.c:2151
 msgid "You type"
 msgstr "�ュ��������絖���"
 
-#: ../plugins/spellchk.c:2164
+#: ../plugins/spellchk.c:2165
 msgid "You send"
 msgstr "絎�������篆<������絖���"
 
-#: ../plugins/spellchk.c:2178
+#: ../plugins/spellchk.c:2179
 msgid "Whole words only"
 msgstr "��茯�����"
 
-#: ../plugins/spellchk.c:2190
+#: ../plugins/spellchk.c:2191
 msgid "Case sensitive"
 msgstr "紊�/絨��鎕����阪�ャ����"
 
-#: ../plugins/spellchk.c:2216
+#: ../plugins/spellchk.c:2217
 msgid "Add a new text replacement"
 msgstr "�違����臀����申��"
 
-#: ../plugins/spellchk.c:2232
+#: ../plugins/spellchk.c:2233
 msgid "You _type:"
 msgstr "�ュ��������絖���(_T):"
 
-#: ../plugins/spellchk.c:2249
+#: ../plugins/spellchk.c:2250
 msgid "You _send:"
 msgstr "絎�������篆<������絖���(_S):"
 
 #. Created here so it can be passed to whole_words_button_toggled.
-#: ../plugins/spellchk.c:2261
+#: ../plugins/spellchk.c:2262
 msgid "_Exact case match (uncheck for automatic case handling)"
 msgstr "紊�/絨��鎕����阪�ャ����(_E)"
 
-#: ../plugins/spellchk.c:2263
+#: ../plugins/spellchk.c:2264
 msgid "Only replace _whole words"
 msgstr "��茯���筝��眼��������舟������(_W)"
 
-#: ../plugins/spellchk.c:2288
+#: ../plugins/spellchk.c:2289
 msgid "General Text Replacement Options"
 msgstr "筝���������絖�����舟�������激�с��"
 
-#: ../plugins/spellchk.c:2289
+#: ../plugins/spellchk.c:2290
 msgid "Enable replacement of last word on send"
 msgstr "��篆≧�����障������舟������"
 
-#: ../plugins/spellchk.c:2314
+#: ../plugins/spellchk.c:2315
 msgid "Text replacement"
 msgstr "�<���祉�若�吾��舟��"
 
-#: ../plugins/spellchk.c:2316 ../plugins/spellchk.c:2317
+#: ../plugins/spellchk.c:2317 ../plugins/spellchk.c:2318
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "���若�吟��絎�臂�����荀���û��c����絎�������篆<�����<���祉�若�吾���吾�������障��"
 
@@ -1476,49 +1488,44 @@
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "SSL ���ゃ���������������若����箴����障��"
 
-#: ../plugins/statenotify.c:49
+#: ../plugins/statenotify.c:50
 #, c-format
 msgid "%s is no longer away."
 msgstr "%s ��������賢�������障����"
 
-#: ../plugins/statenotify.c:51
+#: ../plugins/statenotify.c:52
 #, c-format
 msgid "%s has gone away."
 msgstr "%s �������√賢���障������"
 
-#: ../plugins/statenotify.c:61
+#: ../plugins/statenotify.c:62
 #, c-format
 msgid "%s has become idle."
 msgstr "%s ������緇�罘�筝㏍�������障������"
 
-#: ../plugins/statenotify.c:63
+#: ../plugins/statenotify.c:64
 #, c-format
 msgid "%s is no longer idle."
 msgstr "%s ������緇�罘�筝㏍����緇�鍵���障������"
 
-#: ../plugins/statenotify.c:72
+#: ../plugins/statenotify.c:73
 #, c-format
 msgid "%s has signed on."
 msgstr "%s �������泣�ゃ�潟�祉�ゃ�潟���障������"
 
-#: ../plugins/statenotify.c:79
-#, c-format
-msgid "%s has signed off."
-msgstr "%s �������泣�ゃ�潟�祉�≪�������障������"
-
-#: ../plugins/statenotify.c:90
+#: ../plugins/statenotify.c:91
 msgid "Notify When"
 msgstr "���ャ��������"
 
-#: ../plugins/statenotify.c:93
+#: ../plugins/statenotify.c:94
 msgid "Buddy Goes _Away"
 msgstr "篁臥�����√賢筝㏍����(_A)"
 
-#: ../plugins/statenotify.c:96
+#: ../plugins/statenotify.c:97
 msgid "Buddy Goes _Idle"
 msgstr "篁臥����緇�罘�筝㏍����(_I)"
 
-#: ../plugins/statenotify.c:99
+#: ../plugins/statenotify.c:100
 msgid "Buddy _Signs On/Off"
 msgstr "篁臥�����泣�ゃ�潟�祉�ゃ��/�≪����������(_S)"
 
@@ -1528,7 +1535,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/statenotify.c:141
+#: ../plugins/statenotify.c:142
 msgid "Buddy State Notification"
 msgstr "篁臥�����倶��������"
 
@@ -1536,7 +1543,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/statenotify.c:144 ../plugins/statenotify.c:147
+#: ../plugins/statenotify.c:145 ../plugins/statenotify.c:148
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
@@ -1570,15 +1577,15 @@
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "篁臥�����鴻����羂翫抗�劫�����鴻���㏍�若���������若�吾�с�潟�с��"
 
-#: ../plugins/timestamp.c:188
+#: ../plugins/timestamp.c:186
 msgid "iChat Timestamp"
 msgstr "iChat 綵√����帥�ゃ���鴻�帥�潟��"
 
-#: ../plugins/timestamp.c:195
+#: ../plugins/timestamp.c:193
 msgid "Delay"
 msgstr "����"
 
-#: ../plugins/timestamp.c:202
+#: ../plugins/timestamp.c:200
 msgid "minutes."
 msgstr "(��罸�)"
 
@@ -1588,7 +1595,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/timestamp.c:264
+#: ../plugins/timestamp.c:254
 msgid "Timestamp"
 msgstr "�帥�ゃ���鴻�帥�潟��"
 
@@ -1596,7 +1603,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/timestamp.c:267 ../plugins/timestamp.c:269
+#: ../plugins/timestamp.c:257 ../plugins/timestamp.c:259
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "iChat 綵√����帥�ゃ���鴻�帥�潟���� N ���������荅宴��賢���水�ャ���障��"
 
@@ -1701,19 +1708,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/win32/transparency/win2ktrans.c:657
+#: ../plugins/win32/transparency/win2ktrans.c:658
 msgid "Transparency"
 msgstr "���嫜"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../plugins/win32/transparency/win2ktrans.c:660
+#: ../plugins/win32/transparency/win2ktrans.c:661
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "篁臥�����鴻�����荅宴���c�潟������罧級��������������憗��"
 
 #. *  description
-#: ../plugins/win32/transparency/win2ktrans.c:662
+#: ../plugins/win32/transparency/win2ktrans.c:663
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -1739,7 +1746,7 @@
 msgstr "Windows �鴻�帥�若���≪������ Gaim ��莎桁������(_S)"
 
 #. Buddy List
-#: ../plugins/win32/winprefs/winprefs.c:417 ../src/gtkblist.c:3596
+#: ../plugins/win32/winprefs/winprefs.c:417 ../src/gtkblist.c:3665
 msgid "Buddy List"
 msgstr "篁臥�����鴻��"
 
@@ -1804,47 +1811,48 @@
 msgid "Save password"
 msgstr "���鴻���若�����絖�"
 
-#: ../src/account.c:968 ../src/account.c:1139 ../src/gtkdialogs.c:571
-#: ../src/gtkdialogs.c:708 ../src/gtkdialogs.c:776 ../src/gtkrequest.c:287
-#: ../src/protocols/gg/gg.c:454 ../src/protocols/gg/gg.c:595
-#: ../src/protocols/gg/gg.c:731 ../src/protocols/jabber/jabber.c:1322
-#: ../src/protocols/jabber/xdata.c:337 ../src/protocols/msn/msn.c:250
-#: ../src/protocols/msn/msn.c:265 ../src/protocols/msn/msn.c:280
-#: ../src/protocols/msn/msn.c:295 ../src/protocols/oscar/oscar.c:2999
-#: ../src/protocols/oscar/oscar.c:4542 ../src/protocols/oscar/oscar.c:4623
-#: ../src/protocols/oscar/oscar.c:8051 ../src/protocols/oscar/oscar.c:8174
-#: ../src/protocols/oscar/oscar.c:8199 ../src/protocols/oscar/oscar.c:8251
-#: ../src/protocols/silc/buddy.c:466 ../src/protocols/silc/buddy.c:1182
-#: ../src/protocols/silc/chat.c:423 ../src/protocols/silc/chat.c:461
-#: ../src/protocols/silc/chat.c:724 ../src/protocols/silc/ops.c:1297
-#: ../src/protocols/silc/ops.c:1910 ../src/protocols/silc/silc.c:749
-#: ../src/protocols/yahoo/yahoo.c:3061 ../src/protocols/yahoo/yahoo.c:3070
+#: ../src/account.c:968 ../src/account.c:1139 ../src/gtkblist.c:3549
+#: ../src/gtkdialogs.c:588 ../src/gtkdialogs.c:725 ../src/gtkdialogs.c:789
+#: ../src/gtkrequest.c:269 ../src/protocols/gg/gg.c:497
+#: ../src/protocols/gg/gg.c:638 ../src/protocols/gg/gg.c:774
+#: ../src/protocols/jabber/jabber.c:1319 ../src/protocols/jabber/xdata.c:337
+#: ../src/protocols/msn/msn.c:250 ../src/protocols/msn/msn.c:265
+#: ../src/protocols/msn/msn.c:280 ../src/protocols/msn/msn.c:295
+#: ../src/protocols/oscar/oscar.c:3064 ../src/protocols/oscar/oscar.c:4607
+#: ../src/protocols/oscar/oscar.c:4688 ../src/protocols/oscar/oscar.c:8130
+#: ../src/protocols/oscar/oscar.c:8253 ../src/protocols/oscar/oscar.c:8278
+#: ../src/protocols/oscar/oscar.c:8330 ../src/protocols/silc/buddy.c:466
+#: ../src/protocols/silc/buddy.c:1182 ../src/protocols/silc/chat.c:423
+#: ../src/protocols/silc/chat.c:461 ../src/protocols/silc/chat.c:724
+#: ../src/protocols/silc/ops.c:1297 ../src/protocols/silc/ops.c:1910
+#: ../src/protocols/silc/silc.c:753 ../src/protocols/yahoo/yahoo.c:3063
+#: ../src/protocols/yahoo/yahoo.c:3072
 msgid "OK"
 msgstr "OK"
 
 #: ../src/account.c:969 ../src/account.c:1140 ../src/account.c:1177
-#: ../src/gtkaccount.c:2171 ../src/gtkaccount.c:2638 ../src/gtkblist.c:4948
-#: ../src/gtkdialogs.c:572 ../src/gtkdialogs.c:709 ../src/gtkdialogs.c:777
-#: ../src/gtkdialogs.c:796 ../src/gtkdialogs.c:818 ../src/gtkdialogs.c:838
-#: ../src/gtkdialogs.c:882 ../src/gtkdialogs.c:937 ../src/gtkdialogs.c:974
-#: ../src/gtkdialogs.c:999 ../src/gtkimhtmltoolbar.c:419
-#: ../src/gtkplugin.c:297 ../src/gtkpounce.c:1093 ../src/gtkprivacy.c:568
+#: ../src/gtkaccount.c:2171 ../src/gtkaccount.c:2638 ../src/gtkblist.c:5017
+#: ../src/gtkdialogs.c:589 ../src/gtkdialogs.c:726 ../src/gtkdialogs.c:790
+#: ../src/gtkdialogs.c:809 ../src/gtkdialogs.c:831 ../src/gtkdialogs.c:851
+#: ../src/gtkdialogs.c:895 ../src/gtkdialogs.c:950 ../src/gtkdialogs.c:987
+#: ../src/gtkdialogs.c:1012 ../src/gtkimhtmltoolbar.c:419
+#: ../src/gtkplugin.c:296 ../src/gtkpounce.c:1095 ../src/gtkprivacy.c:568
 #: ../src/gtkprivacy.c:581 ../src/gtkprivacy.c:606 ../src/gtkprivacy.c:617
-#: ../src/gtkrequest.c:288 ../src/gtksavedstatuses.c:296
-#: ../src/protocols/gg/gg.c:455 ../src/protocols/gg/gg.c:596
-#: ../src/protocols/gg/gg.c:732 ../src/protocols/gg/gg.c:812
-#: ../src/protocols/jabber/buddy.c:573 ../src/protocols/jabber/buddy.c:1412
-#: ../src/protocols/jabber/buddy.c:1446 ../src/protocols/jabber/chat.c:780
-#: ../src/protocols/jabber/jabber.c:824 ../src/protocols/jabber/jabber.c:1323
+#: ../src/gtkrequest.c:270 ../src/gtksavedstatuses.c:296
+#: ../src/protocols/gg/gg.c:498 ../src/protocols/gg/gg.c:639
+#: ../src/protocols/gg/gg.c:775 ../src/protocols/gg/gg.c:854
+#: ../src/protocols/jabber/buddy.c:573 ../src/protocols/jabber/buddy.c:1419
+#: ../src/protocols/jabber/buddy.c:1453 ../src/protocols/jabber/chat.c:780
+#: ../src/protocols/jabber/jabber.c:824 ../src/protocols/jabber/jabber.c:1320
 #: ../src/protocols/jabber/xdata.c:338 ../src/protocols/msn/msn.c:251
 #: ../src/protocols/msn/msn.c:266 ../src/protocols/msn/msn.c:281
 #: ../src/protocols/msn/msn.c:296 ../src/protocols/msn/msn.c:313
-#: ../src/protocols/oscar/oscar.c:1641 ../src/protocols/oscar/oscar.c:3000
-#: ../src/protocols/oscar/oscar.c:4500 ../src/protocols/oscar/oscar.c:4543
-#: ../src/protocols/oscar/oscar.c:4580 ../src/protocols/oscar/oscar.c:4624
-#: ../src/protocols/oscar/oscar.c:8052 ../src/protocols/oscar/oscar.c:8175
-#: ../src/protocols/oscar/oscar.c:8200 ../src/protocols/oscar/oscar.c:8252
-#: ../src/protocols/oscar/oscar.c:8321
+#: ../src/protocols/oscar/oscar.c:1705 ../src/protocols/oscar/oscar.c:3065
+#: ../src/protocols/oscar/oscar.c:4565 ../src/protocols/oscar/oscar.c:4608
+#: ../src/protocols/oscar/oscar.c:4645 ../src/protocols/oscar/oscar.c:4689
+#: ../src/protocols/oscar/oscar.c:8131 ../src/protocols/oscar/oscar.c:8254
+#: ../src/protocols/oscar/oscar.c:8279 ../src/protocols/oscar/oscar.c:8331
+#: ../src/protocols/oscar/oscar.c:8400
 #: ../src/protocols/sametime/sametime.c:3376
 #: ../src/protocols/sametime/sametime.c:3461
 #: ../src/protocols/sametime/sametime.c:3631
@@ -1853,9 +1861,9 @@
 #: ../src/protocols/sametime/sametime.c:5533 ../src/protocols/silc/buddy.c:467
 #: ../src/protocols/silc/buddy.c:1078 ../src/protocols/silc/buddy.c:1183
 #: ../src/protocols/silc/chat.c:596 ../src/protocols/silc/chat.c:725
-#: ../src/protocols/silc/ops.c:1911 ../src/protocols/silc/silc.c:750
-#: ../src/protocols/silc/silc.c:955 ../src/protocols/yahoo/yahoo.c:3062
-#: ../src/protocols/yahoo/yahoo.c:3071
+#: ../src/protocols/silc/ops.c:1911 ../src/protocols/silc/silc.c:754
+#: ../src/protocols/silc/silc.c:959 ../src/protocols/yahoo/yahoo.c:3064
+#: ../src/protocols/yahoo/yahoo.c:3073
 msgid "Cancel"
 msgstr "�㏍�c�潟�祉��"
 
@@ -1864,12 +1872,13 @@
 msgid "Missing protocol plugin for %s"
 msgstr "���㏍���潟�� %s �������違�ゃ�潟�������障����"
 
-#: ../src/account.c:996 ../src/connection.c:99 ../src/gtkblist.c:3484
+#: ../src/account.c:996 ../src/connection.c:99 ../src/gtkblist.c:3541
+#: ../src/gtkblist.c:3547
 msgid "Connection Error"
 msgstr "�ョ�������"
 
-#: ../src/account.c:1076 ../src/protocols/gg/gg.c:636
-#: ../src/protocols/jabber/jabber.c:1275
+#: ../src/account.c:1076 ../src/protocols/gg/gg.c:679
+#: ../src/protocols/jabber/jabber.c:1272
 msgid "New passwords do not match."
 msgstr "�違�������鴻���若����筝��眼���障������"
 
@@ -1903,7 +1912,7 @@
 msgid "Change user information for %s"
 msgstr "%s �����若�倶���宴�����"
 
-#: ../src/account.c:1176 ../src/gtkdebug.c:684 ../src/gtkrequest.c:294
+#: ../src/account.c:1176 ../src/gtkdebug.c:684 ../src/gtkrequest.c:276
 #: ../src/protocols/jabber/buddy.c:572
 msgid "Save"
 msgstr "篆�絖�����"
@@ -1918,11 +1927,11 @@
 msgid "buddy list"
 msgstr "篁臥�����鴻��"
 
-#: ../src/blist.c:1173
+#: ../src/blist.c:1179
 msgid "Chats"
 msgstr "���c����"
 
-#: ../src/blist.c:1886
+#: ../src/blist.c:1901
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because it belongs to an account "
@@ -1938,7 +1947,7 @@
 "%d �����≪�����潟�����≦�鴻�障�����������ゃ�括�倶�������������������≪�����潟�����違����"
 "�� %s �������ゃ�с���障�����с��������������参�����違���若�������ゃ���障������\n"
 
-#: ../src/blist.c:1896
+#: ../src/blist.c:1911
 msgid "Group not removed"
 msgstr "�違���若�������ゃ�с���障����"
 
@@ -1951,7 +1960,7 @@
 msgid "+++ %s signed on"
 msgstr "+++ %s �������泣�ゃ�潟�祉�ゃ�潟���障����"
 
-#: ../src/connection.c:322
+#: ../src/connection.c:313
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s �������泣�ゃ�潟�祉�≪�������障����"
@@ -2003,7 +2012,7 @@
 msgid "%s left the room (%s)."
 msgstr "%s ���������c�������若�� (%s) ������絎ゃ���障����"
 
-#: ../src/desktopitem.c:286 ../src/desktopitem.c:875
+#: ../src/desktopitem.c:286 ../src/desktopitem.c:877
 msgid "No name"
 msgstr "��������"
 
@@ -2155,7 +2164,7 @@
 msgid "Password:"
 msgstr "���鴻���若��:"
 
-#: ../src/gtkaccount.c:863 ../src/gtkblist.c:4526 ../src/gtkblist.c:4892
+#: ../src/gtkaccount.c:863 ../src/gtkblist.c:4595 ../src/gtkblist.c:4961
 msgid "Alias:"
 msgstr "�ュ��:"
 
@@ -2242,7 +2251,7 @@
 msgid "Add Account"
 msgstr "�≪�����潟����申��"
 
-#: ../src/gtkaccount.c:1738
+#: ../src/gtkaccount.c:1738 ../src/gtkblist.c:3550
 msgid "Modify Account"
 msgstr "�≪�����潟����隈��"
 
@@ -2264,13 +2273,13 @@
 msgid "Are you sure you want to delete %s?"
 msgstr "����� %s �����ゃ���������������с����鐚�"
 
-#: ../src/gtkaccount.c:2170 ../src/gtkpounce.c:1092 ../src/gtkrequest.c:291
+#: ../src/gtkaccount.c:2170 ../src/gtkpounce.c:1094 ../src/gtkrequest.c:273
 #: ../src/gtksavedstatuses.c:295
 msgid "Delete"
 msgstr "���ゃ����"
 
 #: ../src/gtkaccount.c:2228 ../src/gtksavedstatuses.c:890
-#: ../src/protocols/oscar/oscar.c:5187
+#: ../src/protocols/oscar/oscar.c:5252
 msgid "Screen Name"
 msgstr "�鴻�����若�喝��"
 
@@ -2287,229 +2296,229 @@
 msgid "Add buddy to your list?"
 msgstr "篁臥�������鴻����申�����障����鐚�"
 
-#: ../src/gtkaccount.c:2637 ../src/gtkblist.c:4947 ../src/gtkconv.c:1616
-#: ../src/gtkrequest.c:292 ../src/protocols/gg/gg.c:811
-#: ../src/protocols/oscar/oscar.c:4812
+#: ../src/gtkaccount.c:2637 ../src/gtkblist.c:5016 ../src/gtkconv.c:1625
+#: ../src/gtkrequest.c:274 ../src/protocols/gg/gg.c:853
+#: ../src/protocols/oscar/oscar.c:4877
 #: ../src/protocols/sametime/sametime.c:5408 ../src/protocols/silc/chat.c:595
 msgid "Add"
 msgstr "菴遵������"
 
-#: ../src/gtkblist.c:673
+#: ../src/gtkblist.c:672
 msgid "Join a Chat"
 msgstr "���c���������"
 
-#: ../src/gtkblist.c:694
+#: ../src/gtkblist.c:693
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "�����������c�������ゃ�������������宴���ュ�������������\n"
 
-#: ../src/gtkblist.c:705 ../src/gtkpounce.c:527 ../src/gtkroomlist.c:377
+#: ../src/gtkblist.c:704 ../src/gtkpounce.c:527 ../src/gtkroomlist.c:377
 msgid "_Account:"
 msgstr "�≪�����潟��(_A):"
 
-#: ../src/gtkblist.c:949
+#: ../src/gtkblist.c:948
 msgid "Get _Info"
 msgstr "���宴���緇�(_I)"
 
-#: ../src/gtkblist.c:952 ../src/gtkstock.c:141
+#: ../src/gtkblist.c:951 ../src/gtkstock.c:141
 msgid "I_M"
 msgstr "IM(_M)"
 
-#: ../src/gtkblist.c:958
+#: ../src/gtkblist.c:957
 msgid "_Send File"
 msgstr "���<�ゃ������篆�(_S)"
 
-#: ../src/gtkblist.c:965
+#: ../src/gtkblist.c:964
 msgid "Add Buddy _Pounce"
 msgstr "�ゃ����篁臥����申��(_P)"
 
-#: ../src/gtkblist.c:969 ../src/gtkblist.c:973 ../src/gtkblist.c:1072
-#: ../src/gtkblist.c:1095
+#: ../src/gtkblist.c:968 ../src/gtkblist.c:972 ../src/gtkblist.c:1071
+#: ../src/gtkblist.c:1094
 msgid "View _Log"
 msgstr "�㏍�違��;腓�(_L)"
 
-#: ../src/gtkblist.c:984
+#: ../src/gtkblist.c:983
 msgid "Alias..."
 msgstr "�ュ��..."
 
-#: ../src/gtkblist.c:987 ../src/gtkconv.c:1613 ../src/gtkrequest.c:293
+#: ../src/gtkblist.c:986 ../src/gtkconv.c:1622 ../src/gtkrequest.c:275
 msgid "Remove"
 msgstr "����"
 
-#: ../src/gtkblist.c:993 ../src/gtkblist.c:1080 ../src/gtkblist.c:1101
+#: ../src/gtkblist.c:992 ../src/gtkblist.c:1079 ../src/gtkblist.c:1100
 msgid "_Alias..."
 msgstr "�ュ��(_A)..."
 
-#: ../src/gtkblist.c:995 ../src/gtkblist.c:1082 ../src/gtkblist.c:1103
+#: ../src/gtkblist.c:994 ../src/gtkblist.c:1081 ../src/gtkblist.c:1102
 msgid "_Remove"
 msgstr "����(_R)"
 
-#: ../src/gtkblist.c:1043
+#: ../src/gtkblist.c:1042
 msgid "Add a _Buddy"
 msgstr "篁臥����申��(_B)"
 
-#: ../src/gtkblist.c:1045
+#: ../src/gtkblist.c:1044
 msgid "Add a C_hat"
 msgstr "���c������申��(_H)"
 
-#: ../src/gtkblist.c:1048
+#: ../src/gtkblist.c:1047
 msgid "_Delete Group"
 msgstr "�違���若��������(_D)"
 
-#: ../src/gtkblist.c:1050
+#: ../src/gtkblist.c:1049
 msgid "_Rename"
 msgstr "���������(_R)"
 
 #. join button
-#: ../src/gtkblist.c:1068 ../src/gtkroomlist.c:285 ../src/gtkroomlist.c:441
+#: ../src/gtkblist.c:1067 ../src/gtkroomlist.c:285 ../src/gtkroomlist.c:441
 #: ../src/gtkstock.c:139
 msgid "_Join"
 msgstr "����(_J)"
 
-#: ../src/gtkblist.c:1070
+#: ../src/gtkblist.c:1069
 msgid "Auto-Join"
 msgstr "��������"
 
-#: ../src/gtkblist.c:1108 ../src/gtkblist.c:1131
+#: ../src/gtkblist.c:1107 ../src/gtkblist.c:1130
 msgid "_Collapse"
 msgstr "�潟��(_C)"
 
-#: ../src/gtkblist.c:1136
+#: ../src/gtkblist.c:1135
 msgid "_Expand"
 msgstr "綺�����(_E)"
 
-#: ../src/gtkblist.c:1414 ../src/gtkblist.c:1426 ../src/gtkblist.c:3741
-#: ../src/gtkblist.c:3751
+#: ../src/gtkblist.c:1381 ../src/gtkblist.c:1393 ../src/gtkblist.c:3810
+#: ../src/gtkblist.c:3820
 msgid "/Tools/Mute Sounds"
 msgstr "/���若��/���ャ�若��"
 
-#: ../src/gtkblist.c:1889 ../src/gtkconv.c:4215 ../src/gtkpounce.c:426
+#: ../src/gtkblist.c:1853 ../src/gtkconv.c:4209 ../src/gtkpounce.c:426
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "�上����篁臥����申�������純���≪�����潟���с�泣�ゃ�潟�祉�ゃ�潟�������障������"
 
 #. Buddies menu
-#: ../src/gtkblist.c:2463
+#: ../src/gtkblist.c:2427
 msgid "/_Buddies"
 msgstr "/篁臥��(_B)"
 
-#: ../src/gtkblist.c:2464
+#: ../src/gtkblist.c:2428
 msgid "/Buddies/New Instant _Message..."
 msgstr "/篁臥��/�違�����ゃ�潟�鴻�帥�潟���祉�<���祉�若��(_I)..."
 
-#: ../src/gtkblist.c:2465
+#: ../src/gtkblist.c:2429
 msgid "/Buddies/Join a _Chat..."
 msgstr "/篁臥��/���c���������(_C)..."
 
-#: ../src/gtkblist.c:2466
+#: ../src/gtkblist.c:2430
 msgid "/Buddies/Get User _Info..."
 msgstr "/篁臥��/���若�倶���宴���緇�(_I)..."
 
-#: ../src/gtkblist.c:2467
+#: ../src/gtkblist.c:2431
 msgid "/Buddies/View User _Log..."
 msgstr "/篁臥��/���若�吟�祉�㏍�違��;腓�(_L)..."
 
-#: ../src/gtkblist.c:2469
+#: ../src/gtkblist.c:2433
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/篁臥��/�������ゃ�潟��参����茵�ず����(_O)"
 
-#: ../src/gtkblist.c:2470
+#: ../src/gtkblist.c:2434
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/篁臥��/腥冴�違���若����茵�ず����(_E)"
 
-#: ../src/gtkblist.c:2471
+#: ../src/gtkblist.c:2435
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/篁臥��/篁臥�����膣違��茵�ず����(_D)"
 
-#: ../src/gtkblist.c:2472
+#: ../src/gtkblist.c:2436
 msgid "/Buddies/Show Idle _Times"
 msgstr "/篁臥��/緇�罘�筝㏍��������茵�ず����(_T)"
 
-#: ../src/gtkblist.c:2473
+#: ../src/gtkblist.c:2437
 msgid "/Buddies/_Sort Buddies"
 msgstr "/篁臥��/篁臥����研�恰�帥��(_S)"
 
-#: ../src/gtkblist.c:2475
+#: ../src/gtkblist.c:2439
 msgid "/Buddies/_Add Buddy..."
 msgstr "/篁臥��/篁臥����申��(_A)..."
 
-#: ../src/gtkblist.c:2476
+#: ../src/gtkblist.c:2440
 msgid "/Buddies/Add C_hat..."
 msgstr "/篁臥��/���c������申��(_H)..."
 
-#: ../src/gtkblist.c:2477
+#: ../src/gtkblist.c:2441
 msgid "/Buddies/Add _Group..."
 msgstr "/篁臥��/�違���若����申��(_G)..."
 
-#: ../src/gtkblist.c:2479
+#: ../src/gtkblist.c:2443
 msgid "/Buddies/_Quit"
 msgstr "/篁臥��/腟�篋�(_Q)"
 
 #. Accounts menu
-#: ../src/gtkblist.c:2482
+#: ../src/gtkblist.c:2446
 msgid "/_Accounts"
 msgstr "/�≪�����潟��(_A)"
 
-#: ../src/gtkblist.c:2483 ../src/gtkblist.c:5526
+#: ../src/gtkblist.c:2447 ../src/gtkblist.c:5595
 msgid "/Accounts/Add\\/Edit"
 msgstr "/�≪�����潟��/菴遵��\\/膩���"
 
 #. Tools
-#: ../src/gtkblist.c:2486
+#: ../src/gtkblist.c:2450
 msgid "/_Tools"
 msgstr "/���若��(_T)"
 
-#: ../src/gtkblist.c:2487
+#: ../src/gtkblist.c:2451
 msgid "/Tools/Buddy _Pounces"
 msgstr "/���若��/篁臥�����ゃ����(_P)"
 
-#: ../src/gtkblist.c:2488
+#: ../src/gtkblist.c:2452
 msgid "/Tools/Plu_gins"
 msgstr "/���若��/�����違�ゃ��(_G)"
 
-#: ../src/gtkblist.c:2489
+#: ../src/gtkblist.c:2453
 msgid "/Tools/Pr_eferences"
 msgstr "/���若��/荐㊤�(_E)"
 
-#: ../src/gtkblist.c:2490
+#: ../src/gtkblist.c:2454
 msgid "/Tools/Pr_ivacy"
 msgstr "/���若��/��篋堺����(_I)"
 
-#: ../src/gtkblist.c:2492
+#: ../src/gtkblist.c:2456
 msgid "/Tools/_File Transfers"
 msgstr "/���若��/���<�ゃ����拶��(_F)"
 
-#: ../src/gtkblist.c:2493
+#: ../src/gtkblist.c:2457
 msgid "/Tools/R_oom List"
 msgstr "/���若��/���c�������若�����荀�(_O)"
 
-#: ../src/gtkblist.c:2494
+#: ../src/gtkblist.c:2458
 msgid "/Tools/System _Log"
 msgstr "/���若��/�激�鴻�����祉�㏍��(_L)"
 
-#: ../src/gtkblist.c:2496
+#: ../src/gtkblist.c:2460
 msgid "/Tools/Mute _Sounds"
 msgstr "/���若��/���ャ�若��(_S)"
 
 #. Help
-#: ../src/gtkblist.c:2499
+#: ../src/gtkblist.c:2463
 msgid "/_Help"
 msgstr "/������(_H)"
 
-#: ../src/gtkblist.c:2500
+#: ../src/gtkblist.c:2464
 msgid "/Help/Online _Help"
 msgstr "/������/���潟���ゃ�潟�祉������(_H)"
 
-#: ../src/gtkblist.c:2501
+#: ../src/gtkblist.c:2465
 msgid "/Help/_Debug Window"
 msgstr "/������/�������違�祉���c�潟����(_D)"
 
-#: ../src/gtkblist.c:2502
+#: ../src/gtkblist.c:2466
 msgid "/Help/_About"
 msgstr "/������/����(_A)"
 
-#: ../src/gtkblist.c:2534 ../src/gtkblist.c:2603
+#: ../src/gtkblist.c:2498 ../src/gtkblist.c:2567
 #, c-format
 msgid ""
 "\n"
@@ -2518,7 +2527,7 @@
 "\n"
 "<b>�≪�����潟��:</b> %s"
 
-#: ../src/gtkblist.c:2615
+#: ../src/gtkblist.c:2579
 #, c-format
 msgid ""
 "\n"
@@ -2527,7 +2536,7 @@
 "\n"
 "<b>篁臥�����ュ��:</b> %s"
 
-#: ../src/gtkblist.c:2627
+#: ../src/gtkblist.c:2591
 #, c-format
 msgid ""
 "\n"
@@ -2536,7 +2545,7 @@
 "\n"
 "<b>������:</b> %s"
 
-#: ../src/gtkblist.c:2636
+#: ../src/gtkblist.c:2600
 #, c-format
 msgid ""
 "\n"
@@ -2545,7 +2554,7 @@
 "\n"
 "<b>�㏍�違�ゃ�潟��������:</b> %s"
 
-#: ../src/gtkblist.c:2647
+#: ../src/gtkblist.c:2611
 #, c-format
 msgid ""
 "\n"
@@ -2554,7 +2563,7 @@
 "\n"
 "<b>緇�罘�筝�:</b> %s"
 
-#: ../src/gtkblist.c:2682
+#: ../src/gtkblist.c:2646
 #, c-format
 msgid ""
 "\n"
@@ -2563,7 +2572,7 @@
 "\n"
 "<b>��緇�����篌�����������:</b> %s��"
 
-#: ../src/gtkblist.c:2691
+#: ../src/gtkblist.c:2655
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2571,7 +2580,7 @@
 "\n"
 "<b>�倶��:</b> �������ゃ��"
 
-#: ../src/gtkblist.c:2702
+#: ../src/gtkblist.c:2666
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2579,7 +2588,7 @@
 "\n"
 "<b>茯���:</b> �鴻���若�㏍��"
 
-#: ../src/gtkblist.c:2704
+#: ../src/gtkblist.c:2668
 msgid ""
 "\n"
 "<b>Status:</b> Awesome"
@@ -2587,7 +2596,7 @@
 "\n"
 "<b>�倶��:</b> 絨�������"
 
-#: ../src/gtkblist.c:2706
+#: ../src/gtkblist.c:2670
 msgid ""
 "\n"
 "<b>Status:</b> Rockin'"
@@ -2595,117 +2604,125 @@
 "\n"
 "<b>�倶��:</b> �違���若��"
 
-#: ../src/gtkblist.c:2995
+#: ../src/gtkblist.c:2959
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "緇�罘�筝� %dh %02dm"
 
-#: ../src/gtkblist.c:2997
+#: ../src/gtkblist.c:2961
 #, c-format
 msgid "Idle %dm"
 msgstr "緇�罘�筝� %dm"
 
 #. Idle stuff
-#: ../src/gtkblist.c:3000 ../src/gtkprefs.c:1745
+#: ../src/gtkblist.c:2964 ../src/gtkprefs.c:1745
 #: ../src/protocols/bonjour/bonjour.c:333 ../src/protocols/msn/msn.c:552
 #: ../src/protocols/msn/state.c:32 ../src/protocols/novell/novell.c:2854
-#: ../src/protocols/oscar/oscar.c:5208 ../src/protocols/yahoo/yahoo.c:2729
+#: ../src/protocols/oscar/oscar.c:5273 ../src/protocols/yahoo/yahoo.c:2731
 #: ../src/protocols/yahoo/yahoo_profile.c:691
 msgid "Idle"
 msgstr "緇�罘�筝�"
 
-#: ../src/gtkblist.c:3132
+#: ../src/gtkblist.c:3096
 msgid "/Buddies/New Instant Message..."
 msgstr "/篁臥��/�違�����ゃ�潟�鴻�帥�潟���祉�<���祉�若��..."
 
-#: ../src/gtkblist.c:3133 ../src/gtkblist.c:3166
+#: ../src/gtkblist.c:3097 ../src/gtkblist.c:3130
 msgid "/Buddies/Join a Chat..."
 msgstr "/篁臥��/���c���������..."
 
-#: ../src/gtkblist.c:3134
+#: ../src/gtkblist.c:3098
 msgid "/Buddies/Get User Info..."
 msgstr "/篁臥��/���若�倶���宴���緇�..."
 
-#: ../src/gtkblist.c:3135
+#: ../src/gtkblist.c:3099
 msgid "/Buddies/Add Buddy..."
 msgstr "/篁臥��/篁臥����申��..."
 
-#: ../src/gtkblist.c:3136 ../src/gtkblist.c:3169
+#: ../src/gtkblist.c:3100 ../src/gtkblist.c:3133
 msgid "/Buddies/Add Chat..."
 msgstr "/篁臥��/���c������申��..."
 
-#: ../src/gtkblist.c:3137
+#: ../src/gtkblist.c:3101
 msgid "/Buddies/Add Group..."
 msgstr "/篁臥��/�違���若����申��..."
 
-#: ../src/gtkblist.c:3172
+#: ../src/gtkblist.c:3136
 msgid "/Tools/Buddy Pounces"
 msgstr "/���若��/篁臥�����ゃ����"
 
-#: ../src/gtkblist.c:3175
+#: ../src/gtkblist.c:3139
 msgid "/Tools/Privacy"
 msgstr "/���若��/��篋堺����"
 
-#: ../src/gtkblist.c:3178
+#: ../src/gtkblist.c:3142
 msgid "/Tools/Room List"
 msgstr "/���若��/���c�������若�����荀�"
 
-#: ../src/gtkblist.c:3372
+#: ../src/gtkblist.c:3336
 msgid "Manually"
 msgstr "����"
 
-#: ../src/gtkblist.c:3374
+#: ../src/gtkblist.c:3338
 msgid "Alphabetically"
 msgstr "�≪�����<��������"
 
-#: ../src/gtkblist.c:3375
+#: ../src/gtkblist.c:3339
 msgid "By status"
 msgstr "�倶����"
 
-#: ../src/gtkblist.c:3376
+#: ../src/gtkblist.c:3340
 msgid "By log size"
 msgstr "�㏍�違�祉�泣�ゃ�咲��"
 
-#: ../src/gtkblist.c:3481 ../src/gtkconn.c:191
+#: ../src/gtkblist.c:3535 ../src/gtkconn.c:196
 #, c-format
 msgid "%s disconnected"
 msgstr "%s ������・膓��������障����"
 
-#: ../src/gtkblist.c:3503
+#: ../src/gtkblist.c:3551 ../src/protocols/sametime/sametime.c:3630
+msgid "Connect"
+msgstr "�ョ�"
+
+#: ../src/gtkblist.c:3551
+msgid "Re-enable Account"
+msgstr "�≪�����潟�������恰���鴻������"
+
+#: ../src/gtkblist.c:3572
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s ��・膓��������障����: %s</span>"
 
-#: ../src/gtkblist.c:3630
+#: ../src/gtkblist.c:3699
 msgid "/Accounts"
 msgstr "/�≪�����潟��"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../src/gtkblist.c:3735
+#: ../src/gtkblist.c:3804
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/篁臥��/�������ゃ�潟��参����茵�ず����"
 
-#: ../src/gtkblist.c:3738
+#: ../src/gtkblist.c:3807
 msgid "/Buddies/Show Empty Groups"
 msgstr "/篁臥��/腥冴���違���若����茵�ず����"
 
-#: ../src/gtkblist.c:3744
+#: ../src/gtkblist.c:3813
 msgid "/Buddies/Show Buddy Details"
 msgstr "/篁臥��/篁臥�����膣違��茵�ず����"
 
-#: ../src/gtkblist.c:3747
+#: ../src/gtkblist.c:3816
 msgid "/Buddies/Show Idle Times"
 msgstr "/篁臥��/緇�罘�筝㏍��������茵�ず����"
 
-#: ../src/gtkblist.c:4459 ../src/protocols/silc/buddy.c:736
+#: ../src/gtkblist.c:4528 ../src/protocols/silc/buddy.c:736
 #: ../src/protocols/silc/buddy.c:1030 ../src/protocols/silc/buddy.c:1075
-#: ../src/protocols/silc/buddy.c:1174 ../src/protocols/yahoo/yahoo.c:2976
+#: ../src/protocols/silc/buddy.c:1174 ../src/protocols/yahoo/yahoo.c:2978
 msgid "Add Buddy"
 msgstr "篁臥����申��"
 
-#: ../src/gtkblist.c:4483
+#: ../src/gtkblist.c:4552
 msgid ""
 "Please enter the screen name of the person you would like to add to your "
 "buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
@@ -2715,142 +2732,66 @@
 "�ュ���障�������������ュ���с���障�����ュ������純�������鴻�����若�喝����撮����ű;腓冴��"
 "���障����\n"
 
-#: ../src/gtkblist.c:4505
-msgid "Screen Name:"
-msgstr "�鴻�����若�喝��:"
-
 #. Set up stuff for the account box
-#: ../src/gtkblist.c:4553 ../src/gtkblist.c:4872
+#: ../src/gtkblist.c:4622 ../src/gtkblist.c:4941
 msgid "Account:"
 msgstr "�≪�����潟��:"
 
-#: ../src/gtkblist.c:4805
+#: ../src/gtkblist.c:4874
 msgid "This protocol does not support chat rooms."
 msgstr "�������㏍���潟���с�����c�����祉���若�����泣���若���������障������"
 
-#: ../src/gtkblist.c:4821
+#: ../src/gtkblist.c:4890
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "���c���������純�����㏍���潟���с�泣�ゃ�潟�祉�ゃ�潟�������障������"
 
-#: ../src/gtkblist.c:4838
+#: ../src/gtkblist.c:4907
 msgid "Add Chat"
 msgstr "���c������申��"
 
-#: ../src/gtkblist.c:4862
+#: ../src/gtkblist.c:4931
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr ""
 "�������c�������ュ����参�����鴻����申����������Ε綵������宴���ュ�����������:\n"
 
-#: ../src/gtkblist.c:4944 ../src/protocols/sametime/sametime.c:5319
+#: ../src/gtkblist.c:5013 ../src/protocols/sametime/sametime.c:5319
 #: ../src/protocols/sametime/sametime.c:5406
 msgid "Add Group"
 msgstr "�違���若����申��"
 
-#: ../src/gtkblist.c:4945
+#: ../src/gtkblist.c:5014
 msgid "Please enter the name of the group to be added."
 msgstr "菴遵�������違���若�����������ュ�����������:"
 
-#: ../src/gtkblist.c:5566
+#: ../src/gtkblist.c:5635
 msgid "_Edit Account"
 msgstr "�≪�����潟����隈��(_E)"
 
-#: ../src/gtkblist.c:5599 ../src/gtkblist.c:5605
+#: ../src/gtkblist.c:5668 ../src/gtkblist.c:5674
 msgid "No actions available"
 msgstr "������純���≪���激�с�潟�������障����"
 
-#: ../src/gtkblist.c:5613
+#: ../src/gtkblist.c:5682
 msgid "_Disable"
 msgstr "�≦�鴻������(_D)"
 
-#: ../src/gtkblist.c:5625
+#: ../src/gtkblist.c:5694
 msgid "Enable Account"
 msgstr "�≪�����潟�������鴻������"
 
-#: ../src/gtkblist.c:5678
+#: ../src/gtkblist.c:5747
 msgid "/Tools"
 msgstr "/���若��"
 
-#: ../src/gtkblist.c:5773
+#: ../src/gtkblist.c:5833
 msgid "/Buddies/Sort Buddies"
 msgstr "/篁臥��/篁臥����研�恰�帥��"
 
-#: ../src/gtkcellview.c:198
-msgid "Background color name"
-msgstr "�����蚊������"
-
-#: ../src/gtkcellview.c:199
-msgid "Background color as a string"
-msgstr "�����蚊����絖�茵�憗�с��"
-
-#: ../src/gtkcellview.c:205 ../src/gtkimhtmltoolbar.c:1014
-msgid "Background color"
-msgstr "�����蚊��紊��眼���障��"
-
-#: ../src/gtkcellview.c:206
-msgid "Background color as a GdkColor"
-msgstr "�����蚊��腓冴�� GdkColor 綵√�����絖����с��"
-
-#: ../src/gtkcellview.c:213
-msgid "Background set"
-msgstr "�����蚊���祉����"
-
-#: ../src/gtkcellview.c:214
-msgid "Whether this tag affects the background color"
-msgstr "�����帥�違�������蚊��襲�帥�������������с��"
-
-#: ../src/gtkcombobox.c:490
-msgid "ComboBox model"
-msgstr "ComboBox ���≪����"
-
-#: ../src/gtkcombobox.c:491
-msgid "The model for the combo box"
-msgstr "�潟�潟���祉�������鴻���≪�����с��"
-
-#: ../src/gtkcombobox.c:498
-msgid "Wrap width"
-msgstr "���������"
-
-#: ../src/gtkcombobox.c:499
-msgid "Wrap width for layouting the items in a grid"
-msgstr "�違��������賢����臀������≪�ゃ�����������篏��純�с��"
-
-#: ../src/gtkcombobox.c:508
-msgid "Row span column"
-msgstr "茵����������ゅ��"
-
-#: ../src/gtkcombobox.c:509
-msgid "TreeModel column containing the row span values"
-msgstr "茵����������ゃ��篆����������� TreeModel �����с��"
-
-#: ../src/gtkcombobox.c:518
-msgid "Column span column"
-msgstr "�����������ゅ��"
-
-#: ../src/gtkcombobox.c:520
-msgid "TreeModel column containing the column span values"
-msgstr "�����������ゃ��篆����������� TreeModel ����"
-
-#: ../src/gtkcombobox.c:529
-msgid "Active item"
-msgstr "���鴻������"
-
-#: ../src/gtkcombobox.c:530
-msgid "The item which is currently active"
-msgstr "�上���≪�����c���������с��"
-
-#: ../src/gtkcombobox.c:538
-msgid "Appears as list"
-msgstr "���鴻��茵�ず"
-
-#: ../src/gtkcombobox.c:539
-msgid "Whether combobox dropdowns should look like lists rather than menus"
-msgstr "���㏍���������潟���<���ャ�弱��綣��������Ù�鴻����綣��;腓冴�������������с��"
-
-#: ../src/gtkconn.c:192
+#: ../src/gtkconn.c:197
 #, c-format
 msgid ""
 "%s was disconnected due to an error: %s\n"
@@ -2858,12 +2799,7 @@
 "and re-enable the account."
 msgstr ""
 "�����若���榊���������� %s ��������・膓��������障����: %s\n"
-"�����馹���茹f浦���≪�����潟��������筝�綺����鴻������・膓����眼�����������"
-
-#: ../src/gtkconv.c:364
-#, c-format
-msgid "me is using Gaim v%s."
-msgstr "腱��� Gaim v%s ��篏睡���������障��"
+"�����若��茹f浦���≪�����潟��������筝�綺����鴻�������障�у���ョ����障������"
 
 #: ../src/gtkconv.c:373
 msgid "Supported debug options are:  version"
@@ -2935,7 +2871,7 @@
 msgid "_Message:"
 msgstr "�<���祉�若��(_M):"
 
-#: ../src/gtkconv.c:945 ../src/gtkconv.c:2399 ../src/gtkdebug.c:217
+#: ../src/gtkconv.c:945 ../src/gtkconv.c:2392 ../src/gtkdebug.c:217
 #: ../src/gtkft.c:488
 msgid "Unable to open file."
 msgstr "���<�ゃ���������障����"
@@ -2949,275 +2885,291 @@
 msgid "Save Conversation"
 msgstr "篌�荅宴���絖�"
 
-#: ../src/gtkconv.c:1093 ../src/gtkdebug.c:165 ../src/gtkdebug.c:678
+#: ../src/gtkconv.c:1096 ../src/gtkdebug.c:165 ../src/gtkdebug.c:678
 msgid "Find"
 msgstr "罎�膣�"
 
-#: ../src/gtkconv.c:1119 ../src/gtkdebug.c:193
+#: ../src/gtkconv.c:1122 ../src/gtkdebug.c:193
 msgid "_Search for:"
 msgstr "罎�膣≪������茯�(_S):"
 
-#: ../src/gtkconv.c:1290
+#: ../src/gtkconv.c:1293
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr "�㏍�違����蚊����紮����障����������篁ラ�����荅宴���㏍�違����蚊�����障����"
 
-#: ../src/gtkconv.c:1298
+#: ../src/gtkconv.c:1301
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr "�㏍�違����蚊����罩≪���障����������篁ラ�����荅宴���㏍�違����蚊�����障������"
 
-#: ../src/gtkconv.c:1578
+#: ../src/gtkconv.c:1562
 msgid "IM"
 msgstr "IM"
 
-#: ../src/gtkconv.c:1584 ../src/protocols/oscar/oscar.c:650
+#: ../src/gtkconv.c:1573 ../src/protocols/oscar/oscar.c:714
 msgid "Send File"
 msgstr "���<�ゃ������篆�"
 
-#: ../src/gtkconv.c:1591
+#: ../src/gtkconv.c:1588
 msgid "Un-Ignore"
 msgstr "�∴�������"
 
-#: ../src/gtkconv.c:1594
+#: ../src/gtkconv.c:1591
 msgid "Ignore"
 msgstr "�∴�����絲乗院"
 
-#: ../src/gtkconv.c:1600
+#: ../src/gtkconv.c:1601
 msgid "Info"
 msgstr "����"
 
-#: ../src/gtkconv.c:1606
+#: ../src/gtkconv.c:1611
 msgid "Get Away Message"
 msgstr "�√賢�<���祉�若�吾���緇�"
 
-#: ../src/gtkconv.c:1621
+#: ../src/gtkconv.c:1634
 msgid "Last said"
 msgstr "��緇����<���祉�若��:"
 
-#: ../src/gtkconv.c:2407
+#: ../src/gtkconv.c:2400
 msgid "Unable to save icon file to disk."
 msgstr "�≪�ゃ�潟�潟�祉���<�ゃ����篆�絖��с���障������"
 
-#: ../src/gtkconv.c:2430
+#: ../src/gtkconv.c:2424
 msgid "Save Icon"
 msgstr "�≪�ゃ�潟�潟���絖�"
 
-#: ../src/gtkconv.c:2479
+#: ../src/gtkconv.c:2473
 msgid "Animate"
 msgstr "�≪���<�若�激�с�潟�����鴻������"
 
+#: ../src/gtkconv.c:2478
+msgid "Hide Icon"
+msgstr "�≪�ゃ�潟�潟������"
+
 #: ../src/gtkconv.c:2484
-msgid "Hide Icon"
-msgstr "�≪�ゃ�潟�潟������"
-
-#: ../src/gtkconv.c:2490
 msgid "Save Icon As..."
 msgstr "�≪�ゃ�潟�潟���ュ���т�絖�..."
 
 #. Conversation menu
-#: ../src/gtkconv.c:2631
+#: ../src/gtkconv.c:2625
 msgid "/_Conversation"
 msgstr "/篌�荅�(_C)"
 
-#: ../src/gtkconv.c:2633
+#: ../src/gtkconv.c:2627
 msgid "/Conversation/New Instant _Message..."
 msgstr "/篌�荅�/�違�����ゃ�潟�鴻�帥�潟���祉�<���祉�若��(_M)..."
 
-#: ../src/gtkconv.c:2638
+#: ../src/gtkconv.c:2632
 msgid "/Conversation/_Find..."
 msgstr "/篌�荅�/罎�膣�(_F)..."
 
-#: ../src/gtkconv.c:2640
+#: ../src/gtkconv.c:2634
 msgid "/Conversation/View _Log"
 msgstr "/篌�荅�/�㏍�違��;腓�(_L)"
 
-#: ../src/gtkconv.c:2641
+#: ../src/gtkconv.c:2635
 msgid "/Conversation/_Save As..."
 msgstr "/篌�荅�/�ュ���т�絖�(_S)..."
 
-#: ../src/gtkconv.c:2643
+#: ../src/gtkconv.c:2637
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/篌�荅�/������(_R)"
 
-#: ../src/gtkconv.c:2647
+#: ../src/gtkconv.c:2641
 msgid "/Conversation/Se_nd File..."
 msgstr "/篌�荅�/���<�ゃ������篆�(_N)..."
 
-#: ../src/gtkconv.c:2648
+#: ../src/gtkconv.c:2642
 msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/篌�荅�/�ゃ����篁臥����申��(_P)..."
-
-#: ../src/gtkconv.c:2650
+msgstr "/篌�荅�/�ゃ����篁臥����申������(_P)..."
+
+#: ../src/gtkconv.c:2644
 msgid "/Conversation/_Get Info"
 msgstr "/篌�荅�/���宴���緇�(_G)"
 
-#: ../src/gtkconv.c:2652
+#: ../src/gtkconv.c:2646
 msgid "/Conversation/In_vite..."
 msgstr "/篌�荅�/��緇�(_V)..."
 
-#: ../src/gtkconv.c:2657
+#: ../src/gtkconv.c:2651
 msgid "/Conversation/Al_ias..."
 msgstr "/篌�荅�/�ュ��(_I)..."
 
-#: ../src/gtkconv.c:2659
+#: ../src/gtkconv.c:2653
 msgid "/Conversation/_Block..."
 msgstr "/篌�荅�/����(_B)..."
 
-#: ../src/gtkconv.c:2661
+#: ../src/gtkconv.c:2655
 msgid "/Conversation/_Add..."
 msgstr "/篌�荅�/菴遵��(_A)..."
 
-#: ../src/gtkconv.c:2663
+#: ../src/gtkconv.c:2657
 msgid "/Conversation/_Remove..."
 msgstr "/篌�荅�/����(_R)..."
 
-#: ../src/gtkconv.c:2668
+#: ../src/gtkconv.c:2662
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/篌�荅�/���潟�����水��(_K)..."
 
-#: ../src/gtkconv.c:2670
+#: ../src/gtkconv.c:2664
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/篌�荅�/�糸����水��(_E)..."
 
-#: ../src/gtkconv.c:2675
+#: ../src/gtkconv.c:2669
 msgid "/Conversation/_Close"
 msgstr "/篌�荅�/������(_C)"
 
 #. Options
-#: ../src/gtkconv.c:2679
+#: ../src/gtkconv.c:2673
 msgid "/_Options"
 msgstr "/�����激�с��(_O)"
 
-#: ../src/gtkconv.c:2680
+#: ../src/gtkconv.c:2674
 msgid "/Options/Enable _Logging"
 msgstr "/�����激�с��/�㏍�違��荐��蚊����(_L)"
 
-#: ../src/gtkconv.c:2681
+#: ../src/gtkconv.c:2675
 msgid "/Options/Enable _Sounds"
 msgstr "/�����激�с��/�泣���潟�������鴻������(_S)"
 
-#: ../src/gtkconv.c:2682
+#: ../src/gtkconv.c:2676
 msgid "/Options/Show Buddy _Icon"
 msgstr "/�����激�с��/篁臥���≪�ゃ�潟�潟��茵�ず����(_I)"
 
-#: ../src/gtkconv.c:2684
+#: ../src/gtkconv.c:2678
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/�����激�с��/�後����若�����若��茵�ず����(_T)"
 
-#: ../src/gtkconv.c:2685
+#: ../src/gtkconv.c:2679
 msgid "/Options/Show Ti_mestamps"
 msgstr "/�����激�с��/�帥�ゃ���鴻�帥�潟����茵�ず����(_M)"
 
-#: ../src/gtkconv.c:2777
+#: ../src/gtkconv.c:2771
 msgid "/Conversation/View Log"
 msgstr "/篌�荅�/�㏍�違��;腓�"
 
-#: ../src/gtkconv.c:2783
+#: ../src/gtkconv.c:2777
 msgid "/Conversation/Send File..."
 msgstr "/篌�荅�/���<�ゃ������篆�..."
 
+#: ../src/gtkconv.c:2781
+msgid "/Conversation/Add Buddy Pounce..."
+msgstr "/篌�荅�/�ゃ����篁臥����申������..."
+
 #: ../src/gtkconv.c:2787
-msgid "/Conversation/Add Buddy Pounce..."
-msgstr "/篌�荅�/�ゃ����篁臥����申��..."
-
-#: ../src/gtkconv.c:2793
 msgid "/Conversation/Get Info"
 msgstr "/篌�荅�/���宴���緇�"
 
-#: ../src/gtkconv.c:2797
+#: ../src/gtkconv.c:2791
 msgid "/Conversation/Invite..."
 msgstr "/篌�荅�/��緇�..."
 
-#: ../src/gtkconv.c:2803
+#: ../src/gtkconv.c:2797
 msgid "/Conversation/Alias..."
 msgstr "/篌�荅�/�ュ��..."
 
-#: ../src/gtkconv.c:2807
+#: ../src/gtkconv.c:2801
 msgid "/Conversation/Block..."
 msgstr "/篌�荅�/����..."
 
-#: ../src/gtkconv.c:2811
+#: ../src/gtkconv.c:2805
 msgid "/Conversation/Add..."
 msgstr "/篌�荅�/菴遵��..."
 
-#: ../src/gtkconv.c:2815
+#: ../src/gtkconv.c:2809
 msgid "/Conversation/Remove..."
 msgstr "/篌�荅�/����..."
 
-#: ../src/gtkconv.c:2821
+#: ../src/gtkconv.c:2815
 msgid "/Conversation/Insert Link..."
 msgstr "/篌�荅�/���潟�����水��..."
 
+#: ../src/gtkconv.c:2819
+msgid "/Conversation/Insert Image..."
+msgstr "/篌�荅�/�糸����水��..."
+
 #: ../src/gtkconv.c:2825
-msgid "/Conversation/Insert Image..."
-msgstr "/篌�荅�/�糸����水��..."
-
-#: ../src/gtkconv.c:2831
 msgid "/Options/Enable Logging"
 msgstr "/�����激�с��/�㏍�違��荐��蚊����"
 
-#: ../src/gtkconv.c:2834
+#: ../src/gtkconv.c:2828
 msgid "/Options/Enable Sounds"
 msgstr "/�����激�с��/�泣���潟�������鴻������"
 
-#: ../src/gtkconv.c:2847
+#: ../src/gtkconv.c:2841
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/�����激�с��/�後����若�����若��茵�ず����"
 
-#: ../src/gtkconv.c:2850
+#: ../src/gtkconv.c:2844
 msgid "/Options/Show Timestamps"
 msgstr "/�����激�с��/�帥�ゃ���鴻�帥�潟����茵�ず����"
 
-#: ../src/gtkconv.c:2853
+#: ../src/gtkconv.c:2847
 msgid "/Options/Show Buddy Icon"
 msgstr "/�����激�с��/篁臥���≪�ゃ�潟�潟��茵�ず����"
 
-#: ../src/gtkconv.c:2933
+#: ../src/gtkconv.c:2927
 msgid "User is typing..."
 msgstr "���若�吟��篏����ュ���������障��..."
 
-#: ../src/gtkconv.c:2936
+#: ../src/gtkconv.c:2930
 msgid "User has typed something and stopped"
 msgstr "���若�吟������ュ�����������罩≫賢�с��"
 
 #. Build the Send To menu
-#: ../src/gtkconv.c:3119
+#: ../src/gtkconv.c:3113
 msgid "_Send To"
 msgstr "��篆≦��(_S)"
 
-#: ../src/gtkconv.c:3771
+#: ../src/gtkconv.c:3765
 msgid "_Send"
 msgstr "��篆<����(_S)"
 
-#: ../src/gtkconv.c:3826 ../src/protocols/sametime/sametime.c:3572
+#: ../src/gtkconv.c:3820 ../src/protocols/sametime/sametime.c:3572
 msgid "Topic:"
 msgstr "��������:"
 
 #. Setup the label telling how many people are in the room.
-#: ../src/gtkconv.c:3878
+#: ../src/gtkconv.c:3872
 msgid "0 people in room"
 msgstr "茯違�����障����"
 
-#: ../src/gtkconv.c:3957
+#: ../src/gtkconv.c:3951
 msgid "IM the user"
 msgstr "���若�吟���<���祉�若�吾����篆<���障��"
 
-#: ../src/gtkconv.c:3970
+#: ../src/gtkconv.c:3964
 msgid "Ignore the user"
 msgstr "���若�吟���∴����障��"
 
-#: ../src/gtkconv.c:3982
+#: ../src/gtkconv.c:3976
 msgid "Get the user's information"
 msgstr "���若�倶���宴����緇����障��"
 
-#: ../src/gtkconv.c:4954 ../src/gtkconv.c:5063
+#: ../src/gtkconv.c:4958 ../src/gtkconv.c:5067
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "���c�������若���� %d 篋冴�����障��"
 msgstr[1] "���c�������若���� %d 篋冴�����障��"
 
-#: ../src/gtkconv.c:6533
+#: ../src/gtkconv.c:5624 ../src/gtkstatusbox.c:366
+msgid "Typing"
+msgstr "�ュ��筝㏍�с��"
+
+#: ../src/gtkconv.c:5630
+msgid "Stopped Typing"
+msgstr "�ュ����罩≪���������с��"
+
+#: ../src/gtkconv.c:5635
+msgid "Nick Said"
+msgstr "Nick Said"
+
+#: ../src/gtkconv.c:5645
+msgid "New Event"
+msgstr "�違�����ゃ���潟��"
+
+#: ../src/gtkconv.c:6547
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -3225,13 +3177,13 @@
 "say &lt;�<���祉�若��&gt;:  �潟���潟�������������������翫���с���<���祉�若�吾����篆<����"
 "��"
 
-#: ../src/gtkconv.c:6536
+#: ../src/gtkconv.c:6550
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;�≪���激�с��&gt;:  篁臥���障�������c������ IRC �鴻�帥�ゃ�����≪���激�с�潟����篆<��"
 "�障��"
 
-#: ../src/gtkconv.c:6539
+#: ../src/gtkconv.c:6553
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -3239,44 +3191,60 @@
 "debug &lt;�����激�с��&gt;:  ����賢���荅宴���c�潟�����吾�����������������井���宴����"
 "篆<���障��"
 
-#: ../src/gtkconv.c:6542
+#: ../src/gtkconv.c:6556
 msgid "clear: Clears the conversation scrollback."
 msgstr "������: 篌�荅宴���c�潟����������篁ュ�����<���祉�若�吾�������≪���障��"
 
-#: ../src/gtkconv.c:6545
+#: ../src/gtkconv.c:6559
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;�潟���潟��&gt;:  �劫����潟���潟�����������������茵�ず���障��"
 
-#: ../src/gtkconv.c:6704
+#: ../src/gtkconv.c:6718
 msgid "Confirm close"
 msgstr "���㏍�若�冴��∈茯�"
 
-#: ../src/gtkconv.c:6736
+#: ../src/gtkconv.c:6750
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr ""
 "�障��������<���祉�若�吾�������障������������c�潟�����������������������с����鐚�"
 
-#: ../src/gtkconv.c:7540
+#: ../src/gtkconv.c:7272
+msgid "Close other tabs"
+msgstr "篁����帥����������"
+
+#: ../src/gtkconv.c:7278
+msgid "Close all tabs"
+msgstr "�������帥����������"
+
+#: ../src/gtkconv.c:7286
+msgid "Detach this tab"
+msgstr "�����帥��������紊���"
+
+#: ../src/gtkconv.c:7292
+msgid "Close this tab"
+msgstr "�����帥����������"
+
+#: ../src/gtkconv.c:7554
 msgid "Close conversation"
-msgstr "������"
-
-#: ../src/gtkconv.c:8004
+msgstr "篌�荅宴���c�潟�����������障��"
+
+#: ../src/gtkconv.c:8018
 msgid "Last created window"
 msgstr "��緇��������������c�潟����������������"
 
-#: ../src/gtkconv.c:8006
+#: ../src/gtkconv.c:8020
 msgid "Separate IM and Chat windows"
 msgstr "IM �����c�����祉���c�潟���������蚊����"
 
-#: ../src/gtkconv.c:8008 ../src/gtkprefs.c:1243
+#: ../src/gtkconv.c:8022 ../src/gtkprefs.c:1243
 msgid "New window"
 msgstr "�違�������c�潟�����ч����"
 
-#: ../src/gtkconv.c:8010
+#: ../src/gtkconv.c:8024
 msgid "By group"
 msgstr "�違���若��罸����掩������"
 
-#: ../src/gtkconv.c:8012
+#: ../src/gtkconv.c:8026
 msgid "By account"
 msgstr "�≪�����潟��罸����掩������"
 
@@ -3316,14 +3284,15 @@
 msgid "Right click for more options."
 msgstr "�潟���������ц申�������激�с�潟��茵�ず���障��"
 
-#: ../src/gtkdialogs.c:61 ../src/gtkdialogs.c:100
+#: ../src/gtkdialogs.c:61 ../src/gtkdialogs.c:103
 msgid "lead developer"
 msgstr "�<�ゃ�潟�����肴��"
 
 #: ../src/gtkdialogs.c:62 ../src/gtkdialogs.c:63 ../src/gtkdialogs.c:65
-#: ../src/gtkdialogs.c:67 ../src/gtkdialogs.c:68 ../src/gtkdialogs.c:69
-#: ../src/gtkdialogs.c:70 ../src/gtkdialogs.c:71 ../src/gtkdialogs.c:73
-#: ../src/gtkdialogs.c:74
+#: ../src/gtkdialogs.c:66 ../src/gtkdialogs.c:68 ../src/gtkdialogs.c:69
+#: ../src/gtkdialogs.c:70 ../src/gtkdialogs.c:71 ../src/gtkdialogs.c:72
+#: ../src/gtkdialogs.c:73 ../src/gtkdialogs.c:75 ../src/gtkdialogs.c:76
+#: ../src/gtkdialogs.c:77
 msgid "developer"
 msgstr "���肴��"
 
@@ -3331,214 +3300,222 @@
 msgid "win32 port"
 msgstr "Win32 �����若���c�潟��"
 
-#: ../src/gtkdialogs.c:66
+#: ../src/gtkdialogs.c:67
 msgid "developer & webmaster"
 msgstr "���肴��/���с�����鴻��"
 
-#: ../src/gtkdialogs.c:72
+#: ../src/gtkdialogs.c:74
 msgid "support"
 msgstr "�泣���若��"
 
-#: ../src/gtkdialogs.c:94 ../src/gtkdialogs.c:95
+#: ../src/gtkdialogs.c:97 ../src/gtkdialogs.c:98
 msgid "maintainer"
 msgstr "�<�潟����"
 
-#: ../src/gtkdialogs.c:96
+#: ../src/gtkdialogs.c:99
 msgid "libfaim maintainer"
 msgstr "libfaim ���<�潟����"
 
-#: ../src/gtkdialogs.c:97
+#: ../src/gtkdialogs.c:100
 msgid "hacker and designated driver [lazy bum]"
 msgstr "����ù�若����絎����������ゃ�� [lazy bum]"
 
-#: ../src/gtkdialogs.c:98
+#: ../src/gtkdialogs.c:101
 msgid "Jabber developer"
 msgstr "Jabber �����肴��"
 
-#: ../src/gtkdialogs.c:99
+#: ../src/gtkdialogs.c:102
 msgid "original author"
 msgstr "�����吾���������"
 
-#: ../src/gtkdialogs.c:106 ../src/gtkdialogs.c:107 ../src/gtkdialogs.c:158
+#: ../src/gtkdialogs.c:109 ../src/gtkdialogs.c:110 ../src/gtkdialogs.c:164
 msgid "Bulgarian"
 msgstr "���������∵�"
 
-#: ../src/gtkdialogs.c:108 ../src/gtkdialogs.c:109
+#: ../src/gtkdialogs.c:111 ../src/gtkdialogs.c:112
 msgid "Bengali"
 msgstr "���潟�����"
 
-#: ../src/gtkdialogs.c:110
-msgid "Bosnian"
-msgstr "���鴻���∵�"
-
-#: ../src/gtkdialogs.c:111 ../src/gtkdialogs.c:159 ../src/gtkdialogs.c:160
-msgid "Catalan"
-msgstr "���帥���活�"
-
-#: ../src/gtkdialogs.c:112 ../src/gtkdialogs.c:161
-msgid "Czech"
-msgstr "���с�活�"
-
 #: ../src/gtkdialogs.c:113
+msgid "Bosnian"
+msgstr "���鴻���∵�"
+
+#: ../src/gtkdialogs.c:114 ../src/gtkdialogs.c:165 ../src/gtkdialogs.c:166
+msgid "Catalan"
+msgstr "���帥���活�"
+
+#: ../src/gtkdialogs.c:115
+msgid "Valencian"
+msgstr "�����潟�激�∵�"
+
+#: ../src/gtkdialogs.c:116 ../src/gtkdialogs.c:167
+msgid "Czech"
+msgstr "���с�活�"
+
+#: ../src/gtkdialogs.c:117
 msgid "Danish"
 msgstr "���潟���若���"
 
-#: ../src/gtkdialogs.c:114 ../src/gtkdialogs.c:162
+#: ../src/gtkdialogs.c:118 ../src/gtkdialogs.c:168
 msgid "German"
 msgstr "���ゃ��茯�"
 
-#: ../src/gtkdialogs.c:115 ../src/gtkdialogs.c:116
+#: ../src/gtkdialogs.c:119 ../src/gtkdialogs.c:120
 msgid "Greek"
 msgstr "�����激�∵�"
 
-#: ../src/gtkdialogs.c:117
+#: ../src/gtkdialogs.c:121
 msgid "Australian English"
 msgstr "�沿� (���若�鴻��������)"
 
-#: ../src/gtkdialogs.c:118
+#: ../src/gtkdialogs.c:122
 msgid "Canadian English"
 msgstr "�沿� (������)"
 
-#: ../src/gtkdialogs.c:119
+#: ../src/gtkdialogs.c:123
 msgid "British English"
 msgstr "�沿� (�怨��)"
 
-#: ../src/gtkdialogs.c:120 ../src/gtkdialogs.c:163 ../src/gtkdialogs.c:164
-#: ../src/gtkdialogs.c:165 ../src/gtkdialogs.c:166
+#: ../src/gtkdialogs.c:124 ../src/gtkdialogs.c:169 ../src/gtkdialogs.c:170
+#: ../src/gtkdialogs.c:171 ../src/gtkdialogs.c:172
 msgid "Spanish"
 msgstr "�鴻���ゃ�活�"
 
-#: ../src/gtkdialogs.c:121 ../src/gtkdialogs.c:167 ../src/gtkdialogs.c:168
+#: ../src/gtkdialogs.c:125 ../src/gtkdialogs.c:126
+msgid "Persian"
+msgstr "�����激�∵�"
+
+#: ../src/gtkdialogs.c:127 ../src/gtkdialogs.c:173 ../src/gtkdialogs.c:174
 msgid "Finnish"
 msgstr "���c�潟���潟��茯�"
 
-#: ../src/gtkdialogs.c:122 ../src/gtkdialogs.c:169 ../src/gtkdialogs.c:170
-#: ../src/gtkdialogs.c:171 ../src/gtkdialogs.c:172
+#: ../src/gtkdialogs.c:128 ../src/gtkdialogs.c:175 ../src/gtkdialogs.c:176
+#: ../src/gtkdialogs.c:177 ../src/gtkdialogs.c:178
 msgid "French"
 msgstr "�����潟�壕�"
 
-#: ../src/gtkdialogs.c:123
+#: ../src/gtkdialogs.c:129
 msgid "Hebrew"
 msgstr "�������よ�"
 
-#: ../src/gtkdialogs.c:124
+#: ../src/gtkdialogs.c:130
 msgid "Hindi"
 msgstr "���潟�冴�取�"
 
-#: ../src/gtkdialogs.c:125
+#: ../src/gtkdialogs.c:131
 msgid "Hungarian"
 msgstr "��劻�����取�"
 
-#: ../src/gtkdialogs.c:126 ../src/gtkdialogs.c:173
+#: ../src/gtkdialogs.c:132 ../src/gtkdialogs.c:179
 msgid "Italian"
 msgstr "�ゃ�帥���∵�"
 
-#: ../src/gtkdialogs.c:127 ../src/gtkdialogs.c:174 ../src/gtkdialogs.c:175
-#: ../src/gtkdialogs.c:176
+#: ../src/gtkdialogs.c:133 ../src/gtkdialogs.c:180 ../src/gtkdialogs.c:181
+#: ../src/gtkdialogs.c:182
 msgid "Japanese"
 msgstr "�ユ���"
 
-#: ../src/gtkdialogs.c:128 ../src/gtkdialogs.c:177
+#: ../src/gtkdialogs.c:134 ../src/gtkdialogs.c:183
 msgid "Georgian"
 msgstr "�違���吾�∵�"
 
-#: ../src/gtkdialogs.c:129 ../src/gtkdialogs.c:178
+#: ../src/gtkdialogs.c:135 ../src/gtkdialogs.c:184
 msgid "Korean"
 msgstr "���処�"
 
-#: ../src/gtkdialogs.c:130
+#: ../src/gtkdialogs.c:136
 msgid "Kurdish"
 msgstr "������茯�"
 
-#: ../src/gtkdialogs.c:131 ../src/gtkdialogs.c:179
+#: ../src/gtkdialogs.c:137 ../src/gtkdialogs.c:185 ../src/gtkdialogs.c:186
 msgid "Lithuanian"
 msgstr "�����≪���∵�"
 
-#: ../src/gtkdialogs.c:132
+#: ../src/gtkdialogs.c:138
 msgid "Macedonian"
 msgstr "���宴�����∵�"
 
-#: ../src/gtkdialogs.c:133
+#: ../src/gtkdialogs.c:139
 msgid "Dutch, Flemish"
 msgstr "�����潟��/�����潟���若�壕�"
 
-#: ../src/gtkdialogs.c:134
+#: ../src/gtkdialogs.c:140
 msgid "Norwegian"
 msgstr "�������с�取�"
 
-#: ../src/gtkdialogs.c:135 ../src/gtkdialogs.c:136 ../src/gtkdialogs.c:180
+#: ../src/gtkdialogs.c:141 ../src/gtkdialogs.c:142 ../src/gtkdialogs.c:187
 msgid "Polish"
 msgstr "���若���潟��茯�"
 
-#: ../src/gtkdialogs.c:137
+#: ../src/gtkdialogs.c:143
 msgid "Portuguese"
 msgstr "�����������"
 
-#: ../src/gtkdialogs.c:138
+#: ../src/gtkdialogs.c:144
 msgid "Portuguese-Brazil"
 msgstr "�����������祉�����吾���"
 
-#: ../src/gtkdialogs.c:139
+#: ../src/gtkdialogs.c:145
 msgid "Romanian"
 msgstr "���若�����∵�"
 
-#: ../src/gtkdialogs.c:140 ../src/gtkdialogs.c:181 ../src/gtkdialogs.c:182
+#: ../src/gtkdialogs.c:146 ../src/gtkdialogs.c:188 ../src/gtkdialogs.c:189
 msgid "Russian"
 msgstr "�㏍�激�∵�"
 
-#: ../src/gtkdialogs.c:141 ../src/gtkdialogs.c:142
+#: ../src/gtkdialogs.c:147 ../src/gtkdialogs.c:148
 msgid "Serbian"
 msgstr "�祉�����∵�"
 
-#: ../src/gtkdialogs.c:143
+#: ../src/gtkdialogs.c:149
 msgid "Slovenian"
 msgstr "�鴻�㏍�����∵�"
 
-#: ../src/gtkdialogs.c:144 ../src/gtkdialogs.c:184
+#: ../src/gtkdialogs.c:150 ../src/gtkdialogs.c:191
 msgid "Swedish"
 msgstr "�鴻���с�若���活�"
 
-#: ../src/gtkdialogs.c:145
+#: ../src/gtkdialogs.c:151
 msgid "Tamil"
 msgstr "�帥�����"
 
-#: ../src/gtkdialogs.c:146
+#: ../src/gtkdialogs.c:152
 msgid "Telugu"
 msgstr "�����域�"
 
-#: ../src/gtkdialogs.c:147
+#: ../src/gtkdialogs.c:153
 msgid "Turkish"
 msgstr "�����活�"
 
-#: ../src/gtkdialogs.c:148
+#: ../src/gtkdialogs.c:154
 msgid "Vietnamese"
 msgstr "��������茯�"
 
-#: ../src/gtkdialogs.c:148
+#: ../src/gtkdialogs.c:154
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh �� Gnome-Vi ���若��"
 
-#: ../src/gtkdialogs.c:149 ../src/gtkdialogs.c:185
+#: ../src/gtkdialogs.c:155 ../src/gtkdialogs.c:192
 msgid "Simplified Chinese"
 msgstr "膂>�絖�筝㊤�処�"
 
-#: ../src/gtkdialogs.c:150 ../src/gtkdialogs.c:151 ../src/gtkdialogs.c:186
+#: ../src/gtkdialogs.c:156 ../src/gtkdialogs.c:157 ../src/gtkdialogs.c:193
 msgid "Traditional Chinese"
 msgstr "膵�篏�絖�筝㊤�処�"
 
-#: ../src/gtkdialogs.c:157
+#: ../src/gtkdialogs.c:163
 msgid "Amharic"
 msgstr "�≪������"
 
-#: ../src/gtkdialogs.c:183
+#: ../src/gtkdialogs.c:190
 msgid "Slovak"
 msgstr "�鴻�㏍���㏍�∵�"
 
-#: ../src/gtkdialogs.c:227
+#: ../src/gtkdialogs.c:234
 msgid "About Gaim"
 msgstr "Gaim ���ゃ����"
 
-#: ../src/gtkdialogs.c:251
+#: ../src/gtkdialogs.c:258
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, "
@@ -3558,108 +3535,108 @@
 "絮����障��������旺�������膣違���荀с���ゃ������ 'COPYRIGHT' ��緇∴Η筝������������㏍��"
 "����������>�荐若�с����<BR><BR>"
 
-#: ../src/gtkdialogs.c:265
+#: ../src/gtkdialogs.c:272
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
 msgstr ""
 "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net �� #wingaim ���c�潟����<BR><BR>"
 
-#: ../src/gtkdialogs.c:268
+#: ../src/gtkdialogs.c:275
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr ""
 "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net �� #gaim ���c�潟����<BR><BR>"
 
-#: ../src/gtkdialogs.c:274
+#: ../src/gtkdialogs.c:281
 msgid "Current Developers"
 msgstr "�上�������肴��"
 
-#: ../src/gtkdialogs.c:289
+#: ../src/gtkdialogs.c:296
 msgid "Crazy Patch Writers"
 msgstr "Crazy �������������"
 
-#: ../src/gtkdialogs.c:304
+#: ../src/gtkdialogs.c:311
 msgid "Retired Developers"
 msgstr "���肴�� (�с���若�吾�с��)"
 
-#: ../src/gtkdialogs.c:319
+#: ../src/gtkdialogs.c:326
 msgid "Current Translators"
 msgstr "膺肢┳�� (���違���若�吾�с��)"
 
-#: ../src/gtkdialogs.c:339
+#: ../src/gtkdialogs.c:346
 msgid "Past Translators"
 msgstr "膺肢┳�� (�с���若�吾�с��)"
 
-#: ../src/gtkdialogs.c:357
+#: ../src/gtkdialogs.c:364
 msgid "Debugging Information"
 msgstr "�������違���������������"
 
-#: ../src/gtkdialogs.c:553 ../src/gtkdialogs.c:690 ../src/gtkdialogs.c:757
+#: ../src/gtkdialogs.c:570 ../src/gtkdialogs.c:707 ../src/gtkdialogs.c:770
 msgid "_Name"
 msgstr "����(_N)"
 
-#: ../src/gtkdialogs.c:558 ../src/gtkdialogs.c:695 ../src/gtkdialogs.c:762
+#: ../src/gtkdialogs.c:575 ../src/gtkdialogs.c:712 ../src/gtkdialogs.c:775
 msgid "_Account"
 msgstr "�≪�����潟��(_A)"
 
-#: ../src/gtkdialogs.c:566
+#: ../src/gtkdialogs.c:583
 msgid "New Instant Message"
 msgstr "�違�����ゃ�潟�鴻�帥�潟���祉�<���祉�若��"
 
-#: ../src/gtkdialogs.c:568
+#: ../src/gtkdialogs.c:585
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr "IM �т�荅宴�����御�����鴻�����若�喝���障�����ュ�����ュ�����������:"
 
-#: ../src/gtkdialogs.c:703
+#: ../src/gtkdialogs.c:720
 msgid "Get User Info"
 msgstr "���若�倶���宴���緇�"
 
-#: ../src/gtkdialogs.c:705
+#: ../src/gtkdialogs.c:722
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
 msgstr "���宴��茵�ず�����御�����鴻�����若�喝���障�����ュ�����ュ�����������:"
 
-#: ../src/gtkdialogs.c:771
+#: ../src/gtkdialogs.c:784
 msgid "View User Log"
 msgstr "���若�吟�祉�㏍�違��;腓�"
 
-#: ../src/gtkdialogs.c:773
+#: ../src/gtkdialogs.c:786
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
 msgstr "�㏍�違��茵�ず�����御�����鴻�����若�喝���障�����ュ�����ュ�����������:"
 
-#: ../src/gtkdialogs.c:792
+#: ../src/gtkdialogs.c:805
 msgid "Alias Contact"
 msgstr "�潟�潟�帥�������ュ��"
 
-#: ../src/gtkdialogs.c:793
+#: ../src/gtkdialogs.c:806
 msgid "Enter an alias for this contact."
 msgstr "�����潟�潟�帥�������ュ�����ュ�����������:"
 
-#: ../src/gtkdialogs.c:795 ../src/gtkdialogs.c:817 ../src/gtkdialogs.c:837
-#: ../src/gtkrequest.c:295 ../src/protocols/silc/chat.c:586
+#: ../src/gtkdialogs.c:808 ../src/gtkdialogs.c:830 ../src/gtkdialogs.c:850
+#: ../src/gtkrequest.c:277 ../src/protocols/silc/chat.c:586
 msgid "Alias"
 msgstr "�ュ��"
 
-#: ../src/gtkdialogs.c:813
+#: ../src/gtkdialogs.c:826
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "%s ���ュ�����ュ�����������:"
 
-#: ../src/gtkdialogs.c:815
+#: ../src/gtkdialogs.c:828
 msgid "Alias Buddy"
 msgstr "篁臥�����ュ��"
 
-#: ../src/gtkdialogs.c:834
+#: ../src/gtkdialogs.c:847
 msgid "Alias Chat"
 msgstr "���c�������ュ��"
 
-#: ../src/gtkdialogs.c:835
+#: ../src/gtkdialogs.c:848
 msgid "Enter an alias for this chat."
 msgstr "�������c�������ュ�����ュ�����������:"
 
-#: ../src/gtkdialogs.c:872
+#: ../src/gtkdialogs.c:885
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -3674,15 +3651,15 @@
 "篁臥�����鴻������ %s ���������� %d ����参�������ゃ���������������障����膓�茵�������"
 "���������с����鐚�"
 
-#: ../src/gtkdialogs.c:880
+#: ../src/gtkdialogs.c:893
 msgid "Remove Contact"
 msgstr "�潟�潟�帥����������"
 
-#: ../src/gtkdialogs.c:881
+#: ../src/gtkdialogs.c:894
 msgid "_Remove Contact"
 msgstr "���ゃ����(_R)"
 
-#: ../src/gtkdialogs.c:932
+#: ../src/gtkdialogs.c:945
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -3691,29 +3668,29 @@
 "篁臥�����鴻�������違���若�� %s �������<�潟�������ゃ���������������障����膓�茵���������"
 "�������с����鐚�"
 
-#: ../src/gtkdialogs.c:935
+#: ../src/gtkdialogs.c:948
 msgid "Remove Group"
 msgstr "�違���若��������"
 
-#: ../src/gtkdialogs.c:936
+#: ../src/gtkdialogs.c:949
 msgid "_Remove Group"
 msgstr "���ゃ����(_R)"
 
-#: ../src/gtkdialogs.c:969
+#: ../src/gtkdialogs.c:982
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "篁臥�����鴻������ %s �����ゃ���������������障����膓�茵����������������с����鐚�"
 
-#: ../src/gtkdialogs.c:972
+#: ../src/gtkdialogs.c:985
 msgid "Remove Buddy"
 msgstr "篁臥��������"
 
-#: ../src/gtkdialogs.c:973
+#: ../src/gtkdialogs.c:986
 msgid "_Remove Buddy"
 msgstr "���ゃ����(_R)"
 
-#: ../src/gtkdialogs.c:994
+#: ../src/gtkdialogs.c:1007
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -3722,11 +3699,11 @@
 "篁臥�����鴻���������c���� %s �����ゃ���������������障����膓�茵����������������с��"
 "��鐚�"
 
-#: ../src/gtkdialogs.c:997
+#: ../src/gtkdialogs.c:1010
 msgid "Remove Chat"
 msgstr "���c����������"
 
-#: ../src/gtkdialogs.c:998
+#: ../src/gtkdialogs.c:1011
 msgid "_Remove Chat"
 msgstr "���ゃ����(_R)"
 
@@ -3828,7 +3805,7 @@
 msgid "Time Remaining:"
 msgstr "罧�������:"
 
-#: ../src/gtkft.c:708 ../src/protocols/oscar/oscar.c:8546
+#: ../src/gtkft.c:708
 msgid "File Transfers"
 msgstr "���<�ゃ����拶��"
 
@@ -3859,39 +3836,43 @@
 msgid "Failed"
 msgstr "紊掩�����障����"
 
-#: ../src/gtkimhtml.c:818
+#: ../src/gtkimhtml.c:821
 msgid "Paste as Plain _Text"
 msgstr "���㏍�鴻��������下��篁���(_T)"
 
-#: ../src/gtkimhtml.c:1316
+#: ../src/gtkimhtml.c:833
+msgid "_Reset formatting"
+msgstr "�後������祉����(_R)"
+
+#: ../src/gtkimhtml.c:1327
 msgid "Hyperlink color"
 msgstr "������若���潟������"
 
-#: ../src/gtkimhtml.c:1317
+#: ../src/gtkimhtml.c:1328
 msgid "Color to draw hyperlinks."
 msgstr "������若���潟������嵿�����蚊�с��"
 
-#: ../src/gtkimhtml.c:1320
+#: ../src/gtkimhtml.c:1331
 msgid "Hyperlink prelight color"
 msgstr "������若���潟�� (prelight) ����"
 
-#: ../src/gtkimhtml.c:1321
+#: ../src/gtkimhtml.c:1332
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "������若���潟������������鴻�������������蚊�с��"
 
-#: ../src/gtkimhtml.c:1542
+#: ../src/gtkimhtml.c:1553
 msgid "_Copy E-Mail Address"
 msgstr "E-�<�若���祉�≪�����鴻���潟����(_C)"
 
-#: ../src/gtkimhtml.c:1554
+#: ../src/gtkimhtml.c:1565
 msgid "_Open Link in Browser"
 msgstr "���潟�������������吟�ч����(_O)"
 
-#: ../src/gtkimhtml.c:1564
+#: ../src/gtkimhtml.c:1575
 msgid "_Copy Link Location"
 msgstr "���潟�������潟����(_C)"
 
-#: ../src/gtkimhtml.c:3261
+#: ../src/gtkimhtml.c:3272
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -3901,7 +3882,7 @@
 "\n"
 "������������ PNG �糸��������宴���障����"
 
-#: ../src/gtkimhtml.c:3264
+#: ../src/gtkimhtml.c:3275
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -3911,7 +3892,7 @@
 "\n"
 "������������ PNG �糸��������宴���障����"
 
-#: ../src/gtkimhtml.c:3277
+#: ../src/gtkimhtml.c:3288
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -3922,7 +3903,7 @@
 "\n"
 "%s"
 
-#: ../src/gtkimhtml.c:3280
+#: ../src/gtkimhtml.c:3291
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -3933,11 +3914,11 @@
 "\n"
 "%s"
 
-#: ../src/gtkimhtml.c:3360 ../src/gtkimhtml.c:3372
+#: ../src/gtkimhtml.c:3371 ../src/gtkimhtml.c:3383
 msgid "Save Image"
 msgstr "�糸����絖�"
 
-#: ../src/gtkimhtml.c:3400
+#: ../src/gtkimhtml.c:3411
 msgid "_Save Image..."
 msgstr "�糸����絖�(_S)..."
 
@@ -4026,9 +4007,13 @@
 msgid "Foreground font color"
 msgstr "�<���祉�若�吾���蚊��紊��眼���障��"
 
+#: ../src/gtkimhtmltoolbar.c:1014
+msgid "Background color"
+msgstr "�����蚊��紊��眼���障��"
+
 #: ../src/gtkimhtmltoolbar.c:1030
-msgid "Clear formatting"
-msgstr "�後��������≪���障��"
+msgid "Reset formatting"
+msgstr "�後������祉�������障��"
 
 #: ../src/gtkimhtmltoolbar.c:1045
 msgid "Insert link"
@@ -4042,21 +4027,21 @@
 msgid "Insert smiley"
 msgstr "�鴻���ゃ���� (蕁���絖�) ���水�ャ���障��"
 
-#: ../src/gtklog.c:202
+#: ../src/gtklog.c:188
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>%s �с���荅� (%s)</span>"
 
-#: ../src/gtklog.c:207
+#: ../src/gtklog.c:193
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>%s ���������荅� (%s)</span>"
 
-#: ../src/gtklog.c:258
+#: ../src/gtklog.c:242
 msgid "%B %Y"
 msgstr "%Y綛�%B"
 
-#: ../src/gtklog.c:311
+#: ../src/gtklog.c:295
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
@@ -4064,7 +4049,7 @@
 "�激�鴻�����祉�ゃ���潟�����㏍�違����荐㊤����ゃ�≪�㏍�違�� \"�倶������眼�������激�鴻�����祉�㏍��"
 "����蚊����\" �����鴻���翫�������粋��蚊���障����"
 
-#: ../src/gtklog.c:315
+#: ../src/gtklog.c:299
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
@@ -4072,32 +4057,32 @@
 "�ゃ�潟�鴻�帥�潟���祉�<���祉�若�吾���㏍�違����荐㊤����ゃ�≪�㏍�違�� \"�ゃ�潟�鴻�帥�潟���祉�<���祉�若��"
 "�������㏍�違����蚊����\" �����鴻���翫�������粋��蚊���障����"
 
-#: ../src/gtklog.c:318
+#: ../src/gtklog.c:302
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
 "���c�������㏍�違����荐㊤����ゃ�≪�㏍�違�� \"���c�����������激�鴻�����祉�㏍�違����蚊����"
 "\" �����鴻���翫�������帥�㏍�違��荐��蚊���障����"
 
-#: ../src/gtklog.c:322
+#: ../src/gtklog.c:306
 msgid "No logs were found"
 msgstr "�㏍�違��荀��ゃ�����障�����с����"
 
-#: ../src/gtklog.c:398
+#: ../src/gtklog.c:382
 msgid "Total log size:"
 msgstr "�㏍�違����荐��泣�ゃ��:"
 
-#: ../src/gtklog.c:474
+#: ../src/gtklog.c:458
 #, c-format
 msgid "Conversations in %s"
 msgstr "%s ���������荅�"
 
-#: ../src/gtklog.c:482 ../src/gtklog.c:533
+#: ../src/gtklog.c:466 ../src/gtklog.c:517
 #, c-format
 msgid "Conversations with %s"
 msgstr "%s ���������荅�"
 
-#: ../src/gtklog.c:558
+#: ../src/gtklog.c:542
 msgid "System Log"
 msgstr "�激�鴻�����祉�㏍��"
 
@@ -4174,34 +4159,34 @@
 "罨<���泣�ゃ�������с�����帥�������:\n"
 "%scontactinfo.php\n"
 
-#: ../src/gtknotify.c:305
+#: ../src/gtknotify.c:327
 msgid "New Mail"
 msgstr "�亥���<�若��"
 
-#: ../src/gtknotify.c:321
+#: ../src/gtknotify.c:343
 msgid "Open All Messages"
 msgstr "�������<���祉�若�吾������"
 
-#: ../src/gtknotify.c:382 ../src/protocols/jabber/jabber.c:1118
+#: ../src/gtknotify.c:409 ../src/protocols/jabber/jabber.c:1115
 msgid "From"
 msgstr "綏��坂査"
 
-#: ../src/gtknotify.c:390
+#: ../src/gtknotify.c:418
 msgid "Subject"
 msgstr "篁九��"
 
-#: ../src/gtknotify.c:399
+#: ../src/gtknotify.c:427
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">�亥���<�若���������障��鐚�</span>"
 
-#: ../src/gtknotify.c:451
+#: ../src/gtknotify.c:493
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s ���� %d �����違�����<���祉�若�吾�������障����"
 msgstr[1] "%s ���� %d �����違�����<���祉�若�吾�������障����"
 
-#: ../src/gtknotify.c:456
+#: ../src/gtknotify.c:498
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -4212,54 +4197,54 @@
 "\n"
 "%s"
 
-#: ../src/gtknotify.c:643 ../src/protocols/sametime/sametime.c:5459
+#: ../src/gtknotify.c:685 ../src/protocols/sametime/sametime.c:5459
 msgid "Search Results"
 msgstr "罎�膣∝���"
 
-#: ../src/gtknotify.c:799 ../src/protocols/oscar/oscar.c:4996
+#: ../src/gtknotify.c:841 ../src/protocols/oscar/oscar.c:5061
 #, c-format
 msgid "Info for %s"
 msgstr "%s ����������"
 
-#: ../src/gtknotify.c:800 ../src/protocols/toc/toc.c:470
+#: ../src/gtknotify.c:842 ../src/protocols/toc/toc.c:470
 msgid "Buddy Information"
 msgstr "篁臥��������"
 
-#: ../src/gtknotify.c:840
-#, c-format
-msgid "The browser command <b>%s</b> is invalid."
-msgstr "�������吟��莎桁�������潟���潟�� <b>%s</b> ��罩c��������憗������"
-
-#: ../src/gtknotify.c:842 ../src/gtknotify.c:854 ../src/gtknotify.c:867
-#: ../src/gtknotify.c:992
+#: ../src/gtknotify.c:881
+#, c-format
+msgid "The browser command \"%s\" is invalid."
+msgstr "�������吟��莎桁�������潟���潟�� \"%s\" ��罩c��������憗������"
+
+#: ../src/gtknotify.c:883 ../src/gtknotify.c:895 ../src/gtknotify.c:908
+#: ../src/gtknotify.c:1031
 msgid "Unable to open URL"
 msgstr "URL �������障����"
 
-#: ../src/gtknotify.c:852 ../src/gtknotify.c:865
-#, c-format
-msgid "Error launching <b>%s</b>: %s"
-msgstr "<b>%s</b> ��莎桁����������������: %s"
-
-#: ../src/gtknotify.c:993
+#: ../src/gtknotify.c:893 ../src/gtknotify.c:906
+#, c-format
+msgid "Error launching \"%s\": %s"
+msgstr "\"%s\" ��莎桁����������������: %s"
+
+#: ../src/gtknotify.c:1032
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 "�������吟���潟���潟���� '����荐㊤�' ���������с�������潟���潟������絎����������障��"
 "����"
 
-#: ../src/gtkplugin.c:275
+#: ../src/gtkplugin.c:274
 msgid "The following plugins will be unloaded."
 msgstr "罨<�������違�ゃ�潟��茹f�障���障����"
 
-#: ../src/gtkplugin.c:294
+#: ../src/gtkplugin.c:293
 msgid "Multiple plugins will be unloaded."
 msgstr "茲��医���������違�ゃ�潟��茹f�障���障����"
 
-#: ../src/gtkplugin.c:296
+#: ../src/gtkplugin.c:295
 msgid "Unload Plugins"
 msgstr "�����違�ゃ�潟��В��"
 
-#: ../src/gtkplugin.c:410
+#: ../src/gtkplugin.c:407
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -4270,7 +4255,7 @@
 "<span weight=\"bold\">��絽���:</span>\t\t%s\n"
 "<span weight=\"bold\">���<�ゃ����:</span>\t\t%s"
 
-#: ../src/gtkplugin.c:420
+#: ../src/gtkplugin.c:417
 #, c-format
 msgid ""
 "%s\n"
@@ -4279,13 +4264,13 @@
 msgstr ""
 "%s\n"
 "<span foreground=\"#ff0000\" weight=\"bold\">������: %s\n"
-"�≪�������若������������絽�����腆肴������������</span>"
-
-#: ../src/gtkplugin.c:546
+"�≪�������若������������絽����х∈茯������������</span>"
+
+#: ../src/gtkplugin.c:543
 msgid "Configure Pl_ugin"
 msgstr "�����違�ゃ�潟��┃絎�(_U)"
 
-#: ../src/gtkplugin.c:604
+#: ../src/gtkplugin.c:601
 msgid "<b>Plugin Details</b>"
 msgstr "<b>�����違�ゃ�潟���膣�</b>"
 
@@ -4308,166 +4293,166 @@
 #. Create the "Pounce on Whom" frame.
 #: ../src/gtkpounce.c:520
 msgid "Pounce on Whom"
-msgstr "�ゃ����篋�"
+msgstr "茯違��篁臥�����ゃ������..."
 
 #: ../src/gtkpounce.c:547
 msgid "_Buddy name:"
 msgstr "篁臥��������(_B):"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../src/gtkpounce.c:571
+#: ../src/gtkpounce.c:573
 msgid "Pounce When Buddy..."
-msgstr "�ゃ��������"
-
-#: ../src/gtkpounce.c:579
-msgid "Si_gns on"
-msgstr "�泣�ゃ�潟�祉�ゃ�潟������(_G)"
+msgstr "���や参�����ゃ������..."
 
 #: ../src/gtkpounce.c:581
-msgid "Signs o_ff"
-msgstr "�泣�ゃ�潟�祉�≪����������(_F)"
+msgid "Si_gns on"
+msgstr "�泣�ゃ�潟�祉�ゃ�潟������(_G)"
 
 #: ../src/gtkpounce.c:583
+msgid "Signs o_ff"
+msgstr "�泣�ゃ�潟�祉�≪����������(_F)"
+
+#: ../src/gtkpounce.c:585
 msgid "Goes a_way"
 msgstr "�√賢筝㏍�����c����(_W)"
 
-#: ../src/gtkpounce.c:585
+#: ../src/gtkpounce.c:587
 msgid "Ret_urns from away"
 msgstr "�√賢筝㏍�����祉�c����(_U)"
 
-#: ../src/gtkpounce.c:587
+#: ../src/gtkpounce.c:589
 msgid "Becomes _idle"
 msgstr "緇�罘�筝㏍�����c����(_I)"
 
-#: ../src/gtkpounce.c:589
-msgid "Is no longer i_dle"
-msgstr "緇�罘�筝㏍����緇�鍵������(_D)"
-
 #: ../src/gtkpounce.c:591
-msgid "Starts _typing"
-msgstr "篁臥�����ュ����紮�������(_T)"
+msgid "Is no longer i_dle"
+msgstr "緇�罘�筝㏍����緇�鍵������(_D)"
 
 #: ../src/gtkpounce.c:593
+msgid "Starts _typing"
+msgstr "篁臥�����ュ����紮�������(_T)"
+
+#: ../src/gtkpounce.c:595
 msgid "Stops t_yping"
 msgstr "篁臥�����ュ����罩≪������(_Y)"
 
-#: ../src/gtkpounce.c:595
+#: ../src/gtkpounce.c:597
 msgid "Sends a _message"
 msgstr "�<���祉�若�吾����篆<������(_M)"
 
 #. Create the "Action" frame.
-#: ../src/gtkpounce.c:627
+#: ../src/gtkpounce.c:629
 msgid "Action"
-msgstr "�≪���激�с��"
-
-#: ../src/gtkpounce.c:635
+msgstr "�ゃ��������篏���絎�茵�������..."
+
+#: ../src/gtkpounce.c:637
 msgid "Ope_n an IM window"
 msgstr "篌�荅宴���c�潟����������(_N)"
 
-#: ../src/gtkpounce.c:637
+#: ../src/gtkpounce.c:639
 msgid "_Pop up a notification"
 msgstr "�������≪�����������ャ����(_P)"
 
-#: ../src/gtkpounce.c:639
-msgid "Send a _message"
-msgstr "�<���祉�若�吾����篆<����(_M)"
-
 #: ../src/gtkpounce.c:641
+msgid "Send a _message"
+msgstr "�<���祉�若�吾����篆<����(_M)"
+
+#: ../src/gtkpounce.c:643
 msgid "E_xecute a command"
 msgstr "�潟���潟����絎�茵�����(_X)"
 
-#: ../src/gtkpounce.c:643
+#: ../src/gtkpounce.c:645
 msgid "P_lay a sound"
 msgstr "�泣���潟����羲�絅����(_L)"
 
-#: ../src/gtkpounce.c:648
+#: ../src/gtkpounce.c:650
 msgid "Brows_e..."
 msgstr "����(_E)..."
 
-#: ../src/gtkpounce.c:650
+#: ../src/gtkpounce.c:652
 msgid "Br_owse..."
 msgstr "����(_O)..."
 
-#: ../src/gtkpounce.c:651
+#: ../src/gtkpounce.c:653
 msgid "Pre_view"
 msgstr "�������ャ��(_V)"
 
 #. Create the "Options" frame.
-#: ../src/gtkpounce.c:763
+#: ../src/gtkpounce.c:765
 msgid "Options"
 msgstr "�����激�с��"
 
-#: ../src/gtkpounce.c:771
+#: ../src/gtkpounce.c:773
 msgid "P_ounce only when my status is not available"
 msgstr "�������倶������絎��с���������������ゃ����(_O)"
 
-#: ../src/gtkpounce.c:776
+#: ../src/gtkpounce.c:778
 msgid "_Recurring"
 msgstr "膵違��菴���(_R)"
 
-#: ../src/gtkpounce.c:1090
+#: ../src/gtkpounce.c:1092
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "����� %2$s ������ %1$s ���ゃ����荐㊤������ゃ���������������с����鐚�"
 
-#: ../src/gtkpounce.c:1238
+#: ../src/gtkpounce.c:1240
 msgid "Pounce Target"
 msgstr "�ゃ�����御��"
 
-#: ../src/gtkpounce.c:1273
+#: ../src/gtkpounce.c:1275
 msgid "Recurring"
 msgstr "膵違��菴���"
 
-#: ../src/gtkpounce.c:1320
+#: ../src/gtkpounce.c:1322
 msgid "Buddy Pounces"
 msgstr "篁臥�����ゃ����"
 
-#: ../src/gtkpounce.c:1447
+#: ../src/gtkpounce.c:1449
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s �������ュ������紮����障���� (%s)"
 
-#: ../src/gtkpounce.c:1449
+#: ../src/gtkpounce.c:1451
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s �������泣�ゃ�潟�祉�ゃ�潟���障���� (%s)"
 
-#: ../src/gtkpounce.c:1451
+#: ../src/gtkpounce.c:1453
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s ������緇�罘�筝㏍�����祉�c�����障���� (%s)"
 
-#: ../src/gtkpounce.c:1453
+#: ../src/gtkpounce.c:1455
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s �������√賢筝㏍�����祉�c�����障���� (%s)"
 
-#: ../src/gtkpounce.c:1455
+#: ../src/gtkpounce.c:1457
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s �������ュ������罩≪���障���� (%s)"
 
-#: ../src/gtkpounce.c:1457
+#: ../src/gtkpounce.c:1459
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s �������泣�ゃ�潟�祉�≪�������障���� (%s)"
 
-#: ../src/gtkpounce.c:1459
+#: ../src/gtkpounce.c:1461
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s ������緇�罘�筝㏍�������障���� (%s)"
 
-#: ../src/gtkpounce.c:1461
+#: ../src/gtkpounce.c:1463
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s �������√賢���障���� (%s)"
 
-#: ../src/gtkpounce.c:1463
+#: ../src/gtkpounce.c:1465
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s ���������������<���祉�若�吾����篆<���障���� (%s)"
 
-#: ../src/gtkpounce.c:1464
+#: ../src/gtkpounce.c:1466
 msgid "Unknown pounce event. Please report this!"
 msgstr "筝����� \"�ゃ����\" �ゃ���潟���с�������蚊���医�怨�����������鐚�"
 
@@ -4518,7 +4503,7 @@
 
 #: ../src/gtkprefs.c:842
 msgid "_Notify buddies that you are typing to them"
-msgstr "�<���祉�若�吾���ュ��筝㏍�с����������篁臥�������ャ����(_N)"
+msgstr "�<���祉�若�吾���ュ��筝㏍�с����������篁臥�������ャ����(_N)"
 
 #: ../src/gtkprefs.c:845
 msgid "Highlight _misspelled words"
@@ -4581,8 +4566,8 @@
 msgid "N_ew conversations:"
 msgstr "�違����篌�荅宴���c�潟����(_E):"
 
-#: ../src/gtkprefs.c:973 ../src/protocols/oscar/oscar.c:805
-#: ../src/protocols/oscar/oscar.c:6107
+#: ../src/gtkprefs.c:973 ../src/protocols/oscar/oscar.c:869
+#: ../src/protocols/oscar/oscar.c:6172
 msgid "IP Address"
 msgstr "IP-�≪������"
 
@@ -4735,7 +4720,7 @@
 msgid "Quiet"
 msgstr "����"
 
-#: ../src/gtkprefs.c:1468 ../src/protocols/silc/silc.c:666
+#: ../src/gtkprefs.c:1468 ../src/protocols/silc/silc.c:670
 msgid "Normal"
 msgstr "罔�羣�"
 
@@ -4882,7 +4867,7 @@
 msgid "Sounds"
 msgstr "�泣���潟��"
 
-#: ../src/gtkprefs.c:1867 ../src/protocols/silc/silc.c:1847
+#: ../src/gtkprefs.c:1867 ../src/protocols/silc/silc.c:1851
 msgid "Network"
 msgstr "���������若��"
 
@@ -4979,45 +4964,57 @@
 msgid "Are you sure you want to block %s?"
 msgstr "����� %s �������������障����鐚�"
 
-#: ../src/gtkrequest.c:285 ../src/protocols/msn/dialog.c:114
+#: ../src/gtkrequest.c:267 ../src/protocols/msn/dialog.c:114
 #: ../src/protocols/msn/msn.c:559 ../src/protocols/msn/msn.c:568
 #: ../src/protocols/novell/novell.c:1921 ../src/protocols/silc/buddy.c:313
 #: ../src/protocols/silc/pk.c:117 ../src/protocols/silc/wb.c:303
 msgid "Yes"
 msgstr "����"
 
-#: ../src/gtkrequest.c:286 ../src/protocols/msn/dialog.c:115
+#: ../src/gtkrequest.c:268 ../src/protocols/msn/dialog.c:115
 #: ../src/protocols/msn/msn.c:559 ../src/protocols/msn/msn.c:568
 #: ../src/protocols/novell/novell.c:1922 ../src/protocols/silc/buddy.c:314
 #: ../src/protocols/silc/pk.c:118 ../src/protocols/silc/wb.c:304
 msgid "No"
 msgstr "������"
 
-#: ../src/gtkrequest.c:289
+#: ../src/gtkrequest.c:271
 msgid "Apply"
 msgstr "����"
 
-#: ../src/gtkrequest.c:290 ../src/protocols/msn/msn.c:357
+#: ../src/gtkrequest.c:272 ../src/protocols/msn/msn.c:357
 #: ../src/protocols/silc/util.c:336
 msgid "Close"
 msgstr "������"
 
-#: ../src/gtkrequest.c:1851
+#: ../src/gtkrequest.c:1467
 msgid "That file already exists"
 msgstr "�≪���������<�ゃ����������障��"
 
-#: ../src/gtkrequest.c:1852
+#: ../src/gtkrequest.c:1468
 msgid "Would you like to overwrite it?"
 msgstr "筝��吾�����������������с����鐚�"
 
-#: ../src/gtkrequest.c:1896 ../src/gtkrequest.c:1937
+#: ../src/gtkrequest.c:1469
+msgid "Overwrite"
+msgstr "筝��吾������"
+
+#: ../src/gtkrequest.c:1470
+msgid "Choose New Name"
+msgstr "�ャ��������篁�����"
+
+#: ../src/gtkrequest.c:1512 ../src/gtkrequest.c:1553
 msgid "Save File..."
 msgstr "���<�ゃ�����絖�..."
 
-#: ../src/gtkrequest.c:1897 ../src/gtkrequest.c:1938
+#: ../src/gtkrequest.c:1513 ../src/gtkrequest.c:1554
 msgid "Open File..."
 msgstr "���<�ゃ��������..."
 
+#: ../src/gtkrequest.c:1601 ../src/gtkrequest.c:1615
+msgid "Select Folder..."
+msgstr "�����������御��..."
+
 #: ../src/gtkroomlist.c:287
 msgid "_Add"
 msgstr "菴遵��(_A)"
@@ -5048,24 +5045,24 @@
 #. Available status messages are plain text
 #: ../src/gtksavedstatuses.c:459 ../src/gtksavedstatuses.c:920
 #: ../src/protocols/bonjour/bonjour.c:256
-#: ../src/protocols/bonjour/bonjour.c:263 ../src/protocols/gg/gg.c:1421
-#: ../src/protocols/gg/gg.c:1431 ../src/protocols/gg/gg.c:1437
-#: ../src/protocols/gg/gg.c:1446 ../src/protocols/gg/gg.c:1451
-#: ../src/protocols/irc/irc.c:227 ../src/protocols/jabber/jabber.c:1185
-#: ../src/protocols/jabber/jabber.c:1195 ../src/protocols/jabber/jabber.c:1205
-#: ../src/protocols/jabber/jabber.c:1215 ../src/protocols/jabber/jabber.c:1225
-#: ../src/protocols/jabber/jabber.c:1237 ../src/protocols/novell/novell.c:2868
+#: ../src/protocols/bonjour/bonjour.c:263 ../src/protocols/gg/gg.c:1461
+#: ../src/protocols/gg/gg.c:1471 ../src/protocols/gg/gg.c:1477
+#: ../src/protocols/gg/gg.c:1486 ../src/protocols/gg/gg.c:1491
+#: ../src/protocols/irc/irc.c:227 ../src/protocols/jabber/jabber.c:1182
+#: ../src/protocols/jabber/jabber.c:1192 ../src/protocols/jabber/jabber.c:1202
+#: ../src/protocols/jabber/jabber.c:1212 ../src/protocols/jabber/jabber.c:1222
+#: ../src/protocols/jabber/jabber.c:1234 ../src/protocols/novell/novell.c:2868
 #: ../src/protocols/novell/novell.c:2974 ../src/protocols/novell/novell.c:2980
-#: ../src/protocols/novell/novell.c:2986 ../src/protocols/oscar/oscar.c:7723
-#: ../src/protocols/oscar/oscar.c:7737 ../src/protocols/oscar/oscar.c:7742
-#: ../src/protocols/oscar/oscar.c:7951 ../src/protocols/oscar/oscar.c:7963
+#: ../src/protocols/novell/novell.c:2986 ../src/protocols/oscar/oscar.c:7801
+#: ../src/protocols/oscar/oscar.c:7816 ../src/protocols/oscar/oscar.c:7821
+#: ../src/protocols/oscar/oscar.c:8030 ../src/protocols/oscar/oscar.c:8042
 #: ../src/protocols/sametime/sametime.c:3274
 #: ../src/protocols/sametime/sametime.c:3280
 #: ../src/protocols/sametime/sametime.c:3286
 #: ../src/protocols/sametime/sametime.c:3365
 #: ../src/protocols/silc/buddy.c:1544 ../src/protocols/simple/simple.c:242
-#: ../src/protocols/yahoo/yahoo.c:3278 ../src/protocols/yahoo/yahoo.c:3284
-#: ../src/protocols/zephyr/zephyr.c:2261
+#: ../src/protocols/yahoo/yahoo.c:3280 ../src/protocols/yahoo/yahoo.c:3286
+#: ../src/protocols/zephyr/zephyr.c:2281
 msgid "Message"
 msgstr "�<���祉�若��"
 
@@ -5087,13 +5084,13 @@
 msgstr "�ャ���倶��"
 
 #: ../src/gtksavedstatuses.c:909 ../src/gtksavedstatuses.c:1056
-#: ../src/protocols/gg/gg.c:1403 ../src/protocols/gg/gg.c:1408
+#: ../src/protocols/gg/gg.c:1444 ../src/protocols/gg/gg.c:1448
 #: ../src/protocols/jabber/buddy.c:623 ../src/protocols/jabber/buddy.c:630
-#: ../src/protocols/jabber/buddy.c:641 ../src/protocols/jabber/jabber.c:1156
+#: ../src/protocols/jabber/buddy.c:641 ../src/protocols/jabber/jabber.c:1153
 #: ../src/protocols/msn/msn.c:550 ../src/protocols/novell/novell.c:2867
-#: ../src/protocols/novell/novell.c:2871 ../src/protocols/oscar/oscar.c:785
-#: ../src/protocols/oscar/oscar.c:791 ../src/protocols/oscar/oscar.c:794
-#: ../src/protocols/yahoo/yahoo.c:2880
+#: ../src/protocols/novell/novell.c:2871 ../src/protocols/oscar/oscar.c:849
+#: ../src/protocols/oscar/oscar.c:855 ../src/protocols/oscar/oscar.c:858
+#: ../src/protocols/yahoo/yahoo.c:2882
 msgid "Status"
 msgstr "�倶��"
 
@@ -5158,14 +5155,14 @@
 
 #: ../src/gtksound.c:72
 msgid "Someone says your name in chat"
-msgstr "���c������賢�ц��������������若�潟�障����"
-
-#: ../src/gtksound.c:488
+msgstr "���c�����ц��������������若�潟�障����"
+
+#: ../src/gtksound.c:485
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr "荐㊤��������<�ゃ�� (%s) ��絖����������������泣���潟���������с���障������"
 
-#: ../src/gtksound.c:504
+#: ../src/gtksound.c:501
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
@@ -5173,7 +5170,7 @@
 "�泣���潟���阪�����号��� \"�潟���潟��\" ���御�����������с�������潟���潟������絎�������"
 "���������с�泣���潟���������с���障������"
 
-#: ../src/gtksound.c:516
+#: ../src/gtksound.c:513
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
@@ -5181,18 +5178,14 @@
 msgstr ""
 "荐㊤������泣���潟�����潟���潟����絎�茵��с���������с�泣���潟����羲�絅�����障����: %s"
 
-#: ../src/gtkstatusbox.c:362
-msgid "Typing"
-msgstr "�ュ��筝㏍�с��"
-
 #. connect to the server
-#: ../src/gtkstatusbox.c:364 ../src/protocols/irc/irc.c:313
-#: ../src/protocols/jabber/jabber.c:983 ../src/protocols/msn/session.c:349
+#: ../src/gtkstatusbox.c:368 ../src/protocols/irc/irc.c:313
+#: ../src/protocols/jabber/jabber.c:979 ../src/protocols/msn/session.c:349
 #: ../src/protocols/napster/napster.c:536
-#: ../src/protocols/novell/novell.c:2183 ../src/protocols/oscar/oscar.c:1874
+#: ../src/protocols/novell/novell.c:2183 ../src/protocols/oscar/oscar.c:1938
 #: ../src/protocols/sametime/sametime.c:3693
-#: ../src/protocols/simple/simple.c:1503 ../src/protocols/yahoo/yahoo.c:2571
-#: ../src/protocols/zephyr/zephyr.c:1547
+#: ../src/protocols/simple/simple.c:1594 ../src/protocols/yahoo/yahoo.c:2572
+#: ../src/protocols/zephyr/zephyr.c:1565
 msgid "Connecting"
 msgstr "�ョ�筝㏍�с��"
 
@@ -5302,38 +5295,31 @@
 "�������違�����������鴻�������������潟���c�с��������������潟���h��昆�с���������"
 "�劻���c�����������������吾�с������荵∫�����������с��������"
 
-#. Write a local message to this conversation showing that a request for a
-#. * Doodle session has been made
-#.
-#: ../src/gtkwhiteboard.c:344 ../src/protocols/yahoo/yahoo_doodle.c:96
-msgid "Sent Doodle request."
-msgstr "Doodle 荀�羆�����篆<����"
-
-#: ../src/log.c:165
+#: ../src/log.c:167
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">�㏍�域��蚊������粋昭�翠�∽�違�������障����</font></b>"
 
-#: ../src/log.c:547
+#: ../src/log.c:549
 msgid "HTML"
 msgstr "HTML 綵√�"
 
-#: ../src/log.c:558
+#: ../src/log.c:560
 msgid "Plain text"
 msgstr "��絽吾�����㏍�鴻��"
 
-#: ../src/log.c:569
+#: ../src/log.c:571
 msgid "Old Gaim"
 msgstr "�ゃ�� Gaim"
 
-#: ../src/log.c:668
+#: ../src/log.c:666
 msgid "Logging of this conversation failed."
 msgstr "�����<���祉�若�吾���㏍�違��荐��蚊�с���障�����с����"
 
-#: ../src/log.c:969
+#: ../src/log.c:1009
 msgid "XML"
 msgstr "XML"
 
-#: ../src/log.c:1037
+#: ../src/log.c:1083
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -5342,7 +5328,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: ../src/log.c:1039
+#: ../src/log.c:1085
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -5351,22 +5337,22 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: ../src/log.c:1096 ../src/log.c:1218
+#: ../src/log.c:1142 ../src/log.c:1273
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>�㏍�違�祉���<�ゃ����荀��ゃ�����障����鐚�</b></font>"
 
-#: ../src/log.c:1108 ../src/log.c:1230
+#: ../src/log.c:1154 ../src/log.c:1287
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>���<�ゃ����茯㏍�粋昭���障�����с����: %s</b></font>"
 
-#: ../src/log.c:1161
+#: ../src/log.c:1216
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
 #: ../src/plugin.c:281 ../src/protocols/msn/servconn.c:139
-#: ../src/protocols/msn/session.c:326 ../src/protocols/oscar/oscar.c:5063
+#: ../src/protocols/msn/session.c:326 ../src/protocols/oscar/oscar.c:5128
 msgid "Unknown error"
 msgstr "����筝�����������"
 
@@ -5380,11 +5366,11 @@
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "ABI �����若�吾�с�括��� (%d.%d.x) ��鋇��眼���障����: 荀����若�吾�с�� %d.%d.x"
 
-#: ../src/plugin.c:457
+#: ../src/plugin.c:458
 msgid "Plugin does not implement all required functions"
 msgstr "�����違�ゃ�潟��綽�荀����������∽�違��絎�茖��������障����"
 
-#: ../src/plugin.c:514
+#: ../src/plugin.c:523
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -5393,25 +5379,25 @@
 "荀�羆������������違�ゃ�� %s ��荀��ゃ�����障�����с���������������違�ゃ�潟���ゃ�潟�鴻���若��"
 "����������筝�綺��茵������������"
 
-#: ../src/plugin.c:519
+#: ../src/plugin.c:528
 msgid "Gaim encountered errors loading the plugin."
 msgstr "�����違�ゃ�潟��茯㏍�粋昭�����������若���榊�����障������"
 
-#: ../src/plugin.c:542
+#: ../src/plugin.c:551
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "荀�羆������������違�ゃ�� %s ��茯㏍�粋昭���障�����с������"
 
-#: ../src/plugin.c:546
+#: ../src/plugin.c:555
 msgid "Gaim was unable to load your plugin."
 msgstr "�����違�ゃ�潟��茯㏍�粋昭���障�����с������"
 
-#: ../src/plugin.c:648
+#: ../src/plugin.c:657
 #, c-format
 msgid "The dependent plugin %s failed to unload."
 msgstr "箴�絖��с�����������違�ゃ�� %s ��В�障��け�����障����"
 
-#: ../src/plugin.c:653
+#: ../src/plugin.c:662
 msgid "Gaim encountered errors unloading the plugin."
 msgstr "�����違�ゃ�潟��茹f�障�������������若���榊�����障����"
 
@@ -5468,34 +5454,33 @@
 msgstr "Gaim ���若��"
 
 #. Creating the user splits
-#: ../src/protocols/bonjour/bonjour.c:575 ../src/protocols/silc/silc.c:931
+#: ../src/protocols/bonjour/bonjour.c:575 ../src/protocols/silc/silc.c:935
 msgid "Hostname"
 msgstr "���鴻����"
 
 #. Creating the options for the protocol
 #. port to connect to
 #: ../src/protocols/bonjour/bonjour.c:579 ../src/protocols/irc/irc.c:900
-#: ../src/protocols/msn/msn.c:1956 ../src/protocols/napster/napster.c:724
-#: ../src/protocols/sametime/sametime.c:5643 ../src/protocols/silc/silc.c:1855
+#: ../src/protocols/msn/msn.c:2054 ../src/protocols/napster/napster.c:724
+#: ../src/protocols/sametime/sametime.c:5643 ../src/protocols/silc/silc.c:1859
 msgid "Port"
 msgstr "���若�����"
 
-#: ../src/protocols/bonjour/bonjour.c:582 ../src/protocols/gg/gg.c:562
-#: ../src/protocols/gg/gg.c:971
+#: ../src/protocols/bonjour/bonjour.c:582 ../src/protocols/gg/gg.c:605
+#: ../src/protocols/gg/gg.c:1015 ../src/protocols/jabber/jabber.c:770
 msgid "First name"
 msgstr "��"
 
-#: ../src/protocols/bonjour/bonjour.c:585 ../src/protocols/gg/gg.c:557
+#: ../src/protocols/bonjour/bonjour.c:585 ../src/protocols/gg/gg.c:600
+#: ../src/protocols/jabber/jabber.c:775
 msgid "Last name"
 msgstr "鎈�"
 
-#: ../src/protocols/bonjour/bonjour.c:588 ../src/protocols/jabber/buddy.c:261
-#: ../src/protocols/jabber/buddy.c:779 ../src/protocols/jabber/buddy.c:787
-#: ../src/protocols/silc/silc.c:695 ../src/protocols/silc/silc.c:935
-#: ../src/protocols/silc/util.c:512
-#: ../src/protocols/yahoo/yahoo_profile.c:1030
-msgid "Email"
-msgstr "E-�<�若��"
+#: ../src/protocols/bonjour/bonjour.c:588 ../src/protocols/gg/gg.c:468
+#: ../src/protocols/jabber/jabber.c:760 ../src/protocols/silc/silc.c:699
+#: ../src/protocols/silc/silc.c:939
+msgid "E-mail"
+msgstr "E-�<�若��:"
 
 #: ../src/protocols/bonjour/jabber.c:357
 #, c-format
@@ -5522,307 +5507,314 @@
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "�<���祉�若�吾����篆<�с���障���� (篌�荅宴����紮��с���障�����с����)"
 
-#: ../src/protocols/gg/gg.c:80 ../src/protocols/gg/gg.c:102
-#: ../src/protocols/gg/gg.c:137
+#: ../src/protocols/gg/gg.c:76 ../src/proxy.c:2345
+msgid "Invalid proxy settings"
+msgstr "筝�罩c�����㏍�㏍�決┃絎�"
+
+#: ../src/protocols/gg/gg.c:77 ../src/proxy.c:2345
+msgid ""
+"Either the host name or port number specified for your given proxy type is "
+"invalid."
+msgstr "��絎��������㏍�㏍�激����������鴻�����障�������若����垩��罩c��������憗������"
+
+#: ../src/protocols/gg/gg.c:115 ../src/protocols/gg/gg.c:137
+#: ../src/protocols/gg/gg.c:180
 msgid "Token Error"
 msgstr "���若���潟��������"
 
-#: ../src/protocols/gg/gg.c:81 ../src/protocols/gg/gg.c:103
-#: ../src/protocols/gg/gg.c:138
+#: ../src/protocols/gg/gg.c:116 ../src/protocols/gg/gg.c:138
+#: ../src/protocols/gg/gg.c:181
 msgid "Unable to fetch the token.\n"
 msgstr "���若���潟����緇��с���障������\n"
 
-#: ../src/protocols/gg/gg.c:226 ../src/protocols/gg/gg.c:245
+#: ../src/protocols/gg/gg.c:269 ../src/protocols/gg/gg.c:288
 msgid "Save Buddylist..."
 msgstr "篁臥�����鴻�����絖�..."
 
-#: ../src/protocols/gg/gg.c:227
+#: ../src/protocols/gg/gg.c:270
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "篁臥�����鴻����腥冴�����с�����<�ゃ����������吾��莨若�障���障�����с������"
 
-#: ../src/protocols/gg/gg.c:233 ../src/protocols/gg/gg.c:235
+#: ../src/protocols/gg/gg.c:276 ../src/protocols/gg/gg.c:278
 msgid "Couldn't open file"
 msgstr "���<�ゃ���������障�����с������"
 
-#: ../src/protocols/gg/gg.c:246
+#: ../src/protocols/gg/gg.c:289
 msgid "Buddylist saved successfully!"
 msgstr "篁臥�����鴻�����絖���絎�篋����障����鐚�"
 
-#: ../src/protocols/gg/gg.c:264 ../src/protocols/gg/gg.c:265
+#: ../src/protocols/gg/gg.c:307 ../src/protocols/gg/gg.c:308
 msgid "Couldn't load buddylist"
 msgstr "篁臥�����鴻����茯㏍�粋昭���障�����с������"
 
-#: ../src/protocols/gg/gg.c:281
+#: ../src/protocols/gg/gg.c:324
 msgid "Load Buddylist..."
 msgstr "篁臥�����鴻������粋昭��..."
 
-#: ../src/protocols/gg/gg.c:282
+#: ../src/protocols/gg/gg.c:325
 msgid "Buddylist loaded successfully!"
 msgstr "篁臥�����鴻������粋昭�帥��絎�篋����障����鐚�"
 
-#: ../src/protocols/gg/gg.c:293
+#: ../src/protocols/gg/gg.c:336
 msgid "Save buddylist..."
 msgstr "篁臥�����鴻�����絖�..."
 
-#: ../src/protocols/gg/gg.c:337
+#: ../src/protocols/gg/gg.c:380
 msgid "Fill in the registration fields."
 msgstr "�脂�我���宴���吾��莨若�帥��け�����障������"
 
-#: ../src/protocols/gg/gg.c:342
+#: ../src/protocols/gg/gg.c:385
 msgid "Passwords do not match."
 msgstr "���鴻���若����筝��眼���障������"
 
-#: ../src/protocols/gg/gg.c:351
+#: ../src/protocols/gg/gg.c:394
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "�違�����≪�����潟�����脂�蚊�с���障�����������若���榊�����障������\n"
 
-#: ../src/protocols/gg/gg.c:364
+#: ../src/protocols/gg/gg.c:407
 msgid "New Gadu-Gadu Account Registered"
 msgstr "�違���� Gadu-Gadu ���≪�����潟�����脂�蚊���障������"
 
-#: ../src/protocols/gg/gg.c:365
+#: ../src/protocols/gg/gg.c:408
 msgid "Registration completed successfully!"
 msgstr "�脂�蚊��絎�篋����障����鐚�"
 
-#: ../src/protocols/gg/gg.c:425
-msgid "e-Mail"
-msgstr "E-�<�若��"
-
-#: ../src/protocols/gg/gg.c:430 ../src/protocols/gg/gg.c:704
-#: ../src/protocols/jabber/jabber.c:749 ../src/protocols/jabber/jabber.c:1310
+#: ../src/protocols/gg/gg.c:473 ../src/protocols/gg/gg.c:747
+#: ../src/protocols/jabber/jabber.c:749 ../src/protocols/jabber/jabber.c:1307
 msgid "Password"
 msgstr "���鴻���若��"
 
-#: ../src/protocols/gg/gg.c:435 ../src/protocols/gg/gg.c:709
+#: ../src/protocols/gg/gg.c:478 ../src/protocols/gg/gg.c:752
 msgid "Password (retype)"
 msgstr "���鴻���若�� (腆肴���)"
 
-#: ../src/protocols/gg/gg.c:440 ../src/protocols/gg/gg.c:714
+#: ../src/protocols/gg/gg.c:483 ../src/protocols/gg/gg.c:757
 msgid "Enter current token"
 msgstr "�上�������若���潟���ュ�����������"
 
-#: ../src/protocols/gg/gg.c:446 ../src/protocols/gg/gg.c:720
+#: ../src/protocols/gg/gg.c:489 ../src/protocols/gg/gg.c:763
 msgid "Current token"
 msgstr "�上�������若����"
 
-#: ../src/protocols/gg/gg.c:450 ../src/protocols/gg/gg.c:451
+#: ../src/protocols/gg/gg.c:493 ../src/protocols/gg/gg.c:494
 msgid "Register New Gadu-Gadu Account"
 msgstr "�違���� Gadu-Gadu �≪�����潟�����脂��"
 
-#: ../src/protocols/gg/gg.c:452
+#: ../src/protocols/gg/gg.c:495
 msgid "Please, fill in the following fields"
 msgstr "罨<����������������:"
 
-#: ../src/protocols/gg/gg.c:547 ../src/protocols/gg/gg.c:1610
+#: ../src/protocols/gg/gg.c:590 ../src/protocols/gg/gg.c:1657
 msgid "Unable to initiate a new search"
 msgstr "�違����罎�膣≪����紮��с���障����"
 
-#: ../src/protocols/gg/gg.c:548 ../src/protocols/gg/gg.c:1611
+#: ../src/protocols/gg/gg.c:591 ../src/protocols/gg/gg.c:1658
 msgid "You have a pending search. Please wait for it to finish."
 msgstr "罎�膣≪��篆��������c�����障����篁����膣≪��絎�篋������障�с��緇��>�������"
 
-#: ../src/protocols/gg/gg.c:567 ../src/protocols/gg/gg.c:974
-#: ../src/protocols/gg/gg.c:2003 ../src/protocols/jabber/buddy.c:252
-#: ../src/protocols/jabber/buddy.c:695 ../src/protocols/jabber/buddy.c:1395
+#. General
+#: ../src/protocols/gg/gg.c:610 ../src/protocols/gg/gg.c:1018
+#: ../src/protocols/gg/gg.c:2048 ../src/protocols/jabber/buddy.c:252
+#: ../src/protocols/jabber/buddy.c:695 ../src/protocols/jabber/buddy.c:1402
 #: ../src/protocols/jabber/jabber.c:765 ../src/protocols/msn/msn.c:1373
-#: ../src/protocols/silc/buddy.c:1528 ../src/protocols/silc/ops.c:1036
-#: ../src/protocols/silc/ops.c:1179 ../src/protocols/silc/ops.c:1328
-#: ../src/protocols/yahoo/yahoo_profile.c:1035
+#: ../src/protocols/msn/msn.c:1535 ../src/protocols/silc/buddy.c:1528
+#: ../src/protocols/silc/ops.c:1036 ../src/protocols/silc/ops.c:1179
+#: ../src/protocols/silc/ops.c:1328
+#: ../src/protocols/yahoo/yahoo_profile.c:1041
 msgid "Nickname"
 msgstr "���������若��"
 
-#: ../src/protocols/gg/gg.c:572 ../src/protocols/gg/gg.c:977
-#: ../src/protocols/jabber/jabber.c:785 ../src/protocols/oscar/oscar.c:6153
-#: ../src/protocols/oscar/oscar.c:6161
+#: ../src/protocols/gg/gg.c:615 ../src/protocols/gg/gg.c:1021
+#: ../src/protocols/jabber/jabber.c:785 ../src/protocols/oscar/oscar.c:6218
+#: ../src/protocols/oscar/oscar.c:6226
 msgid "City"
 msgstr "��"
 
-#: ../src/protocols/gg/gg.c:577
+#: ../src/protocols/gg/gg.c:620
 msgid "Year of birth"
 msgstr "茯���綛�"
 
-#: ../src/protocols/gg/gg.c:580 ../src/protocols/msn/msn.c:1538
-#: ../src/protocols/oscar/oscar.c:6127
-#: ../src/protocols/yahoo/yahoo_profile.c:1060
+#: ../src/protocols/gg/gg.c:623 ../src/protocols/msn/msn.c:1537
+#: ../src/protocols/oscar/oscar.c:6192
+#: ../src/protocols/yahoo/yahoo_profile.c:1066
 msgid "Gender"
 msgstr "�у��"
 
-#: ../src/protocols/gg/gg.c:581
+#: ../src/protocols/gg/gg.c:624
 msgid "Male or female"
 msgstr "��/絅�"
 
-#: ../src/protocols/gg/gg.c:582 ../src/protocols/oscar/oscar.c:6127
+#: ../src/protocols/gg/gg.c:625 ../src/protocols/oscar/oscar.c:6192
 msgid "Male"
 msgstr "�傑��"
 
-#: ../src/protocols/gg/gg.c:583 ../src/protocols/oscar/oscar.c:6127
+#: ../src/protocols/gg/gg.c:626 ../src/protocols/oscar/oscar.c:6192
 msgid "Female"
 msgstr "絅恰��"
 
-#: ../src/protocols/gg/gg.c:587
+#: ../src/protocols/gg/gg.c:630
 msgid "Only online"
 msgstr "���潟���ゃ�潟����"
 
-#: ../src/protocols/gg/gg.c:591 ../src/protocols/gg/gg.c:592
+#: ../src/protocols/gg/gg.c:634 ../src/protocols/gg/gg.c:635
 msgid "Find buddies"
 msgstr "篁臥�����膣�"
 
-#: ../src/protocols/gg/gg.c:593
+#: ../src/protocols/gg/gg.c:636
 msgid "Please, enter your search criteria below"
 msgstr "罎�膣∽�>散���ュ�����������"
 
-#: ../src/protocols/gg/gg.c:630
+#: ../src/protocols/gg/gg.c:673
 msgid "Fill in the fields."
 msgstr "罨<����������������:"
 
-#: ../src/protocols/gg/gg.c:642
+#: ../src/protocols/gg/gg.c:685
 msgid "Your current password is different from the one that you specified."
 msgstr "�上��戎�������������鴻���若������絎��������鴻���若����筝��眼���障�����с������"
 
-#: ../src/protocols/gg/gg.c:656
+#: ../src/protocols/gg/gg.c:699
 msgid "Unable to change password. Error occured.\n"
 msgstr "���鴻���若����紊��眼�с���障�����������若���榊�����障������\n"
 
-#: ../src/protocols/gg/gg.c:665
+#: ../src/protocols/gg/gg.c:708
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Gadu-Gadu �≪�����潟�������鴻���若�������"
 
-#: ../src/protocols/gg/gg.c:666
+#: ../src/protocols/gg/gg.c:709
 msgid "Password was changed successfully!"
 msgstr "���鴻���若������眼��絎�篋����障����鐚�"
 
-#: ../src/protocols/gg/gg.c:699
+#: ../src/protocols/gg/gg.c:742
 msgid "Current password"
 msgstr "�上�������鴻���若��"
 
-#: ../src/protocols/gg/gg.c:724
+#: ../src/protocols/gg/gg.c:767
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "�上��戎�������������鴻���若���� UIN ���違�������鴻���若�����ュ�����������:"
 
-#: ../src/protocols/gg/gg.c:728 ../src/protocols/gg/gg.c:729
+#: ../src/protocols/gg/gg.c:771 ../src/protocols/gg/gg.c:772
 msgid "Change Gadu-Gadu Password"
 msgstr "Gadu-Gadu �����鴻���若�������"
 
-#. TODO: s/screenname/alias/
-#: ../src/protocols/gg/gg.c:804
+#: ../src/protocols/gg/gg.c:846
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "���c�������御��: %s"
 
-#: ../src/protocols/gg/gg.c:807 ../src/protocols/gg/gg.c:808
+#: ../src/protocols/gg/gg.c:849 ../src/protocols/gg/gg.c:850
 msgid "Add to chat..."
 msgstr "���c������申��..."
 
-#: ../src/protocols/gg/gg.c:950
+#: ../src/protocols/gg/gg.c:993
 msgid "No matching users found"
 msgstr "筝��眼�������若�吟��荀��ゃ�����障�����с����"
 
-#: ../src/protocols/gg/gg.c:951
+#: ../src/protocols/gg/gg.c:994
 msgid "There are no users matching your search criteria."
 msgstr "罎�膣∽�>散����眼�������若�吟��絖������障�����с������"
 
-#: ../src/protocols/gg/gg.c:962 ../src/protocols/gg/gg.c:1029
-#: ../src/protocols/oscar/oscar.c:6264
+#: ../src/protocols/gg/gg.c:1006 ../src/protocols/gg/gg.c:1073
+#: ../src/protocols/oscar/oscar.c:6329
 msgid "Unable to display the search results."
 msgstr "罎�膣∝�����茵�ず�с���障����"
 
-#: ../src/protocols/gg/gg.c:968 ../src/protocols/oscar/oscar.c:6099
+#: ../src/protocols/gg/gg.c:1012 ../src/protocols/oscar/oscar.c:6164
 msgid "UIN"
 msgstr "UIN"
 
-#: ../src/protocols/gg/gg.c:980
+#: ../src/protocols/gg/gg.c:1024
 msgid "Birth year"
 msgstr "茯���綛�"
 
-#: ../src/protocols/gg/gg.c:1020
+#: ../src/protocols/gg/gg.c:1064
 msgid "Gadu-Gadu Public Directory"
 msgstr "Gadu-Gadu ��������������"
 
-#: ../src/protocols/gg/gg.c:1021
+#: ../src/protocols/gg/gg.c:1065
 msgid "Search results"
 msgstr "罎�膣∝���"
 
-#: ../src/protocols/gg/gg.c:1118 ../src/protocols/gg/gg.c:1265
+#: ../src/protocols/gg/gg.c:1162 ../src/protocols/gg/gg.c:1309
 msgid "Unable to read socket"
 msgstr "�純�宴������茯㏍���障����"
 
-#: ../src/protocols/gg/gg.c:1201
+#: ../src/protocols/gg/gg.c:1245
 msgid "Buddy list downloaded"
 msgstr "篁臥�����鴻���������潟�㏍�若�����障����"
 
-#: ../src/protocols/gg/gg.c:1202
+#: ../src/protocols/gg/gg.c:1246
 msgid "Your buddy list was downloaded from the server."
 msgstr "篁臥�����鴻�����泣�若�����������潟�㏍�若�����障������"
 
-#: ../src/protocols/gg/gg.c:1209
+#: ../src/protocols/gg/gg.c:1253
 msgid "Buddy list uploaded"
 msgstr "篁臥�����鴻�����≪�����㏍�若�����障����"
 
-#: ../src/protocols/gg/gg.c:1210
+#: ../src/protocols/gg/gg.c:1254
 msgid "Your buddy list was stored on the server."
 msgstr "篁臥�����鴻�����泣�若�����主����障������"
 
-#: ../src/protocols/gg/gg.c:1311 ../src/protocols/gg/gg.c:1532
+#: ../src/protocols/gg/gg.c:1355 ../src/protocols/gg/gg.c:1579
 msgid "Connection failed."
 msgstr "�ョ���け�����障����"
 
-#: ../src/protocols/gg/gg.c:1445 ../src/protocols/msn/msn.c:566
+#: ../src/protocols/gg/gg.c:1485 ../src/protocols/msn/msn.c:566
 msgid "Blocked"
 msgstr "��������������"
 
-#: ../src/protocols/gg/gg.c:1468
+#: ../src/protocols/gg/gg.c:1508
 msgid "Add to chat"
 msgstr "���c������申��"
 
-#: ../src/protocols/gg/gg.c:1477
+#: ../src/protocols/gg/gg.c:1517
 msgid "Unblock"
 msgstr "����������"
 
-#: ../src/protocols/gg/gg.c:1481
+#: ../src/protocols/gg/gg.c:1521
 msgid "Block"
 msgstr "��������"
 
-#: ../src/protocols/gg/gg.c:1498
+#: ../src/protocols/gg/gg.c:1538
 msgid "Chat _name:"
 msgstr "���c������(_N):"
 
-#: ../src/protocols/gg/gg.c:1724
+#: ../src/protocols/gg/gg.c:1769
 msgid "Chat error"
 msgstr "���c������������"
 
-#: ../src/protocols/gg/gg.c:1725
+#: ../src/protocols/gg/gg.c:1770
 msgid "This chat name is already in use"
 msgstr "�������c���������≪��戎�����������障����"
 
-#: ../src/protocols/gg/gg.c:1808
+#: ../src/protocols/gg/gg.c:1853
 msgid "Not connected to the server."
 msgstr "�泣�若���御・膓��������障������"
 
-#: ../src/protocols/gg/gg.c:1831
+#: ../src/protocols/gg/gg.c:1876
 msgid "Find buddies..."
 msgstr "篁臥�����膣�..."
 
-#: ../src/protocols/gg/gg.c:1837
+#: ../src/protocols/gg/gg.c:1882
 msgid "Change password..."
 msgstr "���鴻���若�������..."
 
-#: ../src/protocols/gg/gg.c:1843
+#: ../src/protocols/gg/gg.c:1888
 msgid "Upload buddylist to Server"
 msgstr "篁臥�����鴻�����≪�����㏍�若��"
 
-#: ../src/protocols/gg/gg.c:1847
+#: ../src/protocols/gg/gg.c:1892
 msgid "Download buddylist from Server"
 msgstr "篁臥�����鴻���������潟�㏍�若��"
 
-#: ../src/protocols/gg/gg.c:1851
+#: ../src/protocols/gg/gg.c:1896
 msgid "Delete buddylist from Server"
 msgstr "�泣�若������篁臥�����鴻��������"
 
-#: ../src/protocols/gg/gg.c:1855
+#: ../src/protocols/gg/gg.c:1900
 msgid "Save buddylist to file..."
 msgstr "篁臥�����鴻�����絖�..."
 
-#: ../src/protocols/gg/gg.c:1859
+#: ../src/protocols/gg/gg.c:1904
 msgid "Load buddylist from file..."
 msgstr "篁臥�����鴻�����ゃ�潟���若��..."
 
@@ -5837,32 +5829,32 @@
 #. id
 #. name
 #. version
-#: ../src/protocols/gg/gg.c:1955
+#: ../src/protocols/gg/gg.c:2000
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu ���㏍���潟���������違�ゃ��"
 
 #. summary
-#: ../src/protocols/gg/gg.c:1956
+#: ../src/protocols/gg/gg.c:2001
 msgid "Polish popular IM"
 msgstr "���若���潟���т査羂������� IM �с��"
 
-#: ../src/protocols/gg/gg.c:2004
+#: ../src/protocols/gg/gg.c:2049
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu ���若��"
 
-#: ../src/protocols/irc/cmds.c:43 ../src/protocols/silc/silc.c:1582
+#: ../src/protocols/irc/cmds.c:43 ../src/protocols/silc/silc.c:1586
 #, c-format
 msgid "Unknown command: %s"
 msgstr "筝������潟���潟��: %s"
 
 #: ../src/protocols/irc/cmds.c:482 ../src/protocols/jabber/chat.c:592
-#: ../src/protocols/silc/silc.c:1290
+#: ../src/protocols/silc/silc.c:1294
 #, c-format
 msgid "current topic is: %s"
 msgstr "�上������������: %s"
 
 #: ../src/protocols/irc/cmds.c:486 ../src/protocols/jabber/chat.c:596
-#: ../src/protocols/silc/silc.c:1294
+#: ../src/protocols/silc/silc.c:1298
 msgid "No topic is set"
 msgstr "����������荐㊤����������障����"
 
@@ -5920,13 +5912,13 @@
 msgid "SSL support unavailable"
 msgstr "SSL �泣���若�����≦�鴻�с��"
 
-#: ../src/protocols/irc/irc.c:333 ../src/protocols/simple/simple.c:456
-#: ../src/protocols/simple/simple.c:1427
+#: ../src/protocols/irc/irc.c:333 ../src/protocols/simple/simple.c:450
+#: ../src/protocols/simple/simple.c:1518
 msgid "Couldn't create socket"
 msgstr "�純�宴�����������с���障�����с����"
 
 #: ../src/protocols/irc/irc.c:404 ../src/protocols/jabber/jabber.c:421
-#: ../src/protocols/oscar/oscar.c:1803 ../src/protocols/oscar/oscar.c:1870
+#: ../src/protocols/oscar/oscar.c:1867 ../src/protocols/oscar/oscar.c:1934
 msgid "Couldn't connect to host"
 msgstr "���鴻���御・膓��с���障�����с����"
 
@@ -5971,11 +5963,11 @@
 msgstr "IRC ���㏍���潟���������違�ゃ�� (Sucks Less)"
 
 #. host to connect to
-#: ../src/protocols/irc/irc.c:897 ../src/protocols/irc/msgs.c:231
-#: ../src/protocols/jabber/jabber.c:1908
+#: ../src/protocols/irc/irc.c:897 ../src/protocols/irc/msgs.c:235
+#: ../src/protocols/jabber/jabber.c:1905
 #: ../src/protocols/napster/napster.c:719
 #: ../src/protocols/sametime/sametime.c:5638 ../src/protocols/silc/ops.c:1242
-#: ../src/protocols/silc/ops.c:1344 ../src/protocols/simple/simple.c:1662
+#: ../src/protocols/silc/ops.c:1344 ../src/protocols/simple/simple.c:1754
 msgid "Server"
 msgstr "�泣�若��"
 
@@ -5983,15 +5975,16 @@
 msgid "Encodings"
 msgstr "���潟�潟�若���c�潟��"
 
-#: ../src/protocols/irc/irc.c:906 ../src/protocols/irc/msgs.c:225
+#: ../src/protocols/irc/irc.c:906 ../src/protocols/irc/msgs.c:229
 #: ../src/protocols/jabber/jabber.c:745 ../src/protocols/silc/buddy.c:1531
 #: ../src/protocols/silc/ops.c:1189 ../src/protocols/silc/ops.c:1191
 #: ../src/protocols/silc/ops.c:1338 ../src/protocols/silc/ops.c:1340
-#: ../src/protocols/silc/silc.c:929
+#: ../src/protocols/silc/silc.c:933
 msgid "Username"
 msgstr "���若�九��"
 
-#: ../src/protocols/irc/irc.c:909
+#: ../src/protocols/irc/irc.c:909 ../src/protocols/irc/msgs.c:230
+#: ../src/protocols/silc/silc.c:937
 msgid "Real name"
 msgstr "羂��"
 
@@ -6003,160 +5996,159 @@
 msgid "Use SSL"
 msgstr "SSL ��鋎帥��"
 
-#: ../src/protocols/irc/msgs.c:103
+#: ../src/protocols/irc/msgs.c:107
 msgid "Bad mode"
 msgstr "�≪�若���������c�����障��"
 
-#: ../src/protocols/irc/msgs.c:114
+#: ../src/protocols/irc/msgs.c:118
 #, c-format
 msgid "You are banned from %s."
 msgstr "�������� %s ����������冴�����障������"
 
-#: ../src/protocols/irc/msgs.c:115
+#: ../src/protocols/irc/msgs.c:119
 msgid "Banned"
 msgstr "膩����冴�����障����"
 
-#: ../src/protocols/irc/msgs.c:132
+#: ../src/protocols/irc/msgs.c:136
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "%s ��膩����冴���障����: 膩����冴�����鴻����筝����с��"
 
-#: ../src/protocols/irc/msgs.c:211 ../src/protocols/irc/msgs.c:231
-#: ../src/protocols/irc/msgs.c:244
+#: ../src/protocols/irc/msgs.c:215 ../src/protocols/irc/msgs.c:235
+#: ../src/protocols/irc/msgs.c:248
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../src/protocols/irc/msgs.c:211 ../src/protocols/oscar/oscar.c:6100
+#: ../src/protocols/irc/msgs.c:215 ../src/protocols/oscar/oscar.c:6165
 #: ../src/protocols/silc/ops.c:1412
 msgid "Nick"
 msgstr "������"
 
-#: ../src/protocols/irc/msgs.c:214
+#: ../src/protocols/irc/msgs.c:218
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: ../src/protocols/irc/msgs.c:215
+#: ../src/protocols/irc/msgs.c:219
 msgid " <i>(identified)</i>"
 msgstr " <i>(identified)</i>"
 
-#: ../src/protocols/irc/msgs.c:219 ../src/protocols/irc/msgs.c:225
-#: ../src/protocols/irc/msgs.c:226 ../src/protocols/irc/msgs.c:237
+#: ../src/protocols/irc/msgs.c:223 ../src/protocols/irc/msgs.c:229
+#: ../src/protocols/irc/msgs.c:230 ../src/protocols/irc/msgs.c:241
 #: ../src/protocols/yahoo/yahoo_profile.c:691
 #, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr "<b>%s:</b> %s<br>"
 
-#: ../src/protocols/irc/msgs.c:226 ../src/protocols/silc/ops.c:1183
-#: ../src/protocols/silc/ops.c:1332
-#: ../src/protocols/yahoo/yahoo_profile.c:1040
-msgid "Realname"
-msgstr "羂��"
-
-#: ../src/protocols/irc/msgs.c:237 ../src/protocols/silc/ops.c:1255
+#: ../src/protocols/irc/msgs.c:241 ../src/protocols/silc/ops.c:1255
 msgid "Currently on"
 msgstr "�����潟����"
 
-#: ../src/protocols/irc/msgs.c:242
+#: ../src/protocols/irc/msgs.c:246
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
 msgstr "<b>緇�罘�筝�:</b> %s<br>"
 
-#: ../src/protocols/irc/msgs.c:244
+#: ../src/protocols/irc/msgs.c:248
 msgid "Online since"
 msgstr "�ュ������ユ��"
 
-#: ../src/protocols/irc/msgs.c:248
+#: ../src/protocols/irc/msgs.c:252
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr "<br><b>綵√�荅����臂�:</b> ��������<br>"
 
-#: ../src/protocols/irc/msgs.c:316
+#: ../src/protocols/irc/msgs.c:326
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s ����������������紊��眼���障����: %s"
 
-#: ../src/protocols/irc/msgs.c:321
+#: ../src/protocols/irc/msgs.c:328
+#, c-format
+msgid "%s has cleared the topic."
+msgstr "%s ���������������������≪���障����"
+
+#: ../src/protocols/irc/msgs.c:336
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "%s ����������: %s"
 
-#: ../src/protocols/irc/msgs.c:338
+#: ../src/protocols/irc/msgs.c:354
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "筝������<���祉�若�� '%s'"
 
-#: ../src/protocols/irc/msgs.c:339
+#: ../src/protocols/irc/msgs.c:355
 msgid "Unknown message"
 msgstr "筝������<���祉�若��"
 
-#: ../src/protocols/irc/msgs.c:339
+#: ../src/protocols/irc/msgs.c:355
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim ����篆<�����<���祉�若�吾�� IRC �泣�若������茹c���障�����с������"
 
-#: ../src/protocols/irc/msgs.c:362
+#: ../src/protocols/irc/msgs.c:378
 #, c-format
 msgid "Users on %s: %s"
 msgstr "%s �����若�倶��: %s"
 
-#: ../src/protocols/irc/msgs.c:490
+#: ../src/protocols/irc/msgs.c:506
 msgid "Time Response"
 msgstr "����綽�膈�"
 
-#: ../src/protocols/irc/msgs.c:491
+#: ../src/protocols/irc/msgs.c:507
 msgid "The IRC server's local time is:"
 msgstr "IRC �泣�若�����㏍�若�����祉�帥�ゃ��:"
 
-#: ../src/protocols/irc/msgs.c:502
+#: ../src/protocols/irc/msgs.c:518
 msgid "No such channel"
 msgstr "�������������c�潟�����������障����"
 
 #. does this happen?
-#: ../src/protocols/irc/msgs.c:513
+#: ../src/protocols/irc/msgs.c:529
 msgid "no such channel"
 msgstr "�������������c�潟�����������障����"
 
-#: ../src/protocols/irc/msgs.c:516
+#: ../src/protocols/irc/msgs.c:532
 msgid "User is not logged in"
 msgstr "���若�吟���㏍�違�ゃ�潟�������障����"
 
-#: ../src/protocols/irc/msgs.c:521
+#: ../src/protocols/irc/msgs.c:537
 msgid "No such nick or channel"
 msgstr "�������������������若���障�������c�潟�����������障����"
 
-#: ../src/protocols/irc/msgs.c:541
+#: ../src/protocols/irc/msgs.c:557
 msgid "Could not send"
 msgstr "��篆<�с���障�����с����"
 
-#: ../src/protocols/irc/msgs.c:597
+#: ../src/protocols/irc/msgs.c:613
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "%s ���������������緇�����綽�荀��������障����"
 
-#: ../src/protocols/irc/msgs.c:598
+#: ../src/protocols/irc/msgs.c:614
 msgid "Invitation only"
 msgstr "��緇�����"
 
-#: ../src/protocols/irc/msgs.c:699
+#: ../src/protocols/irc/msgs.c:715
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "�������� %s ��拘�����障����: (%s)"
 
 #. Remove user from channel
-#: ../src/protocols/irc/msgs.c:704 ../src/protocols/silc/ops.c:721
+#: ../src/protocols/irc/msgs.c:720 ../src/protocols/silc/ops.c:721
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "%s (%s) ��拘�����障����"
 
-#: ../src/protocols/irc/msgs.c:727
+#: ../src/protocols/irc/msgs.c:743
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "�≪�若�� (%s %s) by %s"
 
-#: ../src/protocols/irc/msgs.c:812 ../src/protocols/irc/msgs.c:813
+#: ../src/protocols/irc/msgs.c:828 ../src/protocols/irc/msgs.c:829
 msgid "Invalid nickname"
 msgstr "�������������c�����障��"
 
-#: ../src/protocols/irc/msgs.c:814
+#: ../src/protocols/irc/msgs.c:830
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -6164,7 +6156,7 @@
 "��絎��������������泣�若���眼�ф���������障�������������鋇�罩c����絖������障����������"
 "������憗����"
 
-#: ../src/protocols/irc/msgs.c:818
+#: ../src/protocols/irc/msgs.c:834
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -6172,42 +6164,42 @@
 "��絎������≪�����潟�������泣�若���眼�ф���������障�������������鋇�罩c����絖������障����"
 "������������憗����"
 
-#: ../src/protocols/irc/msgs.c:858
+#: ../src/protocols/irc/msgs.c:873
 msgid "Cannot change nick"
 msgstr "���������若����紊��眼�с���障����"
 
-#: ../src/protocols/irc/msgs.c:858
+#: ../src/protocols/irc/msgs.c:873
 msgid "Could not change nick"
 msgstr "���������若����紊��眼�с���障�����с����"
 
-#: ../src/protocols/irc/msgs.c:879
+#: ../src/protocols/irc/msgs.c:894
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "���c�潟���� %s%s �����∵�宴���障����"
 
-#: ../src/protocols/irc/msgs.c:921
+#: ../src/protocols/irc/msgs.c:936
 msgid "Error: invalid PONG from server"
 msgstr "������: �泣�若���������罩c�� PONG �с��"
 
-#: ../src/protocols/irc/msgs.c:923
+#: ../src/protocols/irc/msgs.c:938
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING 綽�膈� -- Lag: %lu 腱�"
 
-#: ../src/protocols/irc/msgs.c:998
+#: ../src/protocols/irc/msgs.c:1019
 #, c-format
 msgid "Cannot join %s:"
 msgstr "%s ������с���障����:"
 
-#: ../src/protocols/irc/msgs.c:999 ../src/protocols/silc/ops.c:1128
+#: ../src/protocols/irc/msgs.c:1020 ../src/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "���c�潟����������с���障����"
 
-#: ../src/protocols/irc/msgs.c:1033
+#: ../src/protocols/irc/msgs.c:1054
 msgid "Nick or channel is temporarily unavailable."
 msgstr "筝��������������障�������c�潟�����������с���障������"
 
-#: ../src/protocols/irc/msgs.c:1045
+#: ../src/protocols/irc/msgs.c:1066
 #, c-format
 msgid "Wallops from %s"
 msgstr "%s ���������� wallops �с��"
@@ -6316,7 +6308,7 @@
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [���c�潟����]:  ���c�潟������憜���������若�吟��筝�荀ц;腓冴���障��"
 
-#: ../src/protocols/irc/parse.c:129 ../src/protocols/jabber/jabber.c:1746
+#: ../src/protocols/irc/parse.c:129 ../src/protocols/jabber/jabber.c:1743
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;�違����������&gt;:  ��������紊��眼���障��"
 
@@ -6430,7 +6422,7 @@
 msgstr "CTCP PING 綽�膈�"
 
 #: ../src/protocols/irc/parse.c:542 ../src/protocols/irc/parse.c:546
-#: ../src/protocols/oscar/oscar.c:1710 ../src/protocols/toc/toc.c:190
+#: ../src/protocols/oscar/oscar.c:1774 ../src/protocols/toc/toc.c:190
 #: ../src/protocols/toc/toc.c:688 ../src/protocols/toc/toc.c:704
 #: ../src/protocols/toc/toc.c:780
 msgid "Disconnected."
@@ -6529,12 +6521,11 @@
 msgstr "綏�"
 
 #: ../src/protocols/jabber/buddy.c:258 ../src/protocols/jabber/buddy.c:745
-#: ../src/protocols/jabber/jabber.c:795
 msgid "Postal Code"
 msgstr "�灸梢���"
 
 #: ../src/protocols/jabber/buddy.c:259 ../src/protocols/jabber/buddy.c:750
-#: ../src/protocols/silc/silc.c:939
+#: ../src/protocols/silc/silc.c:943
 msgid "Country"
 msgstr "��"
 
@@ -6543,6 +6534,13 @@
 msgid "Telephone"
 msgstr "�嶒����"
 
+#: ../src/protocols/jabber/buddy.c:261 ../src/protocols/jabber/buddy.c:779
+#: ../src/protocols/jabber/buddy.c:787 ../src/protocols/silc/ops.c:1075
+#: ../src/protocols/silc/util.c:512
+#: ../src/protocols/yahoo/yahoo_profile.c:1036
+msgid "E-Mail"
+msgstr "E-���若��"
+
 #: ../src/protocols/jabber/buddy.c:262 ../src/protocols/jabber/buddy.c:802
 msgid "Organization Name"
 msgstr "腟�膵���"
@@ -6556,7 +6554,7 @@
 msgstr "綵壕��"
 
 #: ../src/protocols/jabber/buddy.c:266 ../src/protocols/jabber/buddy.c:698
-#: ../src/protocols/oscar/oscar.c:6133
+#: ../src/protocols/msn/msn.c:1594 ../src/protocols/oscar/oscar.c:6198
 msgid "Birthday"
 msgstr "茯�����"
 
@@ -6572,7 +6570,7 @@
 "罨<���≪�ゃ���������������激�с�潟�с����綽�������篏��с����������������偆���水�ュ������"
 "筝�������"
 
-#: ../src/protocols/jabber/buddy.c:639 ../src/protocols/jabber/jabber.c:1911
+#: ../src/protocols/jabber/buddy.c:639 ../src/protocols/jabber/jabber.c:1908
 msgid "Resource"
 msgstr "���純�若��"
 
@@ -6581,7 +6579,7 @@
 msgstr "�������祉���若��"
 
 #: ../src/protocols/jabber/buddy.c:718 ../src/protocols/jabber/jabber.c:780
-#: ../src/protocols/oscar/oscar.c:6152 ../src/protocols/oscar/oscar.c:6160
+#: ../src/protocols/oscar/oscar.c:6217 ../src/protocols/oscar/oscar.c:6225
 #: ../src/protocols/silc/ops.c:1064
 msgid "Address"
 msgstr "篏��"
@@ -6623,12 +6621,12 @@
 msgstr "顚取������羔���"
 
 #: ../src/protocols/jabber/buddy.c:1097 ../src/protocols/jabber/chat.c:677
-#: ../src/protocols/jabber/chat.c:688 ../src/protocols/jabber/jabber.c:1168
+#: ../src/protocols/jabber/chat.c:688 ../src/protocols/jabber/jabber.c:1165
 #: ../src/protocols/silc/ops.c:1449
 msgid "Error"
 msgstr "������"
 
-#: ../src/protocols/jabber/buddy.c:1103 ../src/protocols/jabber/jabber.c:1193
+#: ../src/protocols/jabber/buddy.c:1103 ../src/protocols/jabber/jabber.c:1190
 msgid "Chatty"
 msgstr "���c�����c��"
 
@@ -6636,8 +6634,8 @@
 msgid "Extended Away"
 msgstr "��莎遺賢"
 
-#: ../src/protocols/jabber/buddy.c:1109 ../src/protocols/jabber/jabber.c:1223
-#: ../src/protocols/oscar/oscar.c:723 ../src/protocols/oscar/oscar.c:7980
+#: ../src/protocols/jabber/buddy.c:1109 ../src/protocols/jabber/jabber.c:1220
+#: ../src/protocols/oscar/oscar.c:787 ../src/protocols/oscar/oscar.c:8059
 #: ../src/protocols/sametime/sametime.c:3285
 msgid "Do Not Disturb"
 msgstr "����������с��"
@@ -6646,45 +6644,45 @@
 msgid "The following are the results of your search"
 msgstr "罎�膣∝����с��"
 
-#: ../src/protocols/jabber/buddy.c:1381
+#: ../src/protocols/jabber/buddy.c:1388
 msgid "Fill in one or more fields to search for any matching Jabber users."
 msgstr "Jabber ���若�吟��罎�膣≪����������や札筝�����������������:"
 
-#: ../src/protocols/jabber/buddy.c:1385 ../src/protocols/jabber/jabber.c:770
-#: ../src/protocols/oscar/oscar.c:6110 ../src/protocols/silc/ops.c:1024
+#: ../src/protocols/jabber/buddy.c:1392 ../src/protocols/oscar/oscar.c:6175
+#: ../src/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr "��"
 
-#: ../src/protocols/jabber/buddy.c:1390 ../src/protocols/jabber/jabber.c:775
-#: ../src/protocols/oscar/oscar.c:6111
+#: ../src/protocols/jabber/buddy.c:1397 ../src/protocols/oscar/oscar.c:6176
 msgid "Last Name"
 msgstr "紮�"
 
-#: ../src/protocols/jabber/buddy.c:1400
+#: ../src/protocols/jabber/buddy.c:1407 ../src/protocols/novell/novell.c:1490
+#: ../src/protocols/oscar/oscar.c:6178 ../src/protocols/oscar/oscar.c:6185
 msgid "E-Mail Address"
 msgstr "E-�<�若���祉�≪������"
 
-#: ../src/protocols/jabber/buddy.c:1409 ../src/protocols/jabber/buddy.c:1410
+#: ../src/protocols/jabber/buddy.c:1416 ../src/protocols/jabber/buddy.c:1417
 msgid "Search for Jabber users"
 msgstr "Jabber ���若�吟���膣�"
 
-#: ../src/protocols/jabber/buddy.c:1424
+#: ../src/protocols/jabber/buddy.c:1431
 msgid "Invalid Directory"
 msgstr "���c���������������c�����障��"
 
-#: ../src/protocols/jabber/buddy.c:1441
+#: ../src/protocols/jabber/buddy.c:1448
 msgid "Enter a User Directory"
 msgstr "���若�吟�祉���c�����������ュ�����������"
 
-#: ../src/protocols/jabber/buddy.c:1442
+#: ../src/protocols/jabber/buddy.c:1449
 msgid "Select a user directory to search"
 msgstr "罎�膣≪�������若�吟�祉���c�����������御��"
 
-#: ../src/protocols/jabber/buddy.c:1445
+#: ../src/protocols/jabber/buddy.c:1452
 msgid "Search Directory"
 msgstr "罎�膣≪�������c��������"
 
-#: ../src/protocols/jabber/chat.c:41 ../src/protocols/oscar/oscar.c:7475
+#: ../src/protocols/jabber/chat.c:41 ../src/protocols/oscar/oscar.c:7552
 #: ../src/protocols/yahoo/yahoochat.c:998
 msgid "_Room:"
 msgstr "���若��(_R):"
@@ -6799,7 +6797,7 @@
 msgid "Registration Successful"
 msgstr "�脂�蚊���篋�"
 
-#: ../src/protocols/jabber/jabber.c:599 ../src/protocols/jabber/jabber.c:1459
+#: ../src/protocols/jabber/jabber.c:599 ../src/protocols/jabber/jabber.c:1456
 msgid "Unknown Error"
 msgstr "筝�����������"
 
@@ -6811,17 +6809,17 @@
 msgid "Already Registered"
 msgstr "�≪���脂�蚊���������障��"
 
-#: ../src/protocols/jabber/jabber.c:760
-msgid "E-Mail"
-msgstr "E-�<�若��"
-
-#: ../src/protocols/jabber/jabber.c:790 ../src/protocols/oscar/oscar.c:6154
-#: ../src/protocols/oscar/oscar.c:6162
+#: ../src/protocols/jabber/jabber.c:790 ../src/protocols/oscar/oscar.c:6219
+#: ../src/protocols/oscar/oscar.c:6227
 msgid "State"
 msgstr "綏�"
 
+#: ../src/protocols/jabber/jabber.c:795
+msgid "Postal code"
+msgstr "�灸梢���"
+
 #: ../src/protocols/jabber/jabber.c:800 ../src/protocols/silc/ops.c:1069
-#: ../src/protocols/silc/silc.c:697 ../src/protocols/silc/util.c:514
+#: ../src/protocols/silc/silc.c:701 ../src/protocols/silc/util.c:514
 msgid "Phone"
 msgstr "�嶒����"
 
@@ -6837,343 +6835,343 @@
 msgid "Register New Jabber Account"
 msgstr "�伹���� Jabber �≪�����潟�����脂��"
 
-#: ../src/protocols/jabber/jabber.c:987
+#: ../src/protocols/jabber/jabber.c:983
 msgid "Initializing Stream"
 msgstr "�鴻�����若����������筝�"
 
-#: ../src/protocols/jabber/jabber.c:993 ../src/protocols/msn/session.c:355
+#: ../src/protocols/jabber/jabber.c:989 ../src/protocols/msn/session.c:355
 msgid "Authenticating"
 msgstr "茯�荐寂賢"
 
-#: ../src/protocols/jabber/jabber.c:1002
+#: ../src/protocols/jabber/jabber.c:998
 msgid "Re-initializing Stream"
 msgstr "�鴻�����若������������筝�"
 
-#: ../src/protocols/jabber/jabber.c:1072 ../src/protocols/jabber/jabber.c:1437
-#: ../src/protocols/jabber/jabber.c:1478 ../src/protocols/jabber/jabber.c:1512
-#: ../src/protocols/oscar/oscar.c:792 ../src/protocols/oscar/oscar.c:7770
+#: ../src/protocols/jabber/jabber.c:1069 ../src/protocols/jabber/jabber.c:1434
+#: ../src/protocols/jabber/jabber.c:1475 ../src/protocols/jabber/jabber.c:1509
+#: ../src/protocols/oscar/oscar.c:856 ../src/protocols/oscar/oscar.c:7849
 msgid "Not Authorized"
 msgstr "茯�荐若���������障����"
 
-#: ../src/protocols/jabber/jabber.c:1114
+#: ../src/protocols/jabber/jabber.c:1111
 msgid "Both"
 msgstr "筝≧��"
 
-#: ../src/protocols/jabber/jabber.c:1116
+#: ../src/protocols/jabber/jabber.c:1113
 msgid "From (To pending)"
 msgstr "From (To pending)"
 
-#: ../src/protocols/jabber/jabber.c:1121
+#: ../src/protocols/jabber/jabber.c:1118
 msgid "To"
 msgstr "To"
 
-#: ../src/protocols/jabber/jabber.c:1123
+#: ../src/protocols/jabber/jabber.c:1120
 msgid "None (To pending)"
 msgstr "None (To pending)"
 
-#: ../src/protocols/jabber/jabber.c:1127
+#: ../src/protocols/jabber/jabber.c:1124
 msgid "Subscription"
 msgstr "莖取�"
 
-#: ../src/protocols/jabber/jabber.c:1184 ../src/protocols/jabber/jabber.c:1194
-#: ../src/protocols/jabber/jabber.c:1204 ../src/protocols/jabber/jabber.c:1214
-#: ../src/protocols/jabber/jabber.c:1224
+#: ../src/protocols/jabber/jabber.c:1181 ../src/protocols/jabber/jabber.c:1191
+#: ../src/protocols/jabber/jabber.c:1201 ../src/protocols/jabber/jabber.c:1211
+#: ../src/protocols/jabber/jabber.c:1221
 msgid "Priority"
 msgstr "������篏�"
 
-#: ../src/protocols/jabber/jabber.c:1253
+#: ../src/protocols/jabber/jabber.c:1250
 msgid "Password Changed"
 msgstr "���鴻���若�������"
 
-#: ../src/protocols/jabber/jabber.c:1254
+#: ../src/protocols/jabber/jabber.c:1251
 msgid "Your password has been changed."
 msgstr "���鴻���若����紊��眼���障������"
 
-#: ../src/protocols/jabber/jabber.c:1258 ../src/protocols/jabber/jabber.c:1259
+#: ../src/protocols/jabber/jabber.c:1255 ../src/protocols/jabber/jabber.c:1256
 msgid "Error changing password"
 msgstr "���鴻���若����紊��眼��������������"
 
-#: ../src/protocols/jabber/jabber.c:1315
+#: ../src/protocols/jabber/jabber.c:1312
 msgid "Password (again)"
 msgstr "���鴻���若�� (腆肴���)"
 
-#: ../src/protocols/jabber/jabber.c:1320 ../src/protocols/jabber/jabber.c:1321
+#: ../src/protocols/jabber/jabber.c:1317 ../src/protocols/jabber/jabber.c:1318
 msgid "Change Jabber Password"
 msgstr "Jabber ���鴻���若�������"
 
-#: ../src/protocols/jabber/jabber.c:1321
+#: ../src/protocols/jabber/jabber.c:1318
 msgid "Please enter your new password"
 msgstr "�違�������鴻���若�����ュ�����������"
 
-#: ../src/protocols/jabber/jabber.c:1331 ../src/protocols/oscar/oscar.c:8404
-#: ../src/protocols/silc/silc.c:1019
+#: ../src/protocols/jabber/jabber.c:1328 ../src/protocols/oscar/oscar.c:8483
+#: ../src/protocols/silc/silc.c:1023
 msgid "Set User Info..."
 msgstr "���若�倶���宴���祉����..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../src/protocols/jabber/jabber.c:1336 ../src/protocols/oscar/oscar.c:8415
-#: ../src/protocols/silc/silc.c:1015
+#: ../src/protocols/jabber/jabber.c:1333 ../src/protocols/oscar/oscar.c:8494
+#: ../src/protocols/silc/silc.c:1019
 msgid "Change Password..."
 msgstr "���鴻���若�������..."
 
 #. }
-#: ../src/protocols/jabber/jabber.c:1341
+#: ../src/protocols/jabber/jabber.c:1338
 msgid "Search for Users..."
 msgstr "���若�吟���膣�..."
 
-#: ../src/protocols/jabber/jabber.c:1417
+#: ../src/protocols/jabber/jabber.c:1414
 msgid "Bad Request"
 msgstr "���������羆��с��"
 
-#: ../src/protocols/jabber/jabber.c:1419
+#: ../src/protocols/jabber/jabber.c:1416
 msgid "Conflict"
 msgstr "茵�腦������障��"
 
-#: ../src/protocols/jabber/jabber.c:1421
+#: ../src/protocols/jabber/jabber.c:1418
 msgid "Feature Not Implemented"
 msgstr "�障��絎�茖��������障����"
 
-#: ../src/protocols/jabber/jabber.c:1423
+#: ../src/protocols/jabber/jabber.c:1420
 msgid "Forbidden"
 msgstr "���������障��"
 
-#: ../src/protocols/jabber/jabber.c:1425
+#: ../src/protocols/jabber/jabber.c:1422
 msgid "Gone"
 msgstr "���c���障��"
 
-#: ../src/protocols/jabber/jabber.c:1427 ../src/protocols/jabber/jabber.c:1502
+#: ../src/protocols/jabber/jabber.c:1424 ../src/protocols/jabber/jabber.c:1499
 msgid "Internal Server Error"
 msgstr "�泣�若��������������"
 
-#: ../src/protocols/jabber/jabber.c:1429
+#: ../src/protocols/jabber/jabber.c:1426
 msgid "Item Not Found"
 msgstr "�≪�ゃ������荀��ゃ�����障����"
 
-#: ../src/protocols/jabber/jabber.c:1431
+#: ../src/protocols/jabber/jabber.c:1428
 msgid "Malformed Jabber ID"
 msgstr "�������� Jabber ID"
 
-#: ../src/protocols/jabber/jabber.c:1433
+#: ../src/protocols/jabber/jabber.c:1430
 msgid "Not Acceptable"
 msgstr "��篆<�с���障����"
 
-#: ../src/protocols/jabber/jabber.c:1435
+#: ../src/protocols/jabber/jabber.c:1432
 msgid "Not Allowed"
 msgstr "荐怨��������障����"
 
-#: ../src/protocols/jabber/jabber.c:1439
+#: ../src/protocols/jabber/jabber.c:1436
 msgid "Payment Required"
 msgstr "�����с��"
 
-#: ../src/protocols/jabber/jabber.c:1441
+#: ../src/protocols/jabber/jabber.c:1438
 msgid "Recipient Unavailable"
 msgstr "��篆∴�������障����"
 
-#: ../src/protocols/jabber/jabber.c:1445
+#: ../src/protocols/jabber/jabber.c:1442
 msgid "Registration Required"
 msgstr "�脂�蚊��綽�荀��с��"
 
-#: ../src/protocols/jabber/jabber.c:1447
+#: ../src/protocols/jabber/jabber.c:1444
 msgid "Remote Server Not Found"
 msgstr "���≪�若���祉�泣�若����荀��ゃ�����障����"
 
-#: ../src/protocols/jabber/jabber.c:1449
+#: ../src/protocols/jabber/jabber.c:1446
 msgid "Remote Server Timeout"
 msgstr "���≪�若���祉�泣�若�����帥�ゃ���≪�������障����"
 
-#: ../src/protocols/jabber/jabber.c:1451
+#: ../src/protocols/jabber/jabber.c:1448
 msgid "Server Overloaded"
 msgstr "�泣�若�������若���若�㏍�若���с��"
 
-#: ../src/protocols/jabber/jabber.c:1453
+#: ../src/protocols/jabber/jabber.c:1450
 msgid "Service Unavailable"
 msgstr "�泣�若���鴻�������с���障����"
 
-#: ../src/protocols/jabber/jabber.c:1455
+#: ../src/protocols/jabber/jabber.c:1452
 msgid "Subscription Required"
 msgstr "莖取����潟��莨若�帥��綽�荀��с��"
 
-#: ../src/protocols/jabber/jabber.c:1457
+#: ../src/protocols/jabber/jabber.c:1454
 msgid "Unexpected Request"
 msgstr "篋����������������鴻���с��"
 
-#: ../src/protocols/jabber/jabber.c:1464
+#: ../src/protocols/jabber/jabber.c:1461
 msgid "Authorization Aborted"
 msgstr "茯�荐若�����������障����"
 
+#: ../src/protocols/jabber/jabber.c:1463
+msgid "Incorrect encoding in authorization"
+msgstr "茯�荐若�т�罩c�����潟�潟�若���c�潟�違�с��"
+
 #: ../src/protocols/jabber/jabber.c:1466
-msgid "Incorrect encoding in authorization"
-msgstr "茯�荐若�т�罩c�����潟�潟�若���c�潟�違�с��"
-
-#: ../src/protocols/jabber/jabber.c:1469
 msgid "Invalid authzid"
 msgstr "筝�罩c�� authzid �с��"
 
-#: ../src/protocols/jabber/jabber.c:1472
+#: ../src/protocols/jabber/jabber.c:1469
 msgid "Invalid Authorization Mechanism"
 msgstr "筝�罩c���荐若�<�����冴���с��"
 
-#: ../src/protocols/jabber/jabber.c:1475
+#: ../src/protocols/jabber/jabber.c:1472
 msgid "Authorization mechanism too weak"
 msgstr "茯�荐若�<�����冴����筝������с��"
 
+#: ../src/protocols/jabber/jabber.c:1477
+msgid "Temporary Authentication Failure"
+msgstr "���潟���������荐若��け�����障����"
+
 #: ../src/protocols/jabber/jabber.c:1480
-msgid "Temporary Authentication Failure"
-msgstr "���潟���������荐若��け�����障����"
-
-#: ../src/protocols/jabber/jabber.c:1483
 msgid "Authentication Failure"
 msgstr "茯�荐若��け�����障����"
 
-#: ../src/protocols/jabber/jabber.c:1487
+#: ../src/protocols/jabber/jabber.c:1484
 msgid "Bad Format"
 msgstr "�������������若������"
 
-#: ../src/protocols/jabber/jabber.c:1489
+#: ../src/protocols/jabber/jabber.c:1486
 msgid "Bad Namespace Prefix"
 msgstr "������������腥咲����・�㊤�"
 
-#: ../src/protocols/jabber/jabber.c:1492
+#: ../src/protocols/jabber/jabber.c:1489
 msgid "Resource Conflict"
 msgstr "���純�若�鴻���腦�"
 
-#: ../src/protocols/jabber/jabber.c:1494 ../src/protocols/silc/ops.c:1728
+#: ../src/protocols/jabber/jabber.c:1491 ../src/protocols/silc/ops.c:1728
 msgid "Connection Timeout"
 msgstr "�ョ����帥�ゃ���≪�������障����"
 
-#: ../src/protocols/jabber/jabber.c:1496
+#: ../src/protocols/jabber/jabber.c:1493
 msgid "Host Gone"
 msgstr "���鴻������篋<��Ù���������障����"
 
-#: ../src/protocols/jabber/jabber.c:1498
+#: ../src/protocols/jabber/jabber.c:1495
 msgid "Host Unknown"
 msgstr "���鴻����筝����с��"
 
-#: ../src/protocols/jabber/jabber.c:1500
+#: ../src/protocols/jabber/jabber.c:1497
 msgid "Improper Addressing"
 msgstr "�����с�������≪�����壕┃絎�"
 
-#: ../src/protocols/jabber/jabber.c:1504
+#: ../src/protocols/jabber/jabber.c:1501
 msgid "Invalid ID"
 msgstr "筝�罩c�� ID"
 
-#: ../src/protocols/jabber/jabber.c:1506
+#: ../src/protocols/jabber/jabber.c:1503
 msgid "Invalid Namespace"
 msgstr "筝�罩c������腥咲��"
 
-#: ../src/protocols/jabber/jabber.c:1508
+#: ../src/protocols/jabber/jabber.c:1505
 msgid "Invalid XML"
 msgstr "筝�罩c�� XML"
 
-#: ../src/protocols/jabber/jabber.c:1510
+#: ../src/protocols/jabber/jabber.c:1507
 msgid "Non-matching Hosts"
 msgstr "筝��眼���������鴻��"
 
-#: ../src/protocols/jabber/jabber.c:1514
+#: ../src/protocols/jabber/jabber.c:1511
 msgid "Policy Violation"
 msgstr "�����激�守����"
 
-#: ../src/protocols/jabber/jabber.c:1516
+#: ../src/protocols/jabber/jabber.c:1513
 msgid "Remote Connection Failed"
 msgstr "���≪�若���ョ���け�����障����"
 
-#: ../src/protocols/jabber/jabber.c:1518
+#: ../src/protocols/jabber/jabber.c:1515
 msgid "Resource Constraint"
 msgstr "���純�若�劫�狗��"
 
-#: ../src/protocols/jabber/jabber.c:1520
+#: ../src/protocols/jabber/jabber.c:1517
 msgid "Restricted XML"
 msgstr "�狗��篁��� XML"
 
-#: ../src/protocols/jabber/jabber.c:1522
+#: ../src/protocols/jabber/jabber.c:1519
 msgid "See Other Host"
 msgstr "篁������鴻����茵�ず����"
 
-#: ../src/protocols/jabber/jabber.c:1524
+#: ../src/protocols/jabber/jabber.c:1521
 msgid "System Shutdown"
 msgstr "�激�鴻�����祉�激�c����������"
 
-#: ../src/protocols/jabber/jabber.c:1526
+#: ../src/protocols/jabber/jabber.c:1523
 msgid "Undefined Condition"
 msgstr "絎�臂������������>散"
 
-#: ../src/protocols/jabber/jabber.c:1528
+#: ../src/protocols/jabber/jabber.c:1525
 msgid "Unsupported Encoding"
 msgstr "�泣���若���������������潟�潟�若���c�潟��"
 
-#: ../src/protocols/jabber/jabber.c:1530
+#: ../src/protocols/jabber/jabber.c:1527
 msgid "Unsupported Stanza Type"
 msgstr "�泣���若������������ Stanza ��"
 
-#: ../src/protocols/jabber/jabber.c:1532
+#: ../src/protocols/jabber/jabber.c:1529
 msgid "Unsupported Version"
 msgstr "�泣���若���������������若�吾�с��"
 
-#: ../src/protocols/jabber/jabber.c:1534
+#: ../src/protocols/jabber/jabber.c:1531
 msgid "XML Not Well Formed"
 msgstr "���с���祉�����若���� XML �с�������障����"
 
-#: ../src/protocols/jabber/jabber.c:1536
+#: ../src/protocols/jabber/jabber.c:1533
 msgid "Stream Error"
 msgstr "�鴻�����若���祉������"
 
-#: ../src/protocols/jabber/jabber.c:1603
+#: ../src/protocols/jabber/jabber.c:1600
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "���若�吟�� %s ������菴純���冴���障����"
 
-#: ../src/protocols/jabber/jabber.c:1623
+#: ../src/protocols/jabber/jabber.c:1620
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "筝��������: \"%s\""
 
-#: ../src/protocols/jabber/jabber.c:1628
+#: ../src/protocols/jabber/jabber.c:1625
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "���若�吟�� %s ������ \"%s\" ������参����申���с���障����"
 
-#: ../src/protocols/jabber/jabber.c:1647
+#: ../src/protocols/jabber/jabber.c:1644
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "筝�����醜��: \"%s\""
 
-#: ../src/protocols/jabber/jabber.c:1654
+#: ../src/protocols/jabber/jabber.c:1651
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "���若�吟��醜�� \"%s\" ���祉�����с���障����: %s"
 
-#: ../src/protocols/jabber/jabber.c:1707
+#: ../src/protocols/jabber/jabber.c:1704
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "���若�吟�� %s �������㏍�����с���障����"
 
-#: ../src/protocols/jabber/jabber.c:1738
+#: ../src/protocols/jabber/jabber.c:1735
 msgid "config:  Configure a chat room."
 msgstr "config:  ���c�����祉���若����荐㊤����障��"
 
-#: ../src/protocols/jabber/jabber.c:1742
+#: ../src/protocols/jabber/jabber.c:1739
 msgid "configure:  Configure a chat room."
 msgstr "configure:  ���c�����祉���若����荐㊤����障��"
 
-#: ../src/protocols/jabber/jabber.c:1751
+#: ../src/protocols/jabber/jabber.c:1748
 msgid "part [room]:  Leave the room."
 msgstr "part [���]:  ����������冴���障��"
 
-#: ../src/protocols/jabber/jabber.c:1756
+#: ../src/protocols/jabber/jabber.c:1753
 msgid "register:  Register with a chat room."
 msgstr "register:  ���c�����祉���若�����脂�蚊���障��"
 
-#: ../src/protocols/jabber/jabber.c:1762
+#: ../src/protocols/jabber/jabber.c:1759
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [�違������������]:  ����������茵�ず������紊��眼���障��"
 
-#: ../src/protocols/jabber/jabber.c:1768
+#: ../src/protocols/jabber/jabber.c:1765
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr ""
 "ban &lt;���若��&gt; [���若��]:  ��絎��������c�����祉���若���������若�吟��菴純���冴����"
 "��"
 
-#: ../src/protocols/jabber/jabber.c:1774
+#: ../src/protocols/jabber/jabber.c:1771
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -7181,7 +7179,7 @@
 "affiliate &lt;���若��&gt; &lt;owner|admin|member|outcast|none&gt;: ���若�吟����"
 "篆����祉�������障��"
 
-#: ../src/protocols/jabber/jabber.c:1780
+#: ../src/protocols/jabber/jabber.c:1777
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -7189,21 +7187,21 @@
 "role &lt;���若��&gt; &lt;moderator|participant|visitor|none&gt;: ���c�����若��"
 "�с��醜�蚊���祉�������障��"
 
-#: ../src/protocols/jabber/jabber.c:1786
+#: ../src/protocols/jabber/jabber.c:1783
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;���若��&gt; [�<���祉�若��]:  ���若�吟�����若������緇����障��"
 
-#: ../src/protocols/jabber/jabber.c:1792
+#: ../src/protocols/jabber/jabber.c:1789
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;���若��&gt; [�泣�若��]:  ��絎������泣�若�������c�����後������障��"
 
-#: ../src/protocols/jabber/jabber.c:1798
+#: ../src/protocols/jabber/jabber.c:1795
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr ""
 "kick &lt;���若��&gt; [���若��]:  ��絎��������若�吟�����c�����祉���若������菴純���冴����"
 "��"
 
-#: ../src/protocols/jabber/jabber.c:1803
+#: ../src/protocols/jabber/jabber.c:1800
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
@@ -7220,60 +7218,60 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/jabber/jabber.c:1886 ../src/protocols/jabber/jabber.c:1888
+#: ../src/protocols/jabber/jabber.c:1883 ../src/protocols/jabber/jabber.c:1885
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber ���㏍���潟���������違�ゃ��"
 
-#: ../src/protocols/jabber/jabber.c:1914
+#: ../src/protocols/jabber/jabber.c:1911
 msgid "Use TLS if available"
 msgstr "���純������ TLS ��篏睡������"
 
-#: ../src/protocols/jabber/jabber.c:1919
+#: ../src/protocols/jabber/jabber.c:1916
 msgid "Require TLS"
 msgstr "TSL �����"
 
-#: ../src/protocols/jabber/jabber.c:1922
+#: ../src/protocols/jabber/jabber.c:1919
 msgid "Force old (port 5223) SSL"
 msgstr "�ゃ�� SSL (���若�����:5223) ��鏁桁�句����戎������"
 
-#: ../src/protocols/jabber/jabber.c:1927
+#: ../src/protocols/jabber/jabber.c:1924
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "���桁���������������鴻�����若����篁����������若�潟���㏍�鴻��茯�荐若��荐怨�����"
 
-#: ../src/protocols/jabber/jabber.c:1932 ../src/protocols/simple/simple.c:1668
+#: ../src/protocols/jabber/jabber.c:1929 ../src/protocols/simple/simple.c:1760
 msgid "Connect port"
 msgstr "�ョ��������若�����"
 
 #. Account options
-#: ../src/protocols/jabber/jabber.c:1936 ../src/protocols/silc/silc.c:1851
+#: ../src/protocols/jabber/jabber.c:1933 ../src/protocols/silc/silc.c:1855
 msgid "Connect server"
 msgstr "�啤�若���御・膓�"
 
-#: ../src/protocols/jabber/message.c:114
+#: ../src/protocols/jabber/message.c:108
 #, c-format
 msgid "Message from %s"
 msgstr "%s �����������<���祉�若��"
 
-#: ../src/protocols/jabber/message.c:178
+#: ../src/protocols/jabber/message.c:172
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s �������������祉�������障����: %s"
 
-#: ../src/protocols/jabber/message.c:180
+#: ../src/protocols/jabber/message.c:174
 #, c-format
 msgid "The topic is: %s"
 msgstr "��������: %s"
 
-#: ../src/protocols/jabber/message.c:230
+#: ../src/protocols/jabber/message.c:224
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "%s �����吾���<���祉�若�吾��������け��: %s"
 
-#: ../src/protocols/jabber/message.c:233
+#: ../src/protocols/jabber/message.c:227
 msgid "Jabber Message Error"
 msgstr "Jabber �<���祉�若�吾�祉������"
 
-#: ../src/protocols/jabber/message.c:297
+#: ../src/protocols/jabber/message.c:295
 #, c-format
 msgid " (Code %s)"
 msgstr " (�潟�若�� %s)"
@@ -7282,31 +7280,31 @@
 msgid "XML Parse error"
 msgstr "XML 茹f��������"
 
-#: ../src/protocols/jabber/presence.c:305
+#: ../src/protocols/jabber/presence.c:309
 msgid "Unknown Error in presence"
 msgstr "筝����������若��莎激�������障��"
 
-#: ../src/protocols/jabber/presence.c:310 ../src/protocols/msn/userlist.c:104
+#: ../src/protocols/jabber/presence.c:314 ../src/protocols/msn/userlist.c:104
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list."
 msgstr "���若�吟�� %s ������ %s ������篁臥�����鴻����申���������c�����障����"
 
-#: ../src/protocols/jabber/presence.c:319 ../src/protocols/oscar/oscar.c:4740
-#: ../src/protocols/oscar/oscar.c:7405
+#: ../src/protocols/jabber/presence.c:323 ../src/protocols/oscar/oscar.c:4805
+#: ../src/protocols/oscar/oscar.c:7482
 msgid "_Authorize"
 msgstr "�粋�����(_A)"
 
-#: ../src/protocols/jabber/presence.c:320 ../src/protocols/oscar/oscar.c:4742
-#: ../src/protocols/oscar/oscar.c:7406
+#: ../src/protocols/jabber/presence.c:324 ../src/protocols/oscar/oscar.c:4807
+#: ../src/protocols/oscar/oscar.c:7483
 msgid "_Deny"
 msgstr "��������"
 
-#: ../src/protocols/jabber/presence.c:376
-#: ../src/protocols/jabber/presence.c:377
+#: ../src/protocols/jabber/presence.c:381
+#: ../src/protocols/jabber/presence.c:382
 msgid "Create New Room"
 msgstr "�違�������c�����祉���若��������"
 
-#: ../src/protocols/jabber/presence.c:378
+#: ../src/protocols/jabber/presence.c:383
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -7314,32 +7312,32 @@
 "�違�������c�����祉���若�����������障�������c�����祉���若����┃絎���茵����障����鐚� ����"
 "���������������ゃ���������障����鐚�"
 
-#: ../src/protocols/jabber/presence.c:380
+#: ../src/protocols/jabber/presence.c:386
 msgid "_Configure Room"
 msgstr "���若����┃絎�(_C)"
 
-#: ../src/protocols/jabber/presence.c:382
+#: ../src/protocols/jabber/presence.c:388
 msgid "_Accept Defaults"
 msgstr "�����������ゃ����������(_A)"
 
-#: ../src/protocols/jabber/presence.c:419
+#: ../src/protocols/jabber/presence.c:426
 #, c-format
 msgid "Error in chat %s"
 msgstr "���c���� %s �����"
 
-#: ../src/protocols/jabber/presence.c:422
+#: ../src/protocols/jabber/presence.c:429
 #, c-format
 msgid "Error joining chat %s"
 msgstr "���c���� %s �������������������"
 
-#: ../src/protocols/jabber/si.c:726
+#: ../src/protocols/jabber/si.c:728
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 "%s �����吾���<�ゃ������篆<�с���障���� (���若�吟�����<�ゃ��拶�����泣���若���������障��"
 "��)"
 
-#: ../src/protocols/jabber/si.c:727 ../src/protocols/jabber/si.c:728
+#: ../src/protocols/jabber/si.c:729 ../src/protocols/jabber/si.c:730
 msgid "File Send Failed"
 msgstr "���<�ゃ����篆<��け��"
 
@@ -7377,7 +7375,7 @@
 
 #: ../src/protocols/msn/error.c:42
 msgid "Invalid e-mail address"
-msgstr "筝�罩c�� E-�<�若���祉�≪������"
+msgstr "E-�<�若���祉�≪�����鴻�������c�����障��"
 
 #: ../src/protocols/msn/error.c:45
 msgid "User does not exist"
@@ -7411,7 +7409,7 @@
 msgid "Not on list"
 msgstr "���鴻���������障����"
 
-#: ../src/protocols/msn/error.c:70 ../src/protocols/zephyr/zephyr.c:690
+#: ../src/protocols/msn/error.c:70 ../src/protocols/zephyr/zephyr.c:705
 msgid "User is offline"
 msgstr "���若�吟���������ゃ�潟�с��"
 
@@ -7556,7 +7554,7 @@
 msgid "Server too busy"
 msgstr "�泣�若�������������吾�若�с��"
 
-#: ../src/protocols/msn/error.c:198 ../src/protocols/oscar/oscar.c:2864
+#: ../src/protocols/msn/error.c:198 ../src/protocols/oscar/oscar.c:2929
 #: ../src/protocols/silc/ops.c:1717 ../src/protocols/toc/toc.c:722
 msgid "Authentication failed"
 msgstr "茯�荐若��け�����障����"
@@ -7653,7 +7651,7 @@
 
 #: ../src/protocols/msn/msn.c:550 ../src/protocols/msn/msn.c:557
 #: ../src/protocols/msn/msn.c:566 ../src/protocols/sametime/sametime.c:3247
-#: ../src/protocols/yahoo/yahoo.c:2880 ../src/protocols/yahoo/yahoo.c:2886
+#: ../src/protocols/yahoo/yahoo.c:2882 ../src/protocols/yahoo/yahoo.c:2888
 #, c-format
 msgid ""
 "\n"
@@ -7667,24 +7665,24 @@
 msgstr "��������篁臥�����鴻�����脂�蚊����������"
 
 #: ../src/protocols/msn/msn.c:587 ../src/protocols/msn/state.c:33
-#: ../src/protocols/yahoo/yahoo.c:2709 ../src/protocols/yahoo/yahoo.c:3288
+#: ../src/protocols/yahoo/yahoo.c:2711 ../src/protocols/yahoo/yahoo.c:3290
 msgid "Be Right Back"
 msgstr "��������絽違�c�����障��"
 
 #: ../src/protocols/msn/msn.c:591 ../src/protocols/msn/state.c:31
 #: ../src/protocols/novell/novell.c:2851 ../src/protocols/novell/novell.c:2985
 #: ../src/protocols/silc/buddy.c:1473 ../src/protocols/silc/silc.c:53
-#: ../src/protocols/yahoo/yahoo.c:2711 ../src/protocols/yahoo/yahoo.c:3291
+#: ../src/protocols/yahoo/yahoo.c:2713 ../src/protocols/yahoo/yahoo.c:3293
 msgid "Busy"
 msgstr "����莨若�推賢�с��"
 
-#: ../src/protocols/msn/msn.c:595 ../src/protocols/yahoo/yahoo.c:2719
-#: ../src/protocols/yahoo/yahoo.c:3303
+#: ../src/protocols/msn/msn.c:595 ../src/protocols/yahoo/yahoo.c:2721
+#: ../src/protocols/yahoo/yahoo.c:3305
 msgid "On the Phone"
 msgstr "�肢�筝㏍�с��"
 
-#: ../src/protocols/msn/msn.c:599 ../src/protocols/yahoo/yahoo.c:2723
-#: ../src/protocols/yahoo/yahoo.c:3309
+#: ../src/protocols/msn/msn.c:599 ../src/protocols/yahoo/yahoo.c:2725
+#: ../src/protocols/yahoo/yahoo.c:3311
 msgid "Out to Lunch"
 msgstr "蕋�篋����冴���������障��"
 
@@ -7737,79 +7735,225 @@
 msgstr "�泣�若���吾��・膓���け�����障����"
 
 #: ../src/protocols/msn/msn.c:1366 ../src/protocols/yahoo/yahoo_profile.c:685
-#: ../src/protocols/zephyr/zephyr.c:721 ../src/protocols/zephyr/zephyr.c:1136
+#: ../src/protocols/zephyr/zephyr.c:736 ../src/protocols/zephyr/zephyr.c:1153
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>�ュ��:</b> %s<br>"
 
 #. put a link to the actual profile URL
-#: ../src/protocols/msn/msn.c:1373 ../src/protocols/msn/msn.c:1725
-#: ../src/protocols/yahoo/yahoo_profile.c:1202 ../src/util.c:1035
+#: ../src/protocols/msn/msn.c:1373 ../src/protocols/yahoo/yahoo_profile.c:1208
+#: ../src/util.c:1055
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b> "
 
-#: ../src/protocols/msn/msn.c:1456
+#: ../src/protocols/msn/msn.c:1463
 msgid "MSN Profile"
 msgstr "MSN �����㏍���c�若��"
 
-#: ../src/protocols/msn/msn.c:1461 ../src/protocols/msn/msn.c:1712
+#: ../src/protocols/msn/msn.c:1468 ../src/protocols/msn/msn.c:1794
 #: ../src/protocols/yahoo/yahoo_profile.c:795
 msgid "Error retrieving profile"
 msgstr "���㏍���c�若������緇���������������"
 
-#: ../src/protocols/msn/msn.c:1531 ../src/protocols/oscar/oscar.c:6139
-#: ../src/protocols/yahoo/yahoo_profile.c:1050
+#: ../src/protocols/msn/msn.c:1536 ../src/protocols/oscar/oscar.c:6204
+#: ../src/protocols/yahoo/yahoo_profile.c:1056
 msgid "Age"
 msgstr "綛顔就"
 
-#: ../src/protocols/msn/msn.c:1547 ../src/protocols/yahoo/yahoo_profile.c:1055
-msgid "Marital Status"
-msgstr "�√�/���"
-
-#: ../src/protocols/msn/msn.c:1554 ../src/protocols/novell/novell.c:1480
-#: ../src/protocols/yahoo/yahoo_profile.c:1045
+#: ../src/protocols/msn/msn.c:1538 ../src/protocols/yahoo/yahoo_profile.c:1071
+msgid "Occupation"
+msgstr "�傑キ"
+
+#: ../src/protocols/msn/msn.c:1539 ../src/protocols/novell/novell.c:1480
+#: ../src/protocols/yahoo/yahoo_profile.c:1051
 msgid "Location"
 msgstr "�贋��"
 
-#: ../src/protocols/msn/msn.c:1562 ../src/protocols/yahoo/yahoo_profile.c:1065
-msgid "Occupation"
-msgstr "�傑キ"
-
-#: ../src/protocols/msn/msn.c:1579 ../src/protocols/msn/msn.c:1585
-#: ../src/protocols/msn/msn.c:1592 ../src/protocols/msn/msn.c:1600
-#: ../src/protocols/msn/msn.c:1607
+#: ../src/protocols/msn/msn.c:1544 ../src/protocols/msn/msn.c:1723
+#: ../src/protocols/msn/msn.c:1729 ../src/protocols/msn/msn.c:1736
+msgid "Hobbies and Interests"
+msgstr "莇e�潟�����潟����������"
+
+#: ../src/protocols/msn/msn.c:1550 ../src/protocols/msn/msn.c:1657
+#: ../src/protocols/msn/msn.c:1663 ../src/protocols/msn/msn.c:1670
+#: ../src/protocols/msn/msn.c:1678 ../src/protocols/msn/msn.c:1685
 msgid "A Little About Me"
 msgstr "�<���c���������㏍���c�若��"
 
-#: ../src/protocols/msn/msn.c:1616 ../src/protocols/msn/msn.c:1622
-#: ../src/protocols/msn/msn.c:1629 ../src/protocols/msn/msn.c:1636
-msgid "Favorite Things"
-msgstr "��羂����ャ��������"
-
-#: ../src/protocols/msn/msn.c:1645 ../src/protocols/msn/msn.c:1651
-#: ../src/protocols/msn/msn.c:1658
-msgid "Hobbies and Interests"
-msgstr "莇e�潟�����潟����������"
-
-#: ../src/protocols/msn/msn.c:1667 ../src/protocols/msn/msn.c:1673
-#: ../src/protocols/yahoo/yahoo_profile.c:1107
+#: ../src/protocols/msn/msn.c:1556
+#, c-format
+msgid "%s<b>General</b><br>%s"
+msgstr "%s<b>����</b><br>%s"
+
+#. Social
+#: ../src/protocols/msn/msn.c:1565 ../src/protocols/yahoo/yahoo_profile.c:1061
+msgid "Marital Status"
+msgstr "�√�/���"
+
+#: ../src/protocols/msn/msn.c:1566
+msgid "Interests"
+msgstr "莇e��"
+
+#: ../src/protocols/msn/msn.c:1567
+msgid "Pets"
+msgstr "������"
+
+#: ../src/protocols/msn/msn.c:1568
+msgid "Hometown"
+msgstr "�肴昆��"
+
+#: ../src/protocols/msn/msn.c:1569
+msgid "Places Lived"
+msgstr "�鞘���"
+
+#: ../src/protocols/msn/msn.c:1570
+msgid "Fashion"
+msgstr "���<���激�с��"
+
+#: ../src/protocols/msn/msn.c:1571
+msgid "Humor"
+msgstr "���若�≪��"
+
+#: ../src/protocols/msn/msn.c:1572
+msgid "Music"
+msgstr "�恰ソ"
+
+#: ../src/protocols/msn/msn.c:1573 ../src/protocols/msn/msn.c:1745
+#: ../src/protocols/msn/msn.c:1751 ../src/protocols/yahoo/yahoo_profile.c:1113
 msgid "Favorite Quote"
 msgstr "綺у劻����"
 
-#: ../src/protocols/msn/msn.c:1681
+#: ../src/protocols/msn/msn.c:1577
+#, c-format
+msgid "%s<b>Social</b><br>%s"
+msgstr "%s<b>絲上�</b><br>%s"
+
+#: ../src/protocols/msn/msn.c:1586
+msgid "Significant Other"
+msgstr "紊у����査"
+
+#: ../src/protocols/msn/msn.c:1587
+msgid "Home Phone"
+msgstr "���若�����若��"
+
+#: ../src/protocols/msn/msn.c:1588
+msgid "Home Phone 2"
+msgstr "���若�����若�醐�"
+
+#: ../src/protocols/msn/msn.c:1589 ../src/protocols/oscar/oscar.c:6216
+msgid "Home Address"
+msgstr "��������"
+
+#: ../src/protocols/msn/msn.c:1590
+msgid "Personal Mobile"
+msgstr "�阪遣 (��篋�)"
+
+#: ../src/protocols/msn/msn.c:1591
+msgid "Home Fax"
+msgstr "����� FAX"
+
+#: ../src/protocols/msn/msn.c:1592
+msgid "Personal E-Mail"
+msgstr "��篋冴�� E-�<�若��"
+
+#: ../src/protocols/msn/msn.c:1593
+msgid "Personal IM"
+msgstr "��篋冴�� IM"
+
+#: ../src/protocols/msn/msn.c:1595
+msgid "Anniversary"
+msgstr "荐�綽究��"
+
+#: ../src/protocols/msn/msn.c:1596 ../src/protocols/msn/msn.c:1620
+msgid "Notes"
+msgstr "����"
+
+#: ../src/protocols/msn/msn.c:1600
+#, c-format
+msgid "<br><b>Personal</b><br>%s"
+msgstr "<br><b>��篋�</b><br>%s"
+
+#: ../src/protocols/msn/msn.c:1607 ../src/protocols/silc/ops.c:1044
+msgid "Job Title"
+msgstr "����"
+
+#: ../src/protocols/msn/msn.c:1608 ../src/protocols/oscar/oscar.c:6233
+msgid "Company"
+msgstr "�ゅ����"
+
+#: ../src/protocols/msn/msn.c:1609 ../src/protocols/novell/novell.c:1482
+msgid "Department"
+msgstr "��讐"
+
+#: ../src/protocols/msn/msn.c:1610
+msgid "Profession"
+msgstr "�傑キ"
+
+#: ../src/protocols/msn/msn.c:1611
+msgid "Work Phone"
+msgstr "�ゅ�������肢����"
+
+#: ../src/protocols/msn/msn.c:1612
+msgid "Work Phone 2"
+msgstr "���������肢���埦�"
+
+#: ../src/protocols/msn/msn.c:1613 ../src/protocols/oscar/oscar.c:6224
+msgid "Work Address"
+msgstr "�ゅ���������"
+
+#: ../src/protocols/msn/msn.c:1614
+msgid "Work Mobile"
+msgstr "�阪遣 (篁�篋�)"
+
+#: ../src/protocols/msn/msn.c:1615
+msgid "Work Pager"
+msgstr "Work Pager"
+
+#: ../src/protocols/msn/msn.c:1616
+msgid "Work Fax"
+msgstr "�ゅ������ FAX"
+
+#: ../src/protocols/msn/msn.c:1617
+msgid "Work E-Mail"
+msgstr "�ゅ������ E-�<�若��"
+
+#: ../src/protocols/msn/msn.c:1618
+msgid "Work IM"
+msgstr "�ゅ������ IM"
+
+#: ../src/protocols/msn/msn.c:1619
+msgid "Start Date"
+msgstr "��紮���"
+
+#: ../src/protocols/msn/msn.c:1624
+#, c-format
+msgid "<br><b>Business</b><br>%s"
+msgstr "<br><b>篁�篋�</b><br>%s"
+
+#: ../src/protocols/msn/msn.c:1635
+#, c-format
+msgid "<hr><b>Contact Info</b>%s%s"
+msgstr "<hr><b>�g機��</b>%s%s"
+
+#: ../src/protocols/msn/msn.c:1694 ../src/protocols/msn/msn.c:1700
+#: ../src/protocols/msn/msn.c:1707 ../src/protocols/msn/msn.c:1714
+msgid "Favorite Things"
+msgstr "��羂����ャ��������"
+
+#: ../src/protocols/msn/msn.c:1759
 msgid "Last Updated"
 msgstr "��腟��贋�井��"
 
-#: ../src/protocols/msn/msn.c:1692 ../src/protocols/silc/ops.c:1060
+#: ../src/protocols/msn/msn.c:1771 ../src/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "���若�����若��"
 
-#: ../src/protocols/msn/msn.c:1714
+#: ../src/protocols/msn/msn.c:1796
 msgid "The user has not created a public profile."
 msgstr "�������若�吟�����㏍���c�若���������������障����"
 
-#: ../src/protocols/msn/msn.c:1715
+#: ../src/protocols/msn/msn.c:1797
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
@@ -7819,15 +7963,21 @@
 "���若�吟��絖������������������������若�吟��������障�������㏍���c�若����������������"
 "���������<�������"
 
-#: ../src/protocols/msn/msn.c:1719
+#: ../src/protocols/msn/msn.c:1801
 msgid ""
 "Gaim could not find any information in the user's profile. The user most "
 "likely does not exist."
 msgstr ""
-"Gaim �����若�吟�����㏍���c�若���������宴����緇��с���障�����с�������������若�吟��������"
-"�鎕���������������������憗����"
-
-#: ../src/protocols/msn/msn.c:1725 ../src/protocols/yahoo/yahoo_profile.c:1202
+"���若�吟�����㏍���c�若���������宴����緇��с���障�����с�������������若�吟���������鎕���"
+"������������������憗����"
+
+#. put a link to the actual profile URL
+#: ../src/protocols/msn/msn.c:1806
+#, c-format
+msgid "<hr><b>%s:</b> "
+msgstr "<hr><b>%s:</b> "
+
+#: ../src/protocols/msn/msn.c:1806 ../src/protocols/yahoo/yahoo_profile.c:1208
 msgid "Profile URL"
 msgstr "���㏍���c�若���� URL"
 
@@ -7841,23 +7991,23 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/msn/msn.c:1930 ../src/protocols/msn/msn.c:1932
+#: ../src/protocols/msn/msn.c:2028 ../src/protocols/msn/msn.c:2030
 msgid "MSN Protocol Plugin"
 msgstr "MSN ���㏍���潟���������違�ゃ��"
 
-#: ../src/protocols/msn/msn.c:1951
+#: ../src/protocols/msn/msn.c:2049
 msgid "Login server"
 msgstr "�㏍�違�ゃ�潟�祉�泣�若��"
 
-#: ../src/protocols/msn/msn.c:1960
+#: ../src/protocols/msn/msn.c:2058
 msgid "Use HTTP Method"
 msgstr "HTTP �<�純��������������"
 
-#: ../src/protocols/msn/msn.c:1965
+#: ../src/protocols/msn/msn.c:2063
 msgid "Show custom smileys"
 msgstr "���鴻�帥�����鴻���ゃ���若��茵�ず����"
 
-#: ../src/protocols/msn/msn.c:1973
+#: ../src/protocols/msn/msn.c:2071
 msgid "nudge: nudge a user to get their attention"
 msgstr "����: ���若�吟��������⑥���潟��薐眼����"
 
@@ -7974,7 +8124,7 @@
 #. MSG_SERVER_GHOST
 #. Looks like someone logged in as us! =-O
 #: ../src/protocols/msn/session.c:312 ../src/protocols/napster/napster.c:456
-#: ../src/protocols/oscar/oscar.c:5816 ../src/protocols/yahoo/yahoo.c:193
+#: ../src/protocols/oscar/oscar.c:5881 ../src/protocols/yahoo/yahoo.c:193
 msgid "You have signed on from another location."
 msgstr "�ャ���贋�������泣�ゃ�潟�祉�ゃ�潟�������障��"
 
@@ -8036,36 +8186,36 @@
 msgid "Out To Lunch"
 msgstr "蕋�篋����冴���������障��"
 
-#: ../src/protocols/msn/switchboard.c:408
+#: ../src/protocols/msn/switchboard.c:406
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "�帥�ゃ���≪���������c�����с���<���祉�若�吾����篆<�����障�����с����:"
 
-#: ../src/protocols/msn/switchboard.c:416
+#: ../src/protocols/msn/switchboard.c:414
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr "���������������<���祉�若�吾����篆<�с���障����:"
 
-#: ../src/protocols/msn/switchboard.c:420
+#: ../src/protocols/msn/switchboard.c:418
 msgid "Message could not be sent because the user is offline:"
 msgstr "��篆≦�������若�吟���������ゃ�潟�����с���<���祉�若�吾����篆<�с���障�����с����:"
 
-#: ../src/protocols/msn/switchboard.c:424
+#: ../src/protocols/msn/switchboard.c:422
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "�ョ������若���榊���������с���<���祉�若�吾����篆<�с���障�����с����:"
 
-#: ../src/protocols/msn/switchboard.c:428
+#: ../src/protocols/msn/switchboard.c:426
 msgid "Message could not be sent because we are sending too quickly:"
 msgstr "��篆<�����帥�ゃ���潟�違�������������с���<���祉�若�吾����篆<�с���障�����с����:"
 
-#: ../src/protocols/msn/switchboard.c:432
+#: ../src/protocols/msn/switchboard.c:430
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr "篋ゆ�罘�膤祉��・膓������若���榊���������с���<���祉�若�吾����篆<�с���障�����с����:"
 
-#: ../src/protocols/msn/switchboard.c:440
+#: ../src/protocols/msn/switchboard.c:438
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "筝����������若���榊�����������<���祉�若�吾����篆<�����障�����с����:"
 
-#: ../src/protocols/msn/switchboard.c:961
+#: ../src/protocols/msn/switchboard.c:959
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s ���������潟�����������c�����障��鐚�"
@@ -8075,11 +8225,11 @@
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "���若�吟�� %s (%s) ������ %s ������篁臥�����鴻����申���������c�����障��"
 
-#: ../src/protocols/msn/userlist.c:111 ../src/protocols/yahoo/yahoo.c:914
+#: ../src/protocols/msn/userlist.c:111 ../src/protocols/yahoo/yahoo.c:915
 msgid "Authorize"
 msgstr "�粋�����"
 
-#: ../src/protocols/msn/userlist.c:112 ../src/protocols/yahoo/yahoo.c:916
+#: ../src/protocols/msn/userlist.c:112 ../src/protocols/yahoo/yahoo.c:917
 msgid "Deny"
 msgstr "��������"
 
@@ -8093,12 +8243,12 @@
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s ��������������篁臥�����鴻���������ゃ�������障��"
 
-#: ../src/protocols/msn/userlist.c:678
+#: ../src/protocols/msn/userlist.c:679
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "\"%s\" ������菴遵���с���障����"
 
-#: ../src/protocols/msn/userlist.c:680
+#: ../src/protocols/msn/userlist.c:681
 msgid "The screen name specified is invalid."
 msgstr "��絎������鴻�����若�喝���������c�����障��"
 
@@ -8141,8 +8291,8 @@
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #: ../src/protocols/napster/napster.c:507
 #: ../src/protocols/napster/napster.c:543 ../src/protocols/toc/toc.c:172
-#: ../src/protocols/yahoo/yahoo.c:2238 ../src/protocols/yahoo/yahoo.c:2265
-#: ../src/protocols/yahoo/yahoo.c:2348 ../src/protocols/yahoo/yahoo.c:2363
+#: ../src/protocols/yahoo/yahoo.c:2239 ../src/protocols/yahoo/yahoo.c:2266
+#: ../src/protocols/yahoo/yahoo.c:2349 ../src/protocols/yahoo/yahoo.c:2364
 #: ../src/protocols/yahoo/yahoo_filexfer.c:74
 #: ../src/protocols/yahoo/yahoo_filexfer.c:137
 #: ../src/protocols/yahoo/ycht.c:540
@@ -8391,10 +8541,6 @@
 msgid "Telephone Number"
 msgstr "�肢����"
 
-#: ../src/protocols/novell/novell.c:1482
-msgid "Department"
-msgstr "��讐"
-
 #: ../src/protocols/novell/novell.c:1484
 msgid "Personal Title"
 msgstr "��篋榊�������吾��"
@@ -8403,11 +8549,6 @@
 msgid "Mailstop"
 msgstr "�<�若���鴻������"
 
-#: ../src/protocols/novell/novell.c:1490 ../src/protocols/oscar/oscar.c:6113
-#: ../src/protocols/oscar/oscar.c:6120
-msgid "Email Address"
-msgstr "E-�<�若���祉�≪������"
-
 #: ../src/protocols/novell/novell.c:1506
 msgid "User ID"
 msgstr "���若�� ID"
@@ -8624,158 +8765,158 @@
 "(�����<���祉�若�吾����篆<�������������若���榊�����障������篌�荅宴��������篁臥���� buggy "
 "�������ゃ�≪�潟�������c�����������с����)"
 
-#: ../src/protocols/oscar/oscar.c:638
+#: ../src/protocols/oscar/oscar.c:702
 msgid "Voice"
 msgstr "�喝0"
 
-#: ../src/protocols/oscar/oscar.c:641
+#: ../src/protocols/oscar/oscar.c:705
 msgid "AIM Direct IM"
 msgstr "AIM Direct IM"
 
-#: ../src/protocols/oscar/oscar.c:644 ../src/protocols/silc/silc.c:693
+#: ../src/protocols/oscar/oscar.c:708 ../src/protocols/silc/silc.c:697
 #: ../src/protocols/silc/util.c:510
 msgid "Chat"
 msgstr "���c����"
 
-#: ../src/protocols/oscar/oscar.c:647 ../src/protocols/oscar/oscar.c:8095
+#: ../src/protocols/oscar/oscar.c:711 ../src/protocols/oscar/oscar.c:8174
 msgid "Get File"
 msgstr "���<�ゃ�����緇�"
 
-#: ../src/protocols/oscar/oscar.c:654
+#: ../src/protocols/oscar/oscar.c:718
 msgid "Games"
 msgstr "�蚊�若��"
 
-#: ../src/protocols/oscar/oscar.c:657
+#: ../src/protocols/oscar/oscar.c:721
 msgid "Add-Ins"
 msgstr "菴遵��"
 
-#: ../src/protocols/oscar/oscar.c:660
+#: ../src/protocols/oscar/oscar.c:724
 msgid "Send Buddy List"
 msgstr "篁臥�����鴻������篆�"
 
-#: ../src/protocols/oscar/oscar.c:663
+#: ../src/protocols/oscar/oscar.c:727
 msgid "ICQ Direct Connect"
 msgstr "ICQ Direct �ョ�"
 
-#: ../src/protocols/oscar/oscar.c:666
+#: ../src/protocols/oscar/oscar.c:730
 msgid "AP User"
 msgstr "AP ���若��"
 
-#: ../src/protocols/oscar/oscar.c:669
+#: ../src/protocols/oscar/oscar.c:733
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../src/protocols/oscar/oscar.c:672
+#: ../src/protocols/oscar/oscar.c:736
 msgid "Nihilist"
 msgstr "�������鴻��"
 
-#: ../src/protocols/oscar/oscar.c:675
+#: ../src/protocols/oscar/oscar.c:739
 msgid "ICQ Server Relay"
 msgstr "ICQ �泣�若��筝㊦�"
 
-#: ../src/protocols/oscar/oscar.c:678
+#: ../src/protocols/oscar/oscar.c:742
 msgid "Old ICQ UTF8"
 msgstr "�ゃ�� ICQ UTF8"
 
-#: ../src/protocols/oscar/oscar.c:681
+#: ../src/protocols/oscar/oscar.c:745
 msgid "Trillian Encryption"
 msgstr "Trillian ���桁��"
 
-#: ../src/protocols/oscar/oscar.c:684
+#: ../src/protocols/oscar/oscar.c:748
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../src/protocols/oscar/oscar.c:687
+#: ../src/protocols/oscar/oscar.c:751
 msgid "Hiptop"
 msgstr "������������"
 
-#: ../src/protocols/oscar/oscar.c:690
+#: ../src/protocols/oscar/oscar.c:754
 msgid "Security Enabled"
 msgstr "�祉�㏍�ャ�����c������"
 
-#: ../src/protocols/oscar/oscar.c:693
+#: ../src/protocols/oscar/oscar.c:757
 msgid "Video Chat"
 msgstr "�������祉���c����"
 
-#: ../src/protocols/oscar/oscar.c:697
+#: ../src/protocols/oscar/oscar.c:761
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../src/protocols/oscar/oscar.c:700
+#: ../src/protocols/oscar/oscar.c:764
 msgid "Live Video"
 msgstr "���ゃ���祉������"
 
-#: ../src/protocols/oscar/oscar.c:703
+#: ../src/protocols/oscar/oscar.c:767
 msgid "Camera"
 msgstr "���<��"
 
-#: ../src/protocols/oscar/oscar.c:721 ../src/protocols/oscar/oscar.c:7957
+#: ../src/protocols/oscar/oscar.c:785 ../src/protocols/oscar/oscar.c:8036
 msgid "Free For Chat"
 msgstr "���c�����с���障��"
 
-#: ../src/protocols/oscar/oscar.c:725 ../src/protocols/oscar/oscar.c:7985
+#: ../src/protocols/oscar/oscar.c:789 ../src/protocols/oscar/oscar.c:8064
 msgid "Not Available"
 msgstr "筝����с��"
 
-#: ../src/protocols/oscar/oscar.c:727 ../src/protocols/oscar/oscar.c:7975
+#: ../src/protocols/oscar/oscar.c:791 ../src/protocols/oscar/oscar.c:8054
 msgid "Occupied"
 msgstr "紊�綽��с��"
 
-#: ../src/protocols/oscar/oscar.c:731
+#: ../src/protocols/oscar/oscar.c:795
 msgid "Web Aware"
 msgstr "���с��������障��"
 
-#: ../src/protocols/oscar/oscar.c:735
+#: ../src/protocols/oscar/oscar.c:799
 msgid "Online"
 msgstr "���潟���ゃ��"
 
-#: ../src/protocols/oscar/oscar.c:812 ../src/protocols/oscar/oscar.c:5188
+#: ../src/protocols/oscar/oscar.c:876 ../src/protocols/oscar/oscar.c:5253
 msgid "Warning Level"
 msgstr "茘���������"
 
-#: ../src/protocols/oscar/oscar.c:821
+#: ../src/protocols/oscar/oscar.c:885
 msgid "Buddy Comment"
 msgstr "篁臥�����潟�<�潟��"
 
-#: ../src/protocols/oscar/oscar.c:970
+#: ../src/protocols/oscar/oscar.c:1034
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr "%s �� Dirct IM �������障����"
 
-#: ../src/protocols/oscar/oscar.c:972
+#: ../src/protocols/oscar/oscar.c:1036
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr "%s �� Direct IM ��紊掩�����障����"
 
-#: ../src/protocols/oscar/oscar.c:980
+#: ../src/protocols/oscar/oscar.c:1044
 msgid "Direct Connect failed"
 msgstr "Direct Connect ��け�����障����"
 
-#: ../src/protocols/oscar/oscar.c:1060 ../src/protocols/oscar/oscar.c:1189
+#: ../src/protocols/oscar/oscar.c:1124 ../src/protocols/oscar/oscar.c:1253
 #, c-format
 msgid "Direct IM with %s established"
 msgstr "%s ���� Direct IM ��腆榊����障����"
 
-#: ../src/protocols/oscar/oscar.c:1141
+#: ../src/protocols/oscar/oscar.c:1205
 #, c-format
 msgid "Attempting to connect to %s at %s:%hu for Direct IM."
 msgstr "Direct IM �� %s �� %s:%hu �с�潟�潟�帥�������������������障����"
 
-#: ../src/protocols/oscar/oscar.c:1544
+#: ../src/protocols/oscar/oscar.c:1608
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "Direct IM �� %s �� %s:%hu �у�������������Ή���障����"
 
-#: ../src/protocols/oscar/oscar.c:1549 ../src/protocols/oscar/oscar.c:1596
+#: ../src/protocols/oscar/oscar.c:1613 ../src/protocols/oscar/oscar.c:1660
 msgid "Unable to open Direct IM"
 msgstr "Direct IM �������障����"
 
-#: ../src/protocols/oscar/oscar.c:1632
+#: ../src/protocols/oscar/oscar.c:1696
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "%s ���������� Direct IM �ョ�����紮����御���������障����"
 
-#: ../src/protocols/oscar/oscar.c:1636
+#: ../src/protocols/oscar/oscar.c:1700
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
@@ -8783,24 +8924,24 @@
 "������������������ IP �≪�����鴻�����������������������с����������������������"
 "���激�若����������鴻�����榊�����障����膓�茵����������������с����鐚�"
 
-#: ../src/protocols/oscar/oscar.c:1640 ../src/protocols/oscar/oscar.c:4499
+#: ../src/protocols/oscar/oscar.c:1704 ../src/protocols/oscar/oscar.c:4564
 msgid "_Connect"
 msgstr "�ョ�����(_C)"
 
-#: ../src/protocols/oscar/oscar.c:1718
+#: ../src/protocols/oscar/oscar.c:1782
 #, c-format
 msgid "You have lost your connection to chat room %s."
 msgstr "���c�����祉���若�� %s �吾��・膓������������障��"
 
-#: ../src/protocols/oscar/oscar.c:1741
+#: ../src/protocols/oscar/oscar.c:1805
 msgid "Chat is currently unavailable"
 msgstr "���c������・膓��с���障����"
 
-#: ../src/protocols/oscar/oscar.c:1813
+#: ../src/protocols/oscar/oscar.c:1877
 msgid "Screen name sent"
 msgstr "�鴻�����若�喝������篆<���障����"
 
-#: ../src/protocols/oscar/oscar.c:1829
+#: ../src/protocols/oscar/oscar.c:1893
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -8811,15 +8952,15 @@
 "�障�����с�������鴻�����若�喝�������㏍����絖���������絖����医����鴻���若�鴻���帥���障����"
 "�医����帥�������������"
 
-#: ../src/protocols/oscar/oscar.c:1857
+#: ../src/protocols/oscar/oscar.c:1921
 msgid "Unable to login to AIM"
 msgstr "AIM �吾�㏍�違�ゃ�潟�с���障����"
 
-#: ../src/protocols/oscar/oscar.c:1960 ../src/protocols/oscar/oscar.c:2951
+#: ../src/protocols/oscar/oscar.c:2024 ../src/protocols/oscar/oscar.c:3016
 msgid "Could Not Connect"
 msgstr "�ョ��с���障�����с����"
 
-#: ../src/protocols/oscar/oscar.c:1971
+#: ../src/protocols/oscar/oscar.c:2035
 msgid "Connection established, cookie sent"
 msgstr "(�ョ�絎�篋�) cookie ����篆<���障����"
 
@@ -8830,7 +8971,7 @@
 #. * redirect to prevent a conflict with the joscar library
 #.
 #. Let the user not to lose hope quite yet
-#: ../src/protocols/oscar/oscar.c:2130
+#: ../src/protocols/oscar/oscar.c:2194
 msgid "Attempting connection redirect..."
 msgstr "�ョ��������ゃ�������������障��..."
 
@@ -8838,53 +8979,53 @@
 #. * Yes, it's a bit odd to ask the user to enable proxied file transfers
 #. * when it's a proxied transfer that timed out. It is possible that a
 #. * stage 1 or 2 proxied transfer might work when a stage 3 will not.
-#: ../src/protocols/oscar/oscar.c:2176
+#: ../src/protocols/oscar/oscar.c:2240
 #, c-format
 msgid ""
 "Transfer of file %s timed out.\n"
-" Try enabling proxy servers for file transfers in Accounts->%s->Edit Account-"
-">Advanced."
+" Try enabling proxy servers for file transfers in Accounts -> %s -> Edit "
+"Account -> Advanced."
 msgstr ""
 "���<�ゃ�� %s ��拶�����帥�ゃ���≪�������障������\n"
 "�<���ャ�若�� [�≪�����潟��]->%s->[�≪�����潟����隈��]->[�≦宍] �с���㏍�㏍�激�祉�泣�若����"
 "���鴻����������荵∫�������帥���������"
 
-#: ../src/protocols/oscar/oscar.c:2274
+#: ../src/protocols/oscar/oscar.c:2338
 #: ../src/protocols/yahoo/yahoo_filexfer.c:253
 #: ../src/protocols/yahoo/yahoo_filexfer.c:262
 #: ../src/protocols/yahoo/yahoo_filexfer.c:271
 msgid "Unable to establish file descriptor."
 msgstr "���<�ゃ���祉���鴻�������帥����緇��с���障����"
 
-#: ../src/protocols/oscar/oscar.c:2279
+#: ../src/protocols/oscar/oscar.c:2343
 msgid "Unable to create new connection."
 msgstr "�違�����ョ��������障����"
 
-#: ../src/protocols/oscar/oscar.c:2516 ../src/protocols/oscar/oscar.c:2525
-#: ../src/protocols/oscar/oscar.c:2539 ../src/protocols/oscar/oscar.c:2549
+#: ../src/protocols/oscar/oscar.c:2581 ../src/protocols/oscar/oscar.c:2590
+#: ../src/protocols/oscar/oscar.c:2604 ../src/protocols/oscar/oscar.c:2614
 msgid "Unable to log into file transfer proxy."
 msgstr "���<�ゃ��拶�������㏍�㏍�激���㏍�違��荐��蚊�с���障����"
 
-#: ../src/protocols/oscar/oscar.c:2603
+#: ../src/protocols/oscar/oscar.c:2668
 msgid "Unable to establish listener socket or no AOL proxy connection present."
 msgstr ""
 "茯㏍�粋昭�睡�����純�宴������腆榊��с������������������憜�� AOL ���㏍�㏍�激��・膓���������"
 "����"
 
-#: ../src/protocols/oscar/oscar.c:2841 ../src/protocols/toc/toc.c:543
+#: ../src/protocols/oscar/oscar.c:2906 ../src/protocols/toc/toc.c:543
 msgid "Incorrect nickname or password."
 msgstr "���������若���障�������鴻���若���������c�����障��"
 
-#: ../src/protocols/oscar/oscar.c:2846
+#: ../src/protocols/oscar/oscar.c:2911
 msgid "Your account is currently suspended."
 msgstr "��篏帥�����≪�����潟����憜����罩≫賢�с��"
 
 #. service temporarily unavailable
-#: ../src/protocols/oscar/oscar.c:2850
+#: ../src/protocols/oscar/oscar.c:2915
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL �ゃ�潟�鴻�帥�潟���祉�<���祉�潟�吾�c�若�祉�泣�若���鴻�����������������с��"
 
-#: ../src/protocols/oscar/oscar.c:2855
+#: ../src/protocols/oscar/oscar.c:2920
 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."
@@ -8892,33 +9033,33 @@
 "�ョ������㏍��膵違��菴���茵����障������10 ��腮�緇��c���������活��帥����������������障��"
 "膓�茵����������������激�鏅����������違��������Ù���障������"
 
-#: ../src/protocols/oscar/oscar.c:2860
+#: ../src/protocols/oscar/oscar.c:2925
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "�����ゃ�≪�潟�������若�吾�с�潟���ゃ�����障����%s ���≪�����違���若�����障��������"
 
-#: ../src/protocols/oscar/oscar.c:2888
+#: ../src/protocols/oscar/oscar.c:2953
 msgid "Internal Error"
 msgstr "����������"
 
-#: ../src/protocols/oscar/oscar.c:2958
+#: ../src/protocols/oscar/oscar.c:3023
 msgid "Received authorization"
 msgstr "茯�荐若����篆<���障����"
 
-#: ../src/protocols/oscar/oscar.c:2982
+#: ../src/protocols/oscar/oscar.c:3047
 msgid "The SecurID key entered is invalid."
 msgstr "�ュ�������祉�㏍�ャ�� ID �泣���罩c�с����"
 
-#: ../src/protocols/oscar/oscar.c:2996
+#: ../src/protocols/oscar/oscar.c:3061
 msgid "Enter SecurID"
 msgstr "�祉�㏍�ャ�� ID ���ュ��"
 
-#: ../src/protocols/oscar/oscar.c:2997
+#: ../src/protocols/oscar/oscar.c:3062
 msgid "Enter the 6 digit number from the digital display."
 msgstr "���吾�帥��;腓冴����鐚�罅����医����ュ�������������"
 
-#: ../src/protocols/oscar/oscar.c:3037 ../src/protocols/oscar/oscar.c:3067
-#: ../src/protocols/oscar/oscar.c:3158
+#: ../src/protocols/oscar/oscar.c:3102 ../src/protocols/oscar/oscar.c:3132
+#: ../src/protocols/oscar/oscar.c:3223
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -8927,24 +9068,24 @@
 "�障����������������с��������篆�③�������� TOC �������������障���障�������贋�違����"
 "������%s ������������������"
 
-#: ../src/protocols/oscar/oscar.c:3040 ../src/protocols/oscar/oscar.c:3070
+#: ../src/protocols/oscar/oscar.c:3105 ../src/protocols/oscar/oscar.c:3135
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim ��③���� AIM �㏍�違�ゃ�� hash ����緇������������с���障�����с������"
 
-#: ../src/protocols/oscar/oscar.c:3161
+#: ../src/protocols/oscar/oscar.c:3226
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim ��③�����㏍�違�ゃ�� hash ����緇��с���障�����с������"
 
-#: ../src/protocols/oscar/oscar.c:3182
+#: ../src/protocols/oscar/oscar.c:3247
 msgid "Password sent"
 msgstr "���鴻���若������篆>賢"
 
-#: ../src/protocols/oscar/oscar.c:4490
+#: ../src/protocols/oscar/oscar.c:4555
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s ���贋・ %s ��・膓������������羆����障������"
 
-#: ../src/protocols/oscar/oscar.c:4493
+#: ../src/protocols/oscar/oscar.c:4558
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
@@ -8954,19 +9095,19 @@
 "����IP �≪�����鴻�����������������с�������ゃ���激�若����������鴻�����榊������������"
 "���障������"
 
-#: ../src/protocols/oscar/oscar.c:4532
+#: ../src/protocols/oscar/oscar.c:4597
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "腱�����������篁臥�����鴻����申���с�����������粋������������"
 
-#: ../src/protocols/oscar/oscar.c:4540
+#: ../src/protocols/oscar/oscar.c:4605
 msgid "Authorization Request Message:"
 msgstr "�粋�荀�羆��<���祉�若��:"
 
-#: ../src/protocols/oscar/oscar.c:4541
+#: ../src/protocols/oscar/oscar.c:4606
 msgid "Please authorize me!"
 msgstr "腱����粋��������������"
 
-#: ../src/protocols/oscar/oscar.c:4571
+#: ../src/protocols/oscar/oscar.c:4636
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -8975,25 +9116,25 @@
 "���若�� %s ��篁臥�����鴻���������������粋���羆��������障�����粋����羆������c������"
 "�������с����鐚�"
 
-#: ../src/protocols/oscar/oscar.c:4576
+#: ../src/protocols/oscar/oscar.c:4641
 msgid "Request Authorization"
 msgstr "�粋����羆�"
 
-#: ../src/protocols/oscar/oscar.c:4578
+#: ../src/protocols/oscar/oscar.c:4643
 msgid "_Request Authorization"
 msgstr "�粋����羆�(_R)"
 
-#: ../src/protocols/oscar/oscar.c:4616 ../src/protocols/oscar/oscar.c:4622
-#: ../src/protocols/oscar/oscar.c:4726 ../src/protocols/oscar/oscar.c:4750
-#: ../src/protocols/oscar/oscar.c:7391 ../src/protocols/oscar/oscar.c:7443
+#: ../src/protocols/oscar/oscar.c:4681 ../src/protocols/oscar/oscar.c:4687
+#: ../src/protocols/oscar/oscar.c:4791 ../src/protocols/oscar/oscar.c:4815
+#: ../src/protocols/oscar/oscar.c:7468 ../src/protocols/oscar/oscar.c:7520
 msgid "No reason given."
 msgstr "���宴��������憗������"
 
-#: ../src/protocols/oscar/oscar.c:4621
+#: ../src/protocols/oscar/oscar.c:4686
 msgid "Authorization Denied Message:"
 msgstr "�粋������<���祉�若��:"
 
-#: ../src/protocols/oscar/oscar.c:4728
+#: ../src/protocols/oscar/oscar.c:4793
 #, c-format
 msgid ""
 "The user %u wants to add %s to their buddy list for the following reason:\n"
@@ -9002,11 +9143,11 @@
 "���若�吟�� %u ������罨<�����宴�� %s ������篁臥�����鴻����申���������c�����障��:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:4738 ../src/protocols/oscar/oscar.c:7403
+#: ../src/protocols/oscar/oscar.c:4803 ../src/protocols/oscar/oscar.c:7480
 msgid "Authorization Request"
 msgstr "�粋����羆�"
 
-#: ../src/protocols/oscar/oscar.c:4750
+#: ../src/protocols/oscar/oscar.c:4815
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -9016,17 +9157,17 @@
 "���若�吟�� %u ������罨<�����宴�т参�����鴻����申������荀�羆����������障����:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:4751
+#: ../src/protocols/oscar/oscar.c:4816
 msgid "ICQ authorization denied."
 msgstr "ICQ 茯�荐若�����������障������"
 
 #. Someone has granted you authorization
-#: ../src/protocols/oscar/oscar.c:4758
+#: ../src/protocols/oscar/oscar.c:4823
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "���若�吟�� %u ������篁臥�����鴻����申���������������羆����粋����障������"
 
-#: ../src/protocols/oscar/oscar.c:4766
+#: ../src/protocols/oscar/oscar.c:4831
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -9039,7 +9180,7 @@
 "綏��坂査: %s [%s]\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:4774
+#: ../src/protocols/oscar/oscar.c:4839
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -9052,7 +9193,7 @@
 "綏��坂査: %s [%s]\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:4782
+#: ../src/protocols/oscar/oscar.c:4847
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -9060,25 +9201,25 @@
 "Message is:\n"
 "%s"
 msgstr ""
-"ICQ e-mail�� %s [%s] ����������篆<���障����\n"
+"%s [%s] ���������� ICQ E-�<�若������篆<���障����\n"
 "\n"
 "�<���祉�若�吾��:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:4803
+#: ../src/protocols/oscar/oscar.c:4868
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ ���若�吟�� %u ��������������参�����鴻������篆<�������障��: %s (%s)"
 
-#: ../src/protocols/oscar/oscar.c:4809
+#: ../src/protocols/oscar/oscar.c:4874
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "�����御����篁臥�����鴻����申�����障����鐚�"
 
-#: ../src/protocols/oscar/oscar.c:4813
+#: ../src/protocols/oscar/oscar.c:4878
 msgid "_Decline"
 msgstr "�㏍��(_D)"
 
-#: ../src/protocols/oscar/oscar.c:4897
+#: ../src/protocols/oscar/oscar.c:4962
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
@@ -9087,7 +9228,7 @@
 msgstr[1] ""
 "%2$s ���������� %1$hu �����<���祉�若�吾��Ε綵��с�������у��������障�����с������"
 
-#: ../src/protocols/oscar/oscar.c:4906
+#: ../src/protocols/oscar/oscar.c:4971
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
@@ -9096,7 +9237,7 @@
 msgstr[1] ""
 "%2$s ���������� %1$hu �����<���祉�若�吾��ぇ����������������������障�����с������"
 
-#: ../src/protocols/oscar/oscar.c:4915
+#: ../src/protocols/oscar/oscar.c:4980
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -9109,7 +9250,7 @@
 "��綺��狗����筝����c������ %2$s ���������� %1$hu �����<���祉�若�吾�����������障������"
 "������"
 
-#: ../src/protocols/oscar/oscar.c:4924
+#: ../src/protocols/oscar/oscar.c:4989
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
@@ -9120,7 +9261,7 @@
 "�御������絎潟���������с��%2$s ���������� %1$hu �����<���祉�若�吾�����������障������"
 "������"
 
-#: ../src/protocols/oscar/oscar.c:4933
+#: ../src/protocols/oscar/oscar.c:4998
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
@@ -9131,7 +9272,7 @@
 "����������絎潟���������с��%2$s ���������� %1$hu �����<���祉�若�吾�����������障����"
 "�����"
 
-#: ../src/protocols/oscar/oscar.c:4942
+#: ../src/protocols/oscar/oscar.c:5007
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
@@ -9142,66 +9283,66 @@
 "����������с������%2$s ���������� %1$hu �����<���祉�若�吾�����������障�����с��"
 "����"
 
-#: ../src/protocols/oscar/oscar.c:5001
+#: ../src/protocols/oscar/oscar.c:5066
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>UIN:</B> %s<BR><B>�倶��:</B> %s<HR>%s"
 
-#: ../src/protocols/oscar/oscar.c:5062
+#: ../src/protocols/oscar/oscar.c:5127
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr "SNAC �鴻���若��������: %s\n"
 
 #. Data is assumed to be the destination sn
-#: ../src/protocols/oscar/oscar.c:5099
+#: ../src/protocols/oscar/oscar.c:5164
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "�<���祉�若�吾����篆<�с���障����: %s"
 
-#: ../src/protocols/oscar/oscar.c:5099 ../src/protocols/oscar/oscar.c:5104
-#: ../src/protocols/oscar/oscar.c:5162 ../src/protocols/oscar/oscar.c:5166
+#: ../src/protocols/oscar/oscar.c:5164 ../src/protocols/oscar/oscar.c:5169
+#: ../src/protocols/oscar/oscar.c:5227 ../src/protocols/oscar/oscar.c:5231
 msgid "Unknown reason."
 msgstr "����������с��"
 
-#: ../src/protocols/oscar/oscar.c:5102
+#: ../src/protocols/oscar/oscar.c:5167
 #: ../src/protocols/sametime/sametime.c:2373
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "%s �����吾�<���祉�若�吾����篆<�с���障����"
 
-#: ../src/protocols/oscar/oscar.c:5162
+#: ../src/protocols/oscar/oscar.c:5227
 #, c-format
 msgid "User information not available: %s"
 msgstr "���若�倶���宴�����鴻�с�������障����: %s"
 
-#: ../src/protocols/oscar/oscar.c:5165
+#: ../src/protocols/oscar/oscar.c:5230
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s �����若�倶���宴�����鴻�с�������障����:"
 
-#: ../src/protocols/oscar/oscar.c:5192
+#: ../src/protocols/oscar/oscar.c:5257
 msgid "Online Since"
 msgstr "�泣�ゃ�潟�祉�ゃ�潟�����ユ��"
 
-#: ../src/protocols/oscar/oscar.c:5197
-#: ../src/protocols/yahoo/yahoo_profile.c:1153
+#: ../src/protocols/oscar/oscar.c:5262
+#: ../src/protocols/yahoo/yahoo_profile.c:1159
 msgid "Member Since"
 msgstr "�<�潟�������c���ユ��"
 
-#: ../src/protocols/oscar/oscar.c:5202
+#: ../src/protocols/oscar/oscar.c:5267
 msgid "Capabilities"
 msgstr "罘���"
 
-#: ../src/protocols/oscar/oscar.c:5220
+#: ../src/protocols/oscar/oscar.c:5285
 msgid "Available Message"
 msgstr "��賢筝㏍���<���祉�若��"
 
-#: ../src/protocols/oscar/oscar.c:5337
+#: ../src/protocols/oscar/oscar.c:5402
 msgid "Your AIM connection may be lost."
 msgstr "AIM �吾��・膓��������������с��"
 
 #. The conversion failed!
-#: ../src/protocols/oscar/oscar.c:5523
+#: ../src/protocols/oscar/oscar.c:5588
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -9209,11 +9350,11 @@
 "[�<���祉�若�吾���罩c����絖������障���������������������若�吟�������<���祉�若�吾��茵�ず��"
 "���障����]"
 
-#: ../src/protocols/oscar/oscar.c:5744
+#: ../src/protocols/oscar/oscar.c:5809
 msgid "Rate limiting error."
 msgstr "��綺��狗�������若�с��"
 
-#: ../src/protocols/oscar/oscar.c:5745
+#: ../src/protocols/oscar/oscar.c:5810
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -9221,94 +9362,82 @@
 "��綺��狗����莇���������������緇�����篏����茵������障�����с������10 腱����祉����c����"
 "����綺���帥���������"
 
-#: ../src/protocols/oscar/oscar.c:5818
+#: ../src/protocols/oscar/oscar.c:5883
 msgid "You have been signed off for an unknown reason."
 msgstr "����������с���������������泣�ゃ�潟�祉�≪�������障����"
 
-#: ../src/protocols/oscar/oscar.c:5831 ../src/protocols/toc/toc.c:971
+#: ../src/protocols/oscar/oscar.c:5896 ../src/protocols/toc/toc.c:971
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "���c�����祉���若�� %s �������㏍�����障����"
 
 #. XXX - Don't call this with ssi
-#: ../src/protocols/oscar/oscar.c:5860
+#: ../src/protocols/oscar/oscar.c:5925
 msgid "Finalizing connection"
 msgstr "�ョ�����腟�茯炊�岩賢"
 
-#: ../src/protocols/oscar/oscar.c:6125 ../src/protocols/silc/util.c:542
+#: ../src/protocols/oscar/oscar.c:6190 ../src/protocols/silc/util.c:542
 msgid "Mobile Phone"
 msgstr "�阪遣�肢�"
 
-#: ../src/protocols/oscar/oscar.c:6142
+#: ../src/protocols/oscar/oscar.c:6207
 msgid "Personal Web Page"
 msgstr "��篋榊�������с�����若��"
 
-#: ../src/protocols/oscar/oscar.c:6146
+#: ../src/protocols/oscar/oscar.c:6211
 msgid "Additional Information"
 msgstr "菴遵������"
 
-#: ../src/protocols/oscar/oscar.c:6151
-msgid "Home Address"
-msgstr "��������"
-
-#: ../src/protocols/oscar/oscar.c:6155 ../src/protocols/oscar/oscar.c:6163
+#: ../src/protocols/oscar/oscar.c:6220 ../src/protocols/oscar/oscar.c:6228
 msgid "Zip Code"
 msgstr "�灸梢���"
 
-#: ../src/protocols/oscar/oscar.c:6159
-msgid "Work Address"
-msgstr "�����������"
-
-#: ../src/protocols/oscar/oscar.c:6167
+#: ../src/protocols/oscar/oscar.c:6232
 msgid "Work Information"
 msgstr "�傑キ"
 
-#: ../src/protocols/oscar/oscar.c:6168
-msgid "Company"
-msgstr "篌�腓�"
-
-#: ../src/protocols/oscar/oscar.c:6169
+#: ../src/protocols/oscar/oscar.c:6234
 msgid "Division"
 msgstr "��絮�"
 
-#: ../src/protocols/oscar/oscar.c:6170
+#: ../src/protocols/oscar/oscar.c:6235
 msgid "Position"
 msgstr "綵壕��"
 
-#: ../src/protocols/oscar/oscar.c:6172
+#: ../src/protocols/oscar/oscar.c:6237
 msgid "Web Page"
 msgstr "���с�����若��"
 
-#: ../src/protocols/oscar/oscar.c:6230
+#: ../src/protocols/oscar/oscar.c:6295
 msgid "Pop-Up Message"
 msgstr "�������≪�����祉�<���祉�若��"
 
-#: ../src/protocols/oscar/oscar.c:6270
+#: ../src/protocols/oscar/oscar.c:6335
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "罨<���鴻�����若�喝���� %s ���∫�c�ャ�����������障��"
 msgstr[1] "罨<���鴻�����若�喝���� %s ���∫�c�ャ�����������障��"
 
-#: ../src/protocols/oscar/oscar.c:6301
+#: ../src/protocols/oscar/oscar.c:6366
 #, c-format
 msgid "No results found for e-mail address %s"
-msgstr "%s �������<�若���祉�≪�����鴻�����������������障�����с����"
-
-#: ../src/protocols/oscar/oscar.c:6322
+msgstr "E-�<�若���祉�≪������ %s �������腟�����緇������障�����с����"
+
+#: ../src/protocols/oscar/oscar.c:6387
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "%s ������腆肴����������������������若������篆<���������"
 
-#: ../src/protocols/oscar/oscar.c:6324
+#: ../src/protocols/oscar/oscar.c:6389
 msgid "Account Confirmation Requested"
 msgstr "�≪�����潟��茯�荐若��荀�羆����障����"
 
-#: ../src/protocols/oscar/oscar.c:6355
+#: ../src/protocols/oscar/oscar.c:6420
 msgid "Error Changing Account Info"
 msgstr "�≪�����潟�����怨��眼������"
 
-#: ../src/protocols/oscar/oscar.c:6358
+#: ../src/protocols/oscar/oscar.c:6423
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -9317,50 +9446,51 @@
 "������ 0x%04x: 荀�羆��������鴻�����若�喝���������吾�������違���c�������������翫就�с��"
 "�障������"
 
-#: ../src/protocols/oscar/oscar.c:6361
+#: ../src/protocols/oscar/oscar.c:6426
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr "������ 0x%04x: 荀�羆��������鴻�����若�喝���������c���������ф�翫就�с���障����"
 
-#: ../src/protocols/oscar/oscar.c:6364
+#: ../src/protocols/oscar/oscar.c:6429
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 msgstr "������ 0x%04x: 荀�羆��������鴻�����若�喝�����激���������ф�翫就�с���障����"
 
-#: ../src/protocols/oscar/oscar.c:6367
+#: ../src/protocols/oscar/oscar.c:6432
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
-"������ 0x%04x: �����鴻�����若�喝����������≪���羆��������������с�<�若���≪�����鴻��"
-"紊��眼�с���障����"
-
-#: ../src/protocols/oscar/oscar.c:6370
+"������ 0x%04x: �����鴻�����若�喝����������≪���羆��������������� E-�<�若���祉�≪��"
+"���鴻��紊��眼�с���障����"
+
+#: ../src/protocols/oscar/oscar.c:6435
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
-"������ 0x%04x: ����������鴻�����若�喝�����蚊��綵����������������с�������<�若���≪��"
-"���鴻������眼�с���障����"
-
-#: ../src/protocols/oscar/oscar.c:6373
+"������ 0x%04x: ����������鴻�����若�喝�����蚊��綵����������������с������ E-�<��"
+"���祉�≪�����鴻������眼�с���障����"
+
+#: ../src/protocols/oscar/oscar.c:6438
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
-"������ 0x%04x: �����≪�����鴻���罩c�����с�������<�若���≪�����鴻������眼�с���障����"
-
-#: ../src/protocols/oscar/oscar.c:6376
+"������ 0x%04x: �����≪�����鴻�������c���������с������ E-�<�若���祉�≪�����鴻�����"
+"�с���障����"
+
+#: ../src/protocols/oscar/oscar.c:6441
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "������ 0x%04x: ����筝����������若�с��"
 
-#: ../src/protocols/oscar/oscar.c:6386
+#: ../src/protocols/oscar/oscar.c:6451
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -9369,27 +9499,27 @@
 "���������鴻�����若�喝�������上������������翫就���������障��:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:6387 ../src/protocols/oscar/oscar.c:6394
+#: ../src/protocols/oscar/oscar.c:6452 ../src/protocols/oscar/oscar.c:6459
 msgid "Account Info"
 msgstr "�≪�����潟������"
 
-#: ../src/protocols/oscar/oscar.c:6392
+#: ../src/protocols/oscar/oscar.c:6457
 #, c-format
 msgid "The e-mail address for %s is %s"
-msgstr "%s �������<�若���≪�����鴻�� %s �с��"
-
-#: ../src/protocols/oscar/oscar.c:6464
+msgstr "%s ������ E-�<�若���祉�≪�����鴻�� %s �с��"
+
+#: ../src/protocols/oscar/oscar.c:6535
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "IM �糸�����鋓<�����障�����с������IM �糸�����鋓<�������� Direct Connected ������"
 "�������"
 
-#: ../src/protocols/oscar/oscar.c:6704
+#: ../src/protocols/oscar/oscar.c:6775
 msgid "Unable to set AIM profile."
 msgstr "AIM ���㏍���c�若�����祉�����с���障����"
 
-#: ../src/protocols/oscar/oscar.c:6705
+#: ../src/protocols/oscar/oscar.c:6776
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
@@ -9399,7 +9529,7 @@
 "���������������㏍���c�若����┃絎�����������c�����障�����ョ���絎�篋�����������綺��"
 "�����������"
 
-#: ../src/protocols/oscar/oscar.c:6719
+#: ../src/protocols/oscar/oscar.c:6790
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -9410,11 +9540,11 @@
 msgstr[0] "���㏍���c�若�����激������紊у�� (%d ���ゃ��) �����������у�����ゃ���障����"
 msgstr[1] "���㏍���c�若�����激������紊у�� (%d ���ゃ��) �����������у�����ゃ���障����"
 
-#: ../src/protocols/oscar/oscar.c:6724
+#: ../src/protocols/oscar/oscar.c:6795
 msgid "Profile too long."
 msgstr "���㏍���c�若�����激�����障��"
 
-#: ../src/protocols/oscar/oscar.c:6766
+#: ../src/protocols/oscar/oscar.c:6843
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -9425,11 +9555,11 @@
 msgstr[0] "�√賢�<���祉�若�吾���激������紊у�� (%d ���ゃ��) �����������у�����ゃ���障����"
 msgstr[1] "�√賢�<���祉�若�吾���激������紊у�� (%d ���ゃ��) �����������у�����ゃ���障����"
 
-#: ../src/protocols/oscar/oscar.c:6771
+#: ../src/protocols/oscar/oscar.c:6848
 msgid "Away message too long."
 msgstr "�√賢�<���祉�若�吾���激�����障��"
 
-#: ../src/protocols/oscar/oscar.c:6840
+#: ../src/protocols/oscar/oscar.c:6917
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -9439,16 +9569,16 @@
 "�鴻�����若�喝���������c����������篁臥�� %s ��菴遵���с���障�����с�������鴻�����若�喝����"
 "���㏍����絖���������絖����医����鴻���若�鴻���帥���障�����医����帥�������������"
 
-#: ../src/protocols/oscar/oscar.c:6842 ../src/protocols/oscar/oscar.c:7249
-#: ../src/protocols/oscar/oscar.c:7263
+#: ../src/protocols/oscar/oscar.c:6919 ../src/protocols/oscar/oscar.c:7326
+#: ../src/protocols/oscar/oscar.c:7340
 msgid "Unable To Add"
 msgstr "菴遵���с���障����"
 
-#: ../src/protocols/oscar/oscar.c:6949
+#: ../src/protocols/oscar/oscar.c:7026
 msgid "Unable To Retrieve Buddy List"
 msgstr "篁臥�����鴻������緇��с���障����"
 
-#: ../src/protocols/oscar/oscar.c:6950
+#: ../src/protocols/oscar/oscar.c:7027
 msgid ""
 "Gaim was temporarily unable to retrieve your buddy list from the AIM "
 "servers.  Your buddy list is not lost, and will probably become available in "
@@ -9457,13 +9587,13 @@
 "Gaim ��������� AIM �泣�若������篁臥�����鴻������緇��с���障�����с������篁臥�����鴻����"
 "紊宴����Ή���障��������������佀����緇����������с�������������c�������с��������"
 
-#: ../src/protocols/oscar/oscar.c:7147 ../src/protocols/oscar/oscar.c:7148
-#: ../src/protocols/oscar/oscar.c:7153 ../src/protocols/oscar/oscar.c:7307
-#: ../src/protocols/oscar/oscar.c:7308 ../src/protocols/oscar/oscar.c:7313
+#: ../src/protocols/oscar/oscar.c:7224 ../src/protocols/oscar/oscar.c:7225
+#: ../src/protocols/oscar/oscar.c:7230 ../src/protocols/oscar/oscar.c:7384
+#: ../src/protocols/oscar/oscar.c:7385 ../src/protocols/oscar/oscar.c:7390
 msgid "Orphans"
 msgstr "�帥������"
 
-#: ../src/protocols/oscar/oscar.c:7247
+#: ../src/protocols/oscar/oscar.c:7324
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -9472,11 +9602,11 @@
 "篁臥���� %s ������菴遵�������������с���障�����с������篁臥�����違��紊������障����筝�篋阪��"
 "�ゃ������綺����������������"
 
-#: ../src/protocols/oscar/oscar.c:7247 ../src/protocols/oscar/oscar.c:7261
+#: ../src/protocols/oscar/oscar.c:7324 ../src/protocols/oscar/oscar.c:7338
 msgid "(no name)"
 msgstr "(�����<��)"
 
-#: ../src/protocols/oscar/oscar.c:7261
+#: ../src/protocols/oscar/oscar.c:7338
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -9487,7 +9617,7 @@
 "������参�����鴻����申�����純��参�����違��莇��������障�c����������������������緇���"
 "����"
 
-#: ../src/protocols/oscar/oscar.c:7344
+#: ../src/protocols/oscar/oscar.c:7421
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -9496,11 +9626,11 @@
 "���若�吟�� %s ��������������篁臥�����鴻����������������荐怨����障������綵若����������"
 "�����������с����鐚�"
 
-#: ../src/protocols/oscar/oscar.c:7350
+#: ../src/protocols/oscar/oscar.c:7427
 msgid "Authorization Given"
 msgstr "�粋���緇������障����"
 
-#: ../src/protocols/oscar/oscar.c:7394
+#: ../src/protocols/oscar/oscar.c:7471
 #, c-format
 msgid ""
 "The user %s wants to add %s to their buddy list for the following reason:\n"
@@ -9510,17 +9640,17 @@
 "%s"
 
 #. Granted
-#: ../src/protocols/oscar/oscar.c:7439
+#: ../src/protocols/oscar/oscar.c:7516
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "���若�吟�� %s ������参�����鴻����申���������������羆����粋����障����"
 
-#: ../src/protocols/oscar/oscar.c:7440
+#: ../src/protocols/oscar/oscar.c:7517
 msgid "Authorization Granted"
 msgstr "�粋���緇������障����"
 
 #. Denied
-#: ../src/protocols/oscar/oscar.c:7443
+#: ../src/protocols/oscar/oscar.c:7520
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -9531,90 +9661,90 @@
 "����:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:7444
+#: ../src/protocols/oscar/oscar.c:7521
 msgid "Authorization Denied"
 msgstr "�粋������������障����"
 
-#: ../src/protocols/oscar/oscar.c:7481 ../src/protocols/toc/toc.c:1372
+#: ../src/protocols/oscar/oscar.c:7558 ../src/protocols/toc/toc.c:1372
 msgid "_Exchange:"
 msgstr "篋ゆ�(_E):"
 
-#: ../src/protocols/oscar/oscar.c:7517
+#: ../src/protocols/oscar/oscar.c:7594
 msgid "Invalid chat name specified."
 msgstr "筝�罩c�����c����������絎������障����"
 
-#: ../src/protocols/oscar/oscar.c:7587
+#: ../src/protocols/oscar/oscar.c:7664
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "IM �糸�����鋓<�����障�����с������AIM ���c������ IM �糸�����鋓<�с���障������"
 
-#: ../src/protocols/oscar/oscar.c:7742
+#: ../src/protocols/oscar/oscar.c:7821
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(��緇�筝�)</i>"
 
-#: ../src/protocols/oscar/oscar.c:8048
+#: ../src/protocols/oscar/oscar.c:8127
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s �����������篁臥�����潟�<�潟��"
 
-#: ../src/protocols/oscar/oscar.c:8049
+#: ../src/protocols/oscar/oscar.c:8128
 msgid "Buddy Comment:"
 msgstr "篁臥�����潟�<�潟��:"
 
-#: ../src/protocols/oscar/oscar.c:8068
+#: ../src/protocols/oscar/oscar.c:8147
 msgid "Edit Buddy Comment"
 msgstr "篁臥�����潟�<�潟����隈��"
 
-#: ../src/protocols/oscar/oscar.c:8075
+#: ../src/protocols/oscar/oscar.c:8154
 msgid "Get Status Msg"
 msgstr "�倶���<���祉�若�吾���緇�"
 
-#: ../src/protocols/oscar/oscar.c:8088
+#: ../src/protocols/oscar/oscar.c:8167
 msgid "Direct IM"
 msgstr "Direct IM"
 
-#: ../src/protocols/oscar/oscar.c:8107
+#: ../src/protocols/oscar/oscar.c:8186
 msgid "Re-request Authorization"
 msgstr "�粋�����荀�羆�"
 
-#: ../src/protocols/oscar/oscar.c:8164
+#: ../src/protocols/oscar/oscar.c:8243
 msgid "Require authorization"
 msgstr "�粋���綽�荀��с��"
 
-#: ../src/protocols/oscar/oscar.c:8167
+#: ../src/protocols/oscar/oscar.c:8246
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr ""
 "���с�����ャ�c������ (���������鴻�������� SPAM ���������������������障����鐚�)"
 
-#: ../src/protocols/oscar/oscar.c:8172
+#: ../src/protocols/oscar/oscar.c:8251
 msgid "ICQ Privacy Options"
 msgstr "ICQ �����ゃ���激�若�������激�с��"
 
-#: ../src/protocols/oscar/oscar.c:8189
+#: ../src/protocols/oscar/oscar.c:8268
 msgid "The new formatting is invalid."
 msgstr "�違�����後��������c�����障��"
 
-#: ../src/protocols/oscar/oscar.c:8190
+#: ../src/protocols/oscar/oscar.c:8269
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "�鴻�����若�喝�����後���ぇ��絖�����醇��絖�����紊��眼�с���障����"
 
-#: ../src/protocols/oscar/oscar.c:8197
+#: ../src/protocols/oscar/oscar.c:8276
 msgid "New screen name formatting:"
 msgstr "�違�����鴻�����若�喝�����後�:"
 
-#: ../src/protocols/oscar/oscar.c:8249
+#: ../src/protocols/oscar/oscar.c:8328
 msgid "Change Address To:"
 msgstr "紊��眼�����≪������:"
 
-#: ../src/protocols/oscar/oscar.c:8294
+#: ../src/protocols/oscar/oscar.c:8373
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>���������粋���緇��c�����障����</i>"
 
-#: ../src/protocols/oscar/oscar.c:8297
+#: ../src/protocols/oscar/oscar.c:8376
 msgid "You are awaiting authorization from the following buddies"
 msgstr "�����������参���������粋���緇��c�����障��"
 
-#: ../src/protocols/oscar/oscar.c:8298
+#: ../src/protocols/oscar/oscar.c:8377
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -9622,76 +9752,64 @@
 "�潟������������ \"茯�荐若����荀�羆�\" ���御�����������с����������参������茯�荐若����荀�"
 "羆������������с���障����"
 
-#: ../src/protocols/oscar/oscar.c:8315
+#: ../src/protocols/oscar/oscar.c:8394
 msgid "Find Buddy by E-Mail"
 msgstr "E-�<�若������篁臥��������"
 
-#: ../src/protocols/oscar/oscar.c:8316
+#: ../src/protocols/oscar/oscar.c:8395
 msgid "Search for a buddy by e-mail address"
 msgstr "E-�<�若���祉�≪�����鴻����篁臥����罎�膣≪���障��"
 
-#: ../src/protocols/oscar/oscar.c:8317
+#: ../src/protocols/oscar/oscar.c:8396
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "罎�膣≪����篁臥���� E-�<�若���祉�≪�����鴻���ュ�����������"
 
-#: ../src/protocols/oscar/oscar.c:8410
+#: ../src/protocols/oscar/oscar.c:8489
 msgid "Set User Info (URL)..."
 msgstr "���若�倶���宴���祉����(URL)..."
 
-#: ../src/protocols/oscar/oscar.c:8421
+#: ../src/protocols/oscar/oscar.c:8500
 msgid "Change Password (URL)"
 msgstr "���鴻���若��紊��� (URL)"
 
-#: ../src/protocols/oscar/oscar.c:8425
+#: ../src/protocols/oscar/oscar.c:8504
 msgid "Configure IM Forwarding (URL)"
 msgstr "IM �������若���c�潟�� (URL) ��┃絎�"
 
 #. ICQ actions
-#: ../src/protocols/oscar/oscar.c:8435
+#: ../src/protocols/oscar/oscar.c:8514
 msgid "Set Privacy Options..."
 msgstr "�����ゃ���激�若�祉�����激�с�潟��申��..."
 
 #. AIM actions
-#: ../src/protocols/oscar/oscar.c:8442
+#: ../src/protocols/oscar/oscar.c:8521
 msgid "Format Screen Name..."
 msgstr "�鴻�����若�喝�����後�..."
 
-#: ../src/protocols/oscar/oscar.c:8446
+#: ../src/protocols/oscar/oscar.c:8525
 msgid "Confirm Account"
 msgstr "�≪�����潟����∈茯�"
 
-#: ../src/protocols/oscar/oscar.c:8450
+#: ../src/protocols/oscar/oscar.c:8529
 msgid "Display Currently Registered Address"
 msgstr "�上���脂�蚊�����������≪�����鴻��;腓�"
 
-#: ../src/protocols/oscar/oscar.c:8454
+#: ../src/protocols/oscar/oscar.c:8533
 msgid "Change Currently Registered Address..."
 msgstr "�上���脂�蚊�����������≪�����鴻�����..."
 
-#: ../src/protocols/oscar/oscar.c:8461
+#: ../src/protocols/oscar/oscar.c:8540
 msgid "Show Buddies Awaiting Authorization"
 msgstr "�粋���緇��c������篁臥����茵�ず"
 
-#: ../src/protocols/oscar/oscar.c:8467
+#: ../src/protocols/oscar/oscar.c:8546
 msgid "Search for Buddy by E-Mail..."
-msgstr "�<�若���т参�����膣�..."
-
-#: ../src/protocols/oscar/oscar.c:8472
+msgstr "E-�<�若���т参�����膣�..."
+
+#: ../src/protocols/oscar/oscar.c:8551
 msgid "Search for Buddy by Information"
 msgstr "���宴�т参�����膣�..."
 
-#: ../src/protocols/oscar/oscar.c:8539
-msgid "Use recent buddies group"
-msgstr "�上����参���違���若������������"
-
-#: ../src/protocols/oscar/oscar.c:8542
-msgid "Show how long you have been idle"
-msgstr "緇�罘�筝㏍��������茵�ず����"
-
-#: ../src/protocols/oscar/oscar.c:8551
-msgid "Use AIM/ICQ proxy server (slower, but usually works)"
-msgstr "AIM/ICQ ���㏍�㏍�激�祉�泣�若������������ (��綺����筝����障��)"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9702,23 +9820,23 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/oscar/oscar.c:8683 ../src/protocols/oscar/oscar.c:8685
+#: ../src/protocols/oscar/oscar.c:8729 ../src/protocols/oscar/oscar.c:8731
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ ���㏍���潟���������違�ゃ��"
 
-#: ../src/protocols/oscar/oscar.c:8704
+#: ../src/protocols/oscar/oscar.c:8750
 msgid "Auth host"
 msgstr "茯�荐若���鴻��"
 
-#: ../src/protocols/oscar/oscar.c:8707
+#: ../src/protocols/oscar/oscar.c:8753
 msgid "Auth port"
 msgstr "茯�荐若���若�����"
 
-#: ../src/protocols/oscar/oscar.c:8710 ../src/protocols/zephyr/zephyr.c:2900
+#: ../src/protocols/oscar/oscar.c:8756 ../src/protocols/zephyr/zephyr.c:2920
 msgid "Encoding"
 msgstr "���潟�潟�若���c�潟��"
 
-#: ../src/protocols/oscar/oscar.c:8714
+#: ../src/protocols/oscar/oscar.c:8760
 msgid ""
 "Use AIM/ICQ proxy server\n"
 "(slower, but usually works)"
@@ -9948,10 +10066,6 @@
 msgid "No Sametime Community Server Specified"
 msgstr "Sametime �潟���ャ�����c�祉�泣�若������絎����������"
 
-#: ../src/protocols/sametime/sametime.c:3630
-msgid "Connect"
-msgstr "�ョ�"
-
 #: ../src/protocols/sametime/sametime.c:4085
 msgid "<b>External User</b><br>"
 msgstr "<b>紊��������若��</b><br>"
@@ -10391,57 +10505,56 @@
 msgid "Robot"
 msgstr "�㏍������"
 
-#: ../src/protocols/silc/buddy.c:1486 ../src/protocols/silc/silc.c:668
+#: ../src/protocols/silc/buddy.c:1486 ../src/protocols/silc/silc.c:672
 #: ../src/protocols/silc/util.c:473
 msgid "Happy"
 msgstr "�������"
 
-#: ../src/protocols/silc/buddy.c:1488 ../src/protocols/silc/silc.c:670
+#: ../src/protocols/silc/buddy.c:1488 ../src/protocols/silc/silc.c:674
 #: ../src/protocols/silc/util.c:475
 msgid "Sad"
 msgstr "�儸����"
 
-#: ../src/protocols/silc/buddy.c:1490 ../src/protocols/silc/silc.c:672
+#: ../src/protocols/silc/buddy.c:1490 ../src/protocols/silc/silc.c:676
 #: ../src/protocols/silc/util.c:477
 msgid "Angry"
 msgstr "����"
 
-#: ../src/protocols/silc/buddy.c:1492 ../src/protocols/silc/silc.c:674
+#: ../src/protocols/silc/buddy.c:1492 ../src/protocols/silc/silc.c:678
 #: ../src/protocols/silc/util.c:479
 msgid "Jealous"
 msgstr "��������"
 
-#: ../src/protocols/silc/buddy.c:1494 ../src/protocols/silc/silc.c:676
+#: ../src/protocols/silc/buddy.c:1494 ../src/protocols/silc/silc.c:680
 #: ../src/protocols/silc/util.c:481
 msgid "Ashamed"
 msgstr "�ャ����"
 
-#: ../src/protocols/silc/buddy.c:1496 ../src/protocols/silc/silc.c:678
+#: ../src/protocols/silc/buddy.c:1496 ../src/protocols/silc/silc.c:682
 #: ../src/protocols/silc/util.c:483
 msgid "Invincible"
 msgstr "�≧��"
 
-#: ../src/protocols/silc/buddy.c:1498 ../src/protocols/silc/silc.c:680
-#: ../src/protocols/silc/util.c:485
+#: ../src/protocols/silc/buddy.c:1498 ../src/protocols/silc/util.c:485
 msgid "In Love"
 msgstr "����筝�"
 
-#: ../src/protocols/silc/buddy.c:1500 ../src/protocols/silc/silc.c:682
+#: ../src/protocols/silc/buddy.c:1500 ../src/protocols/silc/silc.c:686
 #: ../src/protocols/silc/util.c:487
 msgid "Sleepy"
 msgstr "������"
 
-#: ../src/protocols/silc/buddy.c:1502 ../src/protocols/silc/silc.c:684
+#: ../src/protocols/silc/buddy.c:1502 ../src/protocols/silc/silc.c:688
 #: ../src/protocols/silc/util.c:489
 msgid "Bored"
 msgstr "��������"
 
-#: ../src/protocols/silc/buddy.c:1504 ../src/protocols/silc/silc.c:686
+#: ../src/protocols/silc/buddy.c:1504 ../src/protocols/silc/silc.c:690
 #: ../src/protocols/silc/util.c:491
 msgid "Excited"
 msgstr "��絅�"
 
-#: ../src/protocols/silc/buddy.c:1506 ../src/protocols/silc/silc.c:688
+#: ../src/protocols/silc/buddy.c:1506 ../src/protocols/silc/silc.c:692
 #: ../src/protocols/silc/util.c:493
 msgid "Anxious"
 msgstr "綽���"
@@ -10467,7 +10580,7 @@
 msgstr "�����ゃ��"
 
 #: ../src/protocols/silc/buddy.c:1570 ../src/protocols/silc/ops.c:1232
-#: ../src/protocols/silc/silc.c:736 ../src/protocols/silc/silc.c:738
+#: ../src/protocols/silc/silc.c:740 ../src/protocols/silc/silc.c:742
 msgid "Timezone"
 msgstr "�帥�ゃ���障�若��"
 
@@ -10605,7 +10718,7 @@
 msgstr "�違���若����"
 
 #: ../src/protocols/silc/chat.c:581 ../src/protocols/silc/ops.c:1908
-#: ../src/protocols/silc/silc.c:944
+#: ../src/protocols/silc/silc.c:948
 msgid "Passphrase"
 msgstr "���鴻�����若��"
 
@@ -10704,15 +10817,15 @@
 msgid "Cannot join private group"
 msgstr "�����ゃ���若���祉�違���若���後����с���障����"
 
-#: ../src/protocols/silc/chat.c:1293 ../src/protocols/silc/silc.c:1152
+#: ../src/protocols/silc/chat.c:1293 ../src/protocols/silc/silc.c:1156
 msgid "Call Command"
 msgstr "�潟���潟�����茵�"
 
-#: ../src/protocols/silc/chat.c:1293 ../src/protocols/silc/silc.c:1152
+#: ../src/protocols/silc/chat.c:1293 ../src/protocols/silc/silc.c:1156
 msgid "Cannot call command"
 msgstr "�潟���潟����絎�茵��с���障����"
 
-#: ../src/protocols/silc/chat.c:1294 ../src/protocols/silc/silc.c:1153
+#: ../src/protocols/silc/chat.c:1294 ../src/protocols/silc/silc.c:1157
 msgid "Unknown command"
 msgstr "筝������潟���潟��"
 
@@ -10817,15 +10930,11 @@
 msgid "Birth Day"
 msgstr "茯�����"
 
-#: ../src/protocols/silc/ops.c:1044
-msgid "Job Title"
-msgstr "����"
-
 #: ../src/protocols/silc/ops.c:1048
 msgid "Job Role"
 msgstr "綵壕��"
 
-#: ../src/protocols/silc/ops.c:1052 ../src/protocols/silc/silc.c:937
+#: ../src/protocols/silc/ops.c:1052 ../src/protocols/silc/silc.c:941
 msgid "Organization"
 msgstr "��綵���讐"
 
@@ -10833,10 +10942,6 @@
 msgid "Unit"
 msgstr "�違���若��"
 
-#: ../src/protocols/silc/ops.c:1075
-msgid "EMail"
-msgstr "E-�<�若��"
-
 #: ../src/protocols/silc/ops.c:1080
 msgid "Note"
 msgstr "����"
@@ -10845,6 +10950,11 @@
 msgid "Join Chat"
 msgstr "���c���������"
 
+#: ../src/protocols/silc/ops.c:1183 ../src/protocols/silc/ops.c:1332
+#: ../src/protocols/yahoo/yahoo_profile.c:1046
+msgid "Real Name"
+msgstr "羂��"
+
 #: ../src/protocols/silc/ops.c:1211
 msgid "Status Text"
 msgstr "�婣���若�帥�号��"
@@ -10861,7 +10971,7 @@
 msgid "_More..."
 msgstr "荅括完(_M)..."
 
-#: ../src/protocols/silc/ops.c:1369 ../src/protocols/silc/silc.c:1003
+#: ../src/protocols/silc/ops.c:1369 ../src/protocols/silc/silc.c:1007
 msgid "Detach From Server"
 msgstr "�泣�若�����������≪��"
 
@@ -10984,7 +11094,7 @@
 msgstr "�泣�若�����ョ������㏍���障����"
 
 #: ../src/protocols/silc/ops.c:1819 ../src/protocols/silc/ops.c:1866
-#: ../src/protocols/silc/silc.c:195
+#: ../src/protocols/silc/silc.c:199
 msgid "Resuming session"
 msgstr "�祉���激�с�潟��奨絽遺賢"
 
@@ -11080,49 +11190,53 @@
 msgid "Unsupported public key type"
 msgstr "�泣���若�����������������泣��┏蕁�"
 
-#: ../src/protocols/silc/silc.c:155
+#: ../src/protocols/silc/silc.c:158
 msgid "Connection failed"
 msgstr "�ョ���け��"
 
-#: ../src/protocols/silc/silc.c:187
+#: ../src/protocols/silc/silc.c:191
 msgid "Cannot initialize SILC Client connection"
 msgstr "SILC �����ゃ�≪�潟���ョ����������с���障����"
 
-#: ../src/protocols/silc/silc.c:198
+#: ../src/protocols/silc/silc.c:202
 msgid "Performing key exchange"
 msgstr "�泣��困�����茵�筝�"
 
-#: ../src/protocols/silc/silc.c:283
+#: ../src/protocols/silc/silc.c:287
 msgid "Out of memory"
 msgstr "�<�≪����莇潟���障����"
 
-#: ../src/protocols/silc/silc.c:324
+#: ../src/protocols/silc/silc.c:328
 msgid "Cannot initialize SILC protocol"
 msgstr "SILC ���㏍���潟�����������с���障����"
 
-#: ../src/protocols/silc/silc.c:331
+#: ../src/protocols/silc/silc.c:335
 msgid "Cannot find/access ~/.silc directory"
 msgstr "~/.silc ����������荀��帥�ゃ�����������≪���祉�鴻�с���障����"
 
 #. Progress
-#: ../src/protocols/silc/silc.c:336
+#: ../src/protocols/silc/silc.c:340
 msgid "Connecting to SILC Server"
 msgstr "SILC �泣�若���御・膓�筝�"
 
-#: ../src/protocols/silc/silc.c:345
+#: ../src/protocols/silc/silc.c:349
 #, c-format
 msgid "Could not load SILC key pair: %s"
 msgstr "SILC ���泣���≪��茯㏍�粋昭���障�����с����: %s"
 
-#: ../src/protocols/silc/silc.c:365
+#: ../src/protocols/silc/silc.c:369
 msgid "Unable to create connection"
 msgstr "�違�����ョ��������障����"
 
-#: ../src/protocols/silc/silc.c:664
+#: ../src/protocols/silc/silc.c:668
 msgid "Your Current Mood"
 msgstr "�上���� Mood"
 
-#: ../src/protocols/silc/silc.c:691
+#: ../src/protocols/silc/silc.c:684
+msgid "In love"
+msgstr "����筝�"
+
+#: ../src/protocols/silc/silc.c:695
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -11130,43 +11244,43 @@
 "\n"
 "��絅純�帥���g機�号�"
 
-#: ../src/protocols/silc/silc.c:699 ../src/protocols/silc/util.c:518
+#: ../src/protocols/silc/silc.c:703 ../src/protocols/silc/util.c:518
 msgid "SMS"
 msgstr "SMS"
 
-#: ../src/protocols/silc/silc.c:701 ../src/protocols/silc/util.c:520
+#: ../src/protocols/silc/silc.c:705 ../src/protocols/silc/util.c:520
 msgid "MMS"
 msgstr "MMS"
 
-#: ../src/protocols/silc/silc.c:703 ../src/protocols/silc/util.c:522
-msgid "Video Conferencing"
+#: ../src/protocols/silc/silc.c:707
+msgid "Video conferencing"
 msgstr "�������茘�"
 
-#: ../src/protocols/silc/silc.c:708
+#: ../src/protocols/silc/silc.c:712
 msgid "Your Current Status"
 msgstr "�上�����鴻���若�帥��"
 
-#: ../src/protocols/silc/silc.c:715
+#: ../src/protocols/silc/silc.c:719
 msgid "Online Services"
 msgstr "���潟���ゃ�潟�祉�泣�若����"
 
-#: ../src/protocols/silc/silc.c:718
+#: ../src/protocols/silc/silc.c:722
 msgid "Let others see what services you are using"
 msgstr "篏����泣�若���鴻������������������篁���査���<���������������"
 
-#: ../src/protocols/silc/silc.c:724
+#: ../src/protocols/silc/silc.c:728
 msgid "Let others see what computer you are using"
 msgstr "�������潟�潟���ャ�若�帥����������������篁���査���<���������������"
 
-#: ../src/protocols/silc/silc.c:731
+#: ../src/protocols/silc/silc.c:735
 msgid "Your VCard File"
 msgstr "VCard ��綣�����ゃ��"
 
-#: ../src/protocols/silc/silc.c:743 ../src/protocols/silc/silc.c:744
+#: ../src/protocols/silc/silc.c:747 ../src/protocols/silc/silc.c:748
 msgid "User Online Status Attributes"
 msgstr "���若�吟�����潟���ゃ�潟�祉�鴻���若�帥�鴻�����"
 
-#: ../src/protocols/silc/silc.c:745
+#: ../src/protocols/silc/silc.c:749
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
@@ -11175,174 +11289,170 @@
 "�����������潟���ゃ�潟�祉�鴻���若�帥�号���宴����篋堺���宴��篁������若�吟�後������������������"
 "�с����篁������若�吟���������������宴�������ュ�������������"
 
-#: ../src/protocols/silc/silc.c:785 ../src/protocols/silc/silc.c:791
-#: ../src/protocols/silc/silc.c:1431
+#: ../src/protocols/silc/silc.c:789 ../src/protocols/silc/silc.c:795
+#: ../src/protocols/silc/silc.c:1435
 msgid "Message of the Day"
 msgstr "篁��ャ���<���祉�若��"
 
-#: ../src/protocols/silc/silc.c:785
+#: ../src/protocols/silc/silc.c:789
 msgid "No Message of the Day available"
 msgstr "\"篁��ャ���<���祉�若��\" �������с���障����"
 
-#: ../src/protocols/silc/silc.c:786 ../src/protocols/silc/silc.c:1426
+#: ../src/protocols/silc/silc.c:790 ../src/protocols/silc/silc.c:1430
 msgid "There is no Message of the Day associated with this connection"
 msgstr "����・膓����綽����� \"篁��ャ���<���祉�若��\" �������障����"
 
-#: ../src/protocols/silc/silc.c:837 ../src/protocols/silc/silc.c:881
-#: ../src/protocols/silc/silc.c:952 ../src/protocols/silc/silc.c:953
+#: ../src/protocols/silc/silc.c:841 ../src/protocols/silc/silc.c:885
+#: ../src/protocols/silc/silc.c:956 ../src/protocols/silc/silc.c:957
 msgid "Create New SILC Key Pair"
 msgstr "�違���� SILC �泣���≪������"
 
-#: ../src/protocols/silc/silc.c:837
+#: ../src/protocols/silc/silc.c:841
 msgid "Passphrases do not match"
 msgstr "�違�������鴻�����若�冴��筝��眼���障����"
 
-#: ../src/protocols/silc/silc.c:881
+#: ../src/protocols/silc/silc.c:885
 msgid "Key Pair Generation failed"
 msgstr "�泣���≪��������紊掩�����障����"
 
-#: ../src/protocols/silc/silc.c:920
+#: ../src/protocols/silc/silc.c:924
 msgid "Key length"
 msgstr "�泣���激��"
 
-#: ../src/protocols/silc/silc.c:922
+#: ../src/protocols/silc/silc.c:926
 msgid "Public key file"
-msgstr "�����泣�����<�ゃ��"
-
-#: ../src/protocols/silc/silc.c:924
+msgstr "�����泣���<�ゃ��"
+
+#: ../src/protocols/silc/silc.c:928
 msgid "Private key file"
-msgstr "腱�絲��泣�����<�ゃ��"
-
-#: ../src/protocols/silc/silc.c:933
-msgid "Real Name"
-msgstr "羂��"
-
-#: ../src/protocols/silc/silc.c:947
-msgid "Re-type Passphrase"
-msgstr "���婣�����若�冴�����ュ��"
-
-#: ../src/protocols/silc/silc.c:954
+msgstr "腱�絲��泣���<�ゃ��"
+
+#: ../src/protocols/silc/silc.c:951
+msgid "Passphrase (retype)"
+msgstr "���鴻�����若�� (腆肴���)"
+
+#: ../src/protocols/silc/silc.c:958
 msgid "Generate Key Pair"
 msgstr "�泣���≪������"
 
-#: ../src/protocols/silc/silc.c:998
+#: ../src/protocols/silc/silc.c:1002
 msgid "Online Status"
 msgstr "���潟���ゃ�潟�祉�鴻���若�帥��"
 
-#: ../src/protocols/silc/silc.c:1007
+#: ../src/protocols/silc/silc.c:1011
 msgid "View Message of the Day"
 msgstr "\"篁��ャ���<���祉�若��\" ��茵�ず����"
 
-#: ../src/protocols/silc/silc.c:1011
+#: ../src/protocols/silc/silc.c:1015
 msgid "Create SILC Key Pair..."
 msgstr "SILC �泣���≪������..."
 
-#: ../src/protocols/silc/silc.c:1110
+#: ../src/protocols/silc/silc.c:1114
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "���若�� <I>%s</I> �����������若����������障����"
 
-#: ../src/protocols/silc/silc.c:1302
+#: ../src/protocols/silc/silc.c:1306
 msgid "Topic too long"
 msgstr "�����������激�����障��"
 
-#: ../src/protocols/silc/silc.c:1383
+#: ../src/protocols/silc/silc.c:1387
 msgid "You must specify a nick"
 msgstr "����������絎����������"
 
-#: ../src/protocols/silc/silc.c:1485
+#: ../src/protocols/silc/silc.c:1489
 #, c-format
 msgid "channel %s not found"
 msgstr "���c�潟���� %s ��荀��ゃ�����障����"
 
-#: ../src/protocols/silc/silc.c:1490
+#: ../src/protocols/silc/silc.c:1494
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "%s �����c�潟�����祉�≪�若��: %s"
 
-#: ../src/protocols/silc/silc.c:1492
+#: ../src/protocols/silc/silc.c:1496
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "%s �с�����c�潟�����祉�≪�若�����祉���������障����"
 
-#: ../src/protocols/silc/silc.c:1505
+#: ../src/protocols/silc/silc.c:1509
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "%s �����c�潟�����祉�≪�若�����祉������け��"
 
-#: ../src/protocols/silc/silc.c:1535
+#: ../src/protocols/silc/silc.c:1539
 #, c-format
 msgid "Unknown command: %s, (may be a Gaim bug)"
 msgstr "筝������潟���潟��: %s (�������� Gaim ������)"
 
-#: ../src/protocols/silc/silc.c:1598
+#: ../src/protocols/silc/silc.c:1602
 msgid "part [channel]:  Leave the chat"
 msgstr "part [���c�潟����]:  ��絎��������c�潟�����������冴���障��"
 
-#: ../src/protocols/silc/silc.c:1602
+#: ../src/protocols/silc/silc.c:1606
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [���c�潟����]:  ��絎��������c�潟�����������冴���障��"
 
-#: ../src/protocols/silc/silc.c:1606
+#: ../src/protocols/silc/silc.c:1610
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;�違������������&gt;]:  ����������茵�ず������紊��眼���障��"
 
-#: ../src/protocols/silc/silc.c:1611
+#: ../src/protocols/silc/silc.c:1615
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr ""
 "join &lt;���c�潟����&gt; [&lt;���鴻���若��&gt;]:  �������������若�������c�����後�"
 "�����障��"
 
-#: ../src/protocols/silc/silc.c:1615
+#: ../src/protocols/silc/silc.c:1619
 msgid "list:  List channels on this network"
 msgstr "list:  �������������若��������c�潟������筝�荀ц;腓冴���障��"
 
-#: ../src/protocols/silc/silc.c:1619
+#: ../src/protocols/silc/silc.c:1623
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;������&gt;:  ��絎����������������若�倶���宴��茵�ず���障��"
 
-#: ../src/protocols/silc/silc.c:1623 ../src/protocols/zephyr/zephyr.c:2602
+#: ../src/protocols/silc/silc.c:1627 ../src/protocols/zephyr/zephyr.c:2622
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
 "msg &lt;������&gt; &lt;�<���祉�若��&gt;:  ��絎����������������若�吟�後��篋榊�����<��"
 "�祉�若�吾����篆<���障��"
 
-#: ../src/protocols/silc/silc.c:1627
+#: ../src/protocols/silc/silc.c:1631
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 "query &lt;������&gt; [&lt;�<���祉�若��&gt;]:  ��絎����������������若�吟�後��篋榊����"
 "�<���祉�若�吾����篆<���障��"
 
-#: ../src/protocols/silc/silc.c:1631
+#: ../src/protocols/silc/silc.c:1635
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  �泣�若�������� \"篁��ャ���<���祉�若��\" ��茵�ず���障��"
 
-#: ../src/protocols/silc/silc.c:1635
-msgid "detach:  Detach this session"
-msgstr "detach:  �����祉���激�с�潟�������≪���障��"
-
 #: ../src/protocols/silc/silc.c:1639
-msgid "quit [message]:  Disconnect from the server, with an optional message"
-msgstr "quit [�<���祉�若��]:  菴遵���с�<���祉�若�吾��罧������������泣�若���������㏍���障��"
+msgid "detach:  Detach this session"
+msgstr "detach:  �����祉���激�с�潟�������≪���障��"
 
 #: ../src/protocols/silc/silc.c:1643
+msgid "quit [message]:  Disconnect from the server, with an optional message"
+msgstr "quit [�<���祉�若��]:  菴遵���с�<���祉�若�吾��罧������������泣�若���������㏍���障��"
+
+#: ../src/protocols/silc/silc.c:1647
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;�潟���潟��&gt;:  SILC �����ゃ�≪�潟���祉�潟���潟�����若�喝�冴���障��"
 
-#: ../src/protocols/silc/silc.c:1649
+#: ../src/protocols/silc/silc.c:1653
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr ""
 "kill &lt;������&gt; [-pubkey|&lt;����&gt;]:  �����������若�吟��綣桁�句�篋����障��"
 
-#: ../src/protocols/silc/silc.c:1653
+#: ../src/protocols/silc/silc.c:1657
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;�違����������&gt;:  ��篏帥������������紊��眼���障��"
 
-#: ../src/protocols/silc/silc.c:1657
+#: ../src/protocols/silc/silc.c:1661
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;������&gt;:  �����������若�倶���宴��茵�ず���障��"
 
-#: ../src/protocols/silc/silc.c:1661
+#: ../src/protocols/silc/silc.c:1665
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -11350,7 +11460,7 @@
 "cmode &lt;���c�潟����&gt; [+|-&lt;�≪�若��&gt;] [綣���]:  ���c�潟�������≪�若����紊�"
 "�眼������茵�ず���障��"
 
-#: ../src/protocols/silc/silc.c:1665
+#: ../src/protocols/silc/silc.c:1669
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -11358,15 +11468,15 @@
 "cumode &lt;���c�潟����&gt; +|-&lt;�≪�若��&gt; &lt;������&gt;:  ��絎��������c�潟��"
 "���������������若�吟���≪�若����紊��眼���障��"
 
-#: ../src/protocols/silc/silc.c:1669
+#: ../src/protocols/silc/silc.c:1673
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;���若�吟�祉�≪�若��&gt;:  ���������若���с���≪�若�����祉�������障��"
 
-#: ../src/protocols/silc/silc.c:1673
+#: ../src/protocols/silc/silc.c:1677
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;������&gt; [-pubkey]:  �泣�若�����������若�睡�号┤����緇����障��"
 
-#: ../src/protocols/silc/silc.c:1677
+#: ../src/protocols/silc/silc.c:1681
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -11374,40 +11484,40 @@
 "invite &lt;���c�潟����&gt; [-|+]&lt;������&gt;:  ��絎����������������若�吟����緇�"
 "�������障������緇����鴻�������������若�吟��菴遵��/���ゃ���障��"
 
-#: ../src/protocols/silc/silc.c:1681
+#: ../src/protocols/silc/silc.c:1685
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 "kick &lt;���c�潟����&gt; &lt;������&gt; [�潟�<�潟��]:  ���c�潟�������������ゃ�≪��"
 "����菴純���冴���障��"
 
-#: ../src/protocols/silc/silc.c:1685
+#: ../src/protocols/silc/silc.c:1689
 msgid "info [server]:  View server administrative details"
 msgstr "info [�泣�若��]:  �泣�若������������膣違��茵�ず���障��"
 
-#: ../src/protocols/silc/silc.c:1689
+#: ../src/protocols/silc/silc.c:1693
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr ""
 "ban [&lt;���c�潟����&gt; +|-&lt;������&gt;]:  ���≪�ゃ�≪�潟�������c�潟��������菴純��"
 "�冴���障��"
 
-#: ../src/protocols/silc/silc.c:1693
+#: ../src/protocols/silc/silc.c:1697
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 "getkey &lt;������|�泣�若��&gt;:  �����ゃ�≪�潟���障�����泣�若���������泣����緇����障��"
 
-#: ../src/protocols/silc/silc.c:1697
+#: ../src/protocols/silc/silc.c:1701
 msgid "stats:  View server and network statistics"
 msgstr "stats:  �泣�若�������������若����輝荐����宴��茵�ず���障��"
 
-#: ../src/protocols/silc/silc.c:1701
+#: ../src/protocols/silc/silc.c:1705
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  �ョ����������泣�若���� PING ����篆<���障��"
 
-#: ../src/protocols/silc/silc.c:1706
+#: ../src/protocols/silc/silc.c:1710
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;���c�潟����&gt;:  ���c�潟�����������若�吟��筝�荀ц;腓冴���障��"
 
-#: ../src/protocols/silc/silc.c:1710
+#: ../src/protocols/silc/silc.c:1714
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -11424,60 +11534,60 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../src/protocols/silc/silc.c:1819
+#: ../src/protocols/silc/silc.c:1823
 msgid "SILC Protocol Plugin"
 msgstr "SILC ���㏍���潟���������違�ゃ��"
 
 #. *  description
-#: ../src/protocols/silc/silc.c:1821
+#: ../src/protocols/silc/silc.c:1825
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "�祉�㏍�ャ�≪���ゃ�潟�帥�若�������祉���ゃ��篌�茘� (SILC) ���㏍���潟��"
 
-#: ../src/protocols/silc/silc.c:1858
+#: ../src/protocols/silc/silc.c:1862
 msgid "Public Key file"
 msgstr "�����泣���<�ゃ��"
 
-#: ../src/protocols/silc/silc.c:1862
+#: ../src/protocols/silc/silc.c:1866
 msgid "Private Key file"
 msgstr "腱�絲��泣���<�ゃ��"
 
-#: ../src/protocols/silc/silc.c:1872
+#: ../src/protocols/silc/silc.c:1876
 msgid "Cipher"
 msgstr "����"
 
-#: ../src/protocols/silc/silc.c:1882
+#: ../src/protocols/silc/silc.c:1886
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../src/protocols/silc/silc.c:1885
+#: ../src/protocols/silc/silc.c:1889
 msgid "Public key authentication"
 msgstr "�����泣��茯�荐若����"
 
-#: ../src/protocols/silc/silc.c:1888
+#: ../src/protocols/silc/silc.c:1892
 msgid "Reject watching by other users"
 msgstr "篁������若�吟�������h�����������"
 
-#: ../src/protocols/silc/silc.c:1891
+#: ../src/protocols/silc/silc.c:1895
 msgid "Block invites"
 msgstr "��緇�����������"
 
-#: ../src/protocols/silc/silc.c:1894
+#: ../src/protocols/silc/silc.c:1898
 msgid "Block IMs without Key Exchange"
 msgstr "�泣��困�����<�� IM ����������"
 
-#: ../src/protocols/silc/silc.c:1897
+#: ../src/protocols/silc/silc.c:1901
 msgid "Reject online status attribute requests"
 msgstr "���潟���ゃ�潟�祉�鴻���若�帥�鴻����ц�羆�����������"
 
-#: ../src/protocols/silc/silc.c:1900
+#: ../src/protocols/silc/silc.c:1904
 msgid "Block messages to whiteboard"
 msgstr "�����ゃ�����若���吾���<���祉�若�吾�����㏍��������"
 
-#: ../src/protocols/silc/silc.c:1903
+#: ../src/protocols/silc/silc.c:1907
 msgid "Automatically open whiteboard"
 msgstr "�����ゃ�����若��������������������"
 
-#: ../src/protocols/silc/silc.c:1906
+#: ../src/protocols/silc/silc.c:1910
 msgid "Digitally sign and verify all messages"
 msgstr "�糸�臀峨�������������<���祉�若�吾��罎�荐若����"
 
@@ -11500,7 +11610,7 @@
 
 #: ../src/protocols/silc/util.c:318
 #, c-format
-msgid "EMail: \t\t%s\n"
+msgid "E-Mail: \t\t%s\n"
 msgstr "E-�<�若��: \t\t%s\n"
 
 #: ../src/protocols/silc/util.c:320
@@ -11525,7 +11635,7 @@
 
 #: ../src/protocols/silc/util.c:326
 #, c-format
-msgid "Key length: \t%d bits\n"
+msgid "Key Length: \t%d bits\n"
 msgstr "�泣���激��: \t%d ������\n"
 
 #: ../src/protocols/silc/util.c:328
@@ -11556,6 +11666,10 @@
 msgid "Paging"
 msgstr "���若�吾�潟��"
 
+#: ../src/protocols/silc/util.c:522
+msgid "Video Conferencing"
+msgstr "�������茘�"
+
 #: ../src/protocols/silc/util.c:540
 msgid "Computer"
 msgstr "�潟�潟���ャ�若��"
@@ -11589,28 +11703,28 @@
 msgstr "�����ゃ�����若��"
 
 #. TODO: do we really want to disconnect on a failure to write?
-#: ../src/protocols/simple/simple.c:415
+#: ../src/protocols/simple/simple.c:409
 msgid "Could not write"
 msgstr "�吾��莨若���障�����с����"
 
-#: ../src/protocols/simple/simple.c:430 ../src/protocols/simple/simple.c:1331
+#: ../src/protocols/simple/simple.c:424 ../src/protocols/simple/simple.c:1422
 msgid "Could not connect"
 msgstr "�ョ��с���障�����с����"
 
-#: ../src/protocols/simple/simple.c:924
+#: ../src/protocols/simple/simple.c:994
 msgid "Wrong Password"
 msgstr "���鴻���若���������c�����障��"
 
-#: ../src/protocols/simple/simple.c:1362 ../src/protocols/simple/simple.c:1401
-#: ../src/protocols/simple/simple.c:1413 ../src/protocols/simple/simple.c:1460
+#: ../src/protocols/simple/simple.c:1453 ../src/protocols/simple/simple.c:1492
+#: ../src/protocols/simple/simple.c:1504 ../src/protocols/simple/simple.c:1551
 msgid "Could not create listen socket"
 msgstr "�純�宴�����������с���障�����с����"
 
-#: ../src/protocols/simple/simple.c:1383
+#: ../src/protocols/simple/simple.c:1474
 msgid "Couldn't resolve host"
 msgstr "���鴻������茹f浦�с���障�����с����"
 
-#: ../src/protocols/simple/simple.c:1481
+#: ../src/protocols/simple/simple.c:1572
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP �����若�九������純�障���� @ 荐��激�����障���������������с��"
 
@@ -11622,36 +11736,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../src/protocols/simple/simple.c:1642
+#: ../src/protocols/simple/simple.c:1734
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE ���㏍���潟���������違�ゃ��"
 
 #. *  summary
-#: ../src/protocols/simple/simple.c:1643
+#: ../src/protocols/simple/simple.c:1735
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE ���㏍���潟���������違�ゃ��"
 
-#: ../src/protocols/simple/simple.c:1665
+#: ../src/protocols/simple/simple.c:1757
 msgid "Publish status (note: everyone may watch you)"
 msgstr "�倶������������ (羈��: 篁������若�吟����筝梧����������障��)"
 
-#: ../src/protocols/simple/simple.c:1671
+#: ../src/protocols/simple/simple.c:1763
 msgid "Use UDP"
 msgstr "UDP ��篏睡������"
 
-#: ../src/protocols/simple/simple.c:1673
+#: ../src/protocols/simple/simple.c:1765
 msgid "Use proxy"
 msgstr "���㏍�㏍�激����������"
 
-#: ../src/protocols/simple/simple.c:1675
+#: ../src/protocols/simple/simple.c:1767
 msgid "Proxy"
 msgstr "���㏍�㏍��"
 
-#: ../src/protocols/simple/simple.c:1677
+#: ../src/protocols/simple/simple.c:1769
 msgid "Auth User"
 msgstr "���若�区�荐�"
 
-#: ../src/protocols/simple/simple.c:1679
+#: ../src/protocols/simple/simple.c:1771
 msgid "Auth Domain"
 msgstr "���<�ゃ�活�荐�"
 
@@ -11896,11 +12010,11 @@
 msgid "Your Yahoo! message did not get sent."
 msgstr "Yahoo! �<���祉�若�吾�������������с���障�����с������"
 
-#: ../src/protocols/yahoo/yahoo.c:765 ../src/protocols/yahoo/yahoo.c:3561
+#: ../src/protocols/yahoo/yahoo.c:766 ../src/protocols/yahoo/yahoo.c:3563
 msgid "Buzz!!"
 msgstr "Buzz!!"
 
-#: ../src/protocols/yahoo/yahoo.c:810
+#: ../src/protocols/yahoo/yahoo.c:811
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "%s �� Yahoo! �激�鴻�����祉�<���祉�若��:"
@@ -11908,22 +12022,22 @@
 #. TODO: this is almost exactly the same as what MSN does,
 #. * this should probably be moved to the core.
 #.
-#: ../src/protocols/yahoo/yahoo.c:906
+#: ../src/protocols/yahoo/yahoo.c:907
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list%s%s."
 msgstr "���若�吟�� %s ������ %s ������篁臥�����鴻��%s%s ��申���������c�����障��"
 
-#: ../src/protocols/yahoo/yahoo.c:912
+#: ../src/protocols/yahoo/yahoo.c:913
 msgid "Message (optional) :"
 msgstr "�<���祉�若�� (�����激�с��) :"
 
-#: ../src/protocols/yahoo/yahoo.c:954
+#: ../src/protocols/yahoo/yahoo.c:955
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 "%s ��参�����鴻����申���������������羆��� (篁ュ�����������若�c��) �������障������"
 
-#: ../src/protocols/yahoo/yahoo.c:957
+#: ../src/protocols/yahoo/yahoo.c:958
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -11932,11 +12046,11 @@
 "%s ��������宴������篁臥�����鴻����申���������������羆��� (篁ュ�����������若�c��) ��"
 "�����障����\" %s"
 
-#: ../src/protocols/yahoo/yahoo.c:960
+#: ../src/protocols/yahoo/yahoo.c:961
 msgid "Add buddy rejected"
 msgstr "��������篁臥����申��"
 
-#: ../src/protocols/yahoo/yahoo.c:1703
+#: ../src/protocols/yahoo/yahoo.c:1704
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -11947,11 +12061,11 @@
 "Gaim ���������� Yahoo ���泣�ゃ�潟�祉���潟�����������с�������с��������%s �с�≪����"
 "���若���с������腆肴������������"
 
-#: ../src/protocols/yahoo/yahoo.c:1706
+#: ../src/protocols/yahoo/yahoo.c:1707
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! 茯�荐若��け��"
 
-#: ../src/protocols/yahoo/yahoo.c:1772
+#: ../src/protocols/yahoo/yahoo.c:1773
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -11960,19 +12074,19 @@
 "%s ���∴������������障�����������若�吟��篁臥�����鴻���������障�����������若�吟��篁臥����"
 "�鴻���������ゃ�����∴������翫������\"����\" ���������������������"
 
-#: ../src/protocols/yahoo/yahoo.c:1775
+#: ../src/protocols/yahoo/yahoo.c:1776
 msgid "Ignore buddy?"
 msgstr "篁臥�����∴����障����鐚�"
 
-#: ../src/protocols/yahoo/yahoo.c:1809
+#: ../src/protocols/yahoo/yahoo.c:1810
 msgid "Invalid username."
 msgstr "�≦�鴻�����若�九���с����"
 
-#: ../src/protocols/yahoo/yahoo.c:1820
+#: ../src/protocols/yahoo/yahoo.c:1821
 msgid "Normal authentication failed!"
 msgstr "罔�羣����荐若��け�����障����鐚�"
 
-#: ../src/protocols/yahoo/yahoo.c:1821
+#: ../src/protocols/yahoo/yahoo.c:1822
 msgid ""
 "The normal authentication method has failed. This means either your password "
 "is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
@@ -11984,140 +12098,140 @@
 "�吾�c�取�荐惹�号������������㏍�違�ゃ�潟��荅��帥�障�����������с����罘��純��絨�����Ù������"
 "�����障������"
 
-#: ../src/protocols/yahoo/yahoo.c:1829
+#: ../src/protocols/yahoo/yahoo.c:1830
 msgid "Incorrect password."
 msgstr "���鴻���若���������c�����障����"
 
-#: ../src/protocols/yahoo/yahoo.c:1832
+#: ../src/protocols/yahoo/yahoo.c:1833
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr ""
 "��篏帥�����≪�����潟�����㏍�������������障����Yahoo! ���с���泣�ゃ���吾�㏍�違�ゃ�潟�������"
 "����"
 
-#: ../src/protocols/yahoo/yahoo.c:1835
+#: ../src/protocols/yahoo/yahoo.c:1836
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "筝����������主��� %d ������Yahoo! ���с���泣�ゃ���吾�㏍�違�ゃ�潟������信罩c������������"
 "���障������"
 
-#: ../src/protocols/yahoo/yahoo.c:1889
+#: ../src/protocols/yahoo/yahoo.c:1890
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "�違���若�� %2$s ��参�� %1$s ���≪�����潟�� %3$s �с�泣�若���祉���鴻����申���с���障����"
 "�����"
 
-#: ../src/protocols/yahoo/yahoo.c:1892
+#: ../src/protocols/yahoo/yahoo.c:1893
 msgid "Could not add buddy to server list"
 msgstr "篁臥�����泣�若���祉���鴻����申���с���障�����с����"
 
-#: ../src/protocols/yahoo/yahoo.c:2011
+#: ../src/protocols/yahoo/yahoo.c:2012
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ 羲�絅���� %s/%s/%s.swf ] %s"
 
-#: ../src/protocols/yahoo/yahoo.c:2150 ../src/protocols/yahoo/yahoo.c:2297
-#: ../src/protocols/yahoo/yahoo.c:2312 ../src/protocols/yahoo/ycht.c:472
+#: ../src/protocols/yahoo/yahoo.c:2151 ../src/protocols/yahoo/yahoo.c:2298
+#: ../src/protocols/yahoo/yahoo.c:2313 ../src/protocols/yahoo/ycht.c:472
 msgid "Unable to read"
 msgstr "茯㏍�粋昭���障����"
 
-#: ../src/protocols/yahoo/yahoo.c:2336 ../src/protocols/yahoo/yahoo.c:2493
-#: ../src/protocols/yahoo/yahoo.c:2595 ../src/protocols/yahoo/yahoo.c:2605
+#: ../src/protocols/yahoo/yahoo.c:2337 ../src/protocols/yahoo/yahoo.c:2494
+#: ../src/protocols/yahoo/yahoo.c:2596 ../src/protocols/yahoo/yahoo.c:2606
 #: ../src/protocols/yahoo/yahoochat.c:1447
 #: ../src/protocols/yahoo/yahoochat.c:1517 ../src/protocols/yahoo/ycht.c:576
 msgid "Connection problem"
 msgstr "�ョ�������"
 
-#: ../src/protocols/yahoo/yahoo.c:2713 ../src/protocols/yahoo/yahoo.c:3294
+#: ../src/protocols/yahoo/yahoo.c:2715 ../src/protocols/yahoo/yahoo.c:3296
 msgid "Not at Home"
 msgstr "絎吟����障����"
 
-#: ../src/protocols/yahoo/yahoo.c:2715 ../src/protocols/yahoo/yahoo.c:3297
+#: ../src/protocols/yahoo/yahoo.c:2717 ../src/protocols/yahoo/yahoo.c:3299
 msgid "Not at Desk"
 msgstr "��賢�������障����"
 
-#: ../src/protocols/yahoo/yahoo.c:2717 ../src/protocols/yahoo/yahoo.c:3300
+#: ../src/protocols/yahoo/yahoo.c:2719 ../src/protocols/yahoo/yahoo.c:3302
 msgid "Not in Office"
 msgstr "�����c�鴻����障����"
 
-#: ../src/protocols/yahoo/yahoo.c:2721 ../src/protocols/yahoo/yahoo.c:3306
+#: ../src/protocols/yahoo/yahoo.c:2723 ../src/protocols/yahoo/yahoo.c:3308
 msgid "On Vacation"
 msgstr "篌���筝㏍�с��"
 
-#: ../src/protocols/yahoo/yahoo.c:2725 ../src/protocols/yahoo/yahoo.c:3312
+#: ../src/protocols/yahoo/yahoo.c:2727 ../src/protocols/yahoo/yahoo.c:3314
 msgid "Stepped Out"
 msgstr "�<���c�������障��"
 
-#: ../src/protocols/yahoo/yahoo.c:2818 ../src/protocols/yahoo/yahoo.c:2848
+#: ../src/protocols/yahoo/yahoo.c:2820 ../src/protocols/yahoo/yahoo.c:2850
 msgid "Not on server list"
 msgstr "�泣�若���祉���鴻���������障����"
 
-#: ../src/protocols/yahoo/yahoo.c:2865 ../src/protocols/yahoo/yahoo.c:2924
+#: ../src/protocols/yahoo/yahoo.c:2867 ../src/protocols/yahoo/yahoo.c:2926
 msgid "Appear Online"
 msgstr "���潟���ゃ�潟�������с��"
 
-#: ../src/protocols/yahoo/yahoo.c:2868 ../src/protocols/yahoo/yahoo.c:2945
+#: ../src/protocols/yahoo/yahoo.c:2870 ../src/protocols/yahoo/yahoo.c:2947
 msgid "Appear Permanently Offline"
 msgstr "筝��������������ゃ�潟�������с��"
 
-#: ../src/protocols/yahoo/yahoo.c:2887
+#: ../src/protocols/yahoo/yahoo.c:2889
 msgid "Presence"
 msgstr "��賢"
 
-#: ../src/protocols/yahoo/yahoo.c:2930
+#: ../src/protocols/yahoo/yahoo.c:2932
 msgid "Appear Offline"
 msgstr "�������ゃ�潟�������с��"
 
-#: ../src/protocols/yahoo/yahoo.c:2939
+#: ../src/protocols/yahoo/yahoo.c:2941
 msgid "Don't Appear Permanently Offline"
 msgstr "Don't Appear Permanently Offline"
 
-#: ../src/protocols/yahoo/yahoo.c:2987
+#: ../src/protocols/yahoo/yahoo.c:2989
 msgid "Join in Chat"
 msgstr "���c�����後���"
 
-#: ../src/protocols/yahoo/yahoo.c:2993
+#: ../src/protocols/yahoo/yahoo.c:2995
 msgid "Initiate Conference"
 msgstr "篌�茘違����緇�"
 
-#: ../src/protocols/yahoo/yahoo.c:3021
+#: ../src/protocols/yahoo/yahoo.c:3023
 msgid "Presence Settings"
 msgstr "��賢�倶����┃絎�"
 
-#: ../src/protocols/yahoo/yahoo.c:3027
+#: ../src/protocols/yahoo/yahoo.c:3029
 msgid "Start Doodling"
 msgstr "���������吾������"
 
-#: ../src/protocols/yahoo/yahoo.c:3059
+#: ../src/protocols/yahoo/yahoo.c:3061
 msgid "Active which ID?"
 msgstr "���� ID �����劫�����障����鐚�"
 
-#: ../src/protocols/yahoo/yahoo.c:3068
+#: ../src/protocols/yahoo/yahoo.c:3070
 msgid "Join who in chat?"
 msgstr "�������c�����後������障����鐚�"
 
-#: ../src/protocols/yahoo/yahoo.c:3078
+#: ../src/protocols/yahoo/yahoo.c:3080
 msgid "Activate ID..."
 msgstr "ID �����劫��..."
 
-#: ../src/protocols/yahoo/yahoo.c:3082
+#: ../src/protocols/yahoo/yahoo.c:3084
 msgid "Join User in Chat..."
 msgstr "���c�������������..."
 
-#: ../src/protocols/yahoo/yahoo.c:3620
+#: ../src/protocols/yahoo/yahoo.c:3622
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;���若��&gt;: Yahoo ���������若������������c�����後�������"
 
-#: ../src/protocols/yahoo/yahoo.c:3625
+#: ../src/protocols/yahoo/yahoo.c:3627
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: Yahoo ���������若������������若����筝�荀ц;腓冴���障��"
 
-#: ../src/protocols/yahoo/yahoo.c:3629
+#: ../src/protocols/yahoo/yahoo.c:3631
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: ���若�九���⑥���潟��薐眼����"
 
-#: ../src/protocols/yahoo/yahoo.c:3633
+#: ../src/protocols/yahoo/yahoo.c:3635
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: ���������吾����紮��������������若�吟���羆�����"
 
@@ -12131,58 +12245,65 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/yahoo/yahoo.c:3726 ../src/protocols/yahoo/yahoo.c:3728
+#: ../src/protocols/yahoo/yahoo.c:3728 ../src/protocols/yahoo/yahoo.c:3730
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo! ���㏍���潟���祉�����違�ゃ��"
 
-#: ../src/protocols/yahoo/yahoo.c:3745
+#: ../src/protocols/yahoo/yahoo.c:3747
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: ../src/protocols/yahoo/yahoo.c:3748
+#: ../src/protocols/yahoo/yahoo.c:3750
 msgid "Pager host"
 msgstr "���若�吾�c�����鴻����"
 
-#: ../src/protocols/yahoo/yahoo.c:3751
+#: ../src/protocols/yahoo/yahoo.c:3753
 msgid "Japan Pager host"
 msgstr "Japan ���若�吾�c�����鴻����"
 
-#: ../src/protocols/yahoo/yahoo.c:3754
+#: ../src/protocols/yahoo/yahoo.c:3756
 msgid "Pager port"
 msgstr "���若�吾�c�����若�����"
 
-#: ../src/protocols/yahoo/yahoo.c:3757
+#: ../src/protocols/yahoo/yahoo.c:3759
 msgid "File transfer host"
 msgstr "�����ゃ��拶�������鴻��"
 
-#: ../src/protocols/yahoo/yahoo.c:3760
+#: ../src/protocols/yahoo/yahoo.c:3762
 msgid "Japan file transfer host"
 msgstr "Japan ���<�ゃ��拶�������鴻��"
 
-#: ../src/protocols/yahoo/yahoo.c:3763
+#: ../src/protocols/yahoo/yahoo.c:3765
 msgid "File transfer port"
 msgstr "���<�ゃ��拶�������若�����"
 
-#: ../src/protocols/yahoo/yahoo.c:3766
+#: ../src/protocols/yahoo/yahoo.c:3768
 msgid "Chat room locale"
 msgstr "���������祉���若�����贋��"
 
-#: ../src/protocols/yahoo/yahoo.c:3769
+#: ../src/protocols/yahoo/yahoo.c:3771
 msgid "Ignore conference and chatroom invitations"
 msgstr "篌�茘違�����c�������若������緇����∴�����"
 
-#: ../src/protocols/yahoo/yahoo.c:3773
+#: ../src/protocols/yahoo/yahoo.c:3775
 msgid "Chat room list URL"
 msgstr "���c�����祉���若���� URL ���鴻��"
 
-#: ../src/protocols/yahoo/yahoo.c:3776
+#: ../src/protocols/yahoo/yahoo.c:3778
 msgid "YCHT host"
 msgstr "YCHT ���鴻��"
 
-#: ../src/protocols/yahoo/yahoo.c:3779
+#: ../src/protocols/yahoo/yahoo.c:3781
 msgid "YCHT port"
 msgstr "YCHT ���若�����"
 
+#. Write a local message to this conversation showing that a request for a
+#. * Doodle session has been made
+#.
+#: ../src/protocols/yahoo/yahoo_doodle.c:96
+msgid "Sent Doodle request."
+msgstr "Doodle 頳�羆�����篆<����"
+
 #. TODO: what to do here - do we really have to disconnect?
 #: ../src/protocols/yahoo/yahoo_packet.c:265
 msgid "Write Error"
@@ -12217,47 +12338,47 @@
 "�������㏍���<�ゃ�����画Η��絽��������翫��������篏帥�������с���祉�������吟�с�������潟��"
 "��荐�����Ί�������"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1006
+#: ../src/protocols/yahoo/yahoo_profile.c:1012
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1078
-#: ../src/protocols/yahoo/yahoo_profile.c:1082
-#: ../src/protocols/yahoo/yahoo_profile.c:1086
+#: ../src/protocols/yahoo/yahoo_profile.c:1084
+#: ../src/protocols/yahoo/yahoo_profile.c:1088
+#: ../src/protocols/yahoo/yahoo_profile.c:1092
 msgid "Hobbies"
 msgstr "莇e��"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1096
-#: ../src/protocols/yahoo/yahoo_profile.c:1100
+#: ../src/protocols/yahoo/yahoo_profile.c:1102
+#: ../src/protocols/yahoo/yahoo_profile.c:1106
 msgid "Latest News"
 msgstr "���違���ャ�若��"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1121
+#: ../src/protocols/yahoo/yahoo_profile.c:1127
 msgid "Home Page"
 msgstr "���若�����若��"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1136
+#: ../src/protocols/yahoo/yahoo_profile.c:1142
 msgid "Cool Link 1"
 msgstr "���若�������潟���"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1141
+#: ../src/protocols/yahoo/yahoo_profile.c:1147
 msgid "Cool Link 2"
 msgstr "���若�������潟���"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1145
+#: ../src/protocols/yahoo/yahoo_profile.c:1151
 msgid "Cool Link 3"
 msgstr "���若�������潟���"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1158
+#: ../src/protocols/yahoo/yahoo_profile.c:1164
 msgid "Last Update"
 msgstr "��腟��贋�井��"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1164
+#: ../src/protocols/yahoo/yahoo_profile.c:1170
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "%s �����若�倶���宴�����鴻�с�������障����"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1170
+#: ../src/protocols/yahoo/yahoo_profile.c:1176
 msgid ""
 "Sorry, this profile seems to be in a language or format that is not "
 "supported at this time."
@@ -12265,7 +12386,7 @@
 "���帥�障�������������㏍���<�ゃ�����������若�吾�с�潟�с���泣���若���������������後�/荐�茯�"
 "���������"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1186
+#: ../src/protocols/yahoo/yahoo_profile.c:1192
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
@@ -12273,7 +12394,7 @@
 "���若�吟�����㏍���c�若������緇��с���障�����с���������������������鋇��������泣�若����"
 "���馹��с��������緇��у��荅�������帥���������"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1189
+#: ../src/protocols/yahoo/yahoo_profile.c:1195
 msgid ""
 "Could not retrieve the user's profile. This most likely means that the user "
 "does not exist; however, Yahoo! sometimes does fail to find a user's "
@@ -12284,7 +12405,7 @@
 "�������������障�����������若�吟��絖�����������������腆冴�������違��緇��у��荅��������"
 "���������"
 
-#: ../src/protocols/yahoo/yahoo_profile.c:1197
+#: ../src/protocols/yahoo/yahoo_profile.c:1203
 msgid "The user's profile is empty."
 msgstr "���若�吟�����㏍���<�ゃ����腥冴�с����"
 
@@ -12363,7 +12484,7 @@
 msgid "Connection problem with the YCHT server."
 msgstr "YCHT �泣�若����篏帥�c���ョ����馹��������障����"
 
-#: ../src/protocols/zephyr/zephyr.c:331
+#: ../src/protocols/zephyr/zephyr.c:346
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -12371,83 +12492,83 @@
 "(�����<���祉�若�吾��紊����������������若���榊�����障������\t �≪�����潟���祉�����c�帥�� "
 "'���潟�潟�若��' �����激�с�潟��腆肴����������)"
 
-#: ../src/protocols/zephyr/zephyr.c:686
+#: ../src/protocols/zephyr/zephyr.c:701
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "���c���� %s,%s,%s �檎��篆<�с���障����"
 
-#: ../src/protocols/zephyr/zephyr.c:719 ../src/protocols/zephyr/zephyr.c:1134
+#: ../src/protocols/zephyr/zephyr.c:734 ../src/protocols/zephyr/zephyr.c:1151
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>���若��:</b> %s<br>"
 
-#: ../src/protocols/zephyr/zephyr.c:723 ../src/protocols/zephyr/zephyr.c:1139
+#: ../src/protocols/zephyr/zephyr.c:738 ../src/protocols/zephyr/zephyr.c:1156
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>���������������障�����㏍�違�ゃ�潟�������障����"
 
-#: ../src/protocols/zephyr/zephyr.c:728 ../src/protocols/zephyr/zephyr.c:1141
+#: ../src/protocols/zephyr/zephyr.c:743 ../src/protocols/zephyr/zephyr.c:1158
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br> %s �� %s ����絮��障��"
 
-#: ../src/protocols/zephyr/zephyr.c:1472 ../src/protocols/zephyr/zephyr.c:1473
+#: ../src/protocols/zephyr/zephyr.c:1490 ../src/protocols/zephyr/zephyr.c:1491
 msgid "Anyone"
 msgstr "�����с��"
 
-#: ../src/protocols/zephyr/zephyr.c:2278
+#: ../src/protocols/zephyr/zephyr.c:2298
 msgid "_Class:"
 msgstr "������(_C):"
 
-#: ../src/protocols/zephyr/zephyr.c:2284
+#: ../src/protocols/zephyr/zephyr.c:2304
 msgid "_Instance:"
 msgstr "�ゃ�潟�鴻�帥�潟��(_I):"
 
-#: ../src/protocols/zephyr/zephyr.c:2290
+#: ../src/protocols/zephyr/zephyr.c:2310
 msgid "_Recipient:"
 msgstr "����篋�(_R):"
 
-#: ../src/protocols/zephyr/zephyr.c:2301
+#: ../src/protocols/zephyr/zephyr.c:2321
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "%s,%s,%s �吾��骸茯㏍���茵���け��"
 
-#: ../src/protocols/zephyr/zephyr.c:2607
+#: ../src/protocols/zephyr/zephyr.c:2627
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;������&gt;: ���若�吟�������違��腆肴����障��"
 
-#: ../src/protocols/zephyr/zephyr.c:2612
+#: ../src/protocols/zephyr/zephyr.c:2632
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;������&gt;: ���若�吟�������違��腆肴����障��"
 
-#: ../src/protocols/zephyr/zephyr.c:2617
+#: ../src/protocols/zephyr/zephyr.c:2637
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 "instance &lt;�ゃ�潟�鴻�帥�潟��&gt;: ���������鴻�т戎�������ゃ�潟�鴻�帥�潟�鴻���祉�������障��"
 
-#: ../src/protocols/zephyr/zephyr.c:2622
+#: ../src/protocols/zephyr/zephyr.c:2642
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 "inst &lt;�ゃ�潟�鴻�帥�潟��&gt;: ���������鴻�т戎�������ゃ�潟�鴻�帥�潟�鴻���祉�������障��"
 
-#: ../src/protocols/zephyr/zephyr.c:2627
+#: ../src/protocols/zephyr/zephyr.c:2647
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 "topic &lt;�ゃ�潟�鴻�帥�潟��&gt;: ���������鴻�т戎�������ゃ�潟�鴻�帥�潟�鴻���祉�������障��"
 
-#: ../src/protocols/zephyr/zephyr.c:2633
+#: ../src/protocols/zephyr/zephyr.c:2653
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 "sub &lt;������&gt; &lt;�ゃ�潟�鴻�帥�潟��&gt; &lt;絎���&gt;: �違�������c�����後�����"
 "�障��"
 
-#: ../src/protocols/zephyr/zephyr.c:2638
+#: ../src/protocols/zephyr/zephyr.c:2658
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 "zi &lt;�ゃ�潟�鴻�帥�潟��&gt;: &lt;�<���祉�若�吾��<i>�ゃ�潟�鴻�帥�潟��</i>��*&gt; �吾�<��"
 "�祉�若�吾����篆<���障��"
 
-#: ../src/protocols/zephyr/zephyr.c:2644
+#: ../src/protocols/zephyr/zephyr.c:2664
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
@@ -12455,7 +12576,7 @@
 "zci &lt;������&gt; &lt;�ゃ�潟�鴻�帥�潟��&gt;: &lt;<i>������</i>��<i>�ゃ�潟�鴻�帥�潟��</"
 "i>��*&gt; �吾�<���祉�若�吾����篆<���障��"
 
-#: ../src/protocols/zephyr/zephyr.c:2650
+#: ../src/protocols/zephyr/zephyr.c:2670
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
@@ -12463,7 +12584,7 @@
 "zcir &lt;������&gt; &lt;�ゃ�潟�鴻�帥�潟��&gt; &lt;絎���&gt;: &lt;<i>������</i>��<i>"
 "�ゃ�潟�鴻�帥�潟��</i>��<i>絎���</i>&gt; �吾�<���祉�若�吾����篆<���障��"
 
-#: ../src/protocols/zephyr/zephyr.c:2656
+#: ../src/protocols/zephyr/zephyr.c:2676
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -12471,16 +12592,16 @@
 "zir &lt;�ゃ�潟�鴻�帥�潟��&gt; &lt;絎���&gt;: &lt;MESSAGE��<i>�ゃ�潟�鴻�帥�潟��</i>��<i>"
 "絎���</i>&gt; �吾�<���祉�若�吾����篆<���障��"
 
-#: ../src/protocols/zephyr/zephyr.c:2661
+#: ../src/protocols/zephyr/zephyr.c:2681
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr ""
 "zc &lt;������&gt;: &lt;<i>������</i>,PERSONAL,*&gt; �吾�<���祉�若�吾����篆<���障��"
 
-#: ../src/protocols/zephyr/zephyr.c:2767
+#: ../src/protocols/zephyr/zephyr.c:2787
 msgid "Resubscribe"
 msgstr "��莖取�"
 
-#: ../src/protocols/zephyr/zephyr.c:2770
+#: ../src/protocols/zephyr/zephyr.c:2790
 msgid "Retrieve subscriptions from server"
 msgstr "�泣�若������莖取�����緇����障��"
 
@@ -12494,58 +12615,48 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/zephyr/zephyr.c:2855 ../src/protocols/zephyr/zephyr.c:2857
+#: ../src/protocols/zephyr/zephyr.c:2875 ../src/protocols/zephyr/zephyr.c:2877
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr���㏍���潟���祉�����違�ゃ��"
 
-#: ../src/protocols/zephyr/zephyr.c:2882
+#: ../src/protocols/zephyr/zephyr.c:2902
 msgid "Export to .anyone"
 msgstr ".anyone �吾���㏍�鴻���若��"
 
-#: ../src/protocols/zephyr/zephyr.c:2885
+#: ../src/protocols/zephyr/zephyr.c:2905
 msgid "Export to .zephyr.subs"
 msgstr ".zephyr.subs �吾���㏍�鴻���若��"
 
-#: ../src/protocols/zephyr/zephyr.c:2888
+#: ../src/protocols/zephyr/zephyr.c:2908
 msgid "Import from .anyone"
 msgstr ".anyone �����ゃ�潟���若��"
 
-#: ../src/protocols/zephyr/zephyr.c:2891
+#: ../src/protocols/zephyr/zephyr.c:2911
 msgid "Import from .zephyr.subs"
 msgstr ".zephyr.subs �����ゃ�潟���若��"
 
-#: ../src/protocols/zephyr/zephyr.c:2894
+#: ../src/protocols/zephyr/zephyr.c:2914
 msgid "Realm"
 msgstr "Realm"
 
-#: ../src/protocols/zephyr/zephyr.c:2897
+#: ../src/protocols/zephyr/zephyr.c:2917
 msgid "Exposure"
 msgstr "Exposure"
 
-#: ../src/proxy.c:1212 ../src/proxy.c:1265 ../src/proxy.c:1311
-#: ../src/proxy.c:1332
+#: ../src/proxy.c:1216 ../src/proxy.c:1272 ../src/proxy.c:1320
+#: ../src/proxy.c:1347
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "���㏍�㏍�激��・膓������� %d"
 
 #. Forbidden
-#: ../src/proxy.c:1324
+#: ../src/proxy.c:1336
 #, c-format
 msgid "Access denied: proxy server forbids port %d tunnelling."
 msgstr ""
 "�≪���祉�鴻�����������障����: ���㏍�㏍�激�祉�泣�若�������若����� %d ���������潟�違������"
 "���障������"
 
-#: ../src/proxy.c:2318
-msgid "Invalid proxy settings"
-msgstr "筝�罩c�����㏍�㏍�決┃絎�"
-
-#: ../src/proxy.c:2318
-msgid ""
-"Either the host name or port number specified for your given proxy type is "
-"invalid."
-msgstr "��絎��������㏍�㏍�激����������鴻�����障�������若����垩��罩c��������憗������"
-
 #: ../src/savedstatuses.c:514
 msgid "saved statuses"
 msgstr "篆�絖������倶��"
@@ -12554,12 +12665,12 @@
 msgid "I'm not here right now"
 msgstr "篁����√賢筝㏍�с��"
 
-#: ../src/server.c:225
+#: ../src/server.c:227
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s ������ %s �������茘������障����\n"
 
-#: ../src/server.c:675
+#: ../src/server.c:681
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -12568,12 +12679,12 @@
 "%s ������ %s ���������c�����祉���若�� %s �御��緇��������障��:\n"
 "%s"
 
-#: ../src/server.c:680
+#: ../src/server.c:686
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s ������ %s ���������c�����祉���若�� %s �御��緇��������障��\n"
 
-#: ../src/server.c:684
+#: ../src/server.c:690
 msgid "Accept chat invitation?"
 msgstr "���c�����吾����緇��������障����鐚�"
 
@@ -12589,57 +12700,52 @@
 msgid "Mobile"
 msgstr "腱糸��筝�"
 
-#: ../src/status.c:623
-#, c-format
-msgid "%s signed on"
-msgstr "%s �������泣�ゃ�潟�祉�ゃ�潟���障����"
-
-#: ../src/status.c:627
-#, c-format
-msgid "%s came back"
-msgstr "%s �������祉�c�����障����"
-
-#: ../src/status.c:634
-#, c-format
-msgid "%s signed off"
-msgstr "%s �������泣�ゃ�潟�祉�≪�������障����"
-
-#: ../src/status.c:638
-#, c-format
-msgid "%s went away"
-msgstr "%s �������√賢���障����"
-
-#: ../src/status.c:1284
+#: ../src/status.c:622
+#, c-format
+msgid "%s changed status from %s to %s"
+msgstr "%s �������鴻���若�帥�鴻�� %s ���� %s ����眼���障����"
+
+#: ../src/status.c:632
+#, c-format
+msgid "%s is now %s"
+msgstr "%s ������ %s �������茘������障����"
+
+#: ../src/status.c:637
+#, c-format
+msgid "%s is no longer %s"
+msgstr "���� %s ������ %s �����с�������障����"
+
+#: ../src/status.c:1320
 #, c-format
 msgid "%s became idle"
 msgstr "%s ������緇�罘�筝㏍�������障����"
 
-#: ../src/status.c:1297
+#: ../src/status.c:1337
 #, c-format
 msgid "%s became unidle"
 msgstr "%s ������緇�罘�筝㏍����緇�鍵���障����"
 
-#: ../src/status.c:1359
+#: ../src/status.c:1403
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s ������緇�罘�筝㏍�������障����"
 
-#: ../src/status.c:1361
+#: ../src/status.c:1405
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s ������緇�罘�筝㏍����緇�鍵���障����"
 
-#: ../src/util.c:649
+#: ../src/util.c:679
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../src/util.c:2439
+#: ../src/util.c:2455
 #, c-format
 msgid "Error Reading %s"
 msgstr "%s ��茯㏍�粋昭������������"
 
-#: ../src/util.c:2440
+#: ../src/util.c:2456
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -12648,56 +12754,56 @@
 "%s ��茯㏍�粋昭�����������若���榊�����障�������������宴����粋昭�障���障�������障�����ゃ��"
 "���<�ゃ���������� \"%s~\" ����眼���障������"
 
-#: ../src/util.c:2933
+#: ../src/util.c:2895
 msgid "Calculating..."
 msgstr "荐�膊�筝�..."
 
-#: ../src/util.c:2936
+#: ../src/util.c:2898
 msgid "Unknown."
 msgstr "筝����с����"
 
-#: ../src/util.c:2962
+#: ../src/util.c:2924
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d腱�"
 msgstr[1] "%d腱�"
 
-#: ../src/util.c:2974
+#: ../src/util.c:2936
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d��"
 msgstr[1] "%d��"
 
-#: ../src/util.c:2982
+#: ../src/util.c:2944
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s %d����"
 msgstr[1] "%s %d����"
 
-#: ../src/util.c:2988
+#: ../src/util.c:2950
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d����"
 msgstr[1] "%d����"
 
-#: ../src/util.c:2996
+#: ../src/util.c:2958
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
-msgstr[0] "%s, %d��"
-msgstr[1] "%s, %d��"
-
-#: ../src/util.c:3002
+msgstr[0] "%s %d��"
+msgstr[1] "%s %d��"
+
+#: ../src/util.c:2964
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d��"
 msgstr[1] "%d��"
 
-#: ../src/util.c:3477
+#: ../src/util.c:3431
 msgid "g003: Error opening connection.\n"
 msgstr "g003: �ョ�����紮���������������\n"
--- a/src/gtkdialogs.c	Thu Mar 23 14:20:56 2006 +0000
+++ b/src/gtkdialogs.c	Thu Mar 23 16:38:36 2006 +0000
@@ -127,6 +127,7 @@
 	{N_("Persian"),             "fa", "Meelad Zakaria", "meelad@farsiweb.info"},
 	{N_("Finnish"),             "fi", "Timo Jyrinki", "timo.jyrinki@iki.fi"},
 	{N_("French"),              "fr", "�ric Boumaour", "zongo_fr@users.sourceforge.net"},
+	{N_("Galician"),            "gl", "Ignacio Casal Quinteiro", ""},
 	{N_("Hebrew"),              "he", "Pavel Bibergal", "cyberkm203@hotmail.com"},
 	{N_("Hindi"),               "hi", "Ravishankar Shrivastava", "raviratlami@yahoo.com"},
 	{N_("Hungarian"),           "hu", "Zoltan Sutto", "sutto.zoltan@rutinsoft.hu"},
--- a/src/win32/nsis/translations/german.nsh	Thu Mar 23 14:20:56 2006 +0000
+++ b/src/win32/nsis/translations/german.nsh	Thu Mar 23 16:38:36 2006 +0000
@@ -5,7 +5,7 @@
 ;;  German language strings for the Windows Gaim NSIS installer.
 ;;  Windows Code page: 1252
 ;;
-;;  Author: Bjoern Voigt <bjoern@cs.tu-berlin.de>, 2005.
+;;  Author: Bjoern Voigt <bjoern@cs.tu-berlin.de>, 2006.
 ;;  Version 3
 ;;
  
@@ -29,14 +29,14 @@
 !define GAIM_SHORTCUTS_SECTION_TITLE	"Verkn�pfungen"
 !define GAIM_DESKTOP_SHORTCUT_SECTION_TITLE	"Desktop"
 !define GAIM_STARTMENU_SHORTCUT_SECTION_TITLE	"Startmen�"
-!define GAIM_SECTION_DESCRIPTION		"Gaim Basis-Dateien und -DLLs"
-!define GTK_SECTION_DESCRIPTION		"Ein Multi-Plattform GUI Toolkit, verwendet von Gaim"
+!define GAIM_SECTION_DESCRIPTION		"Gaim-Basisdateien und -DLLs"
+!define GTK_SECTION_DESCRIPTION		"Ein Multi-Plattform-GUI-Toolkit, verwendet von Gaim"
 !define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ Themen k�nnen Aussehen und Bedienung von GTK+ Anwendungen ver�ndern."
 !define GTK_NO_THEME_DESC			"Installiere kein GTK+ Thema"
 !define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows Imitator) ist ein GTK Theme, das sich besonders gut in den Windows Desktop integriert."
 !define GTK_BLUECURVE_THEME_DESC		"Das Bluecurve Thema."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Das Lighthouseblue Thema."
-!define GAIM_SHORTCUTS_SECTION_DESCRIPTION	"Verkn�pfungen zum Start von Gaim"
+!define GAIM_SHORTCUTS_SECTION_DESCRIPTION	"Verkn�pfungen zum Starten von Gaim"
 !define GAIM_DESKTOP_SHORTCUT_DESC   "Erstellt eine Verkn�pfung zu Gaim auf dem Desktop"
 !define GAIM_STARTMENU_SHORTCUT_DESC   "Erstellt einen Eintrag f�r Gaim im Startmen�"
  
@@ -84,7 +84,7 @@
 !define GAIM_SPELLCHECK_DUTCH			"Holl�ndisch"
 !define GAIM_SPELLCHECK_NORWEGIAN		"Norwegisch"
 !define GAIM_SPELLCHECK_POLISH			"Polnisch"
-!define GAIM_SPELLCHECK_PORTUGUESE		"Portuguese"
+!define GAIM_SPELLCHECK_PORTUGUESE		"Portugiesisch"
 !define GAIM_SPELLCHECK_ROMANIAN		"Rum�nisch"
 !define GAIM_SPELLCHECK_RUSSIAN			"Russisch"
 !define GAIM_SPELLCHECK_SLOVAK			"Slowakisch"