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 "仲間との連携(_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 シグナルが正常に動作しているかテストします"
 
-#: ../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 @@
 "インスタント・メッセージやチャットのログを記録しておくと、履歴プラグインの機"
 "能を利用できるようになります。"
 
-#: ../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 "一つ以上のメッセージが配送不可能な状態になっています"
 
 #. 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 "メッセンジャー Plus!"
+
+#: ../plugins/log_reader.c:1862 ../plugins/log_reader.c:1940
+msgid "MSN Messenger"
+msgstr "MSN メッセンジャー"
+
+#: ../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 "ログを記録するフォルダ"
 
-#: ../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 "メッセンジャー Plus!"
-
-#: ../plugins/log_reader.c:1942
-msgid "MSN Messenger"
-msgstr "MSN メッセンジャー"
-
-#: ../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 "ユーザが定義した規則に従って、実際に送信するメッセージを書き換えます"
 
@@ -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 "仲間リストと会話ウィンドウを段階的に透明化します"
 
 #. *  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 "キャンセル"
 
@@ -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 "チャット"
 
-#: ../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 さんがチャットルーム (%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 "チャットに参加"
 
-#: ../src/gtkblist.c:694
+#: ../src/gtkblist.c:693
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "参加するチャットについて適切な情報を入力して下さい。\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 "チャットの追加(_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)..."
 
-#: ../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 "/仲間/チャットの追加(_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 "/ツール/チャットルームの一覧(_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 "/ヘルプ/デバッグ・ウィンドウ(_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 "/仲間/チャットに参加..."
 
-#: ../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 "/仲間/チャットの追加..."
 
-#: ../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 "/ツール/チャットルームの一覧"
 
-#: ../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 "このプロトコルではチャット・ルームをサポートしていません。"
 
-#: ../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 "チャットが可能なプロトコルでサイン・インしていません。"
 
-#: ../src/gtkblist.c:4838
+#: ../src/gtkblist.c:4907
 msgid "Add Chat"
 msgstr "チャットの追加"
 
-#: ../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 ""
 "このチャットの別名と仲間リストに追加する際の妥当な情報を入力して下さい:\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 "現在アクティブな項目です"
-
-#: ../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"
-"その問題を解決しアカウントをもう一度有効にして接続し直して下さい。"
-
-#: ../src/gtkconv.c:364
-#, c-format
-msgid "me is using Gaim v%s."
-msgstr "私は Gaim v%s を使用しています"
+"エラーを解決しアカウントをもう一度有効にするまで再接続しません。"
 
 #: ../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] "チャットルームに %d 人にいます"
 msgstr[1] "チャットルームに %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;:  仲間またはチャットへ 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;:  利用中の会話ウィンドウへいろいろなデバッグ情報を送"
 "信します"
 
-#: ../src/gtkconv.c:6542
+#: ../src/gtkconv.c:6556
 msgid "clear: Clears the conversation scrollback."
 msgstr "クリア: 会話ウィンドウにある以前のメッセージをクリアします"
 
-#: ../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 ""
 "まだ未読のメッセージがあります。本当にウィンドウを閉じてもよろしいですか?"
 
-#: ../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 "会話ウィンドウを閉じます"
+
+#: ../src/gtkconv.c:8018
 msgid "Last created window"
 msgstr "最後に生成したウィンドウを再利用する"
 
-#: ../src/gtkconv.c:8006
+#: ../src/gtkconv.c:8020
 msgid "Separate IM and Chat windows"
 msgstr "IM とチャット・ウィンドウを分割する"
 
-#: ../src/gtkconv.c:8008 ../src/gtkprefs.c:1243
+#: ../src/gtkconv.c:8022 ../src/gtkprefs.c:1243
 msgid "New window"
 msgstr "新しいウィンドウで開く"
 
-#: ../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 のポーティング"
 
-#: ../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 "フィンランド語"
 
-#: ../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 チャンネル<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 チャンネル<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 "チャットの別名"
 
-#: ../src/gtkdialogs.c:835
+#: ../src/gtkdialogs.c:848
 msgid "Enter an alias for this chat."
 msgstr "このチャットの別名を入力して下さい:"
 
-#: ../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 @@
 "仲間リストからチャット %s を削除しようとしています。続行してもよろしいです"
 "か?"
 
-#: ../src/gtkdialogs.c:997
+#: ../src/gtkdialogs.c:1010
 msgid "Remove Chat"
 msgstr "チャットの削除"
 
-#: ../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 ""
 "チャットのログは、設定ダイアログで \"チャットを全てシステム・ログに記録する"
 "\" が有効な場合にのみログを記録します。"
 
-#: ../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> が正しくありません。"
-
-#: ../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\" が正しくありません。"
+
+#: ../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 "次のプラグインを解放します。"
 
-#: ../src/gtkplugin.c:294
+#: ../src/gtkplugin.c:293
 msgid "Multiple plugins will be unloaded."
 msgstr "複数個のプラグインを解放します。"
 
-#: ../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 "離席中になった時(_W)"
 
-#: ../src/gtkpounce.c:585
+#: ../src/gtkpounce.c:587
 msgid "Ret_urns from away"
 msgstr "離席中から戻った時(_U)"
 
-#: ../src/gtkpounce.c:587
+#: ../src/gtkpounce.c:589
 msgid "Becomes _idle"
 msgstr "待機中になった時(_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 "会話ウィンドウを開く(_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 さんが待機中から戻ってきました (%s)"
 
-#: ../src/gtkpounce.c:1453
+#: ../src/gtkpounce.c:1455
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s さんが離席中から戻ってきました (%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 "新しい会話ウィンドウ(_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 "チャットの中で誰かがあなたを呼びました"
-
-#: ../src/gtksound.c:488
+msgstr "チャットで誰かがあなたを呼びました"
+
+#: ../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 @@
 "ドラッグしたのはデスクトップのランチャです。おそらくランチャ自身ではなく、ラ"
 "ンチャが指しているオブジェクトを転送したいのでしょう。"
 
-#. 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 "プラグインを解放する際にエラーが発生しました"
 
@@ -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 "不正なプロキシ設定"
+
+#: ../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
-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 "検索が保留になっています。他の検索が完了するまでお待ち下さい。"
 
-#: ../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 "チャットの選択: %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/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 "チャットに追加"
 
-#: ../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 "チャット名(_N):"
 
-#: ../src/protocols/gg/gg.c:1724
+#: ../src/protocols/gg/gg.c:1769
 msgid "Chat error"
 msgstr "チャットのエラー"
 
-#: ../src/protocols/gg/gg.c:1725
+#: ../src/protocols/gg/gg.c:1770
 msgid "This chat name is already in use"
 msgstr "そのチャット名は既に使用されています。"
 
-#: ../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 "エンコーディング"
 
-#: ../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 "モードが間違っています"
 
-#: ../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 サーバは理解しませんでした。"
 
-#: ../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 "そのようなチャンネルはありません"
 
 #. does this happen?
-#: ../src/protocols/irc/msgs.c:513
+#: ../src/protocols/irc/msgs.c:529
 msgid "no such channel"
 msgstr "そのようなチャンネルはありません"
 
-#: ../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 "そのようなニックネームまたはチャンネルはありません"
 
-#: ../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 "あだ名が間違っています"
 
-#: ../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 @@
 "指定したあだ名がサーバ側で拒否されました。おそらく不正な文字が含まれていると"
 "思われます。"
 
-#: ../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 @@
 "指定したアカウント名がサーバ側で拒否されました。おそらく不正な文字が含まれて"
 "いると思われます。"
 
-#: ../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 "チャンネル %s%s から離脱しました"
 
-#: ../src/protocols/irc/msgs.c:921
+#: ../src/protocols/irc/msgs.c:936
 msgid "Error: invalid PONG from server"
 msgstr "エラー: サーバからの不正な 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 "チャンネルに参加できません"
 
-#: ../src/protocols/irc/msgs.c:1033
+#: ../src/protocols/irc/msgs.c:1054
 msgid "Nick or channel is temporarily unavailable."
 msgstr "一時的にあだ名またはチャンネルを利用できません。"
 
-#: ../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 [チャンネル]:  チャンネルに現在いるユーザを一覧表示します"
 
-#: ../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 "チャッティー"
 
@@ -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 "ディレクトリが間違っています"
 
-#: ../src/protocols/jabber/buddy.c:1441
+#: ../src/protocols/jabber/buddy.c:1448
 msgid "Enter a User Directory"
 msgstr "ユーザ・ディレクトリを入力して下さい"
 
-#: ../src/protocols/jabber/buddy.c:1442
+#: ../src/protocols/jabber/buddy.c:1449
 msgid "Select a user directory to search"
 msgstr "検索するユーザ・ディレクトリの選択"
 
-#: ../src/protocols/jabber/buddy.c:1445
+#: ../src/protocols/jabber/buddy.c:1452
 msgid "Search Directory"
 msgstr "検索するディレクトリ"
 
-#: ../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 "逝ってます"
 
-#: ../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 "認証で不正なエンコーディングです"
+
 #: ../src/protocols/jabber/jabber.c:1466
-msgid "Incorrect encoding in authorization"
-msgstr "認証で不正なエンコーディングです"
-
-#: ../src/protocols/jabber/jabber.c:1469
 msgid "Invalid authzid"
 msgstr "不正な authzid です"
 
-#: ../src/protocols/jabber/jabber.c:1472
+#: ../src/protocols/jabber/jabber.c:1469
 msgid "Invalid Authorization Mechanism"
 msgstr "不正な認証メカニズムです"
 
-#: ../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 "不正な ID"
 
-#: ../src/protocols/jabber/jabber.c:1506
+#: ../src/protocols/jabber/jabber.c:1503
 msgid "Invalid Namespace"
 msgstr "不正な名前空間"
 
-#: ../src/protocols/jabber/jabber.c:1508
+#: ../src/protocols/jabber/jabber.c:1505
 msgid "Invalid XML"
 msgstr "不正な 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 "システム・シャットダウン"
 
-#: ../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 "サポートしていないエンコーディング"
 
-#: ../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:  チャット・ルームを設定します"
 
-#: ../src/protocols/jabber/jabber.c:1742
+#: ../src/protocols/jabber/jabber.c:1739
 msgid "configure:  Configure a chat room."
 msgstr "configure:  チャット・ルームを設定します"
 
-#: ../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:  チャット・ルームを登録します"
 
-#: ../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; [ルーム]:  指定したチャット・ルームからユーザを追い出しま"
 "す"
 
-#: ../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;: チャトルーム"
 "での役割をセットします"
 
-#: ../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; [サーバ]:  指定したサーバのチャットへ参加します"
 
-#: ../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; [ルーム]:  指定したユーザをチャット・ルームから追い出しま"
 "す"
 
-#: ../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 解析エラー"
 
-#: ../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 さんを仲間リストに追加したがっています。"
 
-#: ../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 "新しいチャット・ルームの生成"
 
-#: ../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 @@
 "新しいチャット・ルームを生成します。チャット・ルームの設定を行いますか? それ"
 "ともデフォルト値を適用しますか?"
 
-#: ../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 "チャット %s でエラー"
 
-#: ../src/protocols/jabber/presence.c:422
+#: ../src/protocols/jabber/presence.c:429
 #, c-format
 msgid "Error joining chat %s"
 msgstr "チャット %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 "不正な E-メール・アドレス"
+msgstr "E-メール・アドレスが間違っています"
 
 #: ../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 "もうすぐ帰ってきます"
 
 #: ../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 のプロフィール"
 
-#: ../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 "プロフィールを取得する際にエラー"
 
-#: ../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 "趣味と興味のあること"
+
+#: ../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: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 "趣味と興味のあること"
-
-#: ../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 "趣味"
+
+#: ../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 "ホームページ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 "自宅の 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 "勤務先の電話番号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 "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>連絡先</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 "このユーザはプロフィールを公開していません"
 
-#: ../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 @@
 "ユーザが存在しないか、あるいはユーザは存在しますがプロフィールは公開していな"
 "いかのどちらかです。"
 
-#: ../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 はユーザのプロフィールから情報を取得できませんでした。そのユーザはおそら"
-"く存在していないと思われます。"
-
-#: ../src/protocols/msn/msn.c:1725 ../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"
 
@@ -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 "タイムアウトになったので、メッセージは送信されませんでした:"
 
-#: ../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 さんが合図を送りたがっています!"
@@ -8075,11 +8225,11 @@
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "ユーザの %s (%s) さんが %s さんを仲間リストに追加したがっています"
 
-#: ../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 "指定したスクリーン名が間違っています"
 
@@ -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 "
 "なクライアントを持っているようです。)"
 
-#: ../src/protocols/oscar/oscar.c:638
+#: ../src/protocols/oscar/oscar.c:702
 msgid "Voice"
 msgstr "音声"
 
-#: ../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 "チャット"
 
-#: ../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 "セキュリティは有効"
 
-#: ../src/protocols/oscar/oscar.c:693
+#: ../src/protocols/oscar/oscar.c:757
 msgid "Video Chat"
 msgstr "ビデオ・チャット"
 
-#: ../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 "チャットできます"
 
-#: ../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 "チャット・ルーム %s への接続が切れています"
 
-#: ../src/protocols/oscar/oscar.c:1741
+#: ../src/protocols/oscar/oscar.c:1805
 msgid "Chat is currently unavailable"
 msgstr "チャットは接続できません"
 
-#: ../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 "ニックネームまたはパスワードが間違っています"
 
-#: ../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 インスタント・メッセンジャー・サービスは一時的に利用不可です"
 
-#: ../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 分程待ってから再び試みてください。そのまま"
 "続行すると、さらに長く待たなければならなくなりますよ。"
 
-#: ../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 鍵は不正です。"
 
-#: ../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 "デジタル表示から6桁の数字を入力して下さい。"
 
-#: ../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 が仲間リストに加える前に承認を求めています。承認の要求を送ってもよ"
 "ろしいですか?"
 
-#: ../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 さんを仲間リストに追加したがっています:\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 @@
 "速度制限を上回ったので %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 "メンバになった日時"
 
-#: ../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 @@
 "[メッセージに不正な文字が含まれているため、このユーザからのメッセージを表示で"
 "きません]"
 
-#: ../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 秒間ほど待ってか"
 "ら再度試みて下さい。"
 
-#: ../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 "チャット・ルーム %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 に関連づけられています"
 msgstr[1] "次のスクリーン名は %s に関連づけられています"
 
-#: ../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: 要求されたスクリーン名がオリジナルと異なっているため、整形でき"
 "ません。"
 
-#: ../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: 要求されたスクリーン名が間違っているので整形できません"
 
-#: ../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: このアドレスは不正なので、このメールアドレスには変更できません"
-
-#: ../src/protocols/oscar/oscar.c:6376
+"エラー 0x%04x: このアドレスが間違っているので、この 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 プロフィールをセットできません"
 
-#: ../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 @@
 "す。あなたのプロフィールは設定されずに残っています。接続が完了してから再度試"
 "して下さい。"
 
-#: ../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] "プロフィールの長さが最大値 (%d バイト) に達したので切りつめました"
 msgstr[1] "プロフィールの長さが最大値 (%d バイト) に達したので切りつめました"
 
-#: ../src/protocols/oscar/oscar.c:6724
+#: ../src/protocols/oscar/oscar.c:6795
 msgid "Profile too long."
 msgstr "プロフィールが長すぎます"
 
-#: ../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 @@
 "スクリーン名が間違っているため仲間 %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 サーバから仲間リストを取得できませんでした。仲間リストは"
 "失われていません。おそらく数時間後には利用できるようになっているでしょう。"
 
-#: ../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 @@
 "これは仲間リストに追加可能な仲間の数を越えてしまっているということがあり得ま"
 "す。"
 
-#: ../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 "不正なチャット名が指定されました"
 
-#: ../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 チャットで 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 ""
 "ウェブは知っている (これを有効にすると 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 "新しい書式が間違っています"
 
-#: ../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>あなたは承認を待っていません</i>"
 
-#: ../src/protocols/oscar/oscar.c:8297
+#: ../src/protocols/oscar/oscar.c:8376
 msgid "You are awaiting authorization from the following buddies"
 msgstr "あなたは次の仲間からの承認を待っています"
 
-#: ../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 フォワーディング (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 "承認を待っている仲間を表示"
 
-#: ../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 "エンコーディング"
 
-#: ../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 コミュニティ・サーバを指定して下さい"
 
-#: ../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 "チャットに参加"
 
+#: ../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"
 "お好みの連絡方法"
 
-#: ../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 "チャンネル %s が見つかりません"
 
-#: ../src/protocols/silc/silc.c:1490
+#: ../src/protocols/silc/silc.c:1494
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "%s のチャンネル・モード: %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 ではチャンネル・モードをセットしてません"
 
-#: ../src/protocols/silc/silc.c:1505
+#: ../src/protocols/silc/silc.c:1509
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "%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 "不明なコマンド: %s (おそらく Gaim のバグ)"
 
-#: ../src/protocols/silc/silc.c:1598
+#: ../src/protocols/silc/silc.c:1602
 msgid "part [channel]:  Leave the chat"
 msgstr "part [チャンネル]:  指定したチャンネルから退出します"
 
-#: ../src/protocols/silc/silc.c:1602
+#: ../src/protocols/silc/silc.c:1606
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [チャンネル]:  指定したチャンネルから退出します"
 
-#: ../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;チャンネル&gt; [&lt;パスワード&gt;]:  このネットワークのチャットへ参"
 "加します"
 
-#: ../src/protocols/silc/silc.c:1615
+#: ../src/protocols/silc/silc.c:1619
 msgid "list:  List channels on this network"
 msgstr "list:  このネットワーク上のチャンネルを一覧表示します"
 
-#: ../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;チャンネル&gt; [+|-&lt;モード&gt;] [引数]:  チャンネルのモードを変"
 "更したり表示します"
 
-#: ../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;チャンネル&gt; +|-&lt;モード&gt; &lt;あだ名&gt;:  指定したチャンネ"
 "ルのあだ名のユーザのモードを変更します"
 
-#: ../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;チャンネル&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;チャンネル&gt; &lt;あだ名&gt; [コメント]:  チャンネルからクライアン"
 "トを追い出します"
 
-#: ../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;チャンネル&gt; +|-&lt;あだ名&gt;]:  クアイアントをチャンネルから追い"
 "出します"
 
-#: ../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;チャンネル&gt;:  チャンネル内のユーザを一覧表示します"
 
-#: ../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 "他のユーザからの監視を拒否する"
 
-#: ../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 "パスワードが間違っています"
 
-#: ../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 "ホスト名を解決できませんでした"
 
-#: ../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 に追加したがっています"
 
-#: ../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 は仲間リストに追加するあなたの要求を (以前にさかのぼって) 拒否しました。"
 
-#: ../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 は次の理由のため仲間リストに追加するあなたの要求を (以前にさかのぼって) 拒"
 "否しました\" %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 @@
 "ジャー認証方法を利用してログインを試みますが、利用できる機能が少なくなるかも"
 "しれません。"
 
-#: ../src/protocols/yahoo/yahoo.c:1829
+#: ../src/protocols/yahoo/yahoo.c:1830
 msgid "Incorrect password."
 msgstr "パスワードが間違っています。"
 
-#: ../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! ウェブサイトへログインすると修正されるかもし"
 "れません。"
 
-#: ../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 "オフィスに居ません"
 
-#: ../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 "ちょっとそこまで"
 
-#: ../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 "チャットへ参加"
 
-#: ../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 "どのチャットへ参加しますか?"
 
-#: ../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 "チャットに参加する..."
 
-#: ../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 ネットワーク上にあるチャットへ参加する"
 
-#: ../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 "ページャのホスト名"
 
-#: ../src/protocols/yahoo/yahoo.c:3751
+#: ../src/protocols/yahoo/yahoo.c:3753
 msgid "Japan Pager host"
 msgstr "Japan ページャのホスト名"
 
-#: ../src/protocols/yahoo/yahoo.c:3754
+#: ../src/protocols/yahoo/yahoo.c:3756
 msgid "Pager port"
 msgstr "ページャのポート番号"
 
-#: ../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 "会議とチャットルームの招待を無視する"
 
-#: ../src/protocols/yahoo/yahoo.c:3773
+#: ../src/protocols/yahoo/yahoo.c:3775
 msgid "Chat room list URL"
 msgstr "チャット・ルームの 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 "趣味"
 
-#: ../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."
@@ -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 @@
 "ユーザのプロフィールを取得できませんでした。これは、おそらく一時的なサーバ側"
 "の問題でしょう。後で再試行してみて下さい。"
 
-#: ../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 サーバを使った接続に問題があります。"
 
-#: ../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 アカウント・エディタの "
 "'エンコード' オプションを確認して下さい)"
 
-#: ../src/protocols/zephyr/zephyr.c:686
+#: ../src/protocols/zephyr/zephyr.c:701
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "チャット %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;: 新しいチャットへ参加し"
 "ます"
 
-#: ../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 "不正なプロキシ設定"
-
-#: ../src/proxy.c:2318
-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 "保存した状態"
@@ -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 さんをチャット・ルーム %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 さんをチャット・ルーム %s へ招待しています\n"
 
-#: ../src/server.c:684
+#: ../src/server.c:690
 msgid "Accept chat invitation?"
 msgstr "チャットへの招待を受けますか?"
 
@@ -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 さんが戻ってきました"
-
-#: ../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	"Verknpfungen"
 !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 knnen Aussehen und Bedienung von GTK+ Anwendungen verndern."
 !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	"Verknpfungen zum Start von Gaim"
+!define GAIM_SHORTCUTS_SECTION_DESCRIPTION	"Verknpfungen zum Starten von Gaim"
 !define GAIM_DESKTOP_SHORTCUT_DESC   "Erstellt eine Verknpfung zu Gaim auf dem Desktop"
 !define GAIM_STARTMENU_SHORTCUT_DESC   "Erstellt einen Eintrag fr Gaim im Startmen"
  
@@ -84,7 +84,7 @@
 !define GAIM_SPELLCHECK_DUTCH			"Hollndisch"
 !define GAIM_SPELLCHECK_NORWEGIAN		"Norwegisch"
 !define GAIM_SPELLCHECK_POLISH			"Polnisch"
-!define GAIM_SPELLCHECK_PORTUGUESE		"Portuguese"
+!define GAIM_SPELLCHECK_PORTUGUESE		"Portugiesisch"
 !define GAIM_SPELLCHECK_ROMANIAN		"Rumnisch"
 !define GAIM_SPELLCHECK_RUSSIAN			"Russisch"
 !define GAIM_SPELLCHECK_SLOVAK			"Slowakisch"