changeset 14061:eb58c6169e6c

[gaim-migrate @ 16679] some translation updates. I have questions about gu.po, if someone sees that answered, we might need to revert that part of the change. It is all very confusing. The same person submitted the original gu.po and this update, but he called it gu_IN this time committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Wed, 09 Aug 2006 14:47:37 +0000
parents 81648c6aa918
children fa8f65cd912c
files configure.ac po/ChangeLog po/de.po po/fi.po po/gl.po po/gu.po po/it.po po/ne.po po/sl.po po/zh_TW.po src/gtkdialogs.c
diffstat 11 files changed, 29421 insertions(+), 15620 deletions(-) [+]
line wrap: on
line diff
--- a/configure.ac	Wed Aug 09 06:23:18 2006 +0000
+++ b/configure.ac	Wed Aug 09 14:47:37 2006 +0000
@@ -46,7 +46,7 @@
 	;;
 esac
 
-ALL_LINGUAS="am az bg bn bs ca ca@valencia cs da de el en_AU en_CA en_GB es et eu fa fi fr gl gu he hi hu it ja ka ko ku lt mk my_MM nb nl nn pa pl pt_BR pt ro ru sk sl sq sr sr@Latn sv ta te th tr uk vi xh zh_CN zh_TW"
+ALL_LINGUAS="am az bg bn bs ca ca@valencia cs da de el en_AU en_CA en_GB es et eu fa fi fr gl gu he hi hu it ja ka ko ku lt mk my_MM nb ne nl nn pa pl pt_BR pt ro ru sk sl sq sr sr@Latn sv ta te th tr uk vi xh zh_CN zh_TW"
 AM_GLIB_GNU_GETTEXT
 
 dnl we don't use autobreak on cygwin!!
--- a/po/ChangeLog	Wed Aug 09 06:23:18 2006 +0000
+++ b/po/ChangeLog	Wed Aug 09 14:47:37 2006 +0000
@@ -23,13 +23,16 @@
 	* German translation updated (Bjoern Voigt)
 	* German win32 translation updated (Bjoern Voigt)
 	* Greek translation added (Bouklis Panos)
+	* Gujarati translation updated (Ankit Patel)
 	* Hebrew translation updated (Shalom Craimer)
 	* Hungarian translation updated (Gabor Kelemen)
+	* Italian translation updated (Claudio Satriano)
 	* Japanese translation updated (Takeshi Aihana)
 	* Kurdish translation added (Erdal Ronahi and Amed Ç. Jiyan)
 	* Kurdish win32 installer translation added (Erdal Ronahi)
 	* Lithuanian translation updated (Andrius Štikonas, Laurynas Biveinis)
 	* Lithuanian win32 translation added (Laurynas Biveinis)
+	* Nepali translation added (Shyam Krishna Bal)
 	* Persian translation added (Elnaz Sarbar, Meelad Zakaria)
 	* Polish translation updated (Emil Nowak)
 	* Portuguese translation updated (Duarte Henriques)
--- a/po/de.po	Wed Aug 09 06:23:18 2006 +0000
+++ b/po/de.po	Wed Aug 09 14:47:37 2006 +0000
@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: Gaim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-29 23:34+0200\n"
-"PO-Revision-Date: 2006-04-29 23:33+0200\n"
+"POT-Creation-Date: 2006-06-20 10:30+0200\n"
+"PO-Revision-Date: 2006-06-20 10:38+0200\n"
 "Last-Translator: Björn Voigt <bjoern@cs.tu-berlin.de>\n"
 "Language-Team: de <de@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -196,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:3230
+#: ../plugins/docklet/docklet.c:157 ../src/gtkblist.c:3246
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
@@ -208,10 +208,10 @@
 msgstr "Ändere Status"
 
 #: ../plugins/docklet/docklet.c:435 ../src/gtkstatusbox.c:673
-#: ../src/protocols/gg/gg.c:996 ../src/protocols/jabber/buddy.c:1104
+#: ../src/protocols/gg/gg.c:996 ../src/protocols/jabber/buddy.c:1363
 #: ../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/protocols/novell/novell.c:2843 ../src/protocols/yahoo/yahoo.c:2731
 #: ../src/status.c:155
 msgid "Available"
 msgstr "Verfügbar"
@@ -222,25 +222,25 @@
 #: ../plugins/docklet/docklet.c:439 ../src/gtkprefs.c:1774
 #: ../src/gtkstatusbox.c:674 ../src/protocols/gg/gg.c:999
 #: ../src/protocols/irc/irc.c:520 ../src/protocols/irc/msgs.c:223
-#: ../src/protocols/jabber/buddy.c:1108 ../src/protocols/novell/novell.c:2848
-#: ../src/protocols/oscar/oscar.c:719 ../src/protocols/oscar/oscar.c:4391
-#: ../src/protocols/oscar/oscar.c:5434 ../src/protocols/silc/buddy.c:1469
-#: ../src/protocols/yahoo/yahoo.c:3187 ../src/protocols/yahoo/yahoo.c:3260
+#: ../src/protocols/jabber/buddy.c:1367 ../src/protocols/novell/novell.c:2846
+#: ../src/protocols/oscar/oscar.c:719 ../src/protocols/oscar/oscar.c:4397
+#: ../src/protocols/oscar/oscar.c:5440 ../src/protocols/silc/buddy.c:1469
+#: ../src/protocols/yahoo/yahoo.c:3185 ../src/protocols/yahoo/yahoo.c:3258
 #: ../src/status.c:158
 msgid "Away"
 msgstr "Abwesend"
 
 #: ../plugins/docklet/docklet.c:443 ../src/gtkstatusbox.c:675
-#: ../src/protocols/oscar/oscar.c:723 ../src/protocols/yahoo/yahoo.c:2727
+#: ../src/protocols/oscar/oscar.c:723 ../src/protocols/yahoo/yahoo.c:2725
 #: ../src/status.c:157
 msgid "Invisible"
 msgstr "Unsichtbar"
 
-#: ../plugins/docklet/docklet.c:447 ../src/gtkblist.c:2960
+#: ../plugins/docklet/docklet.c:447 ../src/gtkblist.c:2976
 #: ../src/gtkstatusbox.c:676 ../src/protocols/gg/gg.c:993
-#: ../src/protocols/jabber/buddy.c:1102 ../src/protocols/novell/novell.c:2857
-#: ../src/protocols/oscar/oscar.c:785 ../src/protocols/oscar/oscar.c:5406
-#: ../src/protocols/yahoo/yahoo.c:2731 ../src/status.c:154
+#: ../src/protocols/jabber/buddy.c:1361 ../src/protocols/novell/novell.c:2855
+#: ../src/protocols/oscar/oscar.c:785 ../src/protocols/oscar/oscar.c:5412
+#: ../src/protocols/yahoo/yahoo.c:2729 ../src/status.c:154
 msgid "Offline"
 msgstr "Offline"
 
@@ -256,7 +256,7 @@
 msgid "Show Buddy List"
 msgstr "Buddy-Liste anzeigen"
 
-#: ../plugins/docklet/docklet.c:489 ../src/gtkconv.c:5626
+#: ../plugins/docklet/docklet.c:489 ../src/gtkconv.c:5675
 msgid "Unread Messages"
 msgstr "Ungelesene Nachrichten"
 
@@ -296,7 +296,7 @@
 msgstr "_Sofortnachrichten:"
 
 #: ../plugins/docklet/docklet.c:684 ../plugins/docklet/docklet.c:692
-#: ../plugins/win32/winprefs/winprefs.c:424 ../src/gtkprefs.c:823
+#: ../plugins/win32/winprefs/winprefs.c:462 ../src/gtkprefs.c:823
 #: ../src/gtkprefs.c:1764 ../src/gtkprefs.c:1778
 msgid "Never"
 msgstr "Niemals"
@@ -307,7 +307,7 @@
 
 #: ../plugins/docklet/docklet.c:686 ../plugins/docklet/docklet.c:694
 #: ../plugins/timestamp_format.c:39 ../plugins/timestamp_format.c:48
-#: ../plugins/win32/winprefs/winprefs.c:425 ../src/gtkprefs.c:825
+#: ../plugins/win32/winprefs/winprefs.c:463 ../src/gtkprefs.c:825
 msgid "Always"
 msgstr "Immer"
 
@@ -617,7 +617,7 @@
 #. 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/gtkroomlist.c:604 ../src/protocols/jabber/jabber.c:759
 #: ../src/protocols/msn/msn.c:1532 ../src/protocols/msn/msn.c:1585
 #: ../src/protocols/msn/msn.c:1606
 msgid "Name"
@@ -627,10 +627,10 @@
 msgid "Instant Messaging"
 msgstr "Sofortnachrichten"
 
-#: ../plugins/gevolution/add_buddy_dialog.c:442 ../src/gtkblist.c:4526
+#: ../plugins/gevolution/add_buddy_dialog.c:442 ../src/gtkblist.c:4532
 #: ../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/yahoo/yahoo.c:2974
 msgid "Add Buddy"
 msgstr "Buddy hinzufügen"
 
@@ -644,14 +644,14 @@
 #. "Search"
 #: ../plugins/gevolution/add_buddy_dialog.c:468
 #: ../plugins/gevolution/assoc-buddy.c:353
-#: ../src/protocols/jabber/buddy.c:1460 ../src/protocols/oscar/oscar.c:6014
-#: ../src/protocols/sametime/sametime.c:5531
+#: ../src/protocols/jabber/buddy.c:1720 ../src/protocols/oscar/oscar.c:6020
+#: ../src/protocols/sametime/sametime.c:5529
 msgid "Search"
 msgstr "Suchen"
 
 #: ../plugins/gevolution/add_buddy_dialog.c:549
-#: ../plugins/gevolution/new_person_dialog.c:307 ../src/gtkblist.c:4610
-#: ../src/gtkblist.c:4974
+#: ../plugins/gevolution/new_person_dialog.c:307 ../src/gtkblist.c:4616
+#: ../src/gtkblist.c:4980
 msgid "Group:"
 msgstr "Gruppe:"
 
@@ -687,13 +687,13 @@
 msgstr "_Assoziiere den Buddy"
 
 #: ../plugins/gevolution/eds-utils.c:73 ../plugins/gevolution/eds-utils.c:86
-#: ../src/protocols/jabber/jabber.c:1122
+#: ../src/protocols/jabber/jabber.c:1125
 msgid "None"
 msgstr "Kein"
 
 #: ../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:4419 ../src/protocols/jabber/roster.c:65
+#: ../src/gtkblist.c:4425 ../src/protocols/jabber/roster.c:66
 msgid "Buddies"
 msgstr "Buddys"
 
@@ -730,8 +730,8 @@
 "Wählen Sie alle Konten, zu denen Buddys automatisch hinzugefügt werden "
 "sollen."
 
-#: ../plugins/gevolution/gevolution.c:450 ../plugins/idle.c:150
-#: ../plugins/idle.c:186 ../src/gtknotify.c:399 ../src/gtkpounce.c:1262
+#: ../plugins/gevolution/gevolution.c:450 ../plugins/idle.c:153
+#: ../plugins/idle.c:189 ../src/gtknotify.c:399 ../src/gtkpounce.c:1255
 msgid "Account"
 msgstr "Konto"
 
@@ -768,7 +768,7 @@
 msgstr "Kontotyp:"
 
 #: ../plugins/gevolution/new_person_dialog.c:295 ../src/gtkaccount.c:784
-#: ../src/gtkblist.c:4572
+#: ../src/gtkblist.c:4578
 msgid "Screen name:"
 msgstr "Benutzername:"
 
@@ -870,50 +870,50 @@
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "Minimiert die Buddy-Liste und die Gesprächsfenster, wenn Sie weggehen."
 
-#: ../plugins/idle.c:155 ../plugins/idle.c:213
+#: ../plugins/idle.c:158 ../plugins/idle.c:216
 msgid "Minutes"
 msgstr "Minuten"
 
 #. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
 #. If that doesn't translate well into your language, drop the 's before translating.
-#: ../plugins/idle.c:162 ../plugins/idle.c:195 ../plugins/idle.c:220
-#: ../plugins/idle.c:312
+#: ../plugins/idle.c:165 ../plugins/idle.c:198 ../plugins/idle.c:223
+#: ../plugins/idle.c:315
 msgid "I'dle Mak'er"
 msgstr "Untätigkeitsmarker"
 
-#: ../plugins/idle.c:163 ../plugins/idle.c:252
+#: ../plugins/idle.c:166 ../plugins/idle.c:255
 msgid "Set Account Idle Time"
 msgstr "Setze Konto-Untätigkeitszeit"
 
-#: ../plugins/idle.c:166 ../plugins/idle.c:224
+#: ../plugins/idle.c:169 ../plugins/idle.c:227
 msgid "_Set"
 msgstr "_Setzen"
 
-#: ../plugins/idle.c:167 ../plugins/idle.c:200 ../plugins/idle.c:225
+#: ../plugins/idle.c:170 ../plugins/idle.c:203 ../plugins/idle.c:228
 msgid "_Cancel"
 msgstr "A_bbrechen"
 
-#: ../plugins/idle.c:180
+#: ../plugins/idle.c:183
 msgid "None of your accounts are idle."
 msgstr "Keine ihrer Konten sind untätig."
 
-#: ../plugins/idle.c:196 ../plugins/idle.c:256
+#: ../plugins/idle.c:199 ../plugins/idle.c:259
 msgid "Unset Account Idle Time"
 msgstr "Untätigkeitszeit zurücksetzen"
 
-#: ../plugins/idle.c:199
+#: ../plugins/idle.c:202
 msgid "_Unset"
 msgstr "Zurücksetze_n"
 
-#: ../plugins/idle.c:221 ../plugins/idle.c:260
+#: ../plugins/idle.c:224 ../plugins/idle.c:263
 msgid "Set Idle Time for All Accounts"
 msgstr "Untätigkeitszeit für alle Konten setzen"
 
-#: ../plugins/idle.c:265
+#: ../plugins/idle.c:268
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr "Untätigkeitszeit für alle untätige Konten zurücksetzen"
 
-#: ../plugins/idle.c:314 ../plugins/idle.c:315
+#: ../plugins/idle.c:317 ../plugins/idle.c:318
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr ""
 "Erlaubt Ihnen manuell zu konfigurieren, wie lange Sie untätig sein wollen"
@@ -1661,7 +1661,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/timestamp.c:254
+#: ../plugins/timestamp.c:256
 msgid "Timestamp"
 msgstr "Zeitstempel"
 
@@ -1669,7 +1669,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/timestamp.c:257 ../plugins/timestamp.c:259
+#: ../plugins/timestamp.c:259 ../plugins/timestamp.c:261
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "Fügt iChat-ähnliche Zeitstempel alle N Minuten in die Gespräche ein."
 
@@ -1798,57 +1798,57 @@
 "\n"
 "* Hinweis: Dieses Plugin verlangt Win2000 oder höher."
 
-#: ../plugins/win32/winprefs/winprefs.c:397
+#: ../plugins/win32/winprefs/winprefs.c:434
 msgid "GTK+ Runtime Version"
 msgstr "GTK+ Runtime Version"
 
 #. Autostart
-#: ../plugins/win32/winprefs/winprefs.c:405
+#: ../plugins/win32/winprefs/winprefs.c:442
 msgid "Startup"
 msgstr "Start"
 
-#: ../plugins/win32/winprefs/winprefs.c:406
+#: ../plugins/win32/winprefs/winprefs.c:443
 msgid "_Start Gaim on Windows startup"
 msgstr "_Starte Gaim beim Windows-Start"
 
 #. Buddy List
-#: ../plugins/win32/winprefs/winprefs.c:417 ../src/gtkblist.c:3663
+#: ../plugins/win32/winprefs/winprefs.c:455 ../src/gtkblist.c:3672
 msgid "Buddy List"
 msgstr "Buddy-Liste"
 
-#: ../plugins/win32/winprefs/winprefs.c:418
+#: ../plugins/win32/winprefs/winprefs.c:456
 msgid "_Dockable Buddy List"
 msgstr "An_dockbare Buddy-Liste"
 
 #. Blist On Top
-#: ../plugins/win32/winprefs/winprefs.c:422
+#: ../plugins/win32/winprefs/winprefs.c:460
 msgid "_Keep Buddy List window on top:"
 msgstr "_Buddy-Listen-Fenster bleibt im Vordergrund:"
 
 #. XXX: Did this ever work?
-#: ../plugins/win32/winprefs/winprefs.c:427
+#: ../plugins/win32/winprefs/winprefs.c:465
 msgid "Only when docked"
 msgstr "Nur wenn angedockt"
 
 #. Conversations
-#: ../plugins/win32/winprefs/winprefs.c:431 ../src/gtkprefs.c:819
+#: ../plugins/win32/winprefs/winprefs.c:469 ../src/gtkprefs.c:819
 #: ../src/gtkprefs.c:1879
 msgid "Conversations"
 msgstr "Unterhaltungen"
 
-#: ../plugins/win32/winprefs/winprefs.c:432
+#: ../plugins/win32/winprefs/winprefs.c:470
 msgid "_Flash window when messages are received"
 msgstr "_Fenster blinkt, wenn Nachrichten empfangen werden"
 
-#: ../plugins/win32/winprefs/winprefs.c:456
+#: ../plugins/win32/winprefs/winprefs.c:494
 msgid "WinGaim Options"
 msgstr "WinGaim Optionen"
 
-#: ../plugins/win32/winprefs/winprefs.c:458
+#: ../plugins/win32/winprefs/winprefs.c:496
 msgid "Options specific to Windows Gaim."
 msgstr "Windows-Gaim-spezifische Optionen."
 
-#: ../plugins/win32/winprefs/winprefs.c:459
+#: ../plugins/win32/winprefs/winprefs.c:497
 msgid ""
 "Provides options specific to Windows Gaim, such as buddy list docking and "
 "conversation flashing."
@@ -1860,139 +1860,138 @@
 msgid "accounts"
 msgstr "Konten"
 
-#: ../src/account.c:923
+#: ../src/account.c:918
 msgid "Password is required to sign on."
 msgstr "Passwort wird für die Anmeldung benötigt."
 
-#: ../src/account.c:948
+#: ../src/account.c:943
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Geben Sie das Passwort für %s (%s) ein"
 
-#: ../src/account.c:955
+#: ../src/account.c:950
 msgid "Enter Password"
 msgstr "Geben Sie ein Passwort ein"
 
-#: ../src/account.c:960
+#: ../src/account.c:955
 msgid "Save password"
 msgstr "Passwort speichern"
 
 #. *
 #. * 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:3546
-#: ../src/gtkdialogs.c:602 ../src/gtkdialogs.c:739 ../src/gtkdialogs.c:803
+#: ../src/account.c:963 ../src/account.c:1134 ../src/gtkblist.c:3556
+#: ../src/gtkdialogs.c:613 ../src/gtkdialogs.c:750 ../src/gtkdialogs.c:824
 #: ../src/gtkrequest.c:269 ../src/protocols/gg/gg.c:497
 #: ../src/protocols/gg/gg.c:655 ../src/protocols/gg/gg.c:791
-#: ../src/protocols/jabber/jabber.c:1319 ../src/protocols/jabber/xdata.c:337
+#: ../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:1408 ../src/protocols/oscar/oscar.c:2167
-#: ../src/protocols/oscar/oscar.c:2260 ../src/protocols/oscar/oscar.c:5684
-#: ../src/protocols/oscar/oscar.c:5864 ../src/protocols/oscar/oscar.c:5889
-#: ../src/protocols/oscar/oscar.c:5945 ../src/protocols/silc/buddy.c:466
+#: ../src/protocols/oscar/oscar.c:2260 ../src/protocols/oscar/oscar.c:5690
+#: ../src/protocols/oscar/oscar.c:5870 ../src/protocols/oscar/oscar.c:5895
+#: ../src/protocols/oscar/oscar.c:5951 ../src/protocols/silc/buddy.c:466
 #: ../src/protocols/silc/buddy.c:1182 ../src/protocols/silc/chat.c:424
 #: ../src/protocols/silc/chat.c:462 ../src/protocols/silc/chat.c:725
 #: ../src/protocols/silc/ops.c:1297 ../src/protocols/silc/ops.c:1910
-#: ../src/protocols/silc/silc.c:753 ../src/protocols/yahoo/yahoo.c:3061
-#: ../src/protocols/yahoo/yahoo.c:3070 ../src/request.h:1344
+#: ../src/protocols/silc/silc.c:753 ../src/protocols/yahoo/yahoo.c:3059
+#: ../src/protocols/yahoo/yahoo.c:3068 ../src/request.h:1344
 msgid "OK"
 msgstr "OK"
 
-#: ../src/account.c:969 ../src/account.c:1140 ../src/account.c:1177
-#: ../src/gtkaccount.c:2182 ../src/gtkaccount.c:2649 ../src/gtkblist.c:5015
-#: ../src/gtkdialogs.c:603 ../src/gtkdialogs.c:740 ../src/gtkdialogs.c:804
-#: ../src/gtkdialogs.c:823 ../src/gtkdialogs.c:845 ../src/gtkdialogs.c:865
-#: ../src/gtkdialogs.c:909 ../src/gtkdialogs.c:964 ../src/gtkdialogs.c:1001
-#: ../src/gtkdialogs.c:1026 ../src/gtkimhtmltoolbar.c:419
-#: ../src/gtkplugin.c:296 ../src/gtkpounce.c:1095 ../src/gtkprivacy.c:568
+#: ../src/account.c:964 ../src/account.c:1135 ../src/account.c:1172
+#: ../src/gtkaccount.c:2182 ../src/gtkaccount.c:2649 ../src/gtkblist.c:5021
+#: ../src/gtkdialogs.c:614 ../src/gtkdialogs.c:751 ../src/gtkdialogs.c:825
+#: ../src/gtkdialogs.c:844 ../src/gtkdialogs.c:866 ../src/gtkdialogs.c:886
+#: ../src/gtkdialogs.c:930 ../src/gtkdialogs.c:985 ../src/gtkdialogs.c:1022
+#: ../src/gtkdialogs.c:1047 ../src/gtkimhtmltoolbar.c:419
+#: ../src/gtkplugin.c:296 ../src/gtkpounce.c:1088 ../src/gtkprivacy.c:568
 #: ../src/gtkprivacy.c:581 ../src/gtkprivacy.c:606 ../src/gtkprivacy.c:617
 #: ../src/gtkrequest.c:270 ../src/gtksavedstatuses.c:296
 #: ../src/protocols/gg/gg.c:498 ../src/protocols/gg/gg.c:656
 #: ../src/protocols/gg/gg.c:792 ../src/protocols/gg/gg.c:871
-#: ../src/protocols/jabber/buddy.c:576 ../src/protocols/jabber/buddy.c:1461
-#: ../src/protocols/jabber/buddy.c:1495 ../src/protocols/jabber/chat.c:780
-#: ../src/protocols/jabber/jabber.c:824 ../src/protocols/jabber/jabber.c:1320
+#: ../src/protocols/jabber/buddy.c:594 ../src/protocols/jabber/buddy.c:1721
+#: ../src/protocols/jabber/buddy.c:1755 ../src/protocols/jabber/chat.c:778
+#: ../src/protocols/jabber/jabber.c:828 ../src/protocols/jabber/jabber.c:1323
 #: ../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:1409 ../src/protocols/oscar/oscar.c:2168
 #: ../src/protocols/oscar/oscar.c:2209 ../src/protocols/oscar/oscar.c:2261
-#: ../src/protocols/oscar/oscar.c:5685 ../src/protocols/oscar/oscar.c:5737
-#: ../src/protocols/oscar/oscar.c:5865 ../src/protocols/oscar/oscar.c:5890
-#: ../src/protocols/oscar/oscar.c:5946 ../src/protocols/oscar/oscar.c:6015
-#: ../src/protocols/oscar/peer.c:942 ../src/protocols/sametime/sametime.c:3375
-#: ../src/protocols/sametime/sametime.c:3460
-#: ../src/protocols/sametime/sametime.c:3630
-#: ../src/protocols/sametime/sametime.c:5319
-#: ../src/protocols/sametime/sametime.c:5408
-#: ../src/protocols/sametime/sametime.c:5532 ../src/protocols/silc/buddy.c:467
+#: ../src/protocols/oscar/oscar.c:5691 ../src/protocols/oscar/oscar.c:5743
+#: ../src/protocols/oscar/oscar.c:5871 ../src/protocols/oscar/oscar.c:5896
+#: ../src/protocols/oscar/oscar.c:5952 ../src/protocols/oscar/oscar.c:6021
+#: ../src/protocols/oscar/peer.c:942 ../src/protocols/sametime/sametime.c:3368
+#: ../src/protocols/sametime/sametime.c:3453
+#: ../src/protocols/sametime/sametime.c:3623
+#: ../src/protocols/sametime/sametime.c:5317
+#: ../src/protocols/sametime/sametime.c:5406
+#: ../src/protocols/sametime/sametime.c:5530 ../src/protocols/silc/buddy.c:467
 #: ../src/protocols/silc/buddy.c:1078 ../src/protocols/silc/buddy.c:1183
 #: ../src/protocols/silc/chat.c:597 ../src/protocols/silc/chat.c:726
 #: ../src/protocols/silc/ops.c:1911 ../src/protocols/silc/silc.c:754
-#: ../src/protocols/silc/silc.c:959 ../src/protocols/yahoo/yahoo.c:3062
-#: ../src/protocols/yahoo/yahoo.c:3071 ../src/request.h:1344
+#: ../src/protocols/silc/silc.c:959 ../src/protocols/yahoo/yahoo.c:3060
+#: ../src/protocols/yahoo/yahoo.c:3069 ../src/request.h:1344
 #: ../src/request.h:1354
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: ../src/account.c:994 ../src/connection.c:96
+#: ../src/account.c:989 ../src/connection.c:96
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Fehlendes Protokoll-Plugin für %s"
 
-#: ../src/account.c:996 ../src/connection.c:99 ../src/gtkblist.c:3538
-#: ../src/gtkblist.c:3544
+#: ../src/account.c:991 ../src/connection.c:99 ../src/gtkblist.c:3554
 msgid "Connection Error"
 msgstr "Verbindungsfehler"
 
-#: ../src/account.c:1076 ../src/protocols/gg/gg.c:696
-#: ../src/protocols/jabber/jabber.c:1272
+#: ../src/account.c:1071 ../src/protocols/gg/gg.c:696
+#: ../src/protocols/jabber/jabber.c:1275
 msgid "New passwords do not match."
 msgstr "Die neuen Passwörter stimmen nicht überein."
 
-#: ../src/account.c:1085
+#: ../src/account.c:1080
 msgid "Fill out all fields completely."
 msgstr "Bitte füllen Sie alle Felder aus."
 
-#: ../src/account.c:1108
+#: ../src/account.c:1103
 msgid "Original password"
 msgstr "Aktuelles Passwort"
 
-#: ../src/account.c:1115
+#: ../src/account.c:1110
 msgid "New password"
 msgstr "Neues Passwort"
 
-#: ../src/account.c:1122
+#: ../src/account.c:1117
 msgid "New password (again)"
 msgstr "Neues Passwort (nochmal)"
 
-#: ../src/account.c:1128
+#: ../src/account.c:1123
 #, c-format
 msgid "Change password for %s"
 msgstr "Ändern des Passworts für %s"
 
-#: ../src/account.c:1136
+#: ../src/account.c:1131
 msgid "Please enter your current password and your new password."
 msgstr "Bitte geben Sie Ihr aktuelles und Ihr neues Passwort ein."
 
-#: ../src/account.c:1169
+#: ../src/account.c:1164
 #, c-format
 msgid "Change user information for %s"
 msgstr "Ändere die Benutzerinformation für %s"
 
-#: ../src/account.c:1172 ../src/protocols/toc/toc.c:1684
+#: ../src/account.c:1167 ../src/protocols/toc/toc.c:1684
 msgid "Set User Info"
 msgstr "Benutzer-Info setzen"
 
-#: ../src/account.c:1176 ../src/gtkdebug.c:684 ../src/gtkrequest.c:276
-#: ../src/protocols/jabber/buddy.c:575
+#: ../src/account.c:1171 ../src/gtkdebug.c:684 ../src/gtkrequest.c:276
+#: ../src/protocols/jabber/buddy.c:593
 msgid "Save"
 msgstr "Speichern"
 
-#: ../src/account.c:1679 ../src/gtkft.c:159 ../src/protocols/gg/gg.c:1002
-#: ../src/protocols/jabber/buddy.c:633 ../src/protocols/jabber/buddy.c:1098
-#: ../src/protocols/jabber/buddy.c:1115 ../src/protocols/novell/novell.c:2860
+#: ../src/account.c:1681 ../src/gtkft.c:159 ../src/protocols/gg/gg.c:1002
+#: ../src/protocols/jabber/buddy.c:636 ../src/protocols/jabber/buddy.c:1357
+#: ../src/protocols/jabber/buddy.c:1374 ../src/protocols/novell/novell.c:2858
 msgid "Unknown"
 msgstr "Unbekannt"
 
@@ -2040,49 +2039,49 @@
 msgid "+++ %s signed off"
 msgstr "+++ %s hat sich abgemeldet"
 
-#: ../src/conversation.c:161
+#: ../src/conversation.c:168
 msgid "Unable to send message: The message is too large."
 msgstr "Nachricht kann nicht gesendet werden: Sie ist zu groß."
 
-#: ../src/conversation.c:164 ../src/conversation.c:177
+#: ../src/conversation.c:171 ../src/conversation.c:184
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "Kann die Nachricht an %s nicht senden."
 
-#: ../src/conversation.c:165
+#: ../src/conversation.c:172
 msgid "The message is too large."
 msgstr "Die Nachricht ist zu lang."
 
-#: ../src/conversation.c:174
+#: ../src/conversation.c:181
 msgid "Unable to send message."
 msgstr "Nachricht kann nicht gesendet werden."
 
-#: ../src/conversation.c:1515
+#: ../src/conversation.c:1510
 #, c-format
 msgid "%s entered the room."
 msgstr "%s hat den Raum betreten."
 
-#: ../src/conversation.c:1518
+#: ../src/conversation.c:1513
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] hat den Raum betreten."
 
-#: ../src/conversation.c:1625
+#: ../src/conversation.c:1620
 #, c-format
 msgid "You are now known as %s"
 msgstr "Sie heißen jetzt %s"
 
-#: ../src/conversation.c:1645
+#: ../src/conversation.c:1640
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s heißt jetzt %s"
 
-#: ../src/conversation.c:1718
+#: ../src/conversation.c:1713
 #, c-format
 msgid "%s left the room."
 msgstr "%s hat den Raum verlassen."
 
-#: ../src/conversation.c:1721
+#: ../src/conversation.c:1716
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s hat den Raum verlassen (%s)."
@@ -2091,7 +2090,7 @@
 msgid "No name"
 msgstr "Kein Name"
 
-#: ../src/ft.c:189 ../src/protocols/msn/msn.c:412
+#: ../src/ft.c:189 ../src/protocols/msn/msn.c:410
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -2158,60 +2157,60 @@
 "Remote-Computer: %s\n"
 "Remote-Port: %d"
 
-#: ../src/ft.c:391
+#: ../src/ft.c:392
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s bietet an, die Datei %s zu senden"
 
-#: ../src/ft.c:443
+#: ../src/ft.c:444
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s ist kein gültiger Dateiname.\n"
 
-#: ../src/ft.c:464
+#: ../src/ft.c:465
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Angebot zum Senden von %s an %s"
 
-#: ../src/ft.c:476
+#: ../src/ft.c:477
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "Starte die Dateiübertragung von %s von %s"
 
-#: ../src/ft.c:630
+#: ../src/ft.c:631
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Übertragung der Datei %s ist komplett"
 
-#: ../src/ft.c:633
+#: ../src/ft.c:634
 msgid "File transfer complete"
 msgstr "Dateiübertragung ist komplett"
 
-#: ../src/ft.c:1028
+#: ../src/ft.c:1031
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Sie haben die Dateiübertragung von %s abgebrochen"
 
-#: ../src/ft.c:1033
+#: ../src/ft.c:1036
 msgid "File transfer cancelled"
 msgstr "Dateiübertragung wurde abgebrochen"
 
-#: ../src/ft.c:1091
+#: ../src/ft.c:1094
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s hat die Übertragung von %s abgebrochen"
 
-#: ../src/ft.c:1096
+#: ../src/ft.c:1099
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s hat die Datenübertragung abgebrochen"
 
-#: ../src/ft.c:1153
+#: ../src/ft.c:1156
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "Dateiübertragung an %s wurde abgebrochen."
 
-#: ../src/ft.c:1155
+#: ../src/ft.c:1158
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "Dateiübertragung von %s wurde abgebrochen."
@@ -2240,7 +2239,7 @@
 msgid "Password:"
 msgstr "Passwort:"
 
-#: ../src/gtkaccount.c:863 ../src/gtkblist.c:4593 ../src/gtkblist.c:4959
+#: ../src/gtkaccount.c:863 ../src/gtkblist.c:4599 ../src/gtkblist.c:4965
 msgid "Alias:"
 msgstr "Alias:"
 
@@ -2333,7 +2332,7 @@
 msgid "Add Account"
 msgstr "Konto hinzufügen"
 
-#: ../src/gtkaccount.c:1749 ../src/gtkblist.c:3547
+#: ../src/gtkaccount.c:1749 ../src/gtkblist.c:3557
 msgid "Modify Account"
 msgstr "Konto bearbeiten"
 
@@ -2346,7 +2345,7 @@
 msgstr "_Erweitert"
 
 #. Register button
-#: ../src/gtkaccount.c:1797 ../src/protocols/jabber/jabber.c:823
+#: ../src/gtkaccount.c:1797 ../src/protocols/jabber/jabber.c:827
 msgid "Register"
 msgstr "Anmelden"
 
@@ -2355,12 +2354,12 @@
 msgid "Are you sure you want to delete %s?"
 msgstr "Wollen Sie %s wirklich löschen?"
 
-#: ../src/gtkaccount.c:2181 ../src/gtkpounce.c:1094 ../src/gtkrequest.c:273
+#: ../src/gtkaccount.c:2181 ../src/gtkpounce.c:1087 ../src/gtkrequest.c:273
 #: ../src/gtksavedstatuses.c:295
 msgid "Delete"
 msgstr "Löschen"
 
-#: ../src/gtkaccount.c:2239 ../src/gtksavedstatuses.c:889
+#: ../src/gtkaccount.c:2239 ../src/gtksavedstatuses.c:893
 #: ../src/protocols/oscar/oscar.c:2823
 msgid "Screen Name"
 msgstr "Benutzername"
@@ -2378,18 +2377,18 @@
 msgid "Add buddy to your list?"
 msgstr "Benutzer zu Ihrer Buddy-Liste hinzufügen?"
 
-#: ../src/gtkaccount.c:2648 ../src/gtkblist.c:5014 ../src/gtkconv.c:1623
+#: ../src/gtkaccount.c:2648 ../src/gtkblist.c:5020 ../src/gtkconv.c:1621
 #: ../src/gtkrequest.c:274 ../src/protocols/gg/gg.c:870
 #: ../src/protocols/oscar/oscar.c:2453
-#: ../src/protocols/sametime/sametime.c:5407 ../src/protocols/silc/chat.c:596
+#: ../src/protocols/sametime/sametime.c:5405 ../src/protocols/silc/chat.c:596
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: ../src/gtkblist.c:664
+#: ../src/gtkblist.c:673
 msgid "Join a Chat"
 msgstr "Chat betreten"
 
-#: ../src/gtkblist.c:685
+#: ../src/gtkblist.c:694
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
@@ -2397,87 +2396,87 @@
 "Bitte geben Sie geeignete Informationen über den Chat ein, den Sie betreten "
 "wollen.\n"
 
-#: ../src/gtkblist.c:696 ../src/gtkpounce.c:527 ../src/gtkroomlist.c:377
+#: ../src/gtkblist.c:705 ../src/gtkpounce.c:523 ../src/gtkroomlist.c:377
 msgid "_Account:"
 msgstr "_Konto:"
 
-#: ../src/gtkblist.c:940
+#: ../src/gtkblist.c:949
 msgid "Get _Info"
 msgstr "_Info abrufen"
 
-#: ../src/gtkblist.c:943 ../src/gtkstock.c:141
+#: ../src/gtkblist.c:952 ../src/gtkstock.c:141
 msgid "I_M"
 msgstr "I_M"
 
-#: ../src/gtkblist.c:949
+#: ../src/gtkblist.c:958
 msgid "_Send File"
 msgstr "Datei ver_senden"
 
-#: ../src/gtkblist.c:956
+#: ../src/gtkblist.c:965
 msgid "Add Buddy _Pounce"
 msgstr "B_uddy-Alarm hinzufügen"
 
-#: ../src/gtkblist.c:960 ../src/gtkblist.c:964 ../src/gtkblist.c:1063
-#: ../src/gtkblist.c:1086
+#: ../src/gtkblist.c:969 ../src/gtkblist.c:973 ../src/gtkblist.c:1072
+#: ../src/gtkblist.c:1095
 msgid "View _Log"
 msgstr "Mi_tschnitt anzeigen"
 
-#: ../src/gtkblist.c:975
+#: ../src/gtkblist.c:984
 msgid "Alias..."
 msgstr "Alias..."
 
-#: ../src/gtkblist.c:978 ../src/gtkconv.c:1620 ../src/gtkrequest.c:275
+#: ../src/gtkblist.c:987 ../src/gtkconv.c:1618 ../src/gtkrequest.c:275
 msgid "Remove"
 msgstr "Entfernen"
 
-#: ../src/gtkblist.c:984 ../src/gtkblist.c:1071 ../src/gtkblist.c:1092
+#: ../src/gtkblist.c:993 ../src/gtkblist.c:1080 ../src/gtkblist.c:1101
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: ../src/gtkblist.c:986 ../src/gtkblist.c:1073 ../src/gtkblist.c:1094
+#: ../src/gtkblist.c:995 ../src/gtkblist.c:1082 ../src/gtkblist.c:1103
 msgid "_Remove"
 msgstr "_Entfernen"
 
-#: ../src/gtkblist.c:1034
+#: ../src/gtkblist.c:1043
 msgid "Add a _Buddy"
 msgstr "Buddy _hinzufügen"
 
-#: ../src/gtkblist.c:1036
+#: ../src/gtkblist.c:1045
 msgid "Add a C_hat"
 msgstr "C_hat hinzufügen"
 
-#: ../src/gtkblist.c:1039
+#: ../src/gtkblist.c:1048
 msgid "_Delete Group"
 msgstr "Gruppe _löschen"
 
-#: ../src/gtkblist.c:1041
+#: ../src/gtkblist.c:1050
 msgid "_Rename"
 msgstr "_Umbenennen"
 
 #. join button
-#: ../src/gtkblist.c:1059 ../src/gtkroomlist.c:285 ../src/gtkroomlist.c:441
+#: ../src/gtkblist.c:1068 ../src/gtkroomlist.c:285 ../src/gtkroomlist.c:441
 #: ../src/gtkstock.c:139
 msgid "_Join"
 msgstr "_Betreten"
 
-#: ../src/gtkblist.c:1061
+#: ../src/gtkblist.c:1070
 msgid "Auto-Join"
 msgstr "Automatisch beitreten"
 
-#: ../src/gtkblist.c:1099 ../src/gtkblist.c:1122
+#: ../src/gtkblist.c:1108 ../src/gtkblist.c:1131
 msgid "_Collapse"
 msgstr "_Zusammenklappen"
 
-#: ../src/gtkblist.c:1127
+#: ../src/gtkblist.c:1136
 msgid "_Expand"
 msgstr "A_usklappen"
 
-#: ../src/gtkblist.c:1373 ../src/gtkblist.c:1385 ../src/gtkblist.c:3808
-#: ../src/gtkblist.c:3818
+#: ../src/gtkblist.c:1382 ../src/gtkblist.c:1394 ../src/gtkblist.c:3817
+#: ../src/gtkblist.c:3827
 msgid "/Tools/Mute Sounds"
 msgstr "/Werkzeuge/Stummschalten"
 
-#: ../src/gtkblist.c:1845 ../src/gtkconv.c:4195 ../src/gtkpounce.c:426
+#: ../src/gtkblist.c:1859 ../src/gtkconv.c:4235 ../src/gtkpounce.c:422
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
@@ -2485,126 +2484,126 @@
 "kann, um diesen Buddy hinzuzufügen."
 
 #. Buddies menu
-#: ../src/gtkblist.c:2419
+#: ../src/gtkblist.c:2433
 msgid "/_Buddies"
 msgstr "/_Buddys"
 
-#: ../src/gtkblist.c:2420
+#: ../src/gtkblist.c:2434
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Buddys/_Neue Sofortnachricht..."
 
-#: ../src/gtkblist.c:2421
+#: ../src/gtkblist.c:2435
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Buddys/Einen _Chat betreten..."
 
-#: ../src/gtkblist.c:2422
+#: ../src/gtkblist.c:2436
 msgid "/Buddies/Get User _Info..."
 msgstr "/Buddys/B_enutzer-Info abrufen..."
 
-#: ../src/gtkblist.c:2423
+#: ../src/gtkblist.c:2437
 msgid "/Buddies/View User _Log..."
 msgstr "/Buddys/Benutzer-_Mitschnitt ansehen..."
 
-#: ../src/gtkblist.c:2425
+#: ../src/gtkblist.c:2439
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Buddys/Zeige _offline Buddys"
 
-#: ../src/gtkblist.c:2426
+#: ../src/gtkblist.c:2440
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Buddys/Zeige _leere Gruppen"
 
-#: ../src/gtkblist.c:2427
+#: ../src/gtkblist.c:2441
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/Buddys/Zeige Buddy-_Details"
 
-#: ../src/gtkblist.c:2428
+#: ../src/gtkblist.c:2442
 msgid "/Buddies/Show Idle _Times"
 msgstr "/Buddys/Zeige Untätigkeitszei_ten"
 
-#: ../src/gtkblist.c:2429
+#: ../src/gtkblist.c:2443
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Buddys/Buddys _sortieren"
 
-#: ../src/gtkblist.c:2431
+#: ../src/gtkblist.c:2445
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Buddys/B_uddy hinzufügen..."
 
-#: ../src/gtkblist.c:2432
+#: ../src/gtkblist.c:2446
 msgid "/Buddies/Add C_hat..."
 msgstr "/Buddys/C_hat hinzufügen..."
 
-#: ../src/gtkblist.c:2433
+#: ../src/gtkblist.c:2447
 msgid "/Buddies/Add _Group..."
 msgstr "/Buddys/_Gruppe hinzufügen..."
 
-#: ../src/gtkblist.c:2435
+#: ../src/gtkblist.c:2449
 msgid "/Buddies/_Quit"
 msgstr "/Buddys/_Beenden"
 
 #. Accounts menu
-#: ../src/gtkblist.c:2438
+#: ../src/gtkblist.c:2452
 msgid "/_Accounts"
 msgstr "/_Konten"
 
-#: ../src/gtkblist.c:2439 ../src/gtkblist.c:5591
+#: ../src/gtkblist.c:2453 ../src/gtkblist.c:5597
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Konten/Hinzufügen\\/Ändern"
 
 #. Tools
-#: ../src/gtkblist.c:2442
+#: ../src/gtkblist.c:2456
 msgid "/_Tools"
 msgstr "/_Werkzeuge"
 
-#: ../src/gtkblist.c:2443
+#: ../src/gtkblist.c:2457
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Werkzeuge/Buddy-_Alarm"
 
-#: ../src/gtkblist.c:2444
+#: ../src/gtkblist.c:2458
 msgid "/Tools/Plu_gins"
 msgstr "/Werkzeuge/Plu_gins"
 
-#: ../src/gtkblist.c:2445
+#: ../src/gtkblist.c:2459
 msgid "/Tools/Pr_eferences"
 msgstr "/Werkzeuge/_Einstellungen"
 
-#: ../src/gtkblist.c:2446
+#: ../src/gtkblist.c:2460
 msgid "/Tools/Pr_ivacy"
 msgstr "/Werkzeuge/Pri_vatsphäre"
 
-#: ../src/gtkblist.c:2448
+#: ../src/gtkblist.c:2462
 msgid "/Tools/_File Transfers"
 msgstr "/Werkzeuge/_Dateiübertragungen"
 
-#: ../src/gtkblist.c:2449
+#: ../src/gtkblist.c:2463
 msgid "/Tools/R_oom List"
 msgstr "/Werkzeuge/_Raumliste"
 
-#: ../src/gtkblist.c:2450
+#: ../src/gtkblist.c:2464
 msgid "/Tools/System _Log"
 msgstr "/Werkzeuge/_System-Mitschnitt"
 
-#: ../src/gtkblist.c:2452
+#: ../src/gtkblist.c:2466
 msgid "/Tools/Mute _Sounds"
 msgstr "/Werkzeuge/_Stummschalten"
 
 #. Help
-#: ../src/gtkblist.c:2455
+#: ../src/gtkblist.c:2469
 msgid "/_Help"
 msgstr "/_Hilfe"
 
-#: ../src/gtkblist.c:2456
+#: ../src/gtkblist.c:2470
 msgid "/Help/Online _Help"
 msgstr "/Hilfe/Online-_Hilfe"
 
-#: ../src/gtkblist.c:2457
+#: ../src/gtkblist.c:2471
 msgid "/Help/_Debug Window"
 msgstr "/Hilfe/_Debug-Fenster"
 
-#: ../src/gtkblist.c:2458
+#: ../src/gtkblist.c:2472
 msgid "/Help/_About"
 msgstr "/Hilfe/I_nfo"
 
-#: ../src/gtkblist.c:2490 ../src/gtkblist.c:2559
+#: ../src/gtkblist.c:2504 ../src/gtkblist.c:2573
 #, c-format
 msgid ""
 "\n"
@@ -2613,7 +2612,7 @@
 "\n"
 "<b>Konto:</b> %s"
 
-#: ../src/gtkblist.c:2571
+#: ../src/gtkblist.c:2585
 #, c-format
 msgid ""
 "\n"
@@ -2622,7 +2621,7 @@
 "\n"
 "<b>Buddy-Alias:</b> %s"
 
-#: ../src/gtkblist.c:2583
+#: ../src/gtkblist.c:2597
 #, c-format
 msgid ""
 "\n"
@@ -2631,7 +2630,7 @@
 "\n"
 "<b>Spitzname:</b> %s"
 
-#: ../src/gtkblist.c:2592
+#: ../src/gtkblist.c:2606
 #, c-format
 msgid ""
 "\n"
@@ -2640,7 +2639,7 @@
 "\n"
 "<b>Angemeldet:</b> %s"
 
-#: ../src/gtkblist.c:2603
+#: ../src/gtkblist.c:2617
 #, c-format
 msgid ""
 "\n"
@@ -2649,7 +2648,7 @@
 "\n"
 "<b>Untätig:</b> %s"
 
-#: ../src/gtkblist.c:2638
+#: ../src/gtkblist.c:2652
 #, c-format
 msgid ""
 "\n"
@@ -2658,7 +2657,7 @@
 "\n"
 "<b>Zuletzt gesehen:</b> vor %s"
 
-#: ../src/gtkblist.c:2647
+#: ../src/gtkblist.c:2661
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2666,7 +2665,7 @@
 "\n"
 "<b>Status:</b> Offline"
 
-#: ../src/gtkblist.c:2658
+#: ../src/gtkblist.c:2672
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2674,7 +2673,7 @@
 "\n"
 "<b>Beschreibung:</b> Spooky"
 
-#: ../src/gtkblist.c:2660
+#: ../src/gtkblist.c:2674
 msgid ""
 "\n"
 "<b>Status:</b> Awesome"
@@ -2682,7 +2681,7 @@
 "\n"
 "<b>Status:</b> großartig"
 
-#: ../src/gtkblist.c:2662
+#: ../src/gtkblist.c:2676
 msgid ""
 "\n"
 "<b>Status:</b> Rockin'"
@@ -2690,119 +2689,120 @@
 "\n"
 "<b>Status:</b> Rockin'"
 
-#: ../src/gtkblist.c:2951
+#: ../src/gtkblist.c:2967
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Untätig %dh %02dm"
 
-#: ../src/gtkblist.c:2953
+#: ../src/gtkblist.c:2969
 #, c-format
 msgid "Idle %dm"
 msgstr "Untätig %dm"
 
 #. Idle stuff
-#: ../src/gtkblist.c:2956 ../src/gtkprefs.c:1760
-#: ../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:2844 ../src/protocols/yahoo/yahoo.c:2729
+#: ../src/gtkblist.c:2972 ../src/gtkprefs.c:1760
+#: ../src/protocols/bonjour/bonjour.c:333 ../src/protocols/jabber/buddy.c:641
+#: ../src/protocols/jabber/buddy.c:672 ../src/protocols/msn/msn.c:550
+#: ../src/protocols/msn/state.c:32 ../src/protocols/novell/novell.c:2852
+#: ../src/protocols/oscar/oscar.c:2844 ../src/protocols/yahoo/yahoo.c:2727
 #: ../src/protocols/yahoo/yahoo_profile.c:691
 msgid "Idle"
 msgstr "Untätig"
 
-#: ../src/gtkblist.c:3088
+#: ../src/gtkblist.c:3104
 msgid "/Buddies/New Instant Message..."
 msgstr "/Buddys/_Neue Sofortnachricht..."
 
-#: ../src/gtkblist.c:3089 ../src/gtkblist.c:3122
+#: ../src/gtkblist.c:3105 ../src/gtkblist.c:3138
 msgid "/Buddies/Join a Chat..."
 msgstr "/Buddys/Chat betreten..."
 
-#: ../src/gtkblist.c:3090
+#: ../src/gtkblist.c:3106
 msgid "/Buddies/Get User Info..."
 msgstr "/Buddys/B_enutzer-Info abrufen..."
 
-#: ../src/gtkblist.c:3091
+#: ../src/gtkblist.c:3107
 msgid "/Buddies/Add Buddy..."
 msgstr "/Buddys/B_uddy hinzufügen..."
 
-#: ../src/gtkblist.c:3092 ../src/gtkblist.c:3125
+#: ../src/gtkblist.c:3108 ../src/gtkblist.c:3141
 msgid "/Buddies/Add Chat..."
 msgstr "/Buddys/C_hat hinzufügen..."
 
-#: ../src/gtkblist.c:3093
+#: ../src/gtkblist.c:3109
 msgid "/Buddies/Add Group..."
 msgstr "/Buddys/Gruppe hinzufügen..."
 
-#: ../src/gtkblist.c:3128
+#: ../src/gtkblist.c:3144
 msgid "/Tools/Buddy Pounces"
 msgstr "/Werkzeuge/Buddy-Alarm"
 
-#: ../src/gtkblist.c:3131
+#: ../src/gtkblist.c:3147
 msgid "/Tools/Privacy"
 msgstr "/Werkzeuge/Privatsphäre"
 
-#: ../src/gtkblist.c:3134
+#: ../src/gtkblist.c:3150
 msgid "/Tools/Room List"
 msgstr "/Werkzeuge/Raumliste"
 
-#: ../src/gtkblist.c:3328
+#: ../src/gtkblist.c:3344
 msgid "Manually"
 msgstr "Manuell"
 
-#: ../src/gtkblist.c:3330
+#: ../src/gtkblist.c:3346
 msgid "Alphabetically"
 msgstr "Alphabetisch"
 
-#: ../src/gtkblist.c:3331
+#: ../src/gtkblist.c:3347
 msgid "By status"
 msgstr "Nach Status"
 
-#: ../src/gtkblist.c:3332
+#: ../src/gtkblist.c:3348
 msgid "By log size"
 msgstr "Nach Größe der Logs"
 
-#: ../src/gtkblist.c:3532 ../src/gtkconn.c:196
+#: ../src/gtkblist.c:3549 ../src/gtkconn.c:184
 #, c-format
 msgid "%s disconnected"
 msgstr "%s abgemeldet"
 
-#: ../src/gtkblist.c:3548 ../src/protocols/sametime/sametime.c:3629
+#: ../src/gtkblist.c:3558 ../src/protocols/sametime/sametime.c:3622
 msgid "Connect"
 msgstr "Verbinden"
 
-#: ../src/gtkblist.c:3548
+#: ../src/gtkblist.c:3558
 msgid "Re-enable Account"
 msgstr "Konten reaktivieren"
 
-#: ../src/gtkblist.c:3570
+#: ../src/gtkblist.c:3579
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s abgemeldet: %s</span>"
 
-#: ../src/gtkblist.c:3697
+#: ../src/gtkblist.c:3706
 msgid "/Accounts"
 msgstr "/Konten"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../src/gtkblist.c:3802
+#: ../src/gtkblist.c:3811
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Buddys/Zeige Offline Buddys"
 
-#: ../src/gtkblist.c:3805
+#: ../src/gtkblist.c:3814
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Buddys/Zeige leere Gruppen"
 
-#: ../src/gtkblist.c:3811
+#: ../src/gtkblist.c:3820
 msgid "/Buddies/Show Buddy Details"
 msgstr "/Buddys/Zeige Buddy-Details"
 
-#: ../src/gtkblist.c:3814
+#: ../src/gtkblist.c:3823
 msgid "/Buddies/Show Idle Times"
 msgstr "/Buddys/Zeige Untätigkeitszeiten"
 
-#: ../src/gtkblist.c:4550
+#: ../src/gtkblist.c:4556
 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. "
@@ -2814,25 +2814,25 @@
 "immer es möglich ist.\n"
 
 #. Set up stuff for the account box
-#: ../src/gtkblist.c:4620 ../src/gtkblist.c:4939
+#: ../src/gtkblist.c:4626 ../src/gtkblist.c:4945
 msgid "Account:"
 msgstr "Konto:"
 
-#: ../src/gtkblist.c:4872
+#: ../src/gtkblist.c:4878
 msgid "This protocol does not support chat rooms."
 msgstr "Dieses Protokoll unterstützt keine Chaträume."
 
-#: ../src/gtkblist.c:4888
+#: ../src/gtkblist.c:4894
 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:4905
+#: ../src/gtkblist.c:4911
 msgid "Add Chat"
 msgstr "Chat hinzufügen"
 
-#: ../src/gtkblist.c:4929
+#: ../src/gtkblist.c:4935
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2840,40 +2840,40 @@
 "Bitte geben Sie einen Alias und geeignete Informationen über den Chat ein, "
 "den Sie in Ihre Buddy-Liste aufnehmen wollen.\n"
 
-#: ../src/gtkblist.c:5011 ../src/protocols/sametime/sametime.c:5318
-#: ../src/protocols/sametime/sametime.c:5405
+#: ../src/gtkblist.c:5017 ../src/protocols/sametime/sametime.c:5316
+#: ../src/protocols/sametime/sametime.c:5403
 msgid "Add Group"
 msgstr "Gruppe hinzufügen"
 
-#: ../src/gtkblist.c:5012
+#: ../src/gtkblist.c:5018
 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:5631
+#: ../src/gtkblist.c:5637
 msgid "_Edit Account"
 msgstr "Konto _bearbeiten"
 
-#: ../src/gtkblist.c:5664 ../src/gtkblist.c:5670
+#: ../src/gtkblist.c:5670 ../src/gtkblist.c:5676 ../src/gtkconv.c:2747
 msgid "No actions available"
 msgstr "Keine Aktionen verfügbar"
 
-#: ../src/gtkblist.c:5678
+#: ../src/gtkblist.c:5684
 msgid "_Disable"
 msgstr "_Deaktivieren"
 
-#: ../src/gtkblist.c:5690
+#: ../src/gtkblist.c:5696
 msgid "Enable Account"
 msgstr "Konten aktivieren"
 
-#: ../src/gtkblist.c:5743
+#: ../src/gtkblist.c:5749
 msgid "/Tools"
 msgstr "/Werkzeuge"
 
-#: ../src/gtkblist.c:5829
+#: ../src/gtkblist.c:5835
 msgid "/Buddies/Sort Buddies"
 msgstr "/Buddys/Buddys _sortieren"
 
-#: ../src/gtkconn.c:197
+#: ../src/gtkconn.c:185
 #, c-format
 msgid ""
 "%s was disconnected due to an error: %s\n"
@@ -2901,48 +2901,48 @@
 "zu erhalten.\n"
 "Die folgenden Kommandos sind in diesem Kontext verfügbar:\n"
 
-#: ../src/gtkconv.c:482
+#: ../src/gtkconv.c:478
 msgid "No such command."
 msgstr "Es gibt kein solches Kommando."
 
-#: ../src/gtkconv.c:489
+#: ../src/gtkconv.c:485
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 "Syntaxfehler:  Sie übergaben dem Kommando eine falsche Anzahl von Argumenten."
 
-#: ../src/gtkconv.c:494
+#: ../src/gtkconv.c:490
 msgid "Your command failed for an unknown reason."
 msgstr "Ihre Kommando scheiterte aus einem unbekannten Grund."
 
-#: ../src/gtkconv.c:501
+#: ../src/gtkconv.c:497
 msgid "That command only works in chats, not IMs."
 msgstr "Dieses Kommando funktioniert nur in Chats, nicht bei IMs."
 
-#: ../src/gtkconv.c:504
+#: ../src/gtkconv.c:500
 msgid "That command only works in IMs, not chats."
 msgstr "Dieses Kommando funktioniert nur bei IMs, nicht bei Chats."
 
-#: ../src/gtkconv.c:508
+#: ../src/gtkconv.c:504
 msgid "That command doesn't work on this protocol."
 msgstr "Dieses Kommando funktioniert nicht in diesem Protokoll."
 
-#: ../src/gtkconv.c:742 ../src/gtkconv.c:768
+#: ../src/gtkconv.c:739 ../src/gtkconv.c:765
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Der Buddy hat nicht das gleiche Protokoll wie dieser Chat."
 
-#: ../src/gtkconv.c:762
+#: ../src/gtkconv.c:759
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 "Sie sind im Moment nicht mit einem Konto angemeldet, welches benutzt werden "
 "kann, um diesen Buddy einzuladen."
 
-#: ../src/gtkconv.c:815
+#: ../src/gtkconv.c:812
 msgid "Invite Buddy Into Chat Room"
 msgstr "Buddy in einen Chatraum einladen"
 
 #. Put our happy label in it.
-#: ../src/gtkconv.c:845
+#: ../src/gtkconv.c:842
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2950,318 +2950,330 @@
 "Bitte geben Sie den Benutzernamen der Person ein, die Sie einladen möchten "
 "zusammen mit einer optionalen Einladungsnachricht."
 
-#: ../src/gtkconv.c:866
+#: ../src/gtkconv.c:863
 msgid "_Buddy:"
 msgstr "_Buddy:"
 
-#: ../src/gtkconv.c:886 ../src/gtksavedstatuses.c:1107
-#: ../src/gtksavedstatuses.c:1443
+#: ../src/gtkconv.c:883 ../src/gtksavedstatuses.c:1111
+#: ../src/gtksavedstatuses.c:1447
 msgid "_Message:"
 msgstr "_Nachricht:"
 
-#: ../src/gtkconv.c:943 ../src/gtkconv.c:2378 ../src/gtkdebug.c:217
+#: ../src/gtkconv.c:940 ../src/gtkconv.c:2364 ../src/gtkdebug.c:217
 #: ../src/gtkft.c:490
 msgid "Unable to open file."
 msgstr "Konnte die Datei nicht öffnen."
 
-#: ../src/gtkconv.c:949
+#: ../src/gtkconv.c:946
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Unterhaltung mit %s</h1>\n"
 
-#: ../src/gtkconv.c:973
+#: ../src/gtkconv.c:970
 msgid "Save Conversation"
 msgstr "Unterhaltung speichern"
 
-#: ../src/gtkconv.c:1094 ../src/gtkdebug.c:165 ../src/gtkdebug.c:678
+#: ../src/gtkconv.c:1091 ../src/gtkdebug.c:165 ../src/gtkdebug.c:678
 msgid "Find"
 msgstr "Suchen"
 
-#: ../src/gtkconv.c:1120 ../src/gtkdebug.c:193
+#: ../src/gtkconv.c:1117 ../src/gtkdebug.c:193
 msgid "_Search for:"
 msgstr "_Suche nach:"
 
-#: ../src/gtkconv.c:1291
+#: ../src/gtkconv.c:1288
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
 "Mitschnitt gestartet. Zukünftige Nachrichten dieser Unterhaltung werden "
 "mitgeschnitten."
 
-#: ../src/gtkconv.c:1299
+#: ../src/gtkconv.c:1296
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
 "Mitschnitt angehalten. Zukünftige Nachrichten dieser Unterhaltung werden "
 "nicht mitgeschnitten."
 
-#: ../src/gtkconv.c:1560
+#: ../src/gtkconv.c:1558
 msgid "IM"
 msgstr "Nachricht"
 
-#: ../src/gtkconv.c:1571 ../src/protocols/oscar/oscar.c:640
+#: ../src/gtkconv.c:1569 ../src/protocols/oscar/oscar.c:640
 msgid "Send File"
 msgstr "Datei versenden"
 
-#: ../src/gtkconv.c:1586
+#: ../src/gtkconv.c:1584
 msgid "Un-Ignore"
 msgstr "Nicht Ignorieren"
 
-#: ../src/gtkconv.c:1589
+#: ../src/gtkconv.c:1587
 msgid "Ignore"
 msgstr "Ignorieren"
 
-#: ../src/gtkconv.c:1599
+#: ../src/gtkconv.c:1597
 msgid "Info"
 msgstr "Info"
 
-#: ../src/gtkconv.c:1609
+#: ../src/gtkconv.c:1607
 msgid "Get Away Message"
 msgstr "Neue Abwesenheitsnachricht abholen"
 
-#: ../src/gtkconv.c:1632
+#: ../src/gtkconv.c:1630
 msgid "Last said"
 msgstr "Zuletzt gesagt"
 
-#: ../src/gtkconv.c:2386
+#: ../src/gtkconv.c:2372
 msgid "Unable to save icon file to disk."
 msgstr "Kann Icon-Datei nicht auf die Festplatte speichern."
 
-#: ../src/gtkconv.c:2410
+#: ../src/gtkconv.c:2396
 msgid "Save Icon"
 msgstr "Icon speichern"
 
-#: ../src/gtkconv.c:2459
+#: ../src/gtkconv.c:2445
 msgid "Animate"
 msgstr "Animieren"
 
-#: ../src/gtkconv.c:2464
+#: ../src/gtkconv.c:2450
 msgid "Hide Icon"
 msgstr "Icon verbergen"
 
-#: ../src/gtkconv.c:2470
+#: ../src/gtkconv.c:2456
 msgid "Save Icon As..."
 msgstr "Icon speichern unter..."
 
 #. Conversation menu
-#: ../src/gtkconv.c:2611
+#: ../src/gtkconv.c:2596
 msgid "/_Conversation"
 msgstr "/_Unterhaltung"
 
-#: ../src/gtkconv.c:2613
+#: ../src/gtkconv.c:2598
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Unterhaltung/_Neue Sofortnachricht..."
 
-#: ../src/gtkconv.c:2618
+#: ../src/gtkconv.c:2603
 msgid "/Conversation/_Find..."
 msgstr "/Unterhaltung/_Finden..."
 
-#: ../src/gtkconv.c:2620
+#: ../src/gtkconv.c:2605
 msgid "/Conversation/View _Log"
 msgstr "/Unterhaltung/Betrachte _Mitschnitt"
 
-#: ../src/gtkconv.c:2621
+#: ../src/gtkconv.c:2606
 msgid "/Conversation/_Save As..."
 msgstr "/Unterhaltung/_Speichern als..."
 
-#: ../src/gtkconv.c:2623
+#: ../src/gtkconv.c:2608
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Unterhaltung/_Leeren"
 
-#: ../src/gtkconv.c:2627
+#: ../src/gtkconv.c:2612
 msgid "/Conversation/Se_nd File..."
 msgstr "/Unterhaltung/Datei _senden..."
 
-#: ../src/gtkconv.c:2628
+#: ../src/gtkconv.c:2613
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Unterhaltung/Buddy-Alar_m hinzufügen..."
 
-#: ../src/gtkconv.c:2630
+#: ../src/gtkconv.c:2615
 msgid "/Conversation/_Get Info"
 msgstr "/Unterhaltung/B_enutzer-Info abrufen"
 
-#: ../src/gtkconv.c:2632
+#: ../src/gtkconv.c:2617
 msgid "/Conversation/In_vite..."
 msgstr "/Unterhaltung/_Einladen..."
 
-#: ../src/gtkconv.c:2637
+#: ../src/gtkconv.c:2619
+msgid "/Conversation/M_ore"
+msgstr "/Unterhaltung/M_ehr"
+
+#: ../src/gtkconv.c:2623
 msgid "/Conversation/Al_ias..."
 msgstr "/Unterhaltung/Al_ias..."
 
-#: ../src/gtkconv.c:2639
+#: ../src/gtkconv.c:2625
 msgid "/Conversation/_Block..."
 msgstr "/Unterhaltung/_Blockieren..."
 
+#: ../src/gtkconv.c:2627
+msgid "/Conversation/_Add..."
+msgstr "/Unterhaltung/_Hinzufügen..."
+
+#: ../src/gtkconv.c:2629
+msgid "/Conversation/_Remove..."
+msgstr "/Unterhaltung/_Entfernen..."
+
+#: ../src/gtkconv.c:2634
+msgid "/Conversation/Insert Lin_k..."
+msgstr "/Unterhaltung/Füge Lin_k ein..."
+
+#: ../src/gtkconv.c:2636
+msgid "/Conversation/Insert Imag_e..."
+msgstr "/Unterhaltung/Füge Bil_d ein ..."
+
 #: ../src/gtkconv.c:2641
-msgid "/Conversation/_Add..."
-msgstr "/Unterhaltung/_Hinzufügen..."
-
-#: ../src/gtkconv.c:2643
-msgid "/Conversation/_Remove..."
-msgstr "/Unterhaltung/_Entfernen..."
-
-#: ../src/gtkconv.c:2648
-msgid "/Conversation/Insert Lin_k..."
-msgstr "/Unterhaltung/Füge Lin_k ein..."
-
-#: ../src/gtkconv.c:2650
-msgid "/Conversation/Insert Imag_e..."
-msgstr "/Unterhaltung/Füge Bil_d ein ..."
-
-#: ../src/gtkconv.c:2655
 msgid "/Conversation/_Close"
 msgstr "/Unterhaltung/S_chließen"
 
 #. Options
-#: ../src/gtkconv.c:2659
+#: ../src/gtkconv.c:2645
 msgid "/_Options"
 msgstr "/_Optionen"
 
-#: ../src/gtkconv.c:2660
+#: ../src/gtkconv.c:2646
 msgid "/Options/Enable _Logging"
 msgstr "/Optionen/Schalte _Mitschnitt ein"
 
-#: ../src/gtkconv.c:2661
+#: ../src/gtkconv.c:2647
 msgid "/Options/Enable _Sounds"
 msgstr "/Optionen/Schalte _Klänge ein"
 
-#: ../src/gtkconv.c:2662
+#: ../src/gtkconv.c:2648
 msgid "/Options/Show Buddy _Icon"
 msgstr "/Optionen/Buddy-_Icon anzeigen"
 
-#: ../src/gtkconv.c:2664
+#: ../src/gtkconv.c:2650
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Optionen/Zeige _Werkzeugleisten für Formatierung"
 
-#: ../src/gtkconv.c:2665
+#: ../src/gtkconv.c:2651
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Optionen/Zeige Zeitste_mpel"
 
-#: ../src/gtkconv.c:2757
+#: ../src/gtkconv.c:2726
+msgid "/Conversation/More"
+msgstr "/Unterhaltung/Mehr"
+
+#: ../src/gtkconv.c:2764 ../src/gtkconv.c:2791
+msgid "/Conversation"
+msgstr "/Unterhaltung"
+
+#: ../src/gtkconv.c:2801
 msgid "/Conversation/View Log"
 msgstr "/Unterhaltung/Betrachte Mitschnitt"
 
-#: ../src/gtkconv.c:2763
+#: ../src/gtkconv.c:2807
 msgid "/Conversation/Send File..."
 msgstr "/Unterhaltung/Datei senden ..."
 
-#: ../src/gtkconv.c:2767
+#: ../src/gtkconv.c:2811
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Unterhaltung/Buddy-Alarm hinzufügen..."
 
-#: ../src/gtkconv.c:2773
+#: ../src/gtkconv.c:2817
 msgid "/Conversation/Get Info"
 msgstr "/Unterhaltung/Info abrufen"
 
-#: ../src/gtkconv.c:2777
+#: ../src/gtkconv.c:2821
 msgid "/Conversation/Invite..."
 msgstr "/Unterhaltung/Einladen ..."
 
-#: ../src/gtkconv.c:2783
+#: ../src/gtkconv.c:2827
 msgid "/Conversation/Alias..."
 msgstr "/Unterhaltung/Alias..."
 
-#: ../src/gtkconv.c:2787
+#: ../src/gtkconv.c:2831
 msgid "/Conversation/Block..."
 msgstr "/Unterhaltung/Blockieren..."
 
-#: ../src/gtkconv.c:2791
+#: ../src/gtkconv.c:2835
 msgid "/Conversation/Add..."
 msgstr "/Unterhaltung/Hinzufügen..."
 
-#: ../src/gtkconv.c:2795
+#: ../src/gtkconv.c:2839
 msgid "/Conversation/Remove..."
 msgstr "/Unterhaltung/Entfernen..."
 
-#: ../src/gtkconv.c:2801
+#: ../src/gtkconv.c:2845
 msgid "/Conversation/Insert Link..."
 msgstr "/Unterhaltung/Füge Link ein..."
 
-#: ../src/gtkconv.c:2805
+#: ../src/gtkconv.c:2849
 msgid "/Conversation/Insert Image..."
 msgstr "/Unterhaltung/Füge Bild ein ..."
 
-#: ../src/gtkconv.c:2811
+#: ../src/gtkconv.c:2855
 msgid "/Options/Enable Logging"
 msgstr "/Optionen/Schalte Mitschnitt ein"
 
-#: ../src/gtkconv.c:2814
+#: ../src/gtkconv.c:2858
 msgid "/Options/Enable Sounds"
 msgstr "/Optionen/Schalte Klänge ein"
 
-#: ../src/gtkconv.c:2827
+#: ../src/gtkconv.c:2871
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Optionen/Zeige Werkzeugleisten für Formatierung"
 
-#: ../src/gtkconv.c:2830
+#: ../src/gtkconv.c:2874
 msgid "/Options/Show Timestamps"
 msgstr "/Optionen/Zeige Zeitstempel"
 
-#: ../src/gtkconv.c:2833
+#: ../src/gtkconv.c:2877
 msgid "/Options/Show Buddy Icon"
 msgstr "/Optionen/Zeige Buddy-Icon"
 
-#: ../src/gtkconv.c:2913
+#: ../src/gtkconv.c:2953
 msgid "User is typing..."
 msgstr "Benutzer tippt gerade..."
 
-#: ../src/gtkconv.c:2916
+#: ../src/gtkconv.c:2956
 msgid "User has typed something and stopped"
 msgstr "Benutzer hat etwas getippt und wartet nun"
 
 #. Build the Send To menu
-#: ../src/gtkconv.c:3099
+#: ../src/gtkconv.c:3139
 msgid "_Send To"
 msgstr "_Senden an"
 
-#: ../src/gtkconv.c:3751
+#: ../src/gtkconv.c:3791
 msgid "_Send"
 msgstr "Ab_schicken"
 
-#: ../src/gtkconv.c:3806 ../src/protocols/sametime/sametime.c:3571
+#: ../src/gtkconv.c:3846 ../src/protocols/sametime/sametime.c:3564
 msgid "Topic:"
 msgstr "Thema:"
 
 #. Setup the label telling how many people are in the room.
-#: ../src/gtkconv.c:3858
+#: ../src/gtkconv.c:3898
 msgid "0 people in room"
 msgstr "0 Personen im Raum"
 
-#: ../src/gtkconv.c:3937
+#: ../src/gtkconv.c:3977
 msgid "IM the user"
 msgstr "Benutzer eine IM schicken"
 
-#: ../src/gtkconv.c:3950
+#: ../src/gtkconv.c:3990
 msgid "Ignore the user"
 msgstr "Benutzer ignorieren"
 
-#: ../src/gtkconv.c:3962
+#: ../src/gtkconv.c:4002
 msgid "Get the user's information"
 msgstr "Information zum Benutzer abrufen"
 
-#: ../src/gtkconv.c:4944 ../src/gtkconv.c:5053
+#: ../src/gtkconv.c:4993 ../src/gtkconv.c:5102
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d Person im Raum"
 msgstr[1] "%d Personen im Raum"
 
-#: ../src/gtkconv.c:5610 ../src/gtkstatusbox.c:366
+#: ../src/gtkconv.c:5659 ../src/gtkstatusbox.c:366
 msgid "Typing"
 msgstr "Tippt gerade"
 
-#: ../src/gtkconv.c:5616
+#: ../src/gtkconv.c:5665
 msgid "Stopped Typing"
 msgstr "Tippen gestoppt"
 
-#: ../src/gtkconv.c:5621
+#: ../src/gtkconv.c:5670
 msgid "Nick Said"
 msgstr "Spitzname gesagt"
 
-#: ../src/gtkconv.c:5631
+#: ../src/gtkconv.c:5680
 msgid "New Event"
 msgstr "Neue Ereignisse"
 
-#: ../src/gtkconv.c:6521
+#: ../src/gtkconv.c:6570
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -3269,13 +3281,13 @@
 "say &lt;Nachricht&gt;:  Sendet eine Nachricht genau so, als wenn Sie die "
 "Nachricht ohne ein Kommando absenden."
 
-#: ../src/gtkconv.c:6524
+#: ../src/gtkconv.c:6573
 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:6527
+#: ../src/gtkconv.c:6576
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -3283,60 +3295,60 @@
 "debug &lt;Option&gt;:  Verschiedene Debugging-Informationen zur aktuellen "
 "Unterhaltung senden."
 
-#: ../src/gtkconv.c:6530
+#: ../src/gtkconv.c:6579
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Leert das Gesprächsfenster."
 
-#: ../src/gtkconv.c:6533
+#: ../src/gtkconv.c:6582
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;Kommando&gt;:  Hilfe zu einem bestimmten Kommando."
 
-#: ../src/gtkconv.c:6692
+#: ../src/gtkconv.c:6741
 msgid "Confirm close"
 msgstr "Schließen bestätigen"
 
-#: ../src/gtkconv.c:6724
+#: ../src/gtkconv.c:6773
 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:7246
+#: ../src/gtkconv.c:7295
 msgid "Close other tabs"
 msgstr "Andere Reiter schließen"
 
-#: ../src/gtkconv.c:7252
+#: ../src/gtkconv.c:7301
 msgid "Close all tabs"
 msgstr "Alle Reiter schließen"
 
-#: ../src/gtkconv.c:7260
+#: ../src/gtkconv.c:7309
 msgid "Detach this tab"
 msgstr "Diesen Reiter ablösen"
 
-#: ../src/gtkconv.c:7266
+#: ../src/gtkconv.c:7315
 msgid "Close this tab"
 msgstr "Diesen Reiter schließen"
 
-#: ../src/gtkconv.c:7526
+#: ../src/gtkconv.c:7575
 msgid "Close conversation"
 msgstr "Unterhaltung schließen"
 
-#: ../src/gtkconv.c:7990
+#: ../src/gtkconv.c:8039
 msgid "Last created window"
 msgstr "Letztes erstelltes Fenster"
 
-#: ../src/gtkconv.c:7992
+#: ../src/gtkconv.c:8041
 msgid "Separate IM and Chat windows"
 msgstr "Getrennte IM- und Chat-Fenster"
 
-#: ../src/gtkconv.c:7994 ../src/gtkprefs.c:1258
+#: ../src/gtkconv.c:8043 ../src/gtkprefs.c:1258
 msgid "New window"
 msgstr "Neues Fenster"
 
-#: ../src/gtkconv.c:7996
+#: ../src/gtkconv.c:8045
 msgid "By group"
 msgstr "Nach Gruppe"
 
-#: ../src/gtkconv.c:7998
+#: ../src/gtkconv.c:8047
 msgid "By account"
 msgstr "Nach Konto"
 
@@ -3421,7 +3433,7 @@
 msgid "original author"
 msgstr "Originalautor"
 
-#: ../src/gtkdialogs.c:110 ../src/gtkdialogs.c:111 ../src/gtkdialogs.c:169
+#: ../src/gtkdialogs.c:110 ../src/gtkdialogs.c:111 ../src/gtkdialogs.c:174
 msgid "Bulgarian"
 msgstr "Bulgarisch"
 
@@ -3433,186 +3445,194 @@
 msgid "Bosnian"
 msgstr "Bosnisch"
 
-#: ../src/gtkdialogs.c:115 ../src/gtkdialogs.c:170 ../src/gtkdialogs.c:171
+#: ../src/gtkdialogs.c:115 ../src/gtkdialogs.c:175 ../src/gtkdialogs.c:176
 msgid "Catalan"
 msgstr "Katalanisch"
 
-#: ../src/gtkdialogs.c:116
-msgid "Valencian"
-msgstr "Valencianisch"
-
-#: ../src/gtkdialogs.c:117 ../src/gtkdialogs.c:172
+#: ../src/gtkdialogs.c:116 ../src/gtkdialogs.c:117
+msgid "Valencian-Catalan"
+msgstr "Valencianisch-Katalanisch"
+
+#: ../src/gtkdialogs.c:118 ../src/gtkdialogs.c:177
 msgid "Czech"
 msgstr "Tschechisch"
 
-#: ../src/gtkdialogs.c:118
+#: ../src/gtkdialogs.c:119
 msgid "Danish"
 msgstr "Dänisch"
 
-#: ../src/gtkdialogs.c:119 ../src/gtkdialogs.c:120 ../src/gtkdialogs.c:173
+#: ../src/gtkdialogs.c:120 ../src/gtkdialogs.c:121 ../src/gtkdialogs.c:178
 msgid "German"
 msgstr "Deutsch"
 
-#: ../src/gtkdialogs.c:121 ../src/gtkdialogs.c:122
+#: ../src/gtkdialogs.c:122 ../src/gtkdialogs.c:123
 msgid "Greek"
 msgstr "Griechisch"
 
-#: ../src/gtkdialogs.c:123
+#: ../src/gtkdialogs.c:124
 msgid "Australian English"
 msgstr "Australisches Englisch"
 
-#: ../src/gtkdialogs.c:124
+#: ../src/gtkdialogs.c:125
 msgid "Canadian English"
 msgstr "Kanadisches Englisch"
 
-#: ../src/gtkdialogs.c:125
+#: ../src/gtkdialogs.c:126
 msgid "British English"
 msgstr "Britisches Englisch"
 
-#: ../src/gtkdialogs.c:126 ../src/gtkdialogs.c:174 ../src/gtkdialogs.c:175
-#: ../src/gtkdialogs.c:176 ../src/gtkdialogs.c:177
+#: ../src/gtkdialogs.c:127 ../src/gtkdialogs.c:179 ../src/gtkdialogs.c:180
+#: ../src/gtkdialogs.c:181 ../src/gtkdialogs.c:182
 msgid "Spanish"
 msgstr "Spanisch"
 
-#: ../src/gtkdialogs.c:127 ../src/gtkdialogs.c:128
+#: ../src/gtkdialogs.c:128 ../src/gtkdialogs.c:129
+msgid "Euskera(Basque)"
+msgstr "Euskera (Baskisch)"
+
+#: ../src/gtkdialogs.c:130 ../src/gtkdialogs.c:131
 msgid "Persian"
 msgstr "Persisch"
 
-#: ../src/gtkdialogs.c:129 ../src/gtkdialogs.c:178 ../src/gtkdialogs.c:179
+#: ../src/gtkdialogs.c:132 ../src/gtkdialogs.c:183 ../src/gtkdialogs.c:184
 msgid "Finnish"
 msgstr "Finnisch"
 
-#: ../src/gtkdialogs.c:130 ../src/gtkdialogs.c:180 ../src/gtkdialogs.c:181
-#: ../src/gtkdialogs.c:182 ../src/gtkdialogs.c:183
+#: ../src/gtkdialogs.c:133 ../src/gtkdialogs.c:185 ../src/gtkdialogs.c:186
+#: ../src/gtkdialogs.c:187 ../src/gtkdialogs.c:188
 msgid "French"
 msgstr "Französisch"
 
-#: ../src/gtkdialogs.c:131
-msgid "Galician"
-msgstr "Galizisch"
-
-#: ../src/gtkdialogs.c:132 ../src/gtkdialogs.c:184
-msgid "Hebrew"
-msgstr "Hebräisch"
-
-#: ../src/gtkdialogs.c:133
-msgid "Hindi"
-msgstr "Hindi"
-
 #: ../src/gtkdialogs.c:134
+msgid "Galician"
+msgstr "Galizisch"
+
+#: ../src/gtkdialogs.c:135 ../src/gtkdialogs.c:189
+msgid "Hebrew"
+msgstr "Hebräisch"
+
+#: ../src/gtkdialogs.c:136
+msgid "Hindi"
+msgstr "Hindi"
+
+#: ../src/gtkdialogs.c:137
 msgid "Hungarian"
 msgstr "Ungarisch"
 
-#: ../src/gtkdialogs.c:135 ../src/gtkdialogs.c:185
+#: ../src/gtkdialogs.c:138 ../src/gtkdialogs.c:190
 msgid "Italian"
 msgstr "Italienisch"
 
-#: ../src/gtkdialogs.c:136 ../src/gtkdialogs.c:186 ../src/gtkdialogs.c:187
-#: ../src/gtkdialogs.c:188
+#: ../src/gtkdialogs.c:139 ../src/gtkdialogs.c:191 ../src/gtkdialogs.c:192
+#: ../src/gtkdialogs.c:193
 msgid "Japanese"
 msgstr "Japanisch"
 
-#: ../src/gtkdialogs.c:137 ../src/gtkdialogs.c:189
+#: ../src/gtkdialogs.c:140 ../src/gtkdialogs.c:194
 msgid "Georgian"
 msgstr "Georgisch"
 
-#: ../src/gtkdialogs.c:138 ../src/gtkdialogs.c:190
+#: ../src/gtkdialogs.c:141 ../src/gtkdialogs.c:195
 msgid "Korean"
 msgstr "Koreanisch"
 
-#: ../src/gtkdialogs.c:139 ../src/gtkdialogs.c:140 ../src/gtkdialogs.c:141
+#: ../src/gtkdialogs.c:142 ../src/gtkdialogs.c:143 ../src/gtkdialogs.c:144
 msgid "Kurdish"
 msgstr "Kurdisch"
 
-#: ../src/gtkdialogs.c:142 ../src/gtkdialogs.c:191 ../src/gtkdialogs.c:192
+#: ../src/gtkdialogs.c:145 ../src/gtkdialogs.c:196 ../src/gtkdialogs.c:197
 msgid "Lithuanian"
 msgstr "Litauisch"
 
-#: ../src/gtkdialogs.c:143
+#: ../src/gtkdialogs.c:146
 msgid "Macedonian"
 msgstr "Makedonisch"
 
-#: ../src/gtkdialogs.c:144
+#: ../src/gtkdialogs.c:147
 msgid "Dutch, Flemish"
 msgstr "Niederländisch, Flämisch"
 
-#: ../src/gtkdialogs.c:145
-msgid "Norwegian"
-msgstr "Norwegisch"
-
-#: ../src/gtkdialogs.c:146 ../src/gtkdialogs.c:147 ../src/gtkdialogs.c:193
-msgid "Polish"
-msgstr "Polnisch"
-
 #: ../src/gtkdialogs.c:148
+msgid "Norwegian"
+msgstr "Norwegisch"
+
+#: ../src/gtkdialogs.c:149 ../src/gtkdialogs.c:150 ../src/gtkdialogs.c:198
+msgid "Polish"
+msgstr "Polnisch"
+
+#: ../src/gtkdialogs.c:151
 msgid "Portuguese"
 msgstr "Portugiesisch"
 
-#: ../src/gtkdialogs.c:149
+#: ../src/gtkdialogs.c:152
 msgid "Portuguese-Brazil"
 msgstr "Portugiesisch (Brasilien)"
 
-#: ../src/gtkdialogs.c:150
+#: ../src/gtkdialogs.c:153
 msgid "Romanian"
 msgstr "Rumänisch"
 
-#: ../src/gtkdialogs.c:151 ../src/gtkdialogs.c:194 ../src/gtkdialogs.c:195
+#: ../src/gtkdialogs.c:154 ../src/gtkdialogs.c:199 ../src/gtkdialogs.c:200
 msgid "Russian"
 msgstr "Russisch"
 
-#: ../src/gtkdialogs.c:152 ../src/gtkdialogs.c:153
+#: ../src/gtkdialogs.c:155 ../src/gtkdialogs.c:156
 msgid "Serbian"
 msgstr "Serbisch"
 
-#: ../src/gtkdialogs.c:154
+#: ../src/gtkdialogs.c:157 ../src/gtkdialogs.c:201
+msgid "Slovak"
+msgstr "Slowakisch"
+
+#: ../src/gtkdialogs.c:158
 msgid "Slovenian"
 msgstr "Slowenisch"
 
-#: ../src/gtkdialogs.c:155 ../src/gtkdialogs.c:197
+#: ../src/gtkdialogs.c:159 ../src/gtkdialogs.c:202
 msgid "Swedish"
 msgstr "Schwedisch"
 
-#: ../src/gtkdialogs.c:156
+#: ../src/gtkdialogs.c:160
 msgid "Tamil"
 msgstr "Tamil"
 
-#: ../src/gtkdialogs.c:157
+#: ../src/gtkdialogs.c:161
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../src/gtkdialogs.c:158
+#: ../src/gtkdialogs.c:162
+msgid "Thai"
+msgstr "Thailändisch"
+
+#: ../src/gtkdialogs.c:163
 msgid "Turkish"
 msgstr "Türkisch"
 
-#: ../src/gtkdialogs.c:159
+#: ../src/gtkdialogs.c:164
 msgid "Vietnamese"
 msgstr "Vietnamesisch"
 
-#: ../src/gtkdialogs.c:159
+#: ../src/gtkdialogs.c:164
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh und das Gnome-Vi Team"
 
-#: ../src/gtkdialogs.c:160 ../src/gtkdialogs.c:198
+#: ../src/gtkdialogs.c:165 ../src/gtkdialogs.c:203
 msgid "Simplified Chinese"
 msgstr "Vereinfachtes Chinesisch"
 
-#: ../src/gtkdialogs.c:161 ../src/gtkdialogs.c:162 ../src/gtkdialogs.c:199
+#: ../src/gtkdialogs.c:166 ../src/gtkdialogs.c:167 ../src/gtkdialogs.c:204
 msgid "Traditional Chinese"
 msgstr "Traditionelles Chinesisch"
 
-#: ../src/gtkdialogs.c:168
+#: ../src/gtkdialogs.c:173
 msgid "Amharic"
 msgstr "Amharisch"
 
-#: ../src/gtkdialogs.c:196
-msgid "Slovak"
-msgstr "Slowakisch"
-
-#: ../src/gtkdialogs.c:240
+#: ../src/gtkdialogs.c:245
 msgid "About Gaim"
 msgstr "Über Gaim"
 
-#: ../src/gtkdialogs.c:264
+#: ../src/gtkdialogs.c:269
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, "
@@ -3633,61 +3653,61 @@
 "Liste der Entwickler. Wir übernehmen keine Haftung für dieses Programm."
 "<BR><BR>"
 
-#: ../src/gtkdialogs.c:278
+#: ../src/gtkdialogs.c:283
 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:281
+#: ../src/gtkdialogs.c:286
 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:287
+#: ../src/gtkdialogs.c:292
 msgid "Current Developers"
 msgstr "Aktuelle Entwickler"
 
-#: ../src/gtkdialogs.c:302
+#: ../src/gtkdialogs.c:307
 msgid "Crazy Patch Writers"
 msgstr "Verrückte Patchschreiber"
 
-#: ../src/gtkdialogs.c:317
+#: ../src/gtkdialogs.c:322
 msgid "Retired Developers"
 msgstr "Zurückgetretene Entwickler"
 
-#: ../src/gtkdialogs.c:332
+#: ../src/gtkdialogs.c:337
 msgid "Current Translators"
 msgstr "Aktuelle Übersetzer"
 
-#: ../src/gtkdialogs.c:352
+#: ../src/gtkdialogs.c:357
 msgid "Past Translators"
 msgstr "Frühere Übersetzer"
 
-#: ../src/gtkdialogs.c:370
+#: ../src/gtkdialogs.c:375
 msgid "Debugging Information"
 msgstr "Debugging-Information"
 
-#: ../src/gtkdialogs.c:584 ../src/gtkdialogs.c:721 ../src/gtkdialogs.c:784
+#: ../src/gtkdialogs.c:595 ../src/gtkdialogs.c:732 ../src/gtkdialogs.c:795
 msgid "_Name"
 msgstr "_Name"
 
-#: ../src/gtkdialogs.c:589 ../src/gtkdialogs.c:726 ../src/gtkdialogs.c:789
+#: ../src/gtkdialogs.c:600 ../src/gtkdialogs.c:737 ../src/gtkdialogs.c:800
 msgid "_Account"
 msgstr "_Konto"
 
-#: ../src/gtkdialogs.c:597
+#: ../src/gtkdialogs.c:608
 msgid "New Instant Message"
 msgstr "Neue Sofortnachricht"
 
-#: ../src/gtkdialogs.c:599
+#: ../src/gtkdialogs.c:610
 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:734
+#: ../src/gtkdialogs.c:745
 msgid "Get User Info"
 msgstr "Benutzer-Info abrufen"
 
-#: ../src/gtkdialogs.c:736
+#: ../src/gtkdialogs.c:747
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
@@ -3695,11 +3715,11 @@
 "Bitte geben Sie den Benutzernamen oder den Alias der Person ein, deren Info "
 "Sie sehen möchten."
 
-#: ../src/gtkdialogs.c:798
+#: ../src/gtkdialogs.c:819
 msgid "View User Log"
 msgstr "Benutzer-Mitschnitt anzeigen"
 
-#: ../src/gtkdialogs.c:800
+#: ../src/gtkdialogs.c:821
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
@@ -3707,37 +3727,37 @@
 "Bitte geben Sie den Benutzernamen der Person ein, deren Mitschnitt Sie sehen "
 "möchten."
 
-#: ../src/gtkdialogs.c:819
+#: ../src/gtkdialogs.c:840
 msgid "Alias Contact"
 msgstr "Kontakt-Alias"
 
-#: ../src/gtkdialogs.c:820
+#: ../src/gtkdialogs.c:841
 msgid "Enter an alias for this contact."
 msgstr "Geben Sie einen Alias für diesen Kontakt ein."
 
-#: ../src/gtkdialogs.c:822 ../src/gtkdialogs.c:844 ../src/gtkdialogs.c:864
+#: ../src/gtkdialogs.c:843 ../src/gtkdialogs.c:865 ../src/gtkdialogs.c:885
 #: ../src/gtkrequest.c:277 ../src/protocols/silc/chat.c:587
 msgid "Alias"
 msgstr "Alias"
 
-#: ../src/gtkdialogs.c:840
+#: ../src/gtkdialogs.c:861
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Geben Sie einen Alias %s ein."
 
-#: ../src/gtkdialogs.c:842
+#: ../src/gtkdialogs.c:863
 msgid "Alias Buddy"
 msgstr "Alias für Buddy"
 
-#: ../src/gtkdialogs.c:861
+#: ../src/gtkdialogs.c:882
 msgid "Alias Chat"
 msgstr "Chat-Alias"
 
-#: ../src/gtkdialogs.c:862
+#: ../src/gtkdialogs.c:883
 msgid "Enter an alias for this chat."
 msgstr "Geben Sie einen Alias für diesen Chat ein."
 
-#: ../src/gtkdialogs.c:899
+#: ../src/gtkdialogs.c:920
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -3752,15 +3772,15 @@
 "Sie sind dabei, den Kontakt, der %s und %d andere Buddys enthält, aus Ihrer "
 "Buddy-Liste zu entfernen.  Möchten Sie fortsetzen?"
 
-#: ../src/gtkdialogs.c:907
+#: ../src/gtkdialogs.c:928
 msgid "Remove Contact"
 msgstr "Kontakt entfernen"
 
-#: ../src/gtkdialogs.c:908
+#: ../src/gtkdialogs.c:929
 msgid "_Remove Contact"
 msgstr "_Kontakt entfernen"
 
-#: ../src/gtkdialogs.c:959
+#: ../src/gtkdialogs.c:980
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -3769,15 +3789,15 @@
 "Sie sind dabei, die Gruppe %s und alle darin enthaltenen Mitglieder aus "
 "Ihrer Buddy-Liste zu entfernen. Möchten Sie fortsetzen?"
 
-#: ../src/gtkdialogs.c:962
+#: ../src/gtkdialogs.c:983
 msgid "Remove Group"
 msgstr "Gruppe entfernen"
 
-#: ../src/gtkdialogs.c:963
+#: ../src/gtkdialogs.c:984
 msgid "_Remove Group"
 msgstr "_Gruppe entfernen"
 
-#: ../src/gtkdialogs.c:996
+#: ../src/gtkdialogs.c:1017
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
@@ -3785,15 +3805,15 @@
 "Sie sind dabei, %s aus Ihrer Buddy-Liste zu entfernen. Möchten Sie "
 "fortsetzen?"
 
-#: ../src/gtkdialogs.c:999
+#: ../src/gtkdialogs.c:1020
 msgid "Remove Buddy"
 msgstr "Buddy entfernen"
 
-#: ../src/gtkdialogs.c:1000
+#: ../src/gtkdialogs.c:1021
 msgid "_Remove Buddy"
 msgstr "Buddy _entfernen"
 
-#: ../src/gtkdialogs.c:1021
+#: ../src/gtkdialogs.c:1042
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -3802,11 +3822,11 @@
 "Sie sind dabei, den Chat %s aus Ihrer Buddy-Liste zu entfernen. Möchten Sie "
 "fortsetzen?"
 
-#: ../src/gtkdialogs.c:1024
+#: ../src/gtkdialogs.c:1045
 msgid "Remove Chat"
 msgstr "Chat Entfernen"
 
-#: ../src/gtkdialogs.c:1025
+#: ../src/gtkdialogs.c:1046
 msgid "_Remove Chat"
 msgstr "Chat _entfernen"
 
@@ -4226,7 +4246,7 @@
 "                      Kommata)\n"
 "  -v, --version       zeigt aktuelle Version und beendet das Programm\n"
 
-#: ../src/gtkmain.c:492
+#: ../src/gtkmain.c:493
 #, c-format
 msgid ""
 "Gaim has segfaulted and attempted to dump a core file.\n"
@@ -4274,7 +4294,7 @@
 msgid "Open All Messages"
 msgstr "Alle Nachrichten öffnen"
 
-#: ../src/gtknotify.c:411 ../src/protocols/jabber/jabber.c:1115
+#: ../src/gtknotify.c:411 ../src/protocols/jabber/jabber.c:1118
 msgid "From"
 msgstr "Von"
 
@@ -4304,7 +4324,7 @@
 "\n"
 "%s"
 
-#: ../src/gtknotify.c:688 ../src/protocols/sametime/sametime.c:5458
+#: ../src/gtknotify.c:688 ../src/protocols/sametime/sametime.c:5456
 msgid "Search Results"
 msgstr "Suchergebnisse"
 
@@ -4380,185 +4400,194 @@
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Plugin-Details</b>"
 
-#: ../src/gtkpounce.c:162
+#: ../src/gtkpounce.c:155
 msgid "Select a file"
 msgstr "Wählen Sie eine Datei"
 
-#: ../src/gtkpounce.c:259
+#: ../src/gtkpounce.c:252
 msgid "Please enter a buddy to pounce."
 msgstr "Bitte Buddy zum Alarmieren angeben."
 
-#: ../src/gtkpounce.c:503
+#: ../src/gtkpounce.c:499
 msgid "New Buddy Pounce"
 msgstr "Neuer Buddy-Alarm"
 
-#: ../src/gtkpounce.c:503
+#: ../src/gtkpounce.c:499
 msgid "Edit Buddy Pounce"
 msgstr "Buddy-Alarm bearbeiten"
 
 #. Create the "Pounce on Whom" frame.
-#: ../src/gtkpounce.c:520
+#: ../src/gtkpounce.c:516
 msgid "Pounce on Whom"
 msgstr "Bei wem alarmieren"
 
-#: ../src/gtkpounce.c:547
+#: ../src/gtkpounce.c:543
 msgid "_Buddy name:"
 msgstr "_Buddy-Name:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../src/gtkpounce.c:573
+#: ../src/gtkpounce.c:569
 msgid "Pounce When Buddy..."
 msgstr "Alarm, wenn Buddy..."
 
-#: ../src/gtkpounce.c:581
+#: ../src/gtkpounce.c:577
 msgid "Si_gns on"
 msgstr "_sich anmeldet"
 
+#: ../src/gtkpounce.c:579
+msgid "Signs o_ff"
+msgstr "sich abmel_det"
+
+#: ../src/gtkpounce.c:581
+msgid "Goes a_way"
+msgstr "_hinausgeht"
+
 #: ../src/gtkpounce.c:583
-msgid "Signs o_ff"
-msgstr "sich abmel_det"
-
-#: ../src/gtkpounce.c:585
-msgid "Goes a_way"
-msgstr "_hinausgeht"
-
-#: ../src/gtkpounce.c:587
 msgid "Ret_urns from away"
 msgstr "wi_eder anwesend ist"
 
-#: ../src/gtkpounce.c:589
+#: ../src/gtkpounce.c:585
 msgid "Becomes _idle"
 msgstr "_untätig wird"
 
-#: ../src/gtkpounce.c:591
+#: ../src/gtkpounce.c:587
 msgid "Is no longer i_dle"
 msgstr "nicht meh_r untätig ist"
 
+#: ../src/gtkpounce.c:589
+msgid "Starts _typing"
+msgstr "zu _tippen beginnt"
+
+#: ../src/gtkpounce.c:591
+msgid "P_auses while typing"
+msgstr "_Hält an beim Tippen"
+
 #: ../src/gtkpounce.c:593
-msgid "Starts _typing"
-msgstr "zu _tippen beginnt"
+msgid "Stops t_yping"
+msgstr "aufhört _zu tippen"
 
 #: ../src/gtkpounce.c:595
-msgid "Stops t_yping"
-msgstr "aufhört _zu tippen"
-
-#: ../src/gtkpounce.c:597
 msgid "Sends a _message"
 msgstr "_Nachricht senden"
 
 #. Create the "Action" frame.
-#: ../src/gtkpounce.c:629
+#: ../src/gtkpounce.c:630
 msgid "Action"
 msgstr "Aktion"
 
-#: ../src/gtkpounce.c:637
+#: ../src/gtkpounce.c:638
 msgid "Ope_n an IM window"
 msgstr "Gesprächsfenster ö_ffnen"
 
-#: ../src/gtkpounce.c:639
+#: ../src/gtkpounce.c:640
 msgid "_Pop up a notification"
 msgstr "_Popup-Benachrichtigung"
 
-#: ../src/gtkpounce.c:641
+#: ../src/gtkpounce.c:642
 msgid "Send a _message"
 msgstr "_Nachricht senden"
 
-#: ../src/gtkpounce.c:643
+#: ../src/gtkpounce.c:644
 msgid "E_xecute a command"
 msgstr "Befeh_l ausführen"
 
-#: ../src/gtkpounce.c:645
+#: ../src/gtkpounce.c:646
 msgid "P_lay a sound"
 msgstr "einen _Klang abspielen"
 
-#: ../src/gtkpounce.c:650
+#: ../src/gtkpounce.c:651
 msgid "Brows_e..."
 msgstr "Aus_wählen..."
 
-#: ../src/gtkpounce.c:652
-msgid "Br_owse..."
-msgstr "Aus_wählen..."
-
 #: ../src/gtkpounce.c:653
+msgid "Br_owse..."
+msgstr "Aus_wählen..."
+
+#: ../src/gtkpounce.c:654
 msgid "Pre_view"
 msgstr "_Vorschau"
 
 #. Create the "Options" frame.
-#: ../src/gtkpounce.c:765
+#: ../src/gtkpounce.c:766
 msgid "Options"
 msgstr "Optionen"
 
-#: ../src/gtkpounce.c:773
+#: ../src/gtkpounce.c:774
 msgid "P_ounce only when my status is not available"
 msgstr "Nur _alarmieren, wenn ich nicht verfügbar bin"
 
-#: ../src/gtkpounce.c:778
+#: ../src/gtkpounce.c:779
 msgid "_Recurring"
 msgstr "_Wiederkehrend"
 
-#: ../src/gtkpounce.c:1092
+#: ../src/gtkpounce.c:1085
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "Wollen Sie die Alarmierung für %s (Konto %s) wirklich löschen?"
 
-#: ../src/gtkpounce.c:1240
+#: ../src/gtkpounce.c:1233
 msgid "Pounce Target"
 msgstr "Alarm-Ziel"
 
-#: ../src/gtkpounce.c:1275
+#: ../src/gtkpounce.c:1268
 msgid "Recurring"
 msgstr "Wiederkehrend"
 
-#: ../src/gtkpounce.c:1322
+#: ../src/gtkpounce.c:1315
 msgid "Buddy Pounces"
 msgstr "Buddy-Alarm"
 
-#: ../src/gtkpounce.c:1449
+#: ../src/gtkpounce.c:1442
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s hat begonnen Ihnen zu schreiben (%s)"
 
-#: ../src/gtkpounce.c:1451
+#: ../src/gtkpounce.c:1444
+#, c-format
+msgid "%s has paused while typing to you (%s)"
+msgstr "%s hat beim Schreiben an Sie (%s) angehalten"
+
+#: ../src/gtkpounce.c:1446
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s hat sich angemeldet (%s)"
 
-#: ../src/gtkpounce.c:1453
+#: ../src/gtkpounce.c:1448
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s ist nicht mehr inaktiv (%s)"
 
-#: ../src/gtkpounce.c:1455
+#: ../src/gtkpounce.c:1450
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s ist wieder anwesend (%s)"
 
-#: ../src/gtkpounce.c:1457
+#: ../src/gtkpounce.c:1452
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s hat aufgehört, Ihnen zu schreiben (%s)"
 
-#: ../src/gtkpounce.c:1459
+#: ../src/gtkpounce.c:1454
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s hat sich abgemeldet (%s)"
 
-#: ../src/gtkpounce.c:1461
+#: ../src/gtkpounce.c:1456
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s wurde untätig (%s)"
 
-#: ../src/gtkpounce.c:1463
+#: ../src/gtkpounce.c:1458
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s ist abwesend. (%s)"
 
-#: ../src/gtkpounce.c:1465
+#: ../src/gtkpounce.c:1460
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s hat Ihnen eine Nachricht gesendet. (%s)"
 
-#: ../src/gtkpounce.c:1466
+#: ../src/gtkpounce.c:1461
 msgid "Unknown pounce event. Please report this!"
 msgstr "Unbekanntes Alarm-Ereignis. Bitte berichten Sie dieses Problem!"
 
@@ -4578,8 +4607,8 @@
 msgid "Icon"
 msgstr "Icon"
 
-#: ../src/gtkprefs.c:680 ../src/protocols/jabber/buddy.c:267
-#: ../src/protocols/jabber/buddy.c:821 ../src/protocols/jabber/chat.c:769
+#: ../src/gtkprefs.c:680 ../src/protocols/jabber/buddy.c:286
+#: ../src/protocols/jabber/buddy.c:926 ../src/protocols/jabber/chat.c:767
 msgid "Description"
 msgstr "Beschreibung"
 
@@ -5085,16 +5114,16 @@
 #. * 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/msn/msn.c:557 ../src/protocols/msn/msn.c:566
+#: ../src/protocols/novell/novell.c:1919 ../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"
 
 #: ../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/msn/msn.c:557 ../src/protocols/msn/msn.c:566
+#: ../src/protocols/novell/novell.c:1920 ../src/protocols/silc/buddy.c:314
 #: ../src/protocols/silc/pk.c:118 ../src/protocols/silc/wb.c:304
 #: ../src/request.h:1335
 msgid "No"
@@ -5155,8 +5184,8 @@
 msgid "_Add Chat"
 msgstr "Chat _hinzufügen"
 
-#: ../src/gtksavedstatuses.c:433 ../src/protocols/jabber/buddy.c:264
-#: ../src/protocols/jabber/buddy.c:815 ../src/protocols/novell/novell.c:1486
+#: ../src/gtksavedstatuses.c:433 ../src/protocols/jabber/buddy.c:283
+#: ../src/protocols/jabber/buddy.c:920 ../src/protocols/novell/novell.c:1484
 msgid "Title"
 msgstr "Titel"
 
@@ -5164,25 +5193,25 @@
 msgid "Type"
 msgstr "Typ"
 
-#: ../src/gtksavedstatuses.c:459 ../src/gtksavedstatuses.c:919
+#: ../src/gtksavedstatuses.c:459 ../src/gtksavedstatuses.c:923
 #: ../src/protocols/bonjour/bonjour.c:256
 #: ../src/protocols/bonjour/bonjour.c:263 ../src/protocols/gg/gg.c:1591
 #: ../src/protocols/gg/gg.c:1601 ../src/protocols/gg/gg.c:1607
 #: ../src/protocols/gg/gg.c:1616 ../src/protocols/gg/gg.c:1621
-#: ../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:5356
-#: ../src/protocols/oscar/oscar.c:5371 ../src/protocols/oscar/oscar.c:5376
-#: ../src/protocols/oscar/oscar.c:5584 ../src/protocols/oscar/oscar.c:5596
-#: ../src/protocols/sametime/sametime.c:3273
-#: ../src/protocols/sametime/sametime.c:3279
-#: ../src/protocols/sametime/sametime.c:3285
-#: ../src/protocols/sametime/sametime.c:3364
+#: ../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:2866
+#: ../src/protocols/novell/novell.c:2972 ../src/protocols/novell/novell.c:2978
+#: ../src/protocols/novell/novell.c:2984 ../src/protocols/oscar/oscar.c:5362
+#: ../src/protocols/oscar/oscar.c:5377 ../src/protocols/oscar/oscar.c:5382
+#: ../src/protocols/oscar/oscar.c:5590 ../src/protocols/oscar/oscar.c:5602
+#: ../src/protocols/sametime/sametime.c:3266
+#: ../src/protocols/sametime/sametime.c:3272
+#: ../src/protocols/sametime/sametime.c:3278
+#: ../src/protocols/sametime/sametime.c:3357
 #: ../src/protocols/silc/buddy.c:1544 ../src/protocols/simple/simple.c:242
-#: ../src/protocols/yahoo/yahoo.c:3284 ../src/protocols/yahoo/yahoo.c:3290
+#: ../src/protocols/yahoo/yahoo.c:3282 ../src/protocols/yahoo/yahoo.c:3288
 #: ../src/protocols/zephyr/zephyr.c:2281
 msgid "Message"
 msgstr "Nachricht"
@@ -5192,7 +5221,7 @@
 msgstr "Gespeicherter Status"
 
 #. Use button
-#: ../src/gtksavedstatuses.c:549 ../src/gtksavedstatuses.c:1179
+#: ../src/gtksavedstatuses.c:549 ../src/gtksavedstatuses.c:1183
 msgid "_Use"
 msgstr "Über_nehmen"
 
@@ -5200,114 +5229,92 @@
 msgid "Title already in use.  You must choose a unique title."
 msgstr "Bezeichnung wird bereits benutzt. Bitte wählen Sie eine andere."
 
-#: ../src/gtksavedstatuses.c:879
+#: ../src/gtksavedstatuses.c:883
 msgid "Different"
 msgstr "Anders"
 
-#: ../src/gtksavedstatuses.c:908 ../src/gtksavedstatuses.c:1055
+#: ../src/gtksavedstatuses.c:912 ../src/gtksavedstatuses.c:1059
 #: ../src/protocols/gg/gg.c:1024 ../src/protocols/gg/gg.c:1574
-#: ../src/protocols/gg/gg.c:1578 ../src/protocols/jabber/buddy.c:626
-#: ../src/protocols/jabber/buddy.c:633 ../src/protocols/jabber/buddy.c:644
-#: ../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/gg/gg.c:1578 ../src/protocols/jabber/buddy.c:629
+#: ../src/protocols/jabber/buddy.c:636 ../src/protocols/jabber/buddy.c:662
+#: ../src/protocols/jabber/jabber.c:1156 ../src/protocols/msn/msn.c:548
+#: ../src/protocols/novell/novell.c:2865 ../src/protocols/novell/novell.c:2869
 #: ../src/protocols/oscar/oscar.c:775 ../src/protocols/oscar/oscar.c:781
-#: ../src/protocols/oscar/oscar.c:784 ../src/protocols/yahoo/yahoo.c:2880
+#: ../src/protocols/oscar/oscar.c:784 ../src/protocols/yahoo/yahoo.c:2878
 msgid "Status"
 msgstr "Status"
 
-#: ../src/gtksavedstatuses.c:1072
+#: ../src/gtksavedstatuses.c:1076
 msgid "_Title:"
 msgstr "_Bezeichnung:"
 
-#: ../src/gtksavedstatuses.c:1091 ../src/gtksavedstatuses.c:1412
+#: ../src/gtksavedstatuses.c:1095 ../src/gtksavedstatuses.c:1416
 msgid "_Status:"
 msgstr "_Status:"
 
 #. Different status message expander
-#: ../src/gtksavedstatuses.c:1123
+#: ../src/gtksavedstatuses.c:1127
 msgid "Use a _different status for some accounts"
 msgstr "Benutze einen _anderen Status für einige Konten"
 
 #. Save & Use button
-#: ../src/gtksavedstatuses.c:1187
+#: ../src/gtksavedstatuses.c:1191
 msgid "Sa_ve & Use"
 msgstr "S_peichern & Übernehmen"
 
 #
-#: ../src/gtksavedstatuses.c:1393
+#: ../src/gtksavedstatuses.c:1397
 #, c-format
 msgid "Status for %s"
 msgstr "Status für %s"
 
-#: ../src/gtksound.c:61
+#: ../src/gtksound.c:59
 msgid "Buddy logs in"
 msgstr "Buddy meldet sich an"
 
-#: ../src/gtksound.c:62
+#: ../src/gtksound.c:60
 msgid "Buddy logs out"
 msgstr "Buddy meldet sich ab"
 
-#: ../src/gtksound.c:63
+#: ../src/gtksound.c:61
 msgid "Message received"
 msgstr "Nachricht empfangen"
 
-#: ../src/gtksound.c:64
+#: ../src/gtksound.c:62
 msgid "Message received begins conversation"
 msgstr "Nachricht beginnt neue Unterhaltung"
 
-#: ../src/gtksound.c:65
+#: ../src/gtksound.c:63
 msgid "Message sent"
 msgstr "Nachricht gesendet"
 
-#: ../src/gtksound.c:66
+#: ../src/gtksound.c:64
 msgid "Person enters chat"
 msgstr "Person betritt den Chat"
 
-#: ../src/gtksound.c:67
+#: ../src/gtksound.c:65
 msgid "Person leaves chat"
 msgstr "Person verlässt den Chat"
 
-#: ../src/gtksound.c:68
+#: ../src/gtksound.c:66
 msgid "You talk in chat"
 msgstr "Sie sprechen im Chat"
 
-#: ../src/gtksound.c:69
+#: ../src/gtksound.c:67
 msgid "Others talk in chat"
 msgstr "Andere sprechen im Chat"
 
-#: ../src/gtksound.c:72
+#: ../src/gtksound.c:70
 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:501
-msgid ""
-"Unable to play sound because the 'Command' sound method has been chosen, but "
-"no command has been set."
-msgstr ""
-"Kann keinen Sound spielen, weil die 'Kommando'-Methode gewählt, aber kein "
-"Kommando angegeben wurde."
-
-#: ../src/gtksound.c:513
-#, c-format
-msgid ""
-"Unable to play sound because the configured sound command could not be "
-"launched: %s"
-msgstr ""
-"Kann keinen Sound spielen, weil das konfigurierte Sound-Kommando nicht "
-"aufgerufen werden kann: %s"
-
 #. 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:344
+#: ../src/protocols/jabber/jabber.c:983 ../src/protocols/msn/session.c:344
 #: ../src/protocols/napster/napster.c:536
-#: ../src/protocols/novell/novell.c:2183 ../src/protocols/oscar/oscar.c:1250
-#: ../src/protocols/sametime/sametime.c:3692
-#: ../src/protocols/simple/simple.c:1609 ../src/protocols/yahoo/yahoo.c:2570
+#: ../src/protocols/novell/novell.c:2181 ../src/protocols/oscar/oscar.c:1250
+#: ../src/protocols/sametime/sametime.c:3685
+#: ../src/protocols/simple/simple.c:1615 ../src/protocols/yahoo/yahoo.c:2570
 #: ../src/protocols/zephyr/zephyr.c:1565
 msgid "Connecting"
 msgstr "Verbindungsaufbau"
@@ -5427,31 +5434,31 @@
 msgid "Select color"
 msgstr "Farbe auswählen"
 
-#: ../src/log.c:177
+#: ../src/log.c:180
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">Der Logger hat keine Lesefunktion</font></b>"
 
-#: ../src/log.c:558
+#: ../src/log.c:561
 msgid "HTML"
 msgstr "HTML"
 
-#: ../src/log.c:569
+#: ../src/log.c:572
 msgid "Plain text"
 msgstr "Einfacher Text"
 
-#: ../src/log.c:580
+#: ../src/log.c:583
 msgid "Old Gaim"
 msgstr "Altes Gaim"
 
-#: ../src/log.c:675
+#: ../src/log.c:678
 msgid "Logging of this conversation failed."
 msgstr "Mitschnitt der Unterhaltung fehlgeschlagen."
 
-#: ../src/log.c:1025
+#: ../src/log.c:1028
 msgid "XML"
 msgstr "XML"
 
-#: ../src/log.c:1099
+#: ../src/log.c:1102
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -5460,7 +5467,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: ../src/log.c:1101
+#: ../src/log.c:1104
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -5469,22 +5476,22 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: ../src/log.c:1159 ../src/log.c:1291
+#: ../src/log.c:1162 ../src/log.c:1294
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr ""
 "<font color=\"red\"><b>Kann den Mitschnitt-Pfad nicht finden!</b></font>"
 
-#: ../src/log.c:1171 ../src/log.c:1305
+#: ../src/log.c:1174 ../src/log.c:1308
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Kann folgende Datei nicht lesen: %s</b></font>"
 
-#: ../src/log.c:1233
+#: ../src/log.c:1236
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
-#: ../src/plugin.c:281 ../src/protocols/jabber/buddy.c:1385
+#: ../src/plugin.c:281 ../src/protocols/jabber/buddy.c:1645
 #: ../src/protocols/msn/servconn.c:139 ../src/protocols/msn/session.c:321
 #: ../src/protocols/oscar/oscar.c:2701
 msgid "Unknown error"
@@ -5546,7 +5553,7 @@
 msgstr "Keine Verbindung zum lokalen mDNS-Server. Ist er aktiviert?"
 
 #: ../src/protocols/bonjour/bonjour.c:337
-#: ../src/protocols/sametime/sametime.c:3250
+#: ../src/protocols/sametime/sametime.c:3243
 #, c-format
 msgid ""
 "\n"
@@ -5594,25 +5601,25 @@
 #. port to connect to
 #: ../src/protocols/bonjour/bonjour.c:579 ../src/protocols/irc/irc.c:900
 #: ../src/protocols/msn/msn.c:2054 ../src/protocols/napster/napster.c:724
-#: ../src/protocols/oscar/oscar.c:6460
-#: ../src/protocols/sametime/sametime.c:5642 ../src/protocols/silc/silc.c:1858
+#: ../src/protocols/oscar/oscar.c:6466
+#: ../src/protocols/sametime/sametime.c:5640 ../src/protocols/silc/silc.c:1858
 #: ../src/protocols/toc/toc.c:2344
 msgid "Port"
 msgstr "Port"
 
 # old strings
 #: ../src/protocols/bonjour/bonjour.c:582 ../src/protocols/gg/gg.c:622
-#: ../src/protocols/jabber/jabber.c:770
+#: ../src/protocols/jabber/jabber.c:774
 msgid "First name"
 msgstr "Vorname"
 
 #: ../src/protocols/bonjour/bonjour.c:585 ../src/protocols/gg/gg.c:617
-#: ../src/protocols/jabber/jabber.c:775
+#: ../src/protocols/jabber/jabber.c:779
 msgid "Last name"
 msgstr "Nachname"
 
 #: ../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/jabber/jabber.c:764 ../src/protocols/silc/silc.c:699
 #: ../src/protocols/silc/silc.c:939
 msgid "E-mail"
 msgstr "E-Mail"
@@ -5721,7 +5728,7 @@
 msgstr "Registrierung erfolgreich abgeschlossen!"
 
 #: ../src/protocols/gg/gg.c:473 ../src/protocols/gg/gg.c:764
-#: ../src/protocols/jabber/jabber.c:749 ../src/protocols/jabber/jabber.c:1307
+#: ../src/protocols/jabber/jabber.c:753 ../src/protocols/jabber/jabber.c:1310
 msgid "Password"
 msgstr "Passwort"
 
@@ -5748,9 +5755,9 @@
 #. General
 #: ../src/protocols/gg/gg.c:627 ../src/protocols/gg/gg.c:1038
 #: ../src/protocols/gg/gg.c:1104 ../src/protocols/gg/gg.c:2175
-#: ../src/protocols/jabber/buddy.c:252 ../src/protocols/jabber/buddy.c:698
-#: ../src/protocols/jabber/buddy.c:1262 ../src/protocols/jabber/buddy.c:1444
-#: ../src/protocols/jabber/jabber.c:765 ../src/protocols/msn/msn.c:1373
+#: ../src/protocols/jabber/buddy.c:271 ../src/protocols/jabber/buddy.c:803
+#: ../src/protocols/jabber/buddy.c:1522 ../src/protocols/jabber/buddy.c:1704
+#: ../src/protocols/jabber/jabber.c:769 ../src/protocols/msn/msn.c:1373
 #: ../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
@@ -5759,8 +5766,8 @@
 msgstr "Spitzname"
 
 #: ../src/protocols/gg/gg.c:632 ../src/protocols/gg/gg.c:1043
-#: ../src/protocols/gg/gg.c:1107 ../src/protocols/jabber/jabber.c:785
-#: ../src/protocols/oscar/oscar.c:3677 ../src/protocols/oscar/oscar.c:3685
+#: ../src/protocols/gg/gg.c:1107 ../src/protocols/jabber/jabber.c:789
+#: ../src/protocols/oscar/oscar.c:3687 ../src/protocols/oscar/oscar.c:3695
 msgid "City"
 msgstr "Stadt"
 
@@ -5846,7 +5853,7 @@
 msgstr "UIN"
 
 #: ../src/protocols/gg/gg.c:1033 ../src/protocols/gg/gg.c:1101
-#: ../src/protocols/jabber/buddy.c:1258 ../src/protocols/jabber/buddy.c:1434
+#: ../src/protocols/jabber/buddy.c:1518 ../src/protocols/jabber/buddy.c:1694
 #: ../src/protocols/oscar/oscar.c:3634 ../src/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr "Vorname"
@@ -5856,7 +5863,7 @@
 msgstr "Geburtsjahr"
 
 #: ../src/protocols/gg/gg.c:1092 ../src/protocols/gg/gg.c:1161
-#: ../src/protocols/oscar/oscar.c:3788
+#: ../src/protocols/oscar/oscar.c:3798
 msgid "Unable to display the search results."
 msgstr "Kann Suchergebnisse nicht anzeigen."
 
@@ -5900,7 +5907,7 @@
 msgid "Connection failed."
 msgstr "Verbindung fehlgeschlagen."
 
-#: ../src/protocols/gg/gg.c:1615 ../src/protocols/msn/msn.c:566
+#: ../src/protocols/gg/gg.c:1615 ../src/protocols/msn/msn.c:564
 msgid "Blocked"
 msgstr "Blockiert"
 
@@ -5989,13 +5996,13 @@
 msgid "Unknown command: %s"
 msgstr "Unbekanntes Kommando: %s"
 
-#: ../src/protocols/irc/cmds.c:482 ../src/protocols/jabber/chat.c:592
+#: ../src/protocols/irc/cmds.c:484 ../src/protocols/jabber/chat.c:590
 #: ../src/protocols/silc/silc.c:1293
 #, c-format
 msgid "current topic is: %s"
 msgstr "Das aktuelle Thema ist: %s"
 
-#: ../src/protocols/irc/cmds.c:486 ../src/protocols/jabber/chat.c:596
+#: ../src/protocols/irc/cmds.c:488 ../src/protocols/jabber/chat.c:594
 #: ../src/protocols/silc/silc.c:1297
 msgid "No topic is set"
 msgstr "Kein Thema gesetzt"
@@ -6049,26 +6056,26 @@
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC-Nicknamen dürfen keine Leerzeichen enthalten"
 
-#: ../src/protocols/irc/irc.c:321 ../src/protocols/jabber/jabber.c:550
-#: ../src/protocols/jabber/jabber.c:890
+#: ../src/protocols/irc/irc.c:321 ../src/protocols/jabber/jabber.c:554
+#: ../src/protocols/jabber/jabber.c:893
 msgid "SSL support unavailable"
 msgstr "SSL-Unterstützung nicht verfügbar"
 
 #: ../src/protocols/irc/irc.c:333 ../src/protocols/simple/simple.c:452
-#: ../src/protocols/simple/simple.c:1521
+#: ../src/protocols/simple/simple.c:1527
 msgid "Couldn't create socket"
 msgstr "Kann Socket nicht erstellen"
 
-#: ../src/protocols/irc/irc.c:404 ../src/protocols/jabber/jabber.c:421
+#: ../src/protocols/irc/irc.c:404 ../src/protocols/jabber/jabber.c:426
 #: ../src/protocols/oscar/oscar.c:1246
 msgid "Couldn't connect to host"
 msgstr "Keine Verbindung zum Host"
 
-#: ../src/protocols/irc/irc.c:429 ../src/protocols/jabber/jabber.c:448
+#: ../src/protocols/irc/irc.c:429 ../src/protocols/jabber/jabber.c:453
 msgid "Connection Failed"
 msgstr "Verbindung fehlgeschlagen"
 
-#: ../src/protocols/irc/irc.c:432 ../src/protocols/jabber/jabber.c:451
+#: ../src/protocols/irc/irc.c:432 ../src/protocols/jabber/jabber.c:456
 msgid "SSL Handshake Failed"
 msgstr "SSL Handshake gescheitert"
 
@@ -6081,7 +6088,7 @@
 msgid "Users"
 msgstr "Benutzer"
 
-#: ../src/protocols/irc/irc.c:768 ../src/protocols/sametime/sametime.c:3361
+#: ../src/protocols/irc/irc.c:768 ../src/protocols/sametime/sametime.c:3354
 #: ../src/protocols/silc/chat.c:1424 ../src/protocols/silc/ops.c:1380
 #: ../src/protocols/yahoo/yahoochat.c:1439
 msgid "Topic"
@@ -6106,10 +6113,10 @@
 
 #. host to connect to
 #: ../src/protocols/irc/irc.c:897 ../src/protocols/irc/msgs.c:235
-#: ../src/protocols/jabber/jabber.c:1905 ../src/protocols/msn/msn.c:2049
-#: ../src/protocols/napster/napster.c:719 ../src/protocols/oscar/oscar.c:6457
-#: ../src/protocols/sametime/sametime.c:5637 ../src/protocols/silc/ops.c:1242
-#: ../src/protocols/silc/ops.c:1344 ../src/protocols/simple/simple.c:1769
+#: ../src/protocols/jabber/jabber.c:1908 ../src/protocols/msn/msn.c:2049
+#: ../src/protocols/napster/napster.c:719 ../src/protocols/oscar/oscar.c:6463
+#: ../src/protocols/sametime/sametime.c:5635 ../src/protocols/silc/ops.c:1242
+#: ../src/protocols/silc/ops.c:1344 ../src/protocols/simple/simple.c:1775
 #: ../src/protocols/toc/toc.c:2340
 msgid "Server"
 msgstr "Server"
@@ -6119,7 +6126,7 @@
 msgstr "Kodierungen"
 
 #: ../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/jabber/jabber.c:749 ../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:933
@@ -6451,7 +6458,7 @@
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [Kanal]:  Listet die Benutzer im aktuellen Kanal auf."
 
-#: ../src/protocols/irc/parse.c:129 ../src/protocols/jabber/jabber.c:1743
+#: ../src/protocols/irc/parse.c:129 ../src/protocols/jabber/jabber.c:1746
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;new nickname&gt;:  Ihren Spitznamen ändern."
 
@@ -6632,83 +6639,83 @@
 msgid "SASL error"
 msgstr "SASL-Fehler"
 
-#: ../src/protocols/jabber/buddy.c:249 ../src/protocols/jabber/buddy.c:667
+#: ../src/protocols/jabber/buddy.c:268 ../src/protocols/jabber/buddy.c:772
 #: ../src/protocols/silc/ops.c:1020
 msgid "Full Name"
 msgstr "Vollständiger Name"
 
-#: ../src/protocols/jabber/buddy.c:250 ../src/protocols/jabber/buddy.c:680
+#: ../src/protocols/jabber/buddy.c:269 ../src/protocols/jabber/buddy.c:785
 #: ../src/protocols/silc/ops.c:1032
 msgid "Family Name"
 msgstr "Nachname"
 
-#: ../src/protocols/jabber/buddy.c:251 ../src/protocols/jabber/buddy.c:684
+#: ../src/protocols/jabber/buddy.c:270 ../src/protocols/jabber/buddy.c:789
 msgid "Given Name"
 msgstr "Vorname"
 
-#: ../src/protocols/jabber/buddy.c:253 ../src/protocols/jabber/jabber.c:805
+#: ../src/protocols/jabber/buddy.c:272 ../src/protocols/jabber/jabber.c:809
 msgid "URL"
 msgstr "URL"
 
-#: ../src/protocols/jabber/buddy.c:254 ../src/protocols/jabber/buddy.c:736
+#: ../src/protocols/jabber/buddy.c:273 ../src/protocols/jabber/buddy.c:841
 msgid "Street Address"
 msgstr "Straße"
 
-#: ../src/protocols/jabber/buddy.c:255 ../src/protocols/jabber/buddy.c:732
+#: ../src/protocols/jabber/buddy.c:274 ../src/protocols/jabber/buddy.c:837
 msgid "Extended Address"
 msgstr "Erweiterte Adresse"
 
-#: ../src/protocols/jabber/buddy.c:256 ../src/protocols/jabber/buddy.c:740
+#: ../src/protocols/jabber/buddy.c:275 ../src/protocols/jabber/buddy.c:845
 msgid "Locality"
 msgstr "Ort"
 
-#: ../src/protocols/jabber/buddy.c:257 ../src/protocols/jabber/buddy.c:744
+#: ../src/protocols/jabber/buddy.c:276 ../src/protocols/jabber/buddy.c:849
 msgid "Region"
 msgstr "Region"
 
-#: ../src/protocols/jabber/buddy.c:258 ../src/protocols/jabber/buddy.c:748
+#: ../src/protocols/jabber/buddy.c:277 ../src/protocols/jabber/buddy.c:853
 msgid "Postal Code"
 msgstr "Postleitzahl"
 
-#: ../src/protocols/jabber/buddy.c:259 ../src/protocols/jabber/buddy.c:753
+#: ../src/protocols/jabber/buddy.c:278 ../src/protocols/jabber/buddy.c:858
 #: ../src/protocols/silc/silc.c:943
 msgid "Country"
 msgstr "Land"
 
-#: ../src/protocols/jabber/buddy.c:260 ../src/protocols/jabber/buddy.c:764
-#: ../src/protocols/jabber/buddy.c:771
+#: ../src/protocols/jabber/buddy.c:279 ../src/protocols/jabber/buddy.c:869
+#: ../src/protocols/jabber/buddy.c:876
 msgid "Telephone"
 msgstr "Telefon"
 
-#: ../src/protocols/jabber/buddy.c:261 ../src/protocols/jabber/buddy.c:782
-#: ../src/protocols/jabber/buddy.c:790 ../src/protocols/jabber/buddy.c:1264
+#: ../src/protocols/jabber/buddy.c:280 ../src/protocols/jabber/buddy.c:887
+#: ../src/protocols/jabber/buddy.c:895 ../src/protocols/jabber/buddy.c:1524
 #: ../src/protocols/silc/ops.c:1075 ../src/protocols/silc/util.c:526
 #: ../src/protocols/yahoo/yahoo_profile.c:1036
 msgid "E-Mail"
 msgstr "E-Mail"
 
-#: ../src/protocols/jabber/buddy.c:262 ../src/protocols/jabber/buddy.c:805
+#: ../src/protocols/jabber/buddy.c:281 ../src/protocols/jabber/buddy.c:910
 msgid "Organization Name"
 msgstr "Name der Organisation"
 
-#: ../src/protocols/jabber/buddy.c:263 ../src/protocols/jabber/buddy.c:809
+#: ../src/protocols/jabber/buddy.c:282 ../src/protocols/jabber/buddy.c:914
 msgid "Organization Unit"
 msgstr "Organisationseinheit"
 
-#: ../src/protocols/jabber/buddy.c:265 ../src/protocols/jabber/buddy.c:818
+#: ../src/protocols/jabber/buddy.c:284 ../src/protocols/jabber/buddy.c:923
 msgid "Role"
 msgstr "Funktion"
 
-#: ../src/protocols/jabber/buddy.c:266 ../src/protocols/jabber/buddy.c:701
-#: ../src/protocols/msn/msn.c:1594 ../src/protocols/oscar/oscar.c:3657
+#: ../src/protocols/jabber/buddy.c:285 ../src/protocols/jabber/buddy.c:806
+#: ../src/protocols/msn/msn.c:1594 ../src/protocols/oscar/oscar.c:3667
 msgid "Birthday"
 msgstr "Geburtstag"
 
-#: ../src/protocols/jabber/buddy.c:570 ../src/protocols/jabber/buddy.c:571
+#: ../src/protocols/jabber/buddy.c:588 ../src/protocols/jabber/buddy.c:589
 msgid "Edit Jabber vCard"
 msgstr "Jabber vCard bearbeiten"
 
-#: ../src/protocols/jabber/buddy.c:572
+#: ../src/protocols/jabber/buddy.c:590
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -6716,91 +6723,99 @@
 "Die folgenden Punkte sind optional. Geben Sie nur die Informationen an, die "
 "Sie angeben möchten."
 
-#: ../src/protocols/jabber/buddy.c:642 ../src/protocols/jabber/jabber.c:1908
+#: ../src/protocols/jabber/buddy.c:646 ../src/protocols/jabber/buddy.c:677
+msgid "Client:"
+msgstr "Client:"
+
+#: ../src/protocols/jabber/buddy.c:650 ../src/protocols/jabber/buddy.c:681
+msgid "Operating System"
+msgstr "Betriebssystem:"
+
+#: ../src/protocols/jabber/buddy.c:660 ../src/protocols/jabber/jabber.c:1911
 msgid "Resource"
 msgstr "Ressource"
 
-#: ../src/protocols/jabber/buddy.c:688 ../src/protocols/silc/ops.c:1028
+#: ../src/protocols/jabber/buddy.c:793 ../src/protocols/silc/ops.c:1028
 msgid "Middle Name"
 msgstr "Zweiter Name"
 
-#: ../src/protocols/jabber/buddy.c:721 ../src/protocols/jabber/jabber.c:780
-#: ../src/protocols/oscar/oscar.c:3676 ../src/protocols/oscar/oscar.c:3684
+#: ../src/protocols/jabber/buddy.c:826 ../src/protocols/jabber/jabber.c:784
+#: ../src/protocols/oscar/oscar.c:3686 ../src/protocols/oscar/oscar.c:3694
 #: ../src/protocols/silc/ops.c:1064
 msgid "Address"
 msgstr "Adresse"
 
-#: ../src/protocols/jabber/buddy.c:728
+#: ../src/protocols/jabber/buddy.c:833
 msgid "P.O. Box"
 msgstr "Postfach"
 
-#: ../src/protocols/jabber/buddy.c:842
+#: ../src/protocols/jabber/buddy.c:947
 msgid "Photo"
 msgstr "Foto"
 
-#: ../src/protocols/jabber/buddy.c:842
+#: ../src/protocols/jabber/buddy.c:947
 msgid "Logo"
 msgstr "Logo"
 
-#: ../src/protocols/jabber/buddy.c:1045
+#: ../src/protocols/jabber/buddy.c:1304
 msgid "Un-hide From"
 msgstr "Sichtbar von"
 
-#: ../src/protocols/jabber/buddy.c:1049
+#: ../src/protocols/jabber/buddy.c:1308
 msgid "Temporarily Hide From"
 msgstr "Temporär versteckt von"
 
 #. && NOT ME
-#: ../src/protocols/jabber/buddy.c:1057
+#: ../src/protocols/jabber/buddy.c:1316
 msgid "Cancel Presence Notification"
 msgstr "Abbrechen der Anwesenheitsbenachrichtigung"
 
-#: ../src/protocols/jabber/buddy.c:1064
+#: ../src/protocols/jabber/buddy.c:1323
 msgid "(Re-)Request authorization"
 msgstr "(Nochmal) nach Autorisierung fragen"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../src/protocols/jabber/buddy.c:1073
+#: ../src/protocols/jabber/buddy.c:1332
 msgid "Unsubscribe"
 msgstr "Abbestellen"
 
-#: ../src/protocols/jabber/buddy.c:1100 ../src/protocols/jabber/chat.c:677
-#: ../src/protocols/jabber/chat.c:688 ../src/protocols/jabber/jabber.c:1165
+#: ../src/protocols/jabber/buddy.c:1359 ../src/protocols/jabber/chat.c:675
+#: ../src/protocols/jabber/chat.c:686 ../src/protocols/jabber/jabber.c:1168
 #: ../src/protocols/silc/ops.c:1449
 msgid "Error"
 msgstr "Fehler"
 
-#: ../src/protocols/jabber/buddy.c:1106 ../src/protocols/jabber/jabber.c:1190
+#: ../src/protocols/jabber/buddy.c:1365 ../src/protocols/jabber/jabber.c:1193
 msgid "Chatty"
 msgstr "Gesprächig"
 
-#: ../src/protocols/jabber/buddy.c:1110 ../src/status.c:159
+#: ../src/protocols/jabber/buddy.c:1369 ../src/status.c:159
 msgid "Extended Away"
 msgstr "Abwesend (erweitert)"
 
-#: ../src/protocols/jabber/buddy.c:1112 ../src/protocols/jabber/jabber.c:1220
-#: ../src/protocols/oscar/oscar.c:713 ../src/protocols/oscar/oscar.c:5613
-#: ../src/protocols/sametime/sametime.c:3284
+#: ../src/protocols/jabber/buddy.c:1371 ../src/protocols/jabber/jabber.c:1223
+#: ../src/protocols/oscar/oscar.c:713 ../src/protocols/oscar/oscar.c:5619
+#: ../src/protocols/sametime/sametime.c:3277
 msgid "Do Not Disturb"
 msgstr "Nicht stören"
 
-#: ../src/protocols/jabber/buddy.c:1256
+#: ../src/protocols/jabber/buddy.c:1516
 msgid "JID"
 msgstr "JID"
 
-#: ../src/protocols/jabber/buddy.c:1260 ../src/protocols/jabber/buddy.c:1439
+#: ../src/protocols/jabber/buddy.c:1520 ../src/protocols/jabber/buddy.c:1699
 #: ../src/protocols/oscar/oscar.c:3635
 msgid "Last Name"
 msgstr "Nachname"
 
-#: ../src/protocols/jabber/buddy.c:1292
+#: ../src/protocols/jabber/buddy.c:1552
 msgid "The following are the results of your search"
 msgstr "Dies sind die Ergebnisse Ihrer Suche"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../src/protocols/jabber/buddy.c:1367
+#: ../src/protocols/jabber/buddy.c:1627
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -6808,53 +6823,53 @@
 "Suchen Sie einen Kontakt durch Eingabe von Suchkriterien in den angegebenen "
 "Feldern. Hinweis: Jedes Feld unterstützt die Suche mit Platzhaltern (%)"
 
-#: ../src/protocols/jabber/buddy.c:1387
+#: ../src/protocols/jabber/buddy.c:1647
 msgid "Directory Query Failed"
 msgstr "Verzeichnisanfrage gescheitert"
 
-#: ../src/protocols/jabber/buddy.c:1388
+#: ../src/protocols/jabber/buddy.c:1648
 msgid "Could not query the directory server."
 msgstr "Konnte die Anfrage beim Verzeichnisdienst nicht durchführen."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../src/protocols/jabber/buddy.c:1422
+#: ../src/protocols/jabber/buddy.c:1682
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Anleitung vom Server: %s"
 
-#: ../src/protocols/jabber/buddy.c:1429
+#: ../src/protocols/jabber/buddy.c:1689
 msgid "Fill in one or more fields to search for any matching Jabber users."
 msgstr ""
 "Füllen sie ein oder mehrere Felder aus, um nach entsprechenden Jabber-"
 "Benutzern zu suchen."
 
-#: ../src/protocols/jabber/buddy.c:1449 ../src/protocols/novell/novell.c:1490
+#: ../src/protocols/jabber/buddy.c:1709 ../src/protocols/novell/novell.c:1488
 #: ../src/protocols/oscar/oscar.c:3637 ../src/protocols/oscar/oscar.c:3644
 msgid "E-Mail Address"
 msgstr "E-Mail-Adresse"
 
-#: ../src/protocols/jabber/buddy.c:1458 ../src/protocols/jabber/buddy.c:1459
+#: ../src/protocols/jabber/buddy.c:1718 ../src/protocols/jabber/buddy.c:1719
 msgid "Search for Jabber users"
 msgstr "Nach Jabber-Benutzern suchen"
 
-#: ../src/protocols/jabber/buddy.c:1473
+#: ../src/protocols/jabber/buddy.c:1733
 msgid "Invalid Directory"
 msgstr "Ungültiges Verzeichnis"
 
-#: ../src/protocols/jabber/buddy.c:1490
+#: ../src/protocols/jabber/buddy.c:1750
 msgid "Enter a User Directory"
 msgstr "Geben Sie ein Benutzerverzeichnis ein"
 
-#: ../src/protocols/jabber/buddy.c:1491
+#: ../src/protocols/jabber/buddy.c:1751
 msgid "Select a user directory to search"
 msgstr "Wählen Sie ein Benutzerverzeichnis zum Suchen"
 
-#: ../src/protocols/jabber/buddy.c:1494
+#: ../src/protocols/jabber/buddy.c:1754
 msgid "Search Directory"
 msgstr "Suche im Verzeichnis"
 
-#: ../src/protocols/jabber/chat.c:41 ../src/protocols/oscar/oscar.c:5098
+#: ../src/protocols/jabber/chat.c:41 ../src/protocols/oscar/oscar.c:5104
 #: ../src/protocols/yahoo/yahoochat.c:998
 msgid "_Room:"
 msgstr "_Raum:"
@@ -6898,45 +6913,45 @@
 msgid "Configuration error"
 msgstr "Konfigurationsfehler"
 
-#: ../src/protocols/jabber/chat.c:404 ../src/protocols/jabber/chat.c:549
+#: ../src/protocols/jabber/chat.c:404 ../src/protocols/jabber/chat.c:547
 msgid "Unable to configure"
 msgstr "Kann nicht konfigurieren"
 
-#: ../src/protocols/jabber/chat.c:420
+#: ../src/protocols/jabber/chat.c:419
 msgid "Room Configuration Error"
 msgstr "Raum-Konfigurationsfehler"
 
-#: ../src/protocols/jabber/chat.c:421
+#: ../src/protocols/jabber/chat.c:420
 msgid "This room is not capable of being configured"
 msgstr "Dieser Raum kann nicht konfiguriert werden"
 
-#: ../src/protocols/jabber/chat.c:471 ../src/protocols/jabber/chat.c:540
+#: ../src/protocols/jabber/chat.c:469 ../src/protocols/jabber/chat.c:538
 msgid "Registration error"
 msgstr "Registrierungsfehler"
 
-#: ../src/protocols/jabber/chat.c:628
+#: ../src/protocols/jabber/chat.c:626
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr ""
 "Die Änderung des Nick-Namens wird in nicht-MUC Chaträumen nicht unterstützt"
 
-#: ../src/protocols/jabber/chat.c:678 ../src/protocols/jabber/chat.c:689
+#: ../src/protocols/jabber/chat.c:676 ../src/protocols/jabber/chat.c:687
 #: ../src/protocols/silc/ops.c:1449
 msgid "Error retrieving room list"
 msgstr "Fehler beim Empfangen der Raumliste"
 
-#: ../src/protocols/jabber/chat.c:737
+#: ../src/protocols/jabber/chat.c:735
 msgid "Invalid Server"
 msgstr "Ungültiger Server"
 
-#: ../src/protocols/jabber/chat.c:775
+#: ../src/protocols/jabber/chat.c:773
 msgid "Enter a Conference Server"
 msgstr "Geben Sie einen Konferenzserver ein"
 
-#: ../src/protocols/jabber/chat.c:776
+#: ../src/protocols/jabber/chat.c:774
 msgid "Select a conference server to query"
 msgstr "Wählen Sie einen Konferenz-Server zur Abfrage"
 
-#: ../src/protocols/jabber/chat.c:779
+#: ../src/protocols/jabber/chat.c:777
 msgid "Find Rooms"
 msgstr "Finde Räume"
 
@@ -6944,407 +6959,407 @@
 msgid "Error initializing session"
 msgstr "Fehler bei Initialisieren der Sitzung"
 
-#: ../src/protocols/jabber/jabber.c:226 ../src/protocols/jabber/jabber.c:275
-#: ../src/protocols/jabber/jabber.c:303
+#: ../src/protocols/jabber/jabber.c:232 ../src/protocols/jabber/jabber.c:281
+#: ../src/protocols/jabber/jabber.c:309
 msgid "Write error"
 msgstr "Schreibfehler"
 
-#: ../src/protocols/jabber/jabber.c:355 ../src/protocols/jabber/jabber.c:388
+#: ../src/protocols/jabber/jabber.c:361 ../src/protocols/jabber/jabber.c:394
 msgid "Read Error"
 msgstr "Fehler beim Lesen"
 
-#: ../src/protocols/jabber/jabber.c:474 ../src/protocols/jabber/jabber.c:900
+#: ../src/protocols/jabber/jabber.c:479 ../src/protocols/jabber/jabber.c:903
 msgid "Unable to create socket"
 msgstr "Kann Socket nicht erstellen"
 
-#: ../src/protocols/jabber/jabber.c:520 ../src/protocols/jabber/jabber.c:857
+#: ../src/protocols/jabber/jabber.c:524 ../src/protocols/jabber/jabber.c:861
 msgid "Invalid Jabber ID"
 msgstr "Ungültige Jabber-ID"
 
-#: ../src/protocols/jabber/jabber.c:590
+#: ../src/protocols/jabber/jabber.c:594
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registrierung von %s@%s erfolgreich"
 
-#: ../src/protocols/jabber/jabber.c:592 ../src/protocols/jabber/jabber.c:593
+#: ../src/protocols/jabber/jabber.c:596 ../src/protocols/jabber/jabber.c:597
 msgid "Registration Successful"
 msgstr "Registrierung erfolgreich"
 
-#: ../src/protocols/jabber/jabber.c:599 ../src/protocols/jabber/jabber.c:1456
+#: ../src/protocols/jabber/jabber.c:603 ../src/protocols/jabber/jabber.c:1459
 msgid "Unknown Error"
 msgstr "Unbekannter Fehler"
 
-#: ../src/protocols/jabber/jabber.c:601 ../src/protocols/jabber/jabber.c:602
+#: ../src/protocols/jabber/jabber.c:605 ../src/protocols/jabber/jabber.c:606
 msgid "Registration Failed"
 msgstr "Registrierung fehlgeschlagen"
 
-#: ../src/protocols/jabber/jabber.c:713 ../src/protocols/jabber/jabber.c:714
+#: ../src/protocols/jabber/jabber.c:717 ../src/protocols/jabber/jabber.c:718
 msgid "Already Registered"
 msgstr "Schon registriert"
 
-#: ../src/protocols/jabber/jabber.c:790 ../src/protocols/oscar/oscar.c:3678
-#: ../src/protocols/oscar/oscar.c:3686
+#: ../src/protocols/jabber/jabber.c:794 ../src/protocols/oscar/oscar.c:3688
+#: ../src/protocols/oscar/oscar.c:3696
 msgid "State"
 msgstr "Provinz/Bundesland"
 
-#: ../src/protocols/jabber/jabber.c:795
+#: ../src/protocols/jabber/jabber.c:799
 msgid "Postal code"
 msgstr "Postleitzahl"
 
-#: ../src/protocols/jabber/jabber.c:800 ../src/protocols/silc/ops.c:1069
+#: ../src/protocols/jabber/jabber.c:804 ../src/protocols/silc/ops.c:1069
 #: ../src/protocols/silc/silc.c:701 ../src/protocols/silc/util.c:528
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/protocols/jabber/jabber.c:810
+#: ../src/protocols/jabber/jabber.c:814
 msgid "Date"
 msgstr "Datum"
 
-#: ../src/protocols/jabber/jabber.c:818
+#: ../src/protocols/jabber/jabber.c:822
 msgid "Please fill out the information below to register your new account."
 msgstr ""
 "Bitte füllen Sie die unten stehenden Informationen aus, um ein neues Konto "
 "zu registrieren."
 
-#: ../src/protocols/jabber/jabber.c:821 ../src/protocols/jabber/jabber.c:822
+#: ../src/protocols/jabber/jabber.c:825 ../src/protocols/jabber/jabber.c:826
 msgid "Register New Jabber Account"
 msgstr "Registrierung eines neuen Jabber-Kontos"
 
-#: ../src/protocols/jabber/jabber.c:983
+#: ../src/protocols/jabber/jabber.c:987
 msgid "Initializing Stream"
 msgstr "Initialisiere den Stream"
 
-#: ../src/protocols/jabber/jabber.c:989 ../src/protocols/msn/session.c:350
+#: ../src/protocols/jabber/jabber.c:992 ../src/protocols/msn/session.c:350
 msgid "Authenticating"
 msgstr "Authentifizierung"
 
-#: ../src/protocols/jabber/jabber.c:998
+#: ../src/protocols/jabber/jabber.c:1001
 msgid "Re-initializing Stream"
 msgstr "Initialisiere Stream nochmal"
 
-#: ../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:782 ../src/protocols/oscar/oscar.c:5404
+#: ../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:782 ../src/protocols/oscar/oscar.c:5410
 msgid "Not Authorized"
 msgstr "Nicht autorisiert"
 
-#: ../src/protocols/jabber/jabber.c:1111
+#: ../src/protocols/jabber/jabber.c:1114
 msgid "Both"
 msgstr "Beide"
 
-#: ../src/protocols/jabber/jabber.c:1113
+#: ../src/protocols/jabber/jabber.c:1116
 msgid "From (To pending)"
 msgstr "Von (zu den offenen)"
 
-#: ../src/protocols/jabber/jabber.c:1118
+#: ../src/protocols/jabber/jabber.c:1121
 msgid "To"
 msgstr "Zu"
 
-#: ../src/protocols/jabber/jabber.c:1120
+#: ../src/protocols/jabber/jabber.c:1123
 msgid "None (To pending)"
 msgstr "Kein (zu den offenen)"
 
-#: ../src/protocols/jabber/jabber.c:1124
+#: ../src/protocols/jabber/jabber.c:1127
 msgid "Subscription"
 msgstr "Abonnement"
 
-#: ../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: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
 msgid "Priority"
 msgstr "Priorität"
 
-#: ../src/protocols/jabber/jabber.c:1250
+#: ../src/protocols/jabber/jabber.c:1253
 msgid "Password Changed"
 msgstr "Passwort geändert"
 
-#: ../src/protocols/jabber/jabber.c:1251
+#: ../src/protocols/jabber/jabber.c:1254
 msgid "Your password has been changed."
 msgstr "Ihr Passwort wurde geändert."
 
-#: ../src/protocols/jabber/jabber.c:1255 ../src/protocols/jabber/jabber.c:1256
+#: ../src/protocols/jabber/jabber.c:1258 ../src/protocols/jabber/jabber.c:1259
 msgid "Error changing password"
 msgstr "Fehler beim Ändern des Passworts"
 
-#: ../src/protocols/jabber/jabber.c:1312
+#: ../src/protocols/jabber/jabber.c:1315
 msgid "Password (again)"
 msgstr "Passwort (nochmal)"
 
-#: ../src/protocols/jabber/jabber.c:1317 ../src/protocols/jabber/jabber.c:1318
+#: ../src/protocols/jabber/jabber.c:1320 ../src/protocols/jabber/jabber.c:1321
 msgid "Change Jabber Password"
 msgstr "Ändere das Jabber-Passwort"
 
-#: ../src/protocols/jabber/jabber.c:1318
+#: ../src/protocols/jabber/jabber.c:1321
 msgid "Please enter your new password"
 msgstr "Bitte geben Sie Ihr neues Passwort ein"
 
-#: ../src/protocols/jabber/jabber.c:1328 ../src/protocols/oscar/oscar.c:6174
+#: ../src/protocols/jabber/jabber.c:1331 ../src/protocols/oscar/oscar.c:6180
 #: ../src/protocols/silc/silc.c:1023
 msgid "Set User Info..."
 msgstr "Benutzer-Info setzen..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../src/protocols/jabber/jabber.c:1333 ../src/protocols/oscar/oscar.c:6185
+#: ../src/protocols/jabber/jabber.c:1336 ../src/protocols/oscar/oscar.c:6191
 #: ../src/protocols/silc/silc.c:1019
 msgid "Change Password..."
 msgstr "Passwort ändern..."
 
 #. }
-#: ../src/protocols/jabber/jabber.c:1338
+#: ../src/protocols/jabber/jabber.c:1341
 msgid "Search for Users..."
 msgstr "Suche nach Benutzern..."
 
-#: ../src/protocols/jabber/jabber.c:1414
+#: ../src/protocols/jabber/jabber.c:1417
 msgid "Bad Request"
 msgstr "Falsche Anfrage"
 
-#: ../src/protocols/jabber/jabber.c:1416
+#: ../src/protocols/jabber/jabber.c:1419
 msgid "Conflict"
 msgstr "Konflikt"
 
-#: ../src/protocols/jabber/jabber.c:1418
+#: ../src/protocols/jabber/jabber.c:1421
 msgid "Feature Not Implemented"
 msgstr "Feature nicht implementiert"
 
-#: ../src/protocols/jabber/jabber.c:1420
+#: ../src/protocols/jabber/jabber.c:1423
 msgid "Forbidden"
 msgstr "Verboten"
 
-#: ../src/protocols/jabber/jabber.c:1422
+#: ../src/protocols/jabber/jabber.c:1425
 msgid "Gone"
 msgstr "Gegangen"
 
-#: ../src/protocols/jabber/jabber.c:1424 ../src/protocols/jabber/jabber.c:1499
+#: ../src/protocols/jabber/jabber.c:1427 ../src/protocols/jabber/jabber.c:1502
 msgid "Internal Server Error"
 msgstr "Interner Server-Fehler"
 
-#: ../src/protocols/jabber/jabber.c:1426
+#: ../src/protocols/jabber/jabber.c:1429
 msgid "Item Not Found"
 msgstr "Eintrag nicht gefunden"
 
-#: ../src/protocols/jabber/jabber.c:1428
+#: ../src/protocols/jabber/jabber.c:1431
 msgid "Malformed Jabber ID"
 msgstr "Falsche Jabber-ID"
 
-#: ../src/protocols/jabber/jabber.c:1430
+#: ../src/protocols/jabber/jabber.c:1433
 msgid "Not Acceptable"
 msgstr "Nicht akzeptabel"
 
-#: ../src/protocols/jabber/jabber.c:1432
+#: ../src/protocols/jabber/jabber.c:1435
 msgid "Not Allowed"
 msgstr "Nicht erlaubt"
 
-#: ../src/protocols/jabber/jabber.c:1436
+#: ../src/protocols/jabber/jabber.c:1439
 msgid "Payment Required"
 msgstr "Bezahlung erforderlich"
 
-#: ../src/protocols/jabber/jabber.c:1438
+#: ../src/protocols/jabber/jabber.c:1441
 msgid "Recipient Unavailable"
 msgstr "Empfänger nicht verfügbar"
 
-#: ../src/protocols/jabber/jabber.c:1442
+#: ../src/protocols/jabber/jabber.c:1445
 msgid "Registration Required"
 msgstr "Registrierung erforderlich"
 
-#: ../src/protocols/jabber/jabber.c:1444
+#: ../src/protocols/jabber/jabber.c:1447
 msgid "Remote Server Not Found"
 msgstr "Remote-Server nicht gefunden"
 
-#: ../src/protocols/jabber/jabber.c:1446
+#: ../src/protocols/jabber/jabber.c:1449
 msgid "Remote Server Timeout"
 msgstr "Zeitüberschreitung beim Remote-Server"
 
-#: ../src/protocols/jabber/jabber.c:1448
+#: ../src/protocols/jabber/jabber.c:1451
 msgid "Server Overloaded"
 msgstr "Server überlastet"
 
-#: ../src/protocols/jabber/jabber.c:1450
+#: ../src/protocols/jabber/jabber.c:1453
 msgid "Service Unavailable"
 msgstr "Dienst nicht erreichbar"
 
-#: ../src/protocols/jabber/jabber.c:1452
+#: ../src/protocols/jabber/jabber.c:1455
 msgid "Subscription Required"
 msgstr "Abonnement erforderlich"
 
-#: ../src/protocols/jabber/jabber.c:1454
+#: ../src/protocols/jabber/jabber.c:1457
 msgid "Unexpected Request"
 msgstr "Unerwartete Anfrage"
 
-#: ../src/protocols/jabber/jabber.c:1461
+#: ../src/protocols/jabber/jabber.c:1464
 msgid "Authorization Aborted"
 msgstr "Autorisierung abgebrochen"
 
-#: ../src/protocols/jabber/jabber.c:1463
+#: ../src/protocols/jabber/jabber.c:1466
 msgid "Incorrect encoding in authorization"
 msgstr "Falsche Kodierung in der Autorisierung"
 
-#: ../src/protocols/jabber/jabber.c:1466
+#: ../src/protocols/jabber/jabber.c:1469
 msgid "Invalid authzid"
 msgstr "Ungültige authzid"
 
-#: ../src/protocols/jabber/jabber.c:1469
+#: ../src/protocols/jabber/jabber.c:1472
 msgid "Invalid Authorization Mechanism"
 msgstr "Falscher Autorisierungsmechanismus"
 
-#: ../src/protocols/jabber/jabber.c:1472
+#: ../src/protocols/jabber/jabber.c:1475
 msgid "Authorization mechanism too weak"
 msgstr "Autorisierungsmechanismus zu schwach"
 
-#: ../src/protocols/jabber/jabber.c:1477
+#: ../src/protocols/jabber/jabber.c:1480
 msgid "Temporary Authentication Failure"
 msgstr "Temporärer Authentifizierungsfehler"
 
-#: ../src/protocols/jabber/jabber.c:1480
+#: ../src/protocols/jabber/jabber.c:1483
 msgid "Authentication Failure"
 msgstr "Authentifizierungsfehler"
 
-#: ../src/protocols/jabber/jabber.c:1484
+#: ../src/protocols/jabber/jabber.c:1487
 msgid "Bad Format"
 msgstr "Schlechtes Format"
 
-#: ../src/protocols/jabber/jabber.c:1486
+#: ../src/protocols/jabber/jabber.c:1489
 msgid "Bad Namespace Prefix"
 msgstr "Falsches Namensraum-Präfix"
 
-#: ../src/protocols/jabber/jabber.c:1489
+#: ../src/protocols/jabber/jabber.c:1492
 msgid "Resource Conflict"
 msgstr "Ressourcenkonflikt"
 
-#: ../src/protocols/jabber/jabber.c:1491 ../src/protocols/silc/ops.c:1728
+#: ../src/protocols/jabber/jabber.c:1494 ../src/protocols/silc/ops.c:1728
 msgid "Connection Timeout"
 msgstr "Verbindungsabbruch wegen Zeitüberschreitung"
 
-#: ../src/protocols/jabber/jabber.c:1493
+#: ../src/protocols/jabber/jabber.c:1496
 msgid "Host Gone"
 msgstr "Server hat sich verabschiedet"
 
-#: ../src/protocols/jabber/jabber.c:1495
+#: ../src/protocols/jabber/jabber.c:1498
 msgid "Host Unknown"
 msgstr "Rechner unbekannt"
 
-#: ../src/protocols/jabber/jabber.c:1497
+#: ../src/protocols/jabber/jabber.c:1500
 msgid "Improper Addressing"
 msgstr "Falsche Adressierung"
 
-#: ../src/protocols/jabber/jabber.c:1501
+#: ../src/protocols/jabber/jabber.c:1504
 msgid "Invalid ID"
 msgstr "Ungültige ID"
 
-#: ../src/protocols/jabber/jabber.c:1503
+#: ../src/protocols/jabber/jabber.c:1506
 msgid "Invalid Namespace"
 msgstr "Ungültiger Namenraum"
 
-#: ../src/protocols/jabber/jabber.c:1505
+#: ../src/protocols/jabber/jabber.c:1508
 msgid "Invalid XML"
 msgstr "Ungültiges XML"
 
-#: ../src/protocols/jabber/jabber.c:1507
+#: ../src/protocols/jabber/jabber.c:1510
 msgid "Non-matching Hosts"
 msgstr "Nicht-passender Rechner"
 
-#: ../src/protocols/jabber/jabber.c:1511
+#: ../src/protocols/jabber/jabber.c:1514
 msgid "Policy Violation"
 msgstr "Richtlinien-Verletzung"
 
-#: ../src/protocols/jabber/jabber.c:1513
+#: ../src/protocols/jabber/jabber.c:1516
 msgid "Remote Connection Failed"
 msgstr "Entfernte Verbindung fehlgeschlagen"
 
-#: ../src/protocols/jabber/jabber.c:1515
+#: ../src/protocols/jabber/jabber.c:1518
 msgid "Resource Constraint"
 msgstr "Eingeschränkte Ressourcen"
 
-#: ../src/protocols/jabber/jabber.c:1517
+#: ../src/protocols/jabber/jabber.c:1520
 msgid "Restricted XML"
 msgstr "Eingeschränktes XML"
 
-#: ../src/protocols/jabber/jabber.c:1519
+#: ../src/protocols/jabber/jabber.c:1522
 msgid "See Other Host"
 msgstr "Siehe anderer Rechner"
 
-#: ../src/protocols/jabber/jabber.c:1521
+#: ../src/protocols/jabber/jabber.c:1524
 msgid "System Shutdown"
 msgstr "Herunterfahren des Systems"
 
-#: ../src/protocols/jabber/jabber.c:1523
+#: ../src/protocols/jabber/jabber.c:1526
 msgid "Undefined Condition"
 msgstr "Undefinierte Bedingung"
 
-#: ../src/protocols/jabber/jabber.c:1525
+#: ../src/protocols/jabber/jabber.c:1528
 msgid "Unsupported Encoding"
 msgstr "Kodierung wird nicht unterstützt"
 
-#: ../src/protocols/jabber/jabber.c:1527
+#: ../src/protocols/jabber/jabber.c:1530
 msgid "Unsupported Stanza Type"
 msgstr "Nicht-unterstützter Strophentyp"
 
-#: ../src/protocols/jabber/jabber.c:1529
+#: ../src/protocols/jabber/jabber.c:1532
 msgid "Unsupported Version"
 msgstr "Nicht-unterstützte Version"
 
-#: ../src/protocols/jabber/jabber.c:1531
+#: ../src/protocols/jabber/jabber.c:1534
 msgid "XML Not Well Formed"
 msgstr "XML ist nicht „wohlgeformt“"
 
-#: ../src/protocols/jabber/jabber.c:1533
+#: ../src/protocols/jabber/jabber.c:1536
 msgid "Stream Error"
 msgstr "Stream-Fehler"
 
-#: ../src/protocols/jabber/jabber.c:1600
+#: ../src/protocols/jabber/jabber.c:1603
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Kann den Benutzer %s nicht verbannen"
 
-#: ../src/protocols/jabber/jabber.c:1620
+#: ../src/protocols/jabber/jabber.c:1623
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Unbekannte Zugehörigkeit: „%s“"
 
-#: ../src/protocols/jabber/jabber.c:1625
+#: ../src/protocols/jabber/jabber.c:1628
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Kann den Benutzer %s nicht zu „%s“ zuordnen"
 
-#: ../src/protocols/jabber/jabber.c:1644
+#: ../src/protocols/jabber/jabber.c:1647
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Unbekannte Rolle: „%s“"
 
-#: ../src/protocols/jabber/jabber.c:1651
+#: ../src/protocols/jabber/jabber.c:1654
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "Kann die Rolle „%s“ für den Benutzer nicht setzen: %s"
 
-#: ../src/protocols/jabber/jabber.c:1704
+#: ../src/protocols/jabber/jabber.c:1707
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Kann den Benutzer %s nicht herauswerfen"
 
-#: ../src/protocols/jabber/jabber.c:1735
+#: ../src/protocols/jabber/jabber.c:1738
 msgid "config:  Configure a chat room."
 msgstr "config:  Konfiguriere einen Chatraum."
 
-#: ../src/protocols/jabber/jabber.c:1739
+#: ../src/protocols/jabber/jabber.c:1742
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Konfiguriere einen Chatraum."
 
-#: ../src/protocols/jabber/jabber.c:1748
+#: ../src/protocols/jabber/jabber.c:1751
 msgid "part [room]:  Leave the room."
 msgstr "part [Raum]:  Verlasse den Raum."
 
-#: ../src/protocols/jabber/jabber.c:1753
+#: ../src/protocols/jabber/jabber.c:1756
 msgid "register:  Register with a chat room."
 msgstr "register:  Für einen Chatraum anmelden."
 
-#: ../src/protocols/jabber/jabber.c:1759
+#: ../src/protocols/jabber/jabber.c:1762
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [neues Thema]:  Thema ändern oder anzeigen."
 
-#: ../src/protocols/jabber/jabber.c:1765
+#: ../src/protocols/jabber/jabber.c:1768
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;Benutzer&gt; [Raum]:  Verbanne einen Benutzer aus dem Raum."
 
-#: ../src/protocols/jabber/jabber.c:1771
+#: ../src/protocols/jabber/jabber.c:1774
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -7352,7 +7367,7 @@
 "affiliate &lt;Benutzer&gt; &lt;owner|admin|member|outcast|none&gt;: Setze "
 "eine Benutzerzugehörigkeit für den Raum."
 
-#: ../src/protocols/jabber/jabber.c:1777
+#: ../src/protocols/jabber/jabber.c:1780
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -7360,20 +7375,20 @@
 "role &lt;Benutzer&gt; &lt;moderator|participant|visitor|none&gt;: Setze eine "
 "Rolle für den Benutzer im Raum."
 
-#: ../src/protocols/jabber/jabber.c:1783
+#: ../src/protocols/jabber/jabber.c:1786
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr ""
 "invite &lt;Benutzer&gt; [Nachricht]:  Lade einen Benutzer in den Raum ein."
 
-#: ../src/protocols/jabber/jabber.c:1789
+#: ../src/protocols/jabber/jabber.c:1792
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;Raum&gt; [Server]:  Betrete einen Chat auf diesem Server."
 
-#: ../src/protocols/jabber/jabber.c:1795
+#: ../src/protocols/jabber/jabber.c:1798
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;Benutzer&gt; [Raum]:  Kickt einen Benutzer aus dem Raum."
 
-#: ../src/protocols/jabber/jabber.c:1800
+#: ../src/protocols/jabber/jabber.c:1803
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
@@ -7390,93 +7405,93 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/jabber/jabber.c:1883 ../src/protocols/jabber/jabber.c:1885
+#: ../src/protocols/jabber/jabber.c:1886 ../src/protocols/jabber/jabber.c:1888
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber-Protokoll-Plugin"
 
-#: ../src/protocols/jabber/jabber.c:1911
+#: ../src/protocols/jabber/jabber.c:1914
 msgid "Use TLS if available"
 msgstr "Benutze TLS, wenn verfügbar"
 
-#: ../src/protocols/jabber/jabber.c:1916
+#: ../src/protocols/jabber/jabber.c:1919
 msgid "Require TLS"
 msgstr "TLS erfordern"
 
-#: ../src/protocols/jabber/jabber.c:1919
+#: ../src/protocols/jabber/jabber.c:1922
 msgid "Force old (port 5223) SSL"
 msgstr "Erzwinge altes SSL (Port 5223)"
 
-#: ../src/protocols/jabber/jabber.c:1924
+#: ../src/protocols/jabber/jabber.c:1927
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Erlaube Klartext-Authentifikation über einen unverschlüsselten Kanal"
 
-#: ../src/protocols/jabber/jabber.c:1929 ../src/protocols/simple/simple.c:1775
+#: ../src/protocols/jabber/jabber.c:1932 ../src/protocols/simple/simple.c:1781
 msgid "Connect port"
 msgstr "Verbindungsport"
 
 #. Account options
-#: ../src/protocols/jabber/jabber.c:1933 ../src/protocols/silc/silc.c:1854
+#: ../src/protocols/jabber/jabber.c:1936 ../src/protocols/silc/silc.c:1854
 msgid "Connect server"
 msgstr "Verbindungsserver"
 
-#: ../src/protocols/jabber/message.c:108
+#: ../src/protocols/jabber/message.c:117
 #, c-format
 msgid "Message from %s"
 msgstr "Nachricht von %s"
 
-#: ../src/protocols/jabber/message.c:172
+#: ../src/protocols/jabber/message.c:181
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s hat das Thema zu %s abgeändert"
 
-#: ../src/protocols/jabber/message.c:174
+#: ../src/protocols/jabber/message.c:183
 #, c-format
 msgid "The topic is: %s"
 msgstr "Das Thema ist: %s"
 
-#: ../src/protocols/jabber/message.c:224
+#: ../src/protocols/jabber/message.c:233
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Nachrichtenzustellung an %s fehlgeschlagen: %s"
 
-#: ../src/protocols/jabber/message.c:227
+#: ../src/protocols/jabber/message.c:236
 msgid "Jabber Message Error"
 msgstr "Jabber Nachrichtenfehler"
 
-#: ../src/protocols/jabber/message.c:295
+#: ../src/protocols/jabber/message.c:319
 #, c-format
 msgid " (Code %s)"
 msgstr " (Code %s)"
 
-#: ../src/protocols/jabber/parser.c:131
+#: ../src/protocols/jabber/parser.c:279 ../src/protocols/jabber/parser.c:288
 msgid "XML Parse error"
 msgstr "Fehler bei Einlesen von XML-Daten"
 
-#: ../src/protocols/jabber/presence.c:309
+#: ../src/protocols/jabber/presence.c:308
 msgid "Unknown Error in presence"
 msgstr "Unbekannter Fehlercode"
 
-#: ../src/protocols/jabber/presence.c:314 ../src/protocols/msn/userlist.c:104
+#: ../src/protocols/jabber/presence.c:313 ../src/protocols/msn/userlist.c:104
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list."
 msgstr "Der Benutzer %s möchte %s zu seiner Buddy-Liste hinzufügen."
 
-#: ../src/protocols/jabber/presence.c:323 ../src/protocols/oscar/oscar.c:2381
-#: ../src/protocols/oscar/oscar.c:5029
+#: ../src/protocols/jabber/presence.c:322 ../src/protocols/oscar/oscar.c:2381
+#: ../src/protocols/oscar/oscar.c:5035
 msgid "_Authorize"
 msgstr "_Autorisieren"
 
-#: ../src/protocols/jabber/presence.c:324 ../src/protocols/oscar/oscar.c:2383
-#: ../src/protocols/oscar/oscar.c:5030
+#: ../src/protocols/jabber/presence.c:323 ../src/protocols/oscar/oscar.c:2383
+#: ../src/protocols/oscar/oscar.c:5036
 msgid "_Deny"
 msgstr "_Verweigern"
 
+#: ../src/protocols/jabber/presence.c:380
 #: ../src/protocols/jabber/presence.c:381
-#: ../src/protocols/jabber/presence.c:382
 msgid "Create New Room"
 msgstr "Einen neuen Chat-Raum erstellen"
 
-#: ../src/protocols/jabber/presence.c:383
+#: ../src/protocols/jabber/presence.c:382
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -7484,20 +7499,20 @@
 "Sie erstellen einen neuen Chat-Raum.  Möchten Sie den Raum konfigurieren "
 "oder akzeptieren Sie die Standardeinstellungen?"
 
-#: ../src/protocols/jabber/presence.c:386
+#: ../src/protocols/jabber/presence.c:385
 msgid "_Configure Room"
 msgstr "Raum _konfigurieren"
 
-#: ../src/protocols/jabber/presence.c:388
+#: ../src/protocols/jabber/presence.c:387
 msgid "_Accept Defaults"
 msgstr "Standards _akzeptieren"
 
-#: ../src/protocols/jabber/presence.c:426
+#: ../src/protocols/jabber/presence.c:425
 #, c-format
 msgid "Error in chat %s"
 msgstr "Fehler im Chat %s"
 
-#: ../src/protocols/jabber/presence.c:429
+#: ../src/protocols/jabber/presence.c:428
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Fehler beim Betreten des Chats %s"
@@ -7821,9 +7836,9 @@
 msgid "Page"
 msgstr "Nachricht"
 
-#: ../src/protocols/msn/msn.c:550 ../src/protocols/msn/msn.c:557
-#: ../src/protocols/msn/msn.c:566 ../src/protocols/sametime/sametime.c:3246
-#: ../src/protocols/yahoo/yahoo.c:2880 ../src/protocols/yahoo/yahoo.c:2886
+#: ../src/protocols/msn/msn.c:548 ../src/protocols/msn/msn.c:555
+#: ../src/protocols/msn/msn.c:564 ../src/protocols/sametime/sametime.c:3239
+#: ../src/protocols/yahoo/yahoo.c:2878 ../src/protocols/yahoo/yahoo.c:2884
 #, c-format
 msgid ""
 "\n"
@@ -7832,69 +7847,69 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: ../src/protocols/msn/msn.c:557
+#: ../src/protocols/msn/msn.c:555
 msgid "Has you"
 msgstr "Hat Sie"
 
-#: ../src/protocols/msn/msn.c:587 ../src/protocols/msn/state.c:33
-#: ../src/protocols/yahoo/yahoo.c:2709 ../src/protocols/yahoo/yahoo.c:3294
+#: ../src/protocols/msn/msn.c:585 ../src/protocols/msn/state.c:33
+#: ../src/protocols/yahoo/yahoo.c:2707 ../src/protocols/yahoo/yahoo.c:3292
 msgid "Be Right Back"
 msgstr "Bin gleich zurück"
 
-#: ../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/msn/msn.c:589 ../src/protocols/msn/state.c:31
+#: ../src/protocols/novell/novell.c:2849 ../src/protocols/novell/novell.c:2983
 #: ../src/protocols/silc/buddy.c:1473 ../src/protocols/silc/silc.c:53
-#: ../src/protocols/yahoo/yahoo.c:2711 ../src/protocols/yahoo/yahoo.c:3297
+#: ../src/protocols/yahoo/yahoo.c:2709 ../src/protocols/yahoo/yahoo.c:3295
 msgid "Busy"
 msgstr "Beschäftigt"
 
-#: ../src/protocols/msn/msn.c:595 ../src/protocols/yahoo/yahoo.c:2719
-#: ../src/protocols/yahoo/yahoo.c:3309
+#: ../src/protocols/msn/msn.c:593 ../src/protocols/yahoo/yahoo.c:2717
+#: ../src/protocols/yahoo/yahoo.c:3307
 msgid "On the Phone"
 msgstr "Am Telefon"
 
-#: ../src/protocols/msn/msn.c:599 ../src/protocols/yahoo/yahoo.c:2723
-#: ../src/protocols/yahoo/yahoo.c:3315
+#: ../src/protocols/msn/msn.c:597 ../src/protocols/yahoo/yahoo.c:2721
+#: ../src/protocols/yahoo/yahoo.c:3313
 msgid "Out to Lunch"
 msgstr "Zur Mittagspause"
 
-#: ../src/protocols/msn/msn.c:623
+#: ../src/protocols/msn/msn.c:621
 msgid "Set Friendly Name..."
 msgstr "Setze Spitzname..."
 
-#: ../src/protocols/msn/msn.c:628
+#: ../src/protocols/msn/msn.c:626
 msgid "Set Home Phone Number..."
 msgstr "Setze private Telefonnummer..."
 
-#: ../src/protocols/msn/msn.c:632
+#: ../src/protocols/msn/msn.c:630
 msgid "Set Work Phone Number..."
 msgstr "Setze geschäftliche Telefonnummer..."
 
-#: ../src/protocols/msn/msn.c:636
+#: ../src/protocols/msn/msn.c:634
 msgid "Set Mobile Phone Number..."
 msgstr "Setze Handynummer..."
 
-#: ../src/protocols/msn/msn.c:642
+#: ../src/protocols/msn/msn.c:640
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Erlaube/verbiete mobile Geräte..."
 
-#: ../src/protocols/msn/msn.c:647
+#: ../src/protocols/msn/msn.c:645
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Erlaube/verbiete mobile Webseiten..."
 
-#: ../src/protocols/msn/msn.c:657
+#: ../src/protocols/msn/msn.c:655
 msgid "Open Hotmail Inbox"
 msgstr "Öffne Hotmail-Posteingang"
 
-#: ../src/protocols/msn/msn.c:681
+#: ../src/protocols/msn/msn.c:679
 msgid "Send to Mobile"
 msgstr "Sende an mobiles Gerät"
 
-#: ../src/protocols/msn/msn.c:691 ../src/protocols/novell/novell.c:3441
+#: ../src/protocols/msn/msn.c:689 ../src/protocols/novell/novell.c:3439
 msgid "Initiate _Chat"
 msgstr "Initiiere _Chat"
 
-#: ../src/protocols/msn/msn.c:729
+#: ../src/protocols/msn/msn.c:727
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -7903,7 +7918,7 @@
 "unterstützte SSL-Bibliothek. Schauen Sie bitte auf http://gaim.sf.net/faq-"
 "ssl.php für weitere Informationen."
 
-#: ../src/protocols/msn/msn.c:757
+#: ../src/protocols/msn/msn.c:755
 msgid "Failed to connect to server."
 msgstr "Verbindung zum Server nicht möglich."
 
@@ -7929,7 +7944,7 @@
 msgid "Error retrieving profile"
 msgstr "Fehler beim Empfangen des Profils"
 
-#: ../src/protocols/msn/msn.c:1536 ../src/protocols/oscar/oscar.c:3663
+#: ../src/protocols/msn/msn.c:1536 ../src/protocols/oscar/oscar.c:3673
 #: ../src/protocols/yahoo/yahoo_profile.c:1056
 msgid "Age"
 msgstr "Alter"
@@ -7938,7 +7953,7 @@
 msgid "Occupation"
 msgstr "Beruf"
 
-#: ../src/protocols/msn/msn.c:1539 ../src/protocols/novell/novell.c:1480
+#: ../src/protocols/msn/msn.c:1539 ../src/protocols/novell/novell.c:1478
 #: ../src/protocols/yahoo/yahoo_profile.c:1051
 msgid "Location"
 msgstr "Ort"
@@ -8014,7 +8029,7 @@
 msgid "Home Phone 2"
 msgstr "Telefon 2 (privat)"
 
-#: ../src/protocols/msn/msn.c:1589 ../src/protocols/oscar/oscar.c:3675
+#: ../src/protocols/msn/msn.c:1589 ../src/protocols/oscar/oscar.c:3685
 msgid "Home Address"
 msgstr "Privatadresse"
 
@@ -8051,11 +8066,11 @@
 msgid "Job Title"
 msgstr "Beruf"
 
-#: ../src/protocols/msn/msn.c:1608 ../src/protocols/oscar/oscar.c:3692
+#: ../src/protocols/msn/msn.c:1608 ../src/protocols/oscar/oscar.c:3702
 msgid "Company"
 msgstr "Firma"
 
-#: ../src/protocols/msn/msn.c:1609 ../src/protocols/novell/novell.c:1482
+#: ../src/protocols/msn/msn.c:1609 ../src/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "Abteilung"
 
@@ -8071,7 +8086,7 @@
 msgid "Work Phone 2"
 msgstr "Telefon 2 (geschäftlich)"
 
-#: ../src/protocols/msn/msn.c:1613 ../src/protocols/oscar/oscar.c:3683
+#: ../src/protocols/msn/msn.c:1613 ../src/protocols/oscar/oscar.c:3693
 msgid "Work Address"
 msgstr "Adresse (geschäftlich)"
 
@@ -8230,15 +8245,15 @@
 msgid "Service Temporarily Unavailable."
 msgstr "Dienst momentan nicht verfügbar."
 
-#: ../src/protocols/msn/notification.c:821
+#: ../src/protocols/msn/notification.c:820
 msgid "Unable to rename group"
 msgstr "Kann die Gruppe nicht umbenennen"
 
-#: ../src/protocols/msn/notification.c:876
+#: ../src/protocols/msn/notification.c:875
 msgid "Unable to delete group"
 msgstr "Kann die Gruppe nicht löschen"
 
-#: ../src/protocols/msn/notification.c:1309
+#: ../src/protocols/msn/notification.c:1308
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -8398,7 +8413,7 @@
 "Nachricht konnte nicht gesendet werden, da ein unbekannter Fehler "
 "aufgetreten ist:"
 
-#: ../src/protocols/msn/switchboard.c:954
+#: ../src/protocols/msn/switchboard.c:953
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s hat Sie gerade angestoßen!"
@@ -8655,7 +8670,7 @@
 msgid "Unable to send message (%s)."
 msgstr "Kann die Nachricht nicht senden (%s)."
 
-#: ../src/protocols/novell/novell.c:493 ../src/protocols/novell/novell.c:987
+#: ../src/protocols/novell/novell.c:493 ../src/protocols/novell/novell.c:985
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "Kann den Benutzer nicht einladen (%s)."
@@ -8716,34 +8731,34 @@
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "Kann %s nicht zu Ihrer Privatsphäre-Liste entfernen (%s)."
 
-#: ../src/protocols/novell/novell.c:942 ../src/protocols/novell/novell.c:1654
+#: ../src/protocols/novell/novell.c:942 ../src/protocols/novell/novell.c:1652
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr ""
 "Kann die serverseitigen Einstellungen zur Privatsphäre nicht ändern (%s)."
 
-#: ../src/protocols/novell/novell.c:1014
+#: ../src/protocols/novell/novell.c:1012
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Konferenz kann nicht erstellt werden (%s)."
 
-#: ../src/protocols/novell/novell.c:1123 ../src/protocols/novell/novell.c:1693
+#: ../src/protocols/novell/novell.c:1121 ../src/protocols/novell/novell.c:1691
 msgid "Error communicating with server. Closing connection."
 msgstr "Kommunikationsfehler mit dem Server. Schließe die Verbindung."
 
-#: ../src/protocols/novell/novell.c:1478
+#: ../src/protocols/novell/novell.c:1476
 msgid "Telephone Number"
 msgstr "Telefonnummer"
 
-#: ../src/protocols/novell/novell.c:1484
+#: ../src/protocols/novell/novell.c:1482
 msgid "Personal Title"
 msgstr "Persönlicher Titel"
 
-#: ../src/protocols/novell/novell.c:1488
+#: ../src/protocols/novell/novell.c:1486
 msgid "Mailstop"
 msgstr "Hauspostcode"
 
-#: ../src/protocols/novell/novell.c:1506
+#: ../src/protocols/novell/novell.c:1504
 msgid "User ID"
 msgstr "Benutzer-ID"
 
@@ -8754,41 +8769,41 @@
 #. tag, value);
 #. }
 #.
-#: ../src/protocols/novell/novell.c:1520
+#: ../src/protocols/novell/novell.c:1518
 msgid "Full name"
 msgstr "Vollständiger Name"
 
-#: ../src/protocols/novell/novell.c:1644
+#: ../src/protocols/novell/novell.c:1642
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise-Konferenz %d"
 
-#: ../src/protocols/novell/novell.c:1669
+#: ../src/protocols/novell/novell.c:1667
 msgid "Unable to make SSL connection to server."
 msgstr "Kann keine SSL-Verbindung zum Server herstellen."
 
-#: ../src/protocols/novell/novell.c:1726
+#: ../src/protocols/novell/novell.c:1724
 msgid "Authenticating..."
 msgstr "Authentifizierung..."
 
-#: ../src/protocols/novell/novell.c:1738
+#: ../src/protocols/novell/novell.c:1736
 msgid "Unable to connect to server."
 msgstr "Verbindung zum Server nicht möglich."
 
-#: ../src/protocols/novell/novell.c:1741
+#: ../src/protocols/novell/novell.c:1739
 msgid "Waiting for response..."
 msgstr "Warte auf Antwort..."
 
-#: ../src/protocols/novell/novell.c:1876
+#: ../src/protocols/novell/novell.c:1874
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s wurde zu diesem Gespräch eingeladen."
 
-#: ../src/protocols/novell/novell.c:1904
+#: ../src/protocols/novell/novell.c:1902
 msgid "Invitation to Conversation"
 msgstr "Einladung zur Unterhaltung"
 
-#: ../src/protocols/novell/novell.c:1905
+#: ../src/protocols/novell/novell.c:1903
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -8799,17 +8814,17 @@
 "\n"
 "Gesendet: %s"
 
-#: ../src/protocols/novell/novell.c:1907
+#: ../src/protocols/novell/novell.c:1905
 msgid "Would you like to join the conversation?"
 msgstr "Möchten der Konferenz beitreten?"
 
-#: ../src/protocols/novell/novell.c:2014
+#: ../src/protocols/novell/novell.c:2012
 msgid "You have been logged out because you logged in at another workstation."
 msgstr ""
 "Sie wurden abgemeldet, weil Sie sich an einer anderen Workstation angemeldet "
 "haben."
 
-#: ../src/protocols/novell/novell.c:2070
+#: ../src/protocols/novell/novell.c:2068
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -8821,7 +8836,7 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: ../src/protocols/novell/novell.c:2168
+#: ../src/protocols/novell/novell.c:2166
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -8829,11 +8844,11 @@
 "Kann keine Verbindung zum Server herstellen. Bitte geben Sie die Adresse des "
 "Servers ein, mit dem Sie sich verbinden wollen."
 
-#: ../src/protocols/novell/novell.c:2190
+#: ../src/protocols/novell/novell.c:2188
 msgid "Error. SSL support is not installed."
 msgstr "Fehler. SSL ist nicht installiert."
 
-#: ../src/protocols/novell/novell.c:2499
+#: ../src/protocols/novell/novell.c:2497
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
 "Diese Konferenz wurde geschlossen. Es können keine Nachrichten mehr gesendet "
@@ -8849,31 +8864,31 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/novell/novell.c:3543 ../src/protocols/novell/novell.c:3545
+#: ../src/protocols/novell/novell.c:3541 ../src/protocols/novell/novell.c:3543
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger Protokoll-Plugin"
 
-#: ../src/protocols/novell/novell.c:3564
+#: ../src/protocols/novell/novell.c:3562
 msgid "Server address"
 msgstr "Server-Adresse"
 
-#: ../src/protocols/novell/novell.c:3568
+#: ../src/protocols/novell/novell.c:3566
 msgid "Server port"
 msgstr "Server-Port"
 
-#: ../src/protocols/oscar/flap_connection.c:216
+#: ../src/protocols/oscar/flap_connection.c:222
 msgid "Server closed the connection."
 msgstr "Der Server hat die Verbindung beendet."
 
-#: ../src/protocols/oscar/flap_connection.c:218
+#: ../src/protocols/oscar/flap_connection.c:224
 msgid "Lost connection with server for an unknown reason."
 msgstr "Verbindung ging aus einem unbekannten Grund verloren."
 
-#: ../src/protocols/oscar/flap_connection.c:220
+#: ../src/protocols/oscar/flap_connection.c:226
 msgid "Received invalid data on connection with server."
 msgstr "Ungültige Daten in der Verbindung mit dem Server empfangen."
 
-#: ../src/protocols/oscar/flap_connection.c:222
+#: ../src/protocols/oscar/flap_connection.c:228
 msgid "Could not establish a connection with the server."
 msgstr "Die Verbindung mit dem Server konnte nicht hergestellt werden."
 
@@ -9034,7 +9049,7 @@
 msgid "Chat"
 msgstr "Chat"
 
-#: ../src/protocols/oscar/oscar.c:637 ../src/protocols/oscar/oscar.c:5783
+#: ../src/protocols/oscar/oscar.c:637 ../src/protocols/oscar/oscar.c:5789
 msgid "Get File"
 msgstr "Datei abrufen"
 
@@ -9106,15 +9121,15 @@
 msgid "Camera"
 msgstr "Kamera"
 
-#: ../src/protocols/oscar/oscar.c:711 ../src/protocols/oscar/oscar.c:5590
+#: ../src/protocols/oscar/oscar.c:711 ../src/protocols/oscar/oscar.c:5596
 msgid "Free For Chat"
 msgstr "Bereit zum Chatten"
 
-#: ../src/protocols/oscar/oscar.c:715 ../src/protocols/oscar/oscar.c:5618
+#: ../src/protocols/oscar/oscar.c:715 ../src/protocols/oscar/oscar.c:5624
 msgid "Not Available"
 msgstr "Nicht verfügbar"
 
-#: ../src/protocols/oscar/oscar.c:717 ../src/protocols/oscar/oscar.c:5608
+#: ../src/protocols/oscar/oscar.c:717 ../src/protocols/oscar/oscar.c:5614
 msgid "Occupied"
 msgstr "Beschäftigt"
 
@@ -9275,7 +9290,7 @@
 
 #: ../src/protocols/oscar/oscar.c:2251 ../src/protocols/oscar/oscar.c:2259
 #: ../src/protocols/oscar/oscar.c:2367 ../src/protocols/oscar/oscar.c:2391
-#: ../src/protocols/oscar/oscar.c:5015 ../src/protocols/oscar/oscar.c:5067
+#: ../src/protocols/oscar/oscar.c:5021 ../src/protocols/oscar/oscar.c:5073
 msgid "No reason given."
 msgstr "Kein Grund angegeben."
 
@@ -9293,7 +9308,7 @@
 "hinzufügen:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:2379 ../src/protocols/oscar/oscar.c:5027
+#: ../src/protocols/oscar/oscar.c:2379 ../src/protocols/oscar/oscar.c:5033
 msgid "Authorization Request"
 msgstr "Autorisierungsanfrage"
 
@@ -9450,7 +9465,7 @@
 msgstr "Unbekannter Grund."
 
 #: ../src/protocols/oscar/oscar.c:2739
-#: ../src/protocols/sametime/sametime.c:2370
+#: ../src/protocols/sametime/sametime.c:2367
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Kann die Nachricht an %s nicht senden:"
@@ -9521,70 +9536,70 @@
 msgid "Mobile Phone"
 msgstr "Handynummer"
 
-#: ../src/protocols/oscar/oscar.c:3666
+#: ../src/protocols/oscar/oscar.c:3676
 msgid "Personal Web Page"
 msgstr "Persönliche Webseite"
 
-#: ../src/protocols/oscar/oscar.c:3670
+#: ../src/protocols/oscar/oscar.c:3680
 msgid "Additional Information"
 msgstr "Zusätzliche Informationen"
 
-#: ../src/protocols/oscar/oscar.c:3679 ../src/protocols/oscar/oscar.c:3687
+#: ../src/protocols/oscar/oscar.c:3689 ../src/protocols/oscar/oscar.c:3697
 msgid "Zip Code"
 msgstr "PLZ"
 
-#: ../src/protocols/oscar/oscar.c:3691
+#: ../src/protocols/oscar/oscar.c:3701
 msgid "Work Information"
 msgstr "Information (Arbeit)"
 
-#: ../src/protocols/oscar/oscar.c:3693
+#: ../src/protocols/oscar/oscar.c:3703
 msgid "Division"
 msgstr "Abteilung"
 
-#: ../src/protocols/oscar/oscar.c:3694
+#: ../src/protocols/oscar/oscar.c:3704
 msgid "Position"
 msgstr "Position"
 
-#: ../src/protocols/oscar/oscar.c:3696
+#: ../src/protocols/oscar/oscar.c:3706
 msgid "Web Page"
 msgstr "Webseite"
 
-#: ../src/protocols/oscar/oscar.c:3754
+#: ../src/protocols/oscar/oscar.c:3764
 msgid "Pop-Up Message"
 msgstr "Pop-Up Nachricht"
 
-#: ../src/protocols/oscar/oscar.c:3794
+#: ../src/protocols/oscar/oscar.c:3804
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "Die folgende Benutzername ist verbunden mit %s"
 msgstr[1] "Die folgenden Benutzernamen sind verbunden mit %s"
 
-#: ../src/protocols/oscar/oscar.c:3799
+#: ../src/protocols/oscar/oscar.c:3809
 msgid "Screen name"
 msgstr "Benutzername"
 
-#: ../src/protocols/oscar/oscar.c:3825
+#: ../src/protocols/oscar/oscar.c:3835
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Keine Ergebnisse für die E-Mail-Adresse %s gefunden"
 
-#: ../src/protocols/oscar/oscar.c:3846
+#: ../src/protocols/oscar/oscar.c:3856
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr ""
 "Sie sollten eine E-Mail erhalten, in der Sie aufgefordert werden, %s zu "
 "bestätigen."
 
-#: ../src/protocols/oscar/oscar.c:3848
+#: ../src/protocols/oscar/oscar.c:3858
 msgid "Account Confirmation Requested"
 msgstr "Kontobestätigung wurde angefragt"
 
-#: ../src/protocols/oscar/oscar.c:3879
+#: ../src/protocols/oscar/oscar.c:3889
 msgid "Error Changing Account Info"
 msgstr "Fehler beim Ändern der Konten-Information"
 
-#: ../src/protocols/oscar/oscar.c:3882
+#: ../src/protocols/oscar/oscar.c:3892
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -9593,14 +9608,14 @@
 "Fehler 0x%04x: Kann den Benutzernamen nicht formatieren, weil der Name vom "
 "Original abweicht."
 
-#: ../src/protocols/oscar/oscar.c:3885
+#: ../src/protocols/oscar/oscar.c:3895
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr ""
 "Fehler 0x%04x: Kann den Benutzernamen nicht formatieren, weil er ungültig "
 "ist."
 
-#: ../src/protocols/oscar/oscar.c:3888
+#: ../src/protocols/oscar/oscar.c:3898
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -9609,7 +9624,7 @@
 "Fehler 0x%04x: Kann den Benutzernamen nicht formatieren, weil der Name zu "
 "lang ist."
 
-#: ../src/protocols/oscar/oscar.c:3891
+#: ../src/protocols/oscar/oscar.c:3901
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -9618,7 +9633,7 @@
 "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:3894
+#: ../src/protocols/oscar/oscar.c:3904
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -9627,7 +9642,7 @@
 "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:3897
+#: ../src/protocols/oscar/oscar.c:3907
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -9636,12 +9651,12 @@
 "Fehler 0x%04x: Kann die E-Mail-Adresse nicht ändern, weil die angegebene "
 "Adresse falsch ist."
 
-#: ../src/protocols/oscar/oscar.c:3900
+#: ../src/protocols/oscar/oscar.c:3910
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Fehler 0x%04x: Unbekannter Fehler."
 
-#: ../src/protocols/oscar/oscar.c:3910
+#: ../src/protocols/oscar/oscar.c:3920
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -9650,27 +9665,27 @@
 "Ihre Benutzername wird zur Zeit wie folgt formatiert:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:3911 ../src/protocols/oscar/oscar.c:3918
+#: ../src/protocols/oscar/oscar.c:3921 ../src/protocols/oscar/oscar.c:3928
 msgid "Account Info"
 msgstr "Konto-Info"
 
-#: ../src/protocols/oscar/oscar.c:3916
+#: ../src/protocols/oscar/oscar.c:3926
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "Die E-Mail-Adresse für %s ist %s"
 
-#: ../src/protocols/oscar/oscar.c:4091
+#: ../src/protocols/oscar/oscar.c:4101
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "Ihr IM-Bild wurde nicht gesendet. Sie müssen direkt verbunden sein, um IM-"
 "Bilder senden zu können."
 
-#: ../src/protocols/oscar/oscar.c:4331
+#: ../src/protocols/oscar/oscar.c:4341
 msgid "Unable to set AIM profile."
 msgstr "Kann das AIM-Profil nicht setzen."
 
-#: ../src/protocols/oscar/oscar.c:4332
+#: ../src/protocols/oscar/oscar.c:4342
 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 "
@@ -9680,7 +9695,7 @@
 "Anmeldeprozedur abgeschlossen war. Das Profil bleibt ungesetzt. Versuchen "
 "Sie es wieder, wenn Sie vollständig verbunden sind."
 
-#: ../src/protocols/oscar/oscar.c:4346
+#: ../src/protocols/oscar/oscar.c:4356
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -9695,11 +9710,11 @@
 "Die maximale Profilgröße von %d Bytes wurde überschritten. Gaim hat das "
 "Profil für Sie abgeschnitten."
 
-#: ../src/protocols/oscar/oscar.c:4351
+#: ../src/protocols/oscar/oscar.c:4361
 msgid "Profile too long."
 msgstr "Profil zu lang."
 
-#: ../src/protocols/oscar/oscar.c:4398
+#: ../src/protocols/oscar/oscar.c:4404
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -9714,11 +9729,11 @@
 "Die Abwesenheitsnachricht hat die maximale Größe von %d Bytes "
 "überschritten.  Gaim hat die Nachricht für Sie abgeschnitten."
 
-#: ../src/protocols/oscar/oscar.c:4403
+#: ../src/protocols/oscar/oscar.c:4409
 msgid "Away message too long."
 msgstr "Abwesenheitsmitteilungen zu lang."
 
-#: ../src/protocols/oscar/oscar.c:4472
+#: ../src/protocols/oscar/oscar.c:4478
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -9730,16 +9745,16 @@
 "Buchstaben, Ziffern und Leerzeichen enthalten oder sie bestehen nur aus "
 "Ziffern."
 
-#: ../src/protocols/oscar/oscar.c:4474 ../src/protocols/oscar/oscar.c:4873
-#: ../src/protocols/oscar/oscar.c:4887
+#: ../src/protocols/oscar/oscar.c:4480 ../src/protocols/oscar/oscar.c:4879
+#: ../src/protocols/oscar/oscar.c:4893
 msgid "Unable To Add"
 msgstr "Kann nicht hinzufügen"
 
-#: ../src/protocols/oscar/oscar.c:4578
+#: ../src/protocols/oscar/oscar.c:4584
 msgid "Unable To Retrieve Buddy List"
 msgstr "Konnte Buddy-Liste nicht laden"
 
-#: ../src/protocols/oscar/oscar.c:4579
+#: ../src/protocols/oscar/oscar.c:4585
 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 "
@@ -9749,13 +9764,13 @@
 "zu laden. Ihre Buddy-Liste ist nicht verloren und wird wahrscheinlich in ein "
 "paar Stunden wieder verfügbar sein."
 
-#: ../src/protocols/oscar/oscar.c:4771 ../src/protocols/oscar/oscar.c:4772
-#: ../src/protocols/oscar/oscar.c:4777 ../src/protocols/oscar/oscar.c:4931
-#: ../src/protocols/oscar/oscar.c:4932 ../src/protocols/oscar/oscar.c:4937
+#: ../src/protocols/oscar/oscar.c:4777 ../src/protocols/oscar/oscar.c:4778
+#: ../src/protocols/oscar/oscar.c:4783 ../src/protocols/oscar/oscar.c:4937
+#: ../src/protocols/oscar/oscar.c:4938 ../src/protocols/oscar/oscar.c:4943
 msgid "Orphans"
 msgstr "Waisen"
 
-#: ../src/protocols/oscar/oscar.c:4871
+#: ../src/protocols/oscar/oscar.c:4877
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -9764,11 +9779,11 @@
 "Kann den Buddy %s nicht hinzufügen, weil Sie schon zu viele Buddys in Ihrer "
 "Buddy-Liste haben. Bitte entfernen Sie einen und versuchen Sie es nochmal."
 
-#: ../src/protocols/oscar/oscar.c:4871 ../src/protocols/oscar/oscar.c:4885
+#: ../src/protocols/oscar/oscar.c:4877 ../src/protocols/oscar/oscar.c:4891
 msgid "(no name)"
 msgstr "(kein Name)"
 
-#: ../src/protocols/oscar/oscar.c:4885
+#: ../src/protocols/oscar/oscar.c:4891
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -9779,7 +9794,7 @@
 "Grund dafür ist, dass Sie die maximale Zahl erlaubter Buddy in Ihrer Buddy-"
 "Liste überschritten haben."
 
-#: ../src/protocols/oscar/oscar.c:4968
+#: ../src/protocols/oscar/oscar.c:4974
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -9788,11 +9803,11 @@
 "Der Benutzer %s hat Ihnen gestattet, Sie zu seiner Buddy-Liste hinzuzufügen. "
 "Möchten Sie ihn hinzufügen?"
 
-#: ../src/protocols/oscar/oscar.c:4974
+#: ../src/protocols/oscar/oscar.c:4980
 msgid "Authorization Given"
 msgstr "Autorisierung wurde gegeben"
 
-#: ../src/protocols/oscar/oscar.c:5018
+#: ../src/protocols/oscar/oscar.c:5024
 #, c-format
 msgid ""
 "The user %s wants to add %s to their buddy list for the following reason:\n"
@@ -9803,19 +9818,19 @@
 "%s"
 
 #. Granted
-#: ../src/protocols/oscar/oscar.c:5063
+#: ../src/protocols/oscar/oscar.c:5069
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 "Der Benutzer %s hat Ihre Anfrage akzeptiert, ihn bzw. sie zu Ihrer Buddy-"
 "Liste hinzufügen zu dürfen."
 
-#: ../src/protocols/oscar/oscar.c:5064
+#: ../src/protocols/oscar/oscar.c:5070
 msgid "Authorization Granted"
 msgstr "Autorisierung erteilt"
 
 #. Denied
-#: ../src/protocols/oscar/oscar.c:5067
+#: ../src/protocols/oscar/oscar.c:5073
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -9826,43 +9841,43 @@
 "Liste hinzufügen zu dürfen, und zwar aus folgendem Grund:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:5068
+#: ../src/protocols/oscar/oscar.c:5074
 msgid "Authorization Denied"
 msgstr "Autorisierung abgelehnt"
 
-#: ../src/protocols/oscar/oscar.c:5104 ../src/protocols/toc/toc.c:1372
+#: ../src/protocols/oscar/oscar.c:5110 ../src/protocols/toc/toc.c:1372
 msgid "_Exchange:"
 msgstr "A_ustausch:"
 
-#: ../src/protocols/oscar/oscar.c:5144
+#: ../src/protocols/oscar/oscar.c:5150
 msgid "Invalid chat name specified."
 msgstr "Ungültiger Chat-Name angegeben."
 
-#: ../src/protocols/oscar/oscar.c:5214
+#: ../src/protocols/oscar/oscar.c:5220
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "Ihr IM-Bild wurde nicht gesendet. Sie können keine IM-Bilder in AIM-Chats "
 "senden."
 
-#: ../src/protocols/oscar/oscar.c:5376
+#: ../src/protocols/oscar/oscar.c:5382
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(empfange)</i>"
 
-#: ../src/protocols/oscar/oscar.c:5681
+#: ../src/protocols/oscar/oscar.c:5687
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Buddy-Kommentar für %s"
 
-#: ../src/protocols/oscar/oscar.c:5682
+#: ../src/protocols/oscar/oscar.c:5688
 msgid "Buddy Comment:"
 msgstr "Buddy-Kommentar:"
 
-#: ../src/protocols/oscar/oscar.c:5728
+#: ../src/protocols/oscar/oscar.c:5734
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Sie haben eine direkte IM-Verbindung mit %s ausgewählt."
 
-#: ../src/protocols/oscar/oscar.c:5732
+#: ../src/protocols/oscar/oscar.c:5738
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -9870,65 +9885,65 @@
 "Da dies Ihre IP-Adresse sichtbar macht, kann es als Sicherheitsrisiko "
 "betrachtet werden. Möchten Sie fortsetzen?"
 
-#: ../src/protocols/oscar/oscar.c:5736 ../src/protocols/oscar/peer.c:941
+#: ../src/protocols/oscar/oscar.c:5742 ../src/protocols/oscar/peer.c:941
 msgid "_Connect"
 msgstr "_Verbinden"
 
-#: ../src/protocols/oscar/oscar.c:5754
+#: ../src/protocols/oscar/oscar.c:5760
 msgid "Edit Buddy Comment"
 msgstr "Buddy-Kommentar bearbeiten"
 
-#: ../src/protocols/oscar/oscar.c:5762
+#: ../src/protocols/oscar/oscar.c:5768
 msgid "Get Status Msg"
 msgstr "Abwesenheitsmitteilung abrufen"
 
-#: ../src/protocols/oscar/oscar.c:5775
+#: ../src/protocols/oscar/oscar.c:5781
 msgid "Direct IM"
 msgstr "Direkte Nachricht"
 
-#: ../src/protocols/oscar/oscar.c:5797
+#: ../src/protocols/oscar/oscar.c:5803
 msgid "Re-request Authorization"
 msgstr "Nochmal nach Autorisierung fragen"
 
-#: ../src/protocols/oscar/oscar.c:5854
+#: ../src/protocols/oscar/oscar.c:5860
 msgid "Require authorization"
 msgstr "Autorisierung erforderlich"
 
-#: ../src/protocols/oscar/oscar.c:5857
+#: ../src/protocols/oscar/oscar.c:5863
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Web aware (Wenn Sie dies aktivieren, werden Sie SPAM erhalten!)"
 
-#: ../src/protocols/oscar/oscar.c:5862
+#: ../src/protocols/oscar/oscar.c:5868
 msgid "ICQ Privacy Options"
 msgstr "ICQ Privatsphärenoptionen"
 
-#: ../src/protocols/oscar/oscar.c:5879
+#: ../src/protocols/oscar/oscar.c:5885
 msgid "The new formatting is invalid."
 msgstr "Die neue Formatierung ist ungültig."
 
-#: ../src/protocols/oscar/oscar.c:5880
+#: ../src/protocols/oscar/oscar.c:5886
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "Benutzernamen-Formatierung kann nur die Groß-/Kleinschreibung und "
 "Leerzeichen ändern."
 
-#: ../src/protocols/oscar/oscar.c:5887
+#: ../src/protocols/oscar/oscar.c:5893
 msgid "New screen name formatting:"
 msgstr "Neue Benutzernamen-Formatierung:"
 
-#: ../src/protocols/oscar/oscar.c:5943
+#: ../src/protocols/oscar/oscar.c:5949
 msgid "Change Address To:"
 msgstr "Ändere die Adresse zu:"
 
-#: ../src/protocols/oscar/oscar.c:5988
+#: ../src/protocols/oscar/oscar.c:5994
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>Sie warten derzeit auf keine Autorisierungen</i>"
 
-#: ../src/protocols/oscar/oscar.c:5991
+#: ../src/protocols/oscar/oscar.c:5997
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Sie warten auf Autorisierung von den folgenden Buddys"
 
-#: ../src/protocols/oscar/oscar.c:5992
+#: ../src/protocols/oscar/oscar.c:5998
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -9937,69 +9952,69 @@
 "den Buddy mit einem Rechtsklick anklicken und „Nochmal nach Autorisierung "
 "fragen“ auswählen."
 
-#: ../src/protocols/oscar/oscar.c:6009
+#: ../src/protocols/oscar/oscar.c:6015
 msgid "Find Buddy by E-Mail"
 msgstr "Suche Buddys nach E-Mail-Adresse"
 
-#: ../src/protocols/oscar/oscar.c:6010
+#: ../src/protocols/oscar/oscar.c:6016
 msgid "Search for a buddy by e-mail address"
 msgstr "Suche nach einem Buddy mit einer bestimmten E-Mail-Adresse"
 
-#: ../src/protocols/oscar/oscar.c:6011
+#: ../src/protocols/oscar/oscar.c:6017
 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."
 
-#: ../src/protocols/oscar/oscar.c:6180
+#: ../src/protocols/oscar/oscar.c:6186
 msgid "Set User Info (URL)..."
 msgstr "Benutzer-Info (URL) setzen..."
 
-#: ../src/protocols/oscar/oscar.c:6191
+#: ../src/protocols/oscar/oscar.c:6197
 msgid "Change Password (URL)"
 msgstr "Ändere Passwort (URL)"
 
-#: ../src/protocols/oscar/oscar.c:6195
+#: ../src/protocols/oscar/oscar.c:6201
 msgid "Configure IM Forwarding (URL)"
 msgstr "Konfiguriere IM-Weiterleitung (URL)"
 
 #. ICQ actions
-#: ../src/protocols/oscar/oscar.c:6205
+#: ../src/protocols/oscar/oscar.c:6211
 msgid "Set Privacy Options..."
 msgstr "Privatsphärenoptionen setzen..."
 
 #. AIM actions
-#: ../src/protocols/oscar/oscar.c:6212
+#: ../src/protocols/oscar/oscar.c:6218
 msgid "Format Screen Name..."
 msgstr "Benutzernamen formatieren..."
 
-#: ../src/protocols/oscar/oscar.c:6216
+#: ../src/protocols/oscar/oscar.c:6222
 msgid "Confirm Account"
 msgstr "Konto bestätigen"
 
-#: ../src/protocols/oscar/oscar.c:6220
+#: ../src/protocols/oscar/oscar.c:6226
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Zeige die aktuell registrierte E-Mail-Adresse"
 
-#: ../src/protocols/oscar/oscar.c:6224
+#: ../src/protocols/oscar/oscar.c:6230
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Ändere die aktuell registrierte E-Mail-Adresse..."
 
-#: ../src/protocols/oscar/oscar.c:6231
+#: ../src/protocols/oscar/oscar.c:6237
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Zeige Buddys, von denen Sie Autorisierung erwarten"
 
-#: ../src/protocols/oscar/oscar.c:6237
+#: ../src/protocols/oscar/oscar.c:6243
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Suche Buddys nach E-Mail-Adresse..."
 
-#: ../src/protocols/oscar/oscar.c:6242
+#: ../src/protocols/oscar/oscar.c:6248
 msgid "Search for Buddy by Information"
 msgstr "Suche Buddy nach Information"
 
-#: ../src/protocols/oscar/oscar.c:6308
+#: ../src/protocols/oscar/oscar.c:6314
 msgid "Use recent buddies group"
 msgstr "Benutze neueste Gruppe"
 
-#: ../src/protocols/oscar/oscar.c:6311
+#: ../src/protocols/oscar/oscar.c:6317
 msgid "Show how long you have been idle"
 msgstr "Anzeigen, wie lange ich untätig war"
 
@@ -10013,15 +10028,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/oscar/oscar.c:6436 ../src/protocols/oscar/oscar.c:6438
+#: ../src/protocols/oscar/oscar.c:6442 ../src/protocols/oscar/oscar.c:6444
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ-Protokoll-Plugin"
 
-#: ../src/protocols/oscar/oscar.c:6463 ../src/protocols/zephyr/zephyr.c:2920
+#: ../src/protocols/oscar/oscar.c:6469 ../src/protocols/zephyr/zephyr.c:2927
 msgid "Encoding"
 msgstr "Kodierung"
 
-#: ../src/protocols/oscar/oscar.c:6467
+#: ../src/protocols/oscar/oscar.c:6473
 msgid ""
 "Always use AIM/ICQ proxy server\n"
 "(slower, but does not reveal your IP address)"
@@ -10062,129 +10077,129 @@
 msgid "Connection closed (writing)"
 msgstr "Verbindung geschlossen (schreibend)"
 
-#: ../src/protocols/sametime/sametime.c:1264
+#: ../src/protocols/sametime/sametime.c:1261
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Gruppentitel:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:1265
+#: ../src/protocols/sametime/sametime.c:1262
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr "<b>Notes-Gruppen-ID:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:1267
+#: ../src/protocols/sametime/sametime.c:1264
 #, c-format
 msgid "Info for Group %s"
 msgstr "Info zur Gruppe %s"
 
-#: ../src/protocols/sametime/sametime.c:1269
+#: ../src/protocols/sametime/sametime.c:1266
 msgid "Notes Address Book Information"
 msgstr "Notes Adressbuch-Information"
 
-#: ../src/protocols/sametime/sametime.c:1301
+#: ../src/protocols/sametime/sametime.c:1298
 msgid "Invite Group to Conference..."
 msgstr "Gruppe zu Konferenz einladen..."
 
-#: ../src/protocols/sametime/sametime.c:1311
+#: ../src/protocols/sametime/sametime.c:1308
 msgid "Get Notes Address Book Info"
 msgstr "Notes Adressbuch-Info anzeigen"
 
-#: ../src/protocols/sametime/sametime.c:1464
+#: ../src/protocols/sametime/sametime.c:1461
 msgid "Sending Handshake"
 msgstr "Sende Handshake"
 
-#: ../src/protocols/sametime/sametime.c:1469
+#: ../src/protocols/sametime/sametime.c:1466
 msgid "Waiting for Handshake Acknowledgement"
 msgstr "Warte auf Bestätigung des Handshakes"
 
-#: ../src/protocols/sametime/sametime.c:1474
+#: ../src/protocols/sametime/sametime.c:1471
 msgid "Handshake Acknowledged, Sending Login"
 msgstr "Handshake bestätigt, sende Login"
 
-#: ../src/protocols/sametime/sametime.c:1479
+#: ../src/protocols/sametime/sametime.c:1476
 msgid "Waiting for Login Acknowledgement"
 msgstr "Warte auf Login-Bestätigung"
 
-#: ../src/protocols/sametime/sametime.c:1484
+#: ../src/protocols/sametime/sametime.c:1481
 msgid "Login Redirected"
 msgstr "Login umgeleitet"
 
-#: ../src/protocols/sametime/sametime.c:1490
+#: ../src/protocols/sametime/sametime.c:1487
 msgid "Forcing Login"
 msgstr "Erzwinge Login"
 
-#: ../src/protocols/sametime/sametime.c:1494
+#: ../src/protocols/sametime/sametime.c:1491
 msgid "Login Acknowledged"
 msgstr "Login bestätigt"
 
-#: ../src/protocols/sametime/sametime.c:1499
+#: ../src/protocols/sametime/sametime.c:1496
 msgid "Starting Services"
 msgstr "Starte Dienste"
 
-#: ../src/protocols/sametime/sametime.c:1504
+#: ../src/protocols/sametime/sametime.c:1501
 msgid "Connected"
 msgstr "Verbunden"
 
-#: ../src/protocols/sametime/sametime.c:1602
+#: ../src/protocols/sametime/sametime.c:1599
 #, c-format
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
 msgstr ""
 "Ein Sametime-Administrator hat die folgende Ankündigung auf Server %s gemacht"
 
-#: ../src/protocols/sametime/sametime.c:1607
+#: ../src/protocols/sametime/sametime.c:1604
 msgid "Sametime Administrator Announcement"
 msgstr "Sametime-Administrator-Ankündigung"
 
-#: ../src/protocols/sametime/sametime.c:1659
+#: ../src/protocols/sametime/sametime.c:1656
 msgid "Connection reset"
 msgstr "Verbindung zurückgesetzt"
 
-#: ../src/protocols/sametime/sametime.c:1666
+#: ../src/protocols/sametime/sametime.c:1663
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr "Fehler beim Lesen des Socket: %s"
 
 #. this is a regular connect, error out
-#: ../src/protocols/sametime/sametime.c:1695
-#: ../src/protocols/sametime/sametime.c:3695
+#: ../src/protocols/sametime/sametime.c:1692
+#: ../src/protocols/sametime/sametime.c:3688
 msgid "Unable to connect to host"
 msgstr "Verbindung zum Server nicht möglich"
 
-#: ../src/protocols/sametime/sametime.c:1733
+#: ../src/protocols/sametime/sametime.c:1730
 #, c-format
 msgid "Announcement from %s"
 msgstr "Ankündigung von %s"
 
-#: ../src/protocols/sametime/sametime.c:1907
+#: ../src/protocols/sametime/sametime.c:1904
 msgid "Conference Closed"
 msgstr "Konferenz geschlossen"
 
-#: ../src/protocols/sametime/sametime.c:2364
+#: ../src/protocols/sametime/sametime.c:2361
 msgid "Unable to send message: "
 msgstr "Kann die Nachricht nicht senden: "
 
-#: ../src/protocols/sametime/sametime.c:2925
+#: ../src/protocols/sametime/sametime.c:2918
 msgid "Place Closed"
 msgstr "Platz geschlossen"
 
-#: ../src/protocols/sametime/sametime.c:3216
+#: ../src/protocols/sametime/sametime.c:3209
 msgid "Microphone"
 msgstr "Mikrofon"
 
-#: ../src/protocols/sametime/sametime.c:3217
+#: ../src/protocols/sametime/sametime.c:3210
 msgid "Speakers"
 msgstr "Lautsprecher"
 
-#: ../src/protocols/sametime/sametime.c:3218
+#: ../src/protocols/sametime/sametime.c:3211
 msgid "Video Camera"
 msgstr "Videokamera"
 
-#: ../src/protocols/sametime/sametime.c:3222
+#: ../src/protocols/sametime/sametime.c:3215
 msgid "File Transfer"
 msgstr "Dateiübertragung"
 
-#: ../src/protocols/sametime/sametime.c:3256
+#: ../src/protocols/sametime/sametime.c:3249
 #, c-format
 msgid ""
 "\n"
@@ -10193,7 +10208,7 @@
 "\n"
 "<b>Unterstützt:</b> %s"
 
-#: ../src/protocols/sametime/sametime.c:3261
+#: ../src/protocols/sametime/sametime.c:3254
 msgid ""
 "\n"
 "<b>External User</b>"
@@ -10201,11 +10216,11 @@
 "\n"
 "<b>Externer Benutzer</b>"
 
-#: ../src/protocols/sametime/sametime.c:3367
+#: ../src/protocols/sametime/sametime.c:3360
 msgid "Create conference with user"
 msgstr "Konferenz mit dem Benutzer beginnen"
 
-#: ../src/protocols/sametime/sametime.c:3368
+#: ../src/protocols/sametime/sametime.c:3361
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
@@ -10214,27 +10229,27 @@
 "Bitte geben sie ein Thema für die neue Konferenz und eine "
 "Einladungsnachricht für %s ein"
 
-#: ../src/protocols/sametime/sametime.c:3372
+#: ../src/protocols/sametime/sametime.c:3365
 msgid "New Conference"
 msgstr "Neue Konferenz"
 
-#: ../src/protocols/sametime/sametime.c:3374
+#: ../src/protocols/sametime/sametime.c:3367
 msgid "Create"
 msgstr "Erzeugen"
 
-#: ../src/protocols/sametime/sametime.c:3438
+#: ../src/protocols/sametime/sametime.c:3431
 msgid "Available Conferences"
 msgstr "Verfügbare Konferenzen"
 
-#: ../src/protocols/sametime/sametime.c:3444
+#: ../src/protocols/sametime/sametime.c:3437
 msgid "Create New Conference..."
 msgstr "Neue Konferenz erzeugen..."
 
-#: ../src/protocols/sametime/sametime.c:3451
+#: ../src/protocols/sametime/sametime.c:3444
 msgid "Invite user to a conference"
 msgstr "Benutzer zu einer Konferenz einladen"
 
-#: ../src/protocols/sametime/sametime.c:3452
+#: ../src/protocols/sametime/sametime.c:3445
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -10245,27 +10260,27 @@
 "möchten. Wählen sie „Neue Konferenz erzeugen“, wenn Sie den Benutzer zu "
 "einer neuen Konferenz einladen möchten."
 
-#: ../src/protocols/sametime/sametime.c:3457
+#: ../src/protocols/sametime/sametime.c:3450
 msgid "Invite to Conference"
 msgstr "Zur Konferenz einladen"
 
-#: ../src/protocols/sametime/sametime.c:3459
+#: ../src/protocols/sametime/sametime.c:3452
 msgid "Invite"
 msgstr "Einladen"
 
-#: ../src/protocols/sametime/sametime.c:3547
+#: ../src/protocols/sametime/sametime.c:3540
 msgid "Invite to Conference..."
 msgstr "Zur Konferenz einladen..."
 
-#: ../src/protocols/sametime/sametime.c:3552
+#: ../src/protocols/sametime/sametime.c:3545
 msgid "Send TEST Announcement"
 msgstr "Sende TEST-Nachricht"
 
-#: ../src/protocols/sametime/sametime.c:3599
+#: ../src/protocols/sametime/sametime.c:3592
 msgid "No Sametime Community Server specified"
 msgstr "Kein Sametime-Community Server angegeben"
 
-#: ../src/protocols/sametime/sametime.c:3621
+#: ../src/protocols/sametime/sametime.c:3614
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -10274,62 +10289,62 @@
 "Es wurde kein Rechner für das Meanwhile-Konto %s angegeben. Bitte geben Sie "
 "einen Rechner an, um die Anmeldung fortzusetzen."
 
-#: ../src/protocols/sametime/sametime.c:3626
+#: ../src/protocols/sametime/sametime.c:3619
 msgid "Meanwhile Connection Setup"
 msgstr "Meanwhile-Verbindungseinstellungen"
 
-#: ../src/protocols/sametime/sametime.c:3627
+#: ../src/protocols/sametime/sametime.c:3620
 msgid "No Sametime Community Server Specified"
 msgstr "Kein Sametime-Community Server angegeben"
 
-#: ../src/protocols/sametime/sametime.c:4084
+#: ../src/protocols/sametime/sametime.c:4082
 msgid "<b>External User</b><br>"
 msgstr "<b>Externer Benutzer</b><br>"
 
-#: ../src/protocols/sametime/sametime.c:4087
+#: ../src/protocols/sametime/sametime.c:4085
 #, c-format
 msgid "<b>User ID:</b> %s<br>"
 msgstr "<b>Benutzer-ID:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:4093
+#: ../src/protocols/sametime/sametime.c:4091
 #, c-format
 msgid "<b>Full Name:</b> %s<br>"
 msgstr "<b>Voller Name:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:4099
+#: ../src/protocols/sametime/sametime.c:4097
 msgid "<b>Last Known Client:</b> "
 msgstr "<b>Letzter bekannter Client:</b> "
 
-#: ../src/protocols/sametime/sametime.c:4107
+#: ../src/protocols/sametime/sametime.c:4105
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Unbekannt (0x%04x)<br>"
 
-#: ../src/protocols/sametime/sametime.c:4114
+#: ../src/protocols/sametime/sametime.c:4112
 #, c-format
 msgid "<b>Supports:</b> %s<br>"
 msgstr "<b>Unterstützt:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:4120
+#: ../src/protocols/sametime/sametime.c:4118
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>Status:</b> %s"
 
-#: ../src/protocols/sametime/sametime.c:4263
-#: ../src/protocols/sametime/sametime.c:5426
+#: ../src/protocols/sametime/sametime.c:4261
+#: ../src/protocols/sametime/sametime.c:5424
 msgid "User Name"
 msgstr "Benutzername"
 
-#: ../src/protocols/sametime/sametime.c:4266
-#: ../src/protocols/sametime/sametime.c:5429
+#: ../src/protocols/sametime/sametime.c:4264
+#: ../src/protocols/sametime/sametime.c:5427
 msgid "Sametime ID"
 msgstr "Sametime ID"
 
-#: ../src/protocols/sametime/sametime.c:4290
+#: ../src/protocols/sametime/sametime.c:4288
 msgid "An ambiguous user ID was entered"
 msgstr "Eine mehrdeutige ID wurde angegeben"
 
-#: ../src/protocols/sametime/sametime.c:4291
+#: ../src/protocols/sametime/sametime.c:4289
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -10339,15 +10354,15 @@
 "beziehen. Bitte wählen Sie den korrekten Benutzer vor der untenstehenden "
 "Liste, um ihn zu Ihrer Buddy-Liste hinzuzufügen."
 
-#: ../src/protocols/sametime/sametime.c:4296
+#: ../src/protocols/sametime/sametime.c:4294
 msgid "Select User"
 msgstr "Benutzer wählen"
 
+#: ../src/protocols/sametime/sametime.c:4364
+msgid "Unable to add user: user not found"
+msgstr "Kann den Benutzer nicht hinzufügen: Benutzer nicht gefunden"
+
 #: ../src/protocols/sametime/sametime.c:4366
-msgid "Unable to add user: user not found"
-msgstr "Kann den Benutzer nicht hinzufügen: Benutzer nicht gefunden"
-
-#: ../src/protocols/sametime/sametime.c:4368
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
@@ -10356,11 +10371,11 @@
 "Der Bezeichner '%s' passt zu keinem der Benutzer in Ihrer Sametime-"
 "Community. Der Eintrag wurde von Ihrer Buddy-Liste entfernt."
 
-#: ../src/protocols/sametime/sametime.c:4373
+#: ../src/protocols/sametime/sametime.c:4371
 msgid "Unable to add user"
 msgstr "Kann den Benutzer nicht hinzufügen"
 
-#: ../src/protocols/sametime/sametime.c:4945
+#: ../src/protocols/sametime/sametime.c:4943
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -10369,63 +10384,63 @@
 "Fehler beim Lesen von %s: \n"
 "%s\n"
 
-#: ../src/protocols/sametime/sametime.c:5076
+#: ../src/protocols/sametime/sametime.c:5074
 msgid "Remotely Stored Buddy List"
 msgstr "Entfernt gespeicherte Buddy-Liste"
 
-#: ../src/protocols/sametime/sametime.c:5081
+#: ../src/protocols/sametime/sametime.c:5079
 msgid "Buddy List Storage Mode"
 msgstr "Buddy-Listen-Speicherungsmethode"
 
-#: ../src/protocols/sametime/sametime.c:5084
+#: ../src/protocols/sametime/sametime.c:5082
 msgid "Local Buddy List Only"
 msgstr "Nur lokale Buddy-Liste"
 
+#: ../src/protocols/sametime/sametime.c:5084
+msgid "Merge List from Server"
+msgstr "Mit Buddy-Liste vom Server zusammenführen"
+
 #: ../src/protocols/sametime/sametime.c:5086
-msgid "Merge List from Server"
-msgstr "Mit Buddy-Liste vom Server zusammenführen"
-
-#: ../src/protocols/sametime/sametime.c:5088
 msgid "Merge and Save List to Server"
 msgstr "Buddy-Liste zusammenführen und zum Server exportieren"
 
-#: ../src/protocols/sametime/sametime.c:5090
+#: ../src/protocols/sametime/sametime.c:5088
 msgid "Synchronize List with Server"
 msgstr "Buddy-Liste mit Server abgleichen"
 
-#: ../src/protocols/sametime/sametime.c:5139
+#: ../src/protocols/sametime/sametime.c:5137
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Sametime-Buddy-Liste für Konto %s importieren"
 
-#: ../src/protocols/sametime/sametime.c:5178
+#: ../src/protocols/sametime/sametime.c:5176
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Sametime-Buddy-Liste für Konto %s exportieren"
 
-#: ../src/protocols/sametime/sametime.c:5231
+#: ../src/protocols/sametime/sametime.c:5229
 msgid "Unable to add group: group exists"
 msgstr "Kann Gruppe nicht hinzufügen: Gruppe existiert"
 
-#: ../src/protocols/sametime/sametime.c:5232
+#: ../src/protocols/sametime/sametime.c:5230
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "Eine Gruppe mit dem Namen '%s' existiert bereits in Ihrer Buddy-Liste."
 
-#: ../src/protocols/sametime/sametime.c:5235
-#: ../src/protocols/sametime/sametime.c:5364
+#: ../src/protocols/sametime/sametime.c:5233
+#: ../src/protocols/sametime/sametime.c:5362
 msgid "Unable to add group"
 msgstr "Kann die Gruppe nicht hinzufügen"
 
-#: ../src/protocols/sametime/sametime.c:5294
+#: ../src/protocols/sametime/sametime.c:5292
 msgid "Possible Matches"
 msgstr "Mögliche Übereinstimmungen"
 
-#: ../src/protocols/sametime/sametime.c:5310
+#: ../src/protocols/sametime/sametime.c:5308
 msgid "Notes Address Book group results"
 msgstr "Notes-Adressbuchgruppenergebnisse"
 
-#: ../src/protocols/sametime/sametime.c:5311
+#: ../src/protocols/sametime/sametime.c:5309
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -10436,15 +10451,15 @@
 "Adressbuchgruppen. Bitte wählen Sie die richtige Gruppe aus der Liste, um "
 "sie Ihrer Buddy-Liste hinzuzufügen."
 
-#: ../src/protocols/sametime/sametime.c:5316
+#: ../src/protocols/sametime/sametime.c:5314
 msgid "Select Notes Address Book"
 msgstr "Wählen Sie das Notes-Adressbuch"
 
+#: ../src/protocols/sametime/sametime.c:5356
+msgid "Unable to add group: group not found"
+msgstr "Kann Gruppe nicht hinzufügen: Gruppe nicht gefunden"
+
 #: ../src/protocols/sametime/sametime.c:5358
-msgid "Unable to add group: group not found"
-msgstr "Kann Gruppe nicht hinzufügen: Gruppe nicht gefunden"
-
-#: ../src/protocols/sametime/sametime.c:5360
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
@@ -10453,11 +10468,11 @@
 "Der Bezeichner '%s' stimmt mit keiner Notes-Adressbuchgruppe in Ihrere "
 "Sametime-Community überein."
 
-#: ../src/protocols/sametime/sametime.c:5401
+#: ../src/protocols/sametime/sametime.c:5399
 msgid "Notes Address Book Group"
 msgstr "Notes-Adressbuchgruppe"
 
-#: ../src/protocols/sametime/sametime.c:5402
+#: ../src/protocols/sametime/sametime.c:5400
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
@@ -10465,12 +10480,12 @@
 "Geben Sie den Namen einer Notes-Adressbuchgruppe in das Feld ein um die "
 "Gruppe und ihre Mitglieder zu ihrer Buddy-Liste hinzuzufügen."
 
-#: ../src/protocols/sametime/sametime.c:5450
+#: ../src/protocols/sametime/sametime.c:5448
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Suchergebnisse für '%s'"
 
-#: ../src/protocols/sametime/sametime.c:5451
+#: ../src/protocols/sametime/sametime.c:5449
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -10482,26 +10497,26 @@
 "können diese Benutzer zu Ihrer Buddy-Liste hinzufügen oder ihnen Nachrichten "
 "senden, indem sie die folgenden Aktions-Buttons benutzen."
 
-#: ../src/protocols/sametime/sametime.c:5483
+#: ../src/protocols/sametime/sametime.c:5481
 msgid "No matches"
 msgstr "Keine Übereinstimmung"
 
-#: ../src/protocols/sametime/sametime.c:5484
+#: ../src/protocols/sametime/sametime.c:5482
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
 "Der Bezeichner '%s' stimmt mit keinem Benutzer in Ihrer Sametime-Community "
 "überein."
 
-#: ../src/protocols/sametime/sametime.c:5488
+#: ../src/protocols/sametime/sametime.c:5486
 msgid "No Matches"
 msgstr "Keine Übereinstimmung"
 
-#: ../src/protocols/sametime/sametime.c:5525
+#: ../src/protocols/sametime/sametime.c:5523
 msgid "Search for a user"
 msgstr "Suche nach einem Benutzer"
 
-#: ../src/protocols/sametime/sametime.c:5526
+#: ../src/protocols/sametime/sametime.c:5524
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
@@ -10509,32 +10524,32 @@
 "Geben die einen Namen oder den Teil einer ID in das folgende Feld ein, um "
 "nach entsprechenden Benutzern in Ihrer Sametime-Community zu suchen."
 
-#: ../src/protocols/sametime/sametime.c:5529
+#: ../src/protocols/sametime/sametime.c:5527
 msgid "User Search"
 msgstr "Benutzersuche"
 
-#: ../src/protocols/sametime/sametime.c:5541
+#: ../src/protocols/sametime/sametime.c:5539
 msgid "Import Sametime List..."
 msgstr "Import der Sametime-Liste..."
 
-#: ../src/protocols/sametime/sametime.c:5545
+#: ../src/protocols/sametime/sametime.c:5543
 msgid "Export Sametime List..."
 msgstr "Export der Sametime-Liste..."
 
-#: ../src/protocols/sametime/sametime.c:5549
+#: ../src/protocols/sametime/sametime.c:5547
 msgid "Add Notes Address Book Group..."
 msgstr "Zum Notes-Adressbuch hinzufügen..."
 
-#: ../src/protocols/sametime/sametime.c:5553
+#: ../src/protocols/sametime/sametime.c:5551
 msgid "User Search..."
 msgstr "Benutzersuche..."
 
-#: ../src/protocols/sametime/sametime.c:5650
+#: ../src/protocols/sametime/sametime.c:5648
 msgid "Force login (ignore server redirects)"
 msgstr "Erzwinge Login (ignoriere Serverumleitungen)"
 
 #. pretend to be Sametime Connect
-#: ../src/protocols/sametime/sametime.c:5660
+#: ../src/protocols/sametime/sametime.c:5658
 msgid "Hide client identity"
 msgstr "Client-Identität verbergen"
 
@@ -11649,7 +11664,7 @@
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;Nick&gt;:  Informationen zum Nick anzeigen"
 
-#: ../src/protocols/silc/silc.c:1626 ../src/protocols/zephyr/zephyr.c:2622
+#: ../src/protocols/silc/silc.c:1626 ../src/protocols/zephyr/zephyr.c:2629
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
 "msg &lt;Benutzer&gt; &lt;Nachricht&gt;:  Sendet eine private Nachricht an "
@@ -11945,7 +11960,7 @@
 msgid "Could not write"
 msgstr "Konnte nicht schreiben"
 
-#: ../src/protocols/simple/simple.c:426 ../src/protocols/simple/simple.c:1425
+#: ../src/protocols/simple/simple.c:426 ../src/protocols/simple/simple.c:1431
 msgid "Could not connect"
 msgstr "Verbinden nicht möglich"
 
@@ -11953,16 +11968,16 @@
 msgid "Wrong Password"
 msgstr "Falsches Passwort"
 
-#: ../src/protocols/simple/simple.c:1456 ../src/protocols/simple/simple.c:1495
-#: ../src/protocols/simple/simple.c:1507 ../src/protocols/simple/simple.c:1565
+#: ../src/protocols/simple/simple.c:1462 ../src/protocols/simple/simple.c:1501
+#: ../src/protocols/simple/simple.c:1513 ../src/protocols/simple/simple.c:1571
 msgid "Could not create listen socket"
 msgstr "Kann Listen-Socket nicht erstellen"
 
-#: ../src/protocols/simple/simple.c:1477
+#: ../src/protocols/simple/simple.c:1483
 msgid "Couldn't resolve host"
 msgstr "Kann den Hostnamen nicht auflösen"
 
-#: ../src/protocols/simple/simple.c:1587
+#: ../src/protocols/simple/simple.c:1593
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP-Benutzernamen dürfen keine Leerzeichen oder @-Symbole enthalten"
 
@@ -11974,36 +11989,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../src/protocols/simple/simple.c:1749
+#: ../src/protocols/simple/simple.c:1755
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE Protokoll-Plugin"
 
 #. *  summary
-#: ../src/protocols/simple/simple.c:1750
+#: ../src/protocols/simple/simple.c:1756
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "Das SIP/SIMPLE-Protokoll-Plugin"
 
-#: ../src/protocols/simple/simple.c:1772
+#: ../src/protocols/simple/simple.c:1778
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Status veröffentlichen (Bemerkung: Jeder kann Sie sehen)"
 
-#: ../src/protocols/simple/simple.c:1778
+#: ../src/protocols/simple/simple.c:1784
 msgid "Use UDP"
 msgstr "Benutze UDP"
 
-#: ../src/protocols/simple/simple.c:1780
+#: ../src/protocols/simple/simple.c:1786
 msgid "Use proxy"
 msgstr "Proxy benutzen"
 
-#: ../src/protocols/simple/simple.c:1782
+#: ../src/protocols/simple/simple.c:1788
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../src/protocols/simple/simple.c:1784
+#: ../src/protocols/simple/simple.c:1790
 msgid "Auth User"
 msgstr "Auth-Benutzer"
 
-#: ../src/protocols/simple/simple.c:1786
+#: ../src/protocols/simple/simple.c:1792
 msgid "Auth Domain"
 msgstr "Auto-Domäne"
 
@@ -12245,7 +12260,7 @@
 msgid "Your Yahoo! message did not get sent."
 msgstr "Ihre Yahoo!-Nachricht wurde nicht verschickt."
 
-#: ../src/protocols/yahoo/yahoo.c:764 ../src/protocols/yahoo/yahoo.c:3567
+#: ../src/protocols/yahoo/yahoo.c:764 ../src/protocols/yahoo/yahoo.c:3564
 msgid "Buzz!!"
 msgstr "Buzz!!"
 
@@ -12379,95 +12394,95 @@
 msgid "Connection problem"
 msgstr "Verbindungsfehler"
 
-#: ../src/protocols/yahoo/yahoo.c:2713 ../src/protocols/yahoo/yahoo.c:3300
+#: ../src/protocols/yahoo/yahoo.c:2711 ../src/protocols/yahoo/yahoo.c:3298
 msgid "Not at Home"
 msgstr "Nicht zu Hause"
 
-#: ../src/protocols/yahoo/yahoo.c:2715 ../src/protocols/yahoo/yahoo.c:3303
+#: ../src/protocols/yahoo/yahoo.c:2713 ../src/protocols/yahoo/yahoo.c:3301
 msgid "Not at Desk"
 msgstr "Nicht am Schreibtisch"
 
-#: ../src/protocols/yahoo/yahoo.c:2717 ../src/protocols/yahoo/yahoo.c:3306
+#: ../src/protocols/yahoo/yahoo.c:2715 ../src/protocols/yahoo/yahoo.c:3304
 msgid "Not in Office"
 msgstr "Nicht im Büro"
 
-#: ../src/protocols/yahoo/yahoo.c:2721 ../src/protocols/yahoo/yahoo.c:3312
+#: ../src/protocols/yahoo/yahoo.c:2719 ../src/protocols/yahoo/yahoo.c:3310
 msgid "On Vacation"
 msgstr "Im Urlaub"
 
-#: ../src/protocols/yahoo/yahoo.c:2725 ../src/protocols/yahoo/yahoo.c:3318
+#: ../src/protocols/yahoo/yahoo.c:2723 ../src/protocols/yahoo/yahoo.c:3316
 msgid "Stepped Out"
 msgstr "Hinausgegangen"
 
-#: ../src/protocols/yahoo/yahoo.c:2818 ../src/protocols/yahoo/yahoo.c:2848
+#: ../src/protocols/yahoo/yahoo.c:2816 ../src/protocols/yahoo/yahoo.c:2846
 msgid "Not on server list"
 msgstr "Nicht auf der Serverliste"
 
-#: ../src/protocols/yahoo/yahoo.c:2865 ../src/protocols/yahoo/yahoo.c:2924
+#: ../src/protocols/yahoo/yahoo.c:2863 ../src/protocols/yahoo/yahoo.c:2922
 msgid "Appear Online"
 msgstr "Offline erscheinen"
 
-#: ../src/protocols/yahoo/yahoo.c:2868 ../src/protocols/yahoo/yahoo.c:2945
+#: ../src/protocols/yahoo/yahoo.c:2866 ../src/protocols/yahoo/yahoo.c:2943
 msgid "Appear Permanently Offline"
 msgstr "Permanent offline erscheinen"
 
-#: ../src/protocols/yahoo/yahoo.c:2887
+#: ../src/protocols/yahoo/yahoo.c:2885
 msgid "Presence"
 msgstr "Präsenz"
 
-#: ../src/protocols/yahoo/yahoo.c:2930
+#: ../src/protocols/yahoo/yahoo.c:2928
 msgid "Appear Offline"
 msgstr "Offline erscheinen"
 
-#: ../src/protocols/yahoo/yahoo.c:2939
+#: ../src/protocols/yahoo/yahoo.c:2937
 msgid "Don't Appear Permanently Offline"
 msgstr "Nicht permanent Offline erscheinen"
 
-#: ../src/protocols/yahoo/yahoo.c:2987
+#: ../src/protocols/yahoo/yahoo.c:2985
 msgid "Join in Chat"
 msgstr "Chat betreten"
 
-#: ../src/protocols/yahoo/yahoo.c:2993
+#: ../src/protocols/yahoo/yahoo.c:2991
 msgid "Initiate Conference"
 msgstr "Konferenz einleiten"
 
-#: ../src/protocols/yahoo/yahoo.c:3021
+#: ../src/protocols/yahoo/yahoo.c:3019
 msgid "Presence Settings"
 msgstr "Anwesenheitseinstellungen"
 
-#: ../src/protocols/yahoo/yahoo.c:3027
+#: ../src/protocols/yahoo/yahoo.c:3025
 msgid "Start Doodling"
 msgstr "Anfangen zu malen"
 
-#: ../src/protocols/yahoo/yahoo.c:3059
+#: ../src/protocols/yahoo/yahoo.c:3057
 msgid "Active which ID?"
 msgstr "Welche ID aktivieren?"
 
-#: ../src/protocols/yahoo/yahoo.c:3068
+#: ../src/protocols/yahoo/yahoo.c:3066
 msgid "Join who in chat?"
 msgstr "Wen wollen Sie zum Chat einladen?"
 
-#: ../src/protocols/yahoo/yahoo.c:3078
+#: ../src/protocols/yahoo/yahoo.c:3076
 msgid "Activate ID..."
 msgstr "Aktiviere ID..."
 
-#: ../src/protocols/yahoo/yahoo.c:3082
+#: ../src/protocols/yahoo/yahoo.c:3080
 msgid "Join User in Chat..."
 msgstr "Einen Benutzer zum Chat einladen..."
 
-#: ../src/protocols/yahoo/yahoo.c:3626
+#: ../src/protocols/yahoo/yahoo.c:3623
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt;Raum&gt;:  Einen Chatraum im Yahoo-Netzwerk betreten"
 
-#: ../src/protocols/yahoo/yahoo.c:3631
+#: ../src/protocols/yahoo/yahoo.c:3628
 msgid "list: List rooms on the Yahoo network"
 msgstr "list:  Liste Räume im Yahoo-Netzwerk auf"
 
-#: ../src/protocols/yahoo/yahoo.c:3635
+#: ../src/protocols/yahoo/yahoo.c:3632
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Einen Kontakt anrufen, um seine Aufmerksamkeit zu erhalten"
 
-#: ../src/protocols/yahoo/yahoo.c:3639
+#: ../src/protocols/yahoo/yahoo.c:3636
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Einen benutzer auffordern, eine Mal-Sitzung zu starten"
 
@@ -12481,55 +12496,55 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/yahoo/yahoo.c:3732 ../src/protocols/yahoo/yahoo.c:3734
+#: ../src/protocols/yahoo/yahoo.c:3729 ../src/protocols/yahoo/yahoo.c:3731
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo-Protokoll-Plugin"
 
+#: ../src/protocols/yahoo/yahoo.c:3748
+msgid "Yahoo Japan"
+msgstr "Yahoo Japan"
+
 #: ../src/protocols/yahoo/yahoo.c:3751
-msgid "Yahoo Japan"
-msgstr "Yahoo Japan"
-
-#: ../src/protocols/yahoo/yahoo.c:3754
 msgid "Pager server"
 msgstr "Pager-Server"
 
-#: ../src/protocols/yahoo/yahoo.c:3757
+#: ../src/protocols/yahoo/yahoo.c:3754
 msgid "Japan Pager server"
 msgstr "Pager-Server (Japan)"
 
+#: ../src/protocols/yahoo/yahoo.c:3757
+msgid "Pager port"
+msgstr "Pager-Port"
+
 #: ../src/protocols/yahoo/yahoo.c:3760
-msgid "Pager port"
-msgstr "Pager-Port"
+msgid "File transfer server"
+msgstr "Server für Dateiübertragungen"
 
 #: ../src/protocols/yahoo/yahoo.c:3763
-msgid "File transfer server"
-msgstr "Server für Dateiübertragungen"
+msgid "Japan file transfer server"
+msgstr "Server für Dateiübertragungen (Japan)"
 
 #: ../src/protocols/yahoo/yahoo.c:3766
-msgid "Japan file transfer server"
-msgstr "Server für Dateiübertragungen (Japan)"
+msgid "File transfer port"
+msgstr "Port für Dateiübertragungen"
 
 #: ../src/protocols/yahoo/yahoo.c:3769
-msgid "File transfer port"
-msgstr "Port für Dateiübertragungen"
-
-#: ../src/protocols/yahoo/yahoo.c:3772
 msgid "Chat room locale"
 msgstr "Chatraum-Gebiet"
 
-#: ../src/protocols/yahoo/yahoo.c:3775
+#: ../src/protocols/yahoo/yahoo.c:3772
 msgid "Ignore conference and chatroom invitations"
 msgstr "Konferenz- und Chateinladungen ignorieren"
 
-#: ../src/protocols/yahoo/yahoo.c:3779
+#: ../src/protocols/yahoo/yahoo.c:3776
 msgid "Chat room list URL"
 msgstr "Chatraumliste (URL)"
 
-#: ../src/protocols/yahoo/yahoo.c:3782
+#: ../src/protocols/yahoo/yahoo.c:3779
 msgid "Yahoo Chat server"
 msgstr "Yahoo-Chat-Server"
 
-#: ../src/protocols/yahoo/yahoo.c:3785
+#: ../src/protocols/yahoo/yahoo.c:3782
 msgid "Yahoo Chat port"
 msgstr "Yahoo-Chat-Port"
 
@@ -12774,44 +12789,44 @@
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "Der Versucht, %s,%s,%s zu abonnieren ist gescheitert"
 
-#: ../src/protocols/zephyr/zephyr.c:2627
+#: ../src/protocols/zephyr/zephyr.c:2634
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;Nick&gt;: Benutzer suchen"
 
-#: ../src/protocols/zephyr/zephyr.c:2632
+#: ../src/protocols/zephyr/zephyr.c:2639
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;Nick&gt;: Benutzer suchen"
 
-#: ../src/protocols/zephyr/zephyr.c:2637
+#: ../src/protocols/zephyr/zephyr.c:2644
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 "instance &lt;Instanz&gt;: Setze die Instanz, die für diese Klasse benutzt "
 "wird"
 
-#: ../src/protocols/zephyr/zephyr.c:2642
+#: ../src/protocols/zephyr/zephyr.c:2649
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 "inst &lt;Instanz&gt;: Setze die Instanz, die für diese Klasse benutzt wird"
 
-#: ../src/protocols/zephyr/zephyr.c:2647
+#: ../src/protocols/zephyr/zephyr.c:2654
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 "topic &lt;Instanz&gt;: Setze die Instanz, die für diese Klasse benutzt wird"
 
-#: ../src/protocols/zephyr/zephyr.c:2653
+#: ../src/protocols/zephyr/zephyr.c:2660
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 "sub &lt;Klasse&gt; &lt;Instanz&gt; &lt;Empfänger&gt;: Einen neuen Chat "
 "betreten"
 
-#: ../src/protocols/zephyr/zephyr.c:2658
+#: ../src/protocols/zephyr/zephyr.c:2665
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 "zi &lt;Instanz&gt;: Sende eine Nachricht an &lt;Nachricht,<i>Instanz</i>,"
 "*&gt;"
 
-#: ../src/protocols/zephyr/zephyr.c:2664
+#: ../src/protocols/zephyr/zephyr.c:2671
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
@@ -12819,7 +12834,7 @@
 "zci &lt;Klasse&gt; &lt;Instanz&gt;: Sendet eine Nachricht an &lt;<i>Klasse</"
 "i>,<i>Instanz</i>,*&gt;"
 
-#: ../src/protocols/zephyr/zephyr.c:2670
+#: ../src/protocols/zephyr/zephyr.c:2677
 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;"
@@ -12827,7 +12842,7 @@
 "zcir &lt;Klasse&gt; &lt;Instanz&gt; &lt;Empfänger&gt;: Sendet eine Nachricht "
 "an &lt;<i>Klasse</i>,<i>Instanz</i>,<i>Empfänger</i>&gt;"
 
-#: ../src/protocols/zephyr/zephyr.c:2676
+#: ../src/protocols/zephyr/zephyr.c:2683
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -12835,16 +12850,16 @@
 "zir &lt;Instanz&gt; &lt;Empfänger&gt;: Sendet eine Nachricht an &lt;"
 "NACHRICHT,<i>Instanz</i>,<i>Empfänger</i>&gt;"
 
-#: ../src/protocols/zephyr/zephyr.c:2681
+#: ../src/protocols/zephyr/zephyr.c:2688
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr ""
 "zc &lt;Klasse&gt;: Sendet eine Nachricht an &lt;<i>Klasse</i>,PERSONAL,*&gt;"
 
-#: ../src/protocols/zephyr/zephyr.c:2787
+#: ../src/protocols/zephyr/zephyr.c:2794
 msgid "Resubscribe"
 msgstr "Neu Abonnieren"
 
-#: ../src/protocols/zephyr/zephyr.c:2790
+#: ../src/protocols/zephyr/zephyr.c:2797
 msgid "Retrieve subscriptions from server"
 msgstr "Abonnements vom Server abrufen"
 
@@ -12858,39 +12873,39 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/zephyr/zephyr.c:2875 ../src/protocols/zephyr/zephyr.c:2877
+#: ../src/protocols/zephyr/zephyr.c:2882 ../src/protocols/zephyr/zephyr.c:2884
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr-Protokoll-Plugin"
 
-#: ../src/protocols/zephyr/zephyr.c:2896
+#: ../src/protocols/zephyr/zephyr.c:2903
 msgid "Use tzc"
 msgstr "Benutze tzc"
 
-#: ../src/protocols/zephyr/zephyr.c:2899
+#: ../src/protocols/zephyr/zephyr.c:2906
 msgid "tzc command"
 msgstr "tzc-Kommando"
 
-#: ../src/protocols/zephyr/zephyr.c:2902
+#: ../src/protocols/zephyr/zephyr.c:2909
 msgid "Export to .anyone"
 msgstr "Export an .anyone"
 
-#: ../src/protocols/zephyr/zephyr.c:2905
+#: ../src/protocols/zephyr/zephyr.c:2912
 msgid "Export to .zephyr.subs"
 msgstr "Export an .zephyr.subs"
 
-#: ../src/protocols/zephyr/zephyr.c:2908
+#: ../src/protocols/zephyr/zephyr.c:2915
 msgid "Import from .anyone"
 msgstr "Import von .anyone"
 
-#: ../src/protocols/zephyr/zephyr.c:2911
+#: ../src/protocols/zephyr/zephyr.c:2918
 msgid "Import from .zephyr.subs"
 msgstr "Import von .zephyr.subs"
 
-#: ../src/protocols/zephyr/zephyr.c:2914
+#: ../src/protocols/zephyr/zephyr.c:2921
 msgid "Realm"
 msgstr "Realm"
 
-#: ../src/protocols/zephyr/zephyr.c:2917
+#: ../src/protocols/zephyr/zephyr.c:2924
 msgid "Exposure"
 msgstr "Aussetzen"
 
@@ -12917,20 +12932,20 @@
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
-#: ../src/savedstatuses.c:44
+#: ../src/savedstatuses.c:45
 msgid "I'm not here right now"
 msgstr "Ich bin gerade nicht hier"
 
-#: ../src/savedstatuses.c:519
+#: ../src/savedstatuses.c:524
 msgid "saved statuses"
 msgstr "gespeicherter Status"
 
-#: ../src/server.c:227
+#: ../src/server.c:225
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s heißt jetzt %s.\n"
 
-#: ../src/server.c:681
+#: ../src/server.c:684
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -12939,12 +12954,12 @@
 "%s hat %s in den Chatraum %s eingeladen:\n"
 "%s"
 
-#: ../src/server.c:686
+#: ../src/server.c:689
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s hat %s in den Chatraum %s eingeladen\n"
 
-#: ../src/server.c:690
+#: ../src/server.c:693
 msgid "Accept chat invitation?"
 msgstr "Akzeptieren Sie die Chat-Einladung?"
 
@@ -13068,6 +13083,24 @@
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Fehler bei Herstellen der Verbindung.\n"
 
+#~ 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."
+
+#~ msgid ""
+#~ "Unable to play sound because the 'Command' sound method has been chosen, "
+#~ "but no command has been set."
+#~ msgstr ""
+#~ "Kann keinen Sound spielen, weil die 'Kommando'-Methode gewählt, aber kein "
+#~ "Kommando angegeben wurde."
+
+#~ msgid ""
+#~ "Unable to play sound because the configured sound command could not be "
+#~ "launched: %s"
+#~ msgstr ""
+#~ "Kann keinen Sound spielen, weil das konfigurierte Sound-Kommando nicht "
+#~ "aufgerufen werden kann: %s"
+
 #~ msgid "Auth host"
 #~ msgstr "Auth Host"
 
@@ -13089,14 +13122,6 @@
 #~ msgid "YCHT port"
 #~ msgstr "YCHT-Port"
 
-#, fuzzy
-#~ msgid "First"
-#~ msgstr "Vorname"
-
-#, fuzzy
-#~ msgid "Last"
-#~ msgstr "Zuletzt gesagt"
-
 #~ msgid "Screen Name:"
 #~ msgstr "Benutzername:"
 
--- a/po/fi.po	Wed Aug 09 06:23:18 2006 +0000
+++ b/po/fi.po	Wed Aug 09 14:47:37 2006 +0000
@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: Gaim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-21 18:14+0300\n"
-"PO-Revision-Date: 2006-05-21 18:15+0300\n"
+"POT-Creation-Date: 2006-08-09 17:59+0300\n"
+"PO-Revision-Date: 2006-08-09 18:00+0300\n"
 "Last-Translator: Timo Jyrinki <timo.jyrinki@iki.fi>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -158,7 +158,7 @@
 msgstr "Piirteiden tarkistus"
 
 #. add enabled / disabled
-#: ../plugins/crazychat/cc_gaim_plugin.c:345 ../src/gtkaccount.c:2262
+#: ../plugins/crazychat/cc_gaim_plugin.c:345 ../src/gtkaccount.c:2258
 #: ../src/gtkplugin.c:574
 msgid "Enabled"
 msgstr "Käytössä"
@@ -173,15 +173,15 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/dbus-example.c:152
-msgid "DBus"
-msgstr "DBus"
+#: ../plugins/dbus-example.c:155
+msgid "DBus Example"
+msgstr "DBus-esimerkki"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/dbus-example.c:155 ../plugins/dbus-example.c:157
+#: ../plugins/dbus-example.c:158 ../plugins/dbus-example.c:160
 msgid "DBus Plugin Example"
 msgstr "DBus-esimerkkiliitännäinen"
 
@@ -201,10 +201,10 @@
 msgstr "Vaihda tila"
 
 #: ../plugins/docklet/docklet.c:435 ../src/gtkstatusbox.c:673
-#: ../src/protocols/gg/gg.c:996 ../src/protocols/jabber/buddy.c:1103
+#: ../src/protocols/gg/gg.c:996 ../src/protocols/jabber/buddy.c:1363
 #: ../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:2843 ../src/protocols/yahoo/yahoo.c:2731
+#: ../src/protocols/novell/novell.c:2843 ../src/protocols/yahoo/yahoo.c:2748
 #: ../src/status.c:155
 msgid "Available"
 msgstr "Tavoitettavissa"
@@ -215,25 +215,25 @@
 #: ../plugins/docklet/docklet.c:439 ../src/gtkprefs.c:1774
 #: ../src/gtkstatusbox.c:674 ../src/protocols/gg/gg.c:999
 #: ../src/protocols/irc/irc.c:520 ../src/protocols/irc/msgs.c:223
-#: ../src/protocols/jabber/buddy.c:1107 ../src/protocols/novell/novell.c:2846
-#: ../src/protocols/oscar/oscar.c:719 ../src/protocols/oscar/oscar.c:4401
-#: ../src/protocols/oscar/oscar.c:5444 ../src/protocols/silc/buddy.c:1469
-#: ../src/protocols/yahoo/yahoo.c:3185 ../src/protocols/yahoo/yahoo.c:3258
+#: ../src/protocols/jabber/buddy.c:1367 ../src/protocols/novell/novell.c:2846
+#: ../src/protocols/oscar/oscar.c:719 ../src/protocols/oscar/oscar.c:4422
+#: ../src/protocols/oscar/oscar.c:5486 ../src/protocols/silc/buddy.c:1469
+#: ../src/protocols/yahoo/yahoo.c:3218 ../src/protocols/yahoo/yahoo.c:3291
 #: ../src/status.c:158
 msgid "Away"
 msgstr "Poissa"
 
 #: ../plugins/docklet/docklet.c:443 ../src/gtkstatusbox.c:675
-#: ../src/protocols/oscar/oscar.c:723 ../src/protocols/yahoo/yahoo.c:2725
+#: ../src/protocols/oscar/oscar.c:723 ../src/protocols/yahoo/yahoo.c:2742
 #: ../src/status.c:157
 msgid "Invisible"
 msgstr "Näkymätön"
 
 #: ../plugins/docklet/docklet.c:447 ../src/gtkblist.c:2969
 #: ../src/gtkstatusbox.c:676 ../src/protocols/gg/gg.c:993
-#: ../src/protocols/jabber/buddy.c:1101 ../src/protocols/novell/novell.c:2855
-#: ../src/protocols/oscar/oscar.c:785 ../src/protocols/oscar/oscar.c:5416
-#: ../src/protocols/yahoo/yahoo.c:2729 ../src/status.c:154
+#: ../src/protocols/jabber/buddy.c:1361 ../src/protocols/novell/novell.c:2855
+#: ../src/protocols/oscar/oscar.c:794 ../src/protocols/oscar/oscar.c:5458
+#: ../src/protocols/yahoo/yahoo.c:2746 ../src/status.c:154
 msgid "Offline"
 msgstr "Poissa linjoilta"
 
@@ -249,7 +249,7 @@
 msgid "Show Buddy List"
 msgstr "Näytä tuttavalista"
 
-#: ../plugins/docklet/docklet.c:489 ../src/gtkconv.c:5680
+#: ../plugins/docklet/docklet.c:489 ../src/gtkconv.c:5677
 msgid "Unread Messages"
 msgstr "Lukemattomat viestit"
 
@@ -257,7 +257,7 @@
 msgid "New Message..."
 msgstr "Uusi viesti..."
 
-#: ../plugins/docklet/docklet.c:519 ../src/gtkaccount.c:2478
+#: ../plugins/docklet/docklet.c:519 ../src/gtkaccount.c:2474
 msgid "Accounts"
 msgstr "Käyttäjätilit"
 
@@ -606,9 +606,9 @@
 #. 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:754
-#: ../src/protocols/msn/msn.c:1527 ../src/protocols/msn/msn.c:1580
-#: ../src/protocols/msn/msn.c:1601
+#: ../src/gtkroomlist.c:604 ../src/protocols/jabber/jabber.c:771
+#: ../src/protocols/msn/msn.c:1529 ../src/protocols/msn/msn.c:1582
+#: ../src/protocols/msn/msn.c:1603
 msgid "Name"
 msgstr "Nimi"
 
@@ -616,10 +616,10 @@
 msgid "Instant Messaging"
 msgstr "Pikaviestintä"
 
-#: ../plugins/gevolution/add_buddy_dialog.c:442 ../src/gtkblist.c:4528
+#: ../plugins/gevolution/add_buddy_dialog.c:442 ../src/gtkblist.c:4535
 #: ../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:2974
+#: ../src/protocols/yahoo/yahoo.c:2991
 msgid "Add Buddy"
 msgstr "Lisää tuttava"
 
@@ -631,14 +631,14 @@
 #. "Search"
 #: ../plugins/gevolution/add_buddy_dialog.c:468
 #: ../plugins/gevolution/assoc-buddy.c:353
-#: ../src/protocols/jabber/buddy.c:1460 ../src/protocols/oscar/oscar.c:6024
-#: ../src/protocols/sametime/sametime.c:5524
+#: ../src/protocols/jabber/buddy.c:1720 ../src/protocols/oscar/oscar.c:6088
+#: ../src/protocols/sametime/sametime.c:5529
 msgid "Search"
 msgstr "Etsi"
 
 #: ../plugins/gevolution/add_buddy_dialog.c:549
-#: ../plugins/gevolution/new_person_dialog.c:307 ../src/gtkblist.c:4612
-#: ../src/gtkblist.c:4976
+#: ../plugins/gevolution/new_person_dialog.c:307 ../src/gtkblist.c:4619
+#: ../src/gtkblist.c:4982
 msgid "Group:"
 msgstr "Ryhmä:"
 
@@ -674,13 +674,13 @@
 msgstr "_Yhdistä tuttava"
 
 #: ../plugins/gevolution/eds-utils.c:73 ../plugins/gevolution/eds-utils.c:86
-#: ../src/protocols/jabber/jabber.c:1120
+#: ../src/protocols/jabber/jabber.c:1134
 msgid "None"
 msgstr "Ei mitään"
 
 #: ../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:4421 ../src/protocols/jabber/roster.c:65
+#: ../src/gtkblist.c:4425 ../src/protocols/jabber/roster.c:67
 msgid "Buddies"
 msgstr "Tuttavat"
 
@@ -715,8 +715,8 @@
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "Valitse kaikki tilit, joihin tuttavat lisätään automaattisesti."
 
-#: ../plugins/gevolution/gevolution.c:450 ../plugins/idle.c:150
-#: ../plugins/idle.c:186 ../src/gtknotify.c:399 ../src/gtkpounce.c:1244
+#: ../plugins/gevolution/gevolution.c:450 ../plugins/idle.c:153
+#: ../plugins/idle.c:189 ../src/gtknotify.c:402 ../src/gtkpounce.c:1255
 msgid "Account"
 msgstr "Tili"
 
@@ -751,8 +751,8 @@
 msgid "Account type:"
 msgstr "Käyttäjätilin tyyppi:"
 
-#: ../plugins/gevolution/new_person_dialog.c:295 ../src/gtkaccount.c:784
-#: ../src/gtkblist.c:4574
+#: ../plugins/gevolution/new_person_dialog.c:295 ../src/gtkaccount.c:779
+#: ../src/gtkblist.c:4581
 msgid "Screen name:"
 msgstr "Näyttönimi:"
 
@@ -762,8 +762,8 @@
 msgstr "Valinnaisia tietoja:"
 
 #. Label
-#: ../plugins/gevolution/new_person_dialog.c:338 ../src/gtkaccount.c:424
-#: ../src/gtkaccount.c:446 ../src/protocols/oscar/oscar.c:625
+#: ../plugins/gevolution/new_person_dialog.c:338 ../src/gtkaccount.c:421
+#: ../src/gtkaccount.c:443 ../src/protocols/oscar/oscar.c:625
 msgid "Buddy Icon"
 msgstr "Tuttavakuvake"
 
@@ -854,50 +854,50 @@
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "Pienentää tuttavalista- ja keskusteluikkunan poissaoloajaksi."
 
-#: ../plugins/idle.c:155 ../plugins/idle.c:213
+#: ../plugins/idle.c:158 ../plugins/idle.c:216
 msgid "Minutes"
 msgstr "Minuuttia"
 
 #. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
 #. If that doesn't translate well into your language, drop the 's before translating.
-#: ../plugins/idle.c:162 ../plugins/idle.c:195 ../plugins/idle.c:220
-#: ../plugins/idle.c:312
+#: ../plugins/idle.c:165 ../plugins/idle.c:198 ../plugins/idle.c:223
+#: ../plugins/idle.c:315
 msgid "I'dle Mak'er"
 msgstr "Joutenoloajan säätö"
 
-#: ../plugins/idle.c:163 ../plugins/idle.c:252
+#: ../plugins/idle.c:166 ../plugins/idle.c:255
 msgid "Set Account Idle Time"
 msgstr "Aseta tilin joutenoloaika"
 
-#: ../plugins/idle.c:166 ../plugins/idle.c:224
+#: ../plugins/idle.c:169 ../plugins/idle.c:227
 msgid "_Set"
 msgstr "_Aseta"
 
-#: ../plugins/idle.c:167 ../plugins/idle.c:200 ../plugins/idle.c:225
+#: ../plugins/idle.c:170 ../plugins/idle.c:203 ../plugins/idle.c:228
 msgid "_Cancel"
 msgstr "_Peru"
 
-#: ../plugins/idle.c:180
+#: ../plugins/idle.c:183
 msgid "None of your accounts are idle."
 msgstr "Yksikään käyttäjätileistäsi ei ole jouten."
 
-#: ../plugins/idle.c:196 ../plugins/idle.c:256
+#: ../plugins/idle.c:199 ../plugins/idle.c:259
 msgid "Unset Account Idle Time"
 msgstr "Poista tilin joutenoloajan asetus"
 
-#: ../plugins/idle.c:199
+#: ../plugins/idle.c:202
 msgid "_Unset"
 msgstr "_Poista asetus"
 
-#: ../plugins/idle.c:221 ../plugins/idle.c:260
+#: ../plugins/idle.c:224 ../plugins/idle.c:263
 msgid "Set Idle Time for All Accounts"
 msgstr "Aseta joutenoloaika kaikille käyttäjätileille"
 
-#: ../plugins/idle.c:265
+#: ../plugins/idle.c:268
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr "Ota pois joutenoloaika kaikilta jouten olevilta tileiltä"
 
-#: ../plugins/idle.c:314 ../plugins/idle.c:315
+#: ../plugins/idle.c:317 ../plugins/idle.c:318
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr "Antaa sinun säätää itse kuinka kauan olet ollut jouten"
 
@@ -967,9 +967,7 @@
 msgid "One or more messages may have been undeliverable."
 msgstr "Yksi tai useampi viesti on saattanut jäädä lähettämättä."
 
-#. MSG_SERVER_DISCONNECTING
-#. we have been kicked off =^(
-#: ../plugins/log_reader.c:1448 ../src/protocols/napster/napster.c:363
+#: ../plugins/log_reader.c:1448
 msgid "You were disconnected from the server."
 msgstr "Yhteys palvelimeen on katkennut."
 
@@ -1103,32 +1101,32 @@
 msgid "Music messaging session confirmed."
 msgstr "Musiikkiviestintäistunto varmistettu."
 
-#: ../plugins/musicmessaging/musicmessaging.c:414
+#: ../plugins/musicmessaging/musicmessaging.c:416
 msgid "Music Messaging"
 msgstr "Musiikkiviestintä"
 
-#: ../plugins/musicmessaging/musicmessaging.c:415
+#: ../plugins/musicmessaging/musicmessaging.c:417
 msgid "There was a conflict in running the command:"
 msgstr "Tapahtui virhe suoritettaessa komentoa:"
 
-#: ../plugins/musicmessaging/musicmessaging.c:523
+#: ../plugins/musicmessaging/musicmessaging.c:525
 msgid "Error Running Editor"
 msgstr "Virhe ajettaessa muokkainta"
 
-#: ../plugins/musicmessaging/musicmessaging.c:524
+#: ../plugins/musicmessaging/musicmessaging.c:526
 msgid "The following error has occured:"
 msgstr "Seuraava virhe esiintyi:"
 
 #. Configuration frame
-#: ../plugins/musicmessaging/musicmessaging.c:623
+#: ../plugins/musicmessaging/musicmessaging.c:625
 msgid "Music Messaging Configuration"
 msgstr "Musiikkiviestinnän asetukset"
 
-#: ../plugins/musicmessaging/musicmessaging.c:627
+#: ../plugins/musicmessaging/musicmessaging.c:629
 msgid "Score Editor Path"
 msgstr "Sävellysmuokkaimen polku"
 
-#: ../plugins/musicmessaging/musicmessaging.c:628
+#: ../plugins/musicmessaging/musicmessaging.c:630
 msgid "_Apply"
 msgstr "_Toteuta"
 
@@ -1140,12 +1138,12 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../plugins/musicmessaging/musicmessaging.c:663
+#: ../plugins/musicmessaging/musicmessaging.c:665
 msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Musiikkiviestintäliitännäinen yhdessä säveltämistä varten."
 
 #. *  summary
-#: ../plugins/musicmessaging/musicmessaging.c:665
+#: ../plugins/musicmessaging/musicmessaging.c:667
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editting a common score in real-time."
@@ -1411,70 +1409,70 @@
 msgid "Tests to see that most things are working."
 msgstr "Kokeilee että useimmat asiat toimivat."
 
-#: ../plugins/spellchk.c:1918
+#: ../plugins/spellchk.c:1945
 msgid "Duplicate Correction"
 msgstr "Korjauksen toisinto"
 
-#: ../plugins/spellchk.c:1919
+#: ../plugins/spellchk.c:1946
 msgid "The specified word already exists in the correction list."
 msgstr "Määritetty sana on jo korjauslistassa."
 
-#: ../plugins/spellchk.c:2128
+#: ../plugins/spellchk.c:2154
 msgid "Text Replacements"
 msgstr "Tekstin korvaus"
 
-#: ../plugins/spellchk.c:2151
+#: ../plugins/spellchk.c:2177
 msgid "You type"
 msgstr "Kirjoitettu"
 
-#: ../plugins/spellchk.c:2165
+#: ../plugins/spellchk.c:2191
 msgid "You send"
 msgstr "Lähetetty"
 
-#: ../plugins/spellchk.c:2179
+#: ../plugins/spellchk.c:2205
 msgid "Whole words only"
 msgstr "Vain kokonaiset sanat"
 
-#: ../plugins/spellchk.c:2191
-msgid "Case sensitive"
-msgstr "Sama kirjainkoko"
-
 #: ../plugins/spellchk.c:2217
+msgid "Case sensitive"
+msgstr "Sama kirjainkoko"
+
+#: ../plugins/spellchk.c:2243
 msgid "Add a new text replacement"
 msgstr "Lisää uusi korvausehto"
 
-#: ../plugins/spellchk.c:2233
+#: ../plugins/spellchk.c:2259
 msgid "You _type:"
 msgstr "_Kirjoitettu:"
 
-#: ../plugins/spellchk.c:2250
+#: ../plugins/spellchk.c:2276
 msgid "You _send:"
 msgstr "_Lähetetty:"
 
 #. Created here so it can be passed to whole_words_button_toggled.
-#: ../plugins/spellchk.c:2262
+#: ../plugins/spellchk.c:2288
 msgid "_Exact case match (uncheck for automatic case handling)"
 msgstr ""
 "_Ehdoton kirjainkoon täsmäys (poista valinta jos haluat automaattisen "
 "kirjainkoon hallinnan)"
 
-#: ../plugins/spellchk.c:2264
+#: ../plugins/spellchk.c:2290
 msgid "Only replace _whole words"
 msgstr "Korvaa vain _kokonaiset sanat"
 
-#: ../plugins/spellchk.c:2289
+#: ../plugins/spellchk.c:2315
 msgid "General Text Replacement Options"
 msgstr "Tekstin korvauksen yleiset valinnat"
 
-#: ../plugins/spellchk.c:2290
+#: ../plugins/spellchk.c:2316
 msgid "Enable replacement of last word on send"
 msgstr "Salli viimeisen sanan korvaus lähetettäessä"
 
-#: ../plugins/spellchk.c:2315
+#: ../plugins/spellchk.c:2341
 msgid "Text replacement"
 msgstr "Tekstin korvaus"
 
-#: ../plugins/spellchk.c:2317 ../plugins/spellchk.c:2318
+#: ../plugins/spellchk.c:2343 ../plugins/spellchk.c:2344
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Korvaa lähetetettävän tekstin käyttäjän määritelmän mukaan."
 
@@ -1484,7 +1482,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/ssl/ssl-gnutls.c:251
+#: ../plugins/ssl/ssl-gnutls.c:256
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -1492,7 +1490,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/ssl/ssl-gnutls.c:254 ../plugins/ssl/ssl-gnutls.c:256
+#: ../plugins/ssl/ssl-gnutls.c:259 ../plugins/ssl/ssl-gnutls.c:261
 msgid "Provides SSL support through GNUTLS."
 msgstr "Tuo SSL-tuen GNUTLS:n kautta."
 
@@ -1685,19 +1683,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/timestamp_format.c:150
+#: ../plugins/timestamp_format.c:149
 msgid "Message Timestamp Formats"
 msgstr "Viestin aikaleimamuodot"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../plugins/timestamp_format.c:153
+#: ../plugins/timestamp_format.c:152
 msgid "Customizes the message timestamp formats."
 msgstr "Muokkaa viestin aikaleimamuotoja."
 
 #. *  description
-#: ../plugins/timestamp_format.c:155
+#: ../plugins/timestamp_format.c:154
 msgid ""
 "This plugin allows the user to customize conversation and logging message "
 "timestamp formats."
@@ -1795,7 +1793,7 @@
 msgstr "_Käynnistä Gaim Windowsin käynnistyessä."
 
 #. Buddy List
-#: ../plugins/win32/winprefs/winprefs.c:455 ../src/gtkblist.c:3665
+#: ../plugins/win32/winprefs/winprefs.c:455 ../src/gtkblist.c:3672
 msgid "Buddy List"
 msgstr "Tuttavalista"
 
@@ -1843,138 +1841,138 @@
 msgid "accounts"
 msgstr "käyttäjätilit"
 
-#: ../src/account.c:918
+#: ../src/account.c:917
 msgid "Password is required to sign on."
 msgstr "Salasana tarvitaan kirjautumiseen."
 
-#: ../src/account.c:943
+#: ../src/account.c:942
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Anna salasana käyttäjätilille %s (%s)"
 
-#: ../src/account.c:950
+#: ../src/account.c:949
 msgid "Enter Password"
 msgstr "Anna salasana"
 
-#: ../src/account.c:955
+#: ../src/account.c:954
 msgid "Save password"
 msgstr "Tallenna salasana"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../src/account.c:963 ../src/account.c:1134 ../src/gtkblist.c:3549
-#: ../src/gtkdialogs.c:607 ../src/gtkdialogs.c:744 ../src/gtkdialogs.c:808
+#: ../src/account.c:962 ../src/account.c:1133 ../src/gtkblist.c:3556
+#: ../src/gtkdialogs.c:613 ../src/gtkdialogs.c:750 ../src/gtkdialogs.c:824
 #: ../src/gtkrequest.c:269 ../src/protocols/gg/gg.c:497
 #: ../src/protocols/gg/gg.c:655 ../src/protocols/gg/gg.c:791
-#: ../src/protocols/jabber/jabber.c:1317 ../src/protocols/jabber/xdata.c:337
+#: ../src/protocols/jabber/jabber.c:1331 ../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:1408 ../src/protocols/oscar/oscar.c:2167
-#: ../src/protocols/oscar/oscar.c:2260 ../src/protocols/oscar/oscar.c:5694
-#: ../src/protocols/oscar/oscar.c:5874 ../src/protocols/oscar/oscar.c:5899
-#: ../src/protocols/oscar/oscar.c:5955 ../src/protocols/silc/buddy.c:466
+#: ../src/protocols/oscar/oscar.c:1417 ../src/protocols/oscar/oscar.c:2175
+#: ../src/protocols/oscar/oscar.c:2262 ../src/protocols/oscar/oscar.c:5736
+#: ../src/protocols/oscar/oscar.c:5938 ../src/protocols/oscar/oscar.c:5963
+#: ../src/protocols/oscar/oscar.c:6019 ../src/protocols/silc/buddy.c:466
 #: ../src/protocols/silc/buddy.c:1182 ../src/protocols/silc/chat.c:424
 #: ../src/protocols/silc/chat.c:462 ../src/protocols/silc/chat.c:725
 #: ../src/protocols/silc/ops.c:1297 ../src/protocols/silc/ops.c:1910
-#: ../src/protocols/silc/silc.c:753 ../src/protocols/yahoo/yahoo.c:3059
-#: ../src/protocols/yahoo/yahoo.c:3068 ../src/request.h:1344
+#: ../src/protocols/silc/silc.c:755 ../src/protocols/yahoo/yahoo.c:3076
+#: ../src/protocols/yahoo/yahoo.c:3085 ../src/request.h:1344
 msgid "OK"
 msgstr "OK"
 
-#: ../src/account.c:964 ../src/account.c:1135 ../src/account.c:1172
-#: ../src/gtkaccount.c:2182 ../src/gtkaccount.c:2649 ../src/gtkblist.c:5017
-#: ../src/gtkdialogs.c:608 ../src/gtkdialogs.c:745 ../src/gtkdialogs.c:809
-#: ../src/gtkdialogs.c:828 ../src/gtkdialogs.c:850 ../src/gtkdialogs.c:870
-#: ../src/gtkdialogs.c:914 ../src/gtkdialogs.c:969 ../src/gtkdialogs.c:1006
-#: ../src/gtkdialogs.c:1031 ../src/gtkimhtmltoolbar.c:419
-#: ../src/gtkplugin.c:296 ../src/gtkpounce.c:1077 ../src/gtkprivacy.c:568
-#: ../src/gtkprivacy.c:581 ../src/gtkprivacy.c:606 ../src/gtkprivacy.c:617
+#: ../src/account.c:963 ../src/account.c:1134 ../src/account.c:1171
+#: ../src/gtkaccount.c:2172 ../src/gtkaccount.c:2642 ../src/gtkblist.c:5023
+#: ../src/gtkdialogs.c:614 ../src/gtkdialogs.c:751 ../src/gtkdialogs.c:825
+#: ../src/gtkdialogs.c:844 ../src/gtkdialogs.c:866 ../src/gtkdialogs.c:886
+#: ../src/gtkdialogs.c:930 ../src/gtkdialogs.c:985 ../src/gtkdialogs.c:1022
+#: ../src/gtkdialogs.c:1047 ../src/gtkimhtmltoolbar.c:419
+#: ../src/gtkplugin.c:296 ../src/gtkpounce.c:1088 ../src/gtkprivacy.c:566
+#: ../src/gtkprivacy.c:579 ../src/gtkprivacy.c:604 ../src/gtkprivacy.c:615
 #: ../src/gtkrequest.c:270 ../src/gtksavedstatuses.c:296
 #: ../src/protocols/gg/gg.c:498 ../src/protocols/gg/gg.c:656
 #: ../src/protocols/gg/gg.c:792 ../src/protocols/gg/gg.c:871
-#: ../src/protocols/jabber/buddy.c:575 ../src/protocols/jabber/buddy.c:1461
-#: ../src/protocols/jabber/buddy.c:1495 ../src/protocols/jabber/chat.c:778
-#: ../src/protocols/jabber/jabber.c:823 ../src/protocols/jabber/jabber.c:1318
+#: ../src/protocols/jabber/buddy.c:594 ../src/protocols/jabber/buddy.c:1721
+#: ../src/protocols/jabber/buddy.c:1755 ../src/protocols/jabber/chat.c:778
+#: ../src/protocols/jabber/jabber.c:840 ../src/protocols/jabber/jabber.c:1332
 #: ../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:1409 ../src/protocols/oscar/oscar.c:2168
-#: ../src/protocols/oscar/oscar.c:2209 ../src/protocols/oscar/oscar.c:2261
-#: ../src/protocols/oscar/oscar.c:5695 ../src/protocols/oscar/oscar.c:5747
-#: ../src/protocols/oscar/oscar.c:5875 ../src/protocols/oscar/oscar.c:5900
-#: ../src/protocols/oscar/oscar.c:5956 ../src/protocols/oscar/oscar.c:6025
+#: ../src/protocols/oscar/oscar.c:1418 ../src/protocols/oscar/oscar.c:2176
+#: ../src/protocols/oscar/oscar.c:2215 ../src/protocols/oscar/oscar.c:2263
+#: ../src/protocols/oscar/oscar.c:5737 ../src/protocols/oscar/oscar.c:5789
+#: ../src/protocols/oscar/oscar.c:5939 ../src/protocols/oscar/oscar.c:5964
+#: ../src/protocols/oscar/oscar.c:6020 ../src/protocols/oscar/oscar.c:6089
 #: ../src/protocols/oscar/peer.c:942 ../src/protocols/sametime/sametime.c:3368
 #: ../src/protocols/sametime/sametime.c:3453
 #: ../src/protocols/sametime/sametime.c:3623
-#: ../src/protocols/sametime/sametime.c:5312
-#: ../src/protocols/sametime/sametime.c:5401
-#: ../src/protocols/sametime/sametime.c:5525 ../src/protocols/silc/buddy.c:467
+#: ../src/protocols/sametime/sametime.c:5317
+#: ../src/protocols/sametime/sametime.c:5406
+#: ../src/protocols/sametime/sametime.c:5530 ../src/protocols/silc/buddy.c:467
 #: ../src/protocols/silc/buddy.c:1078 ../src/protocols/silc/buddy.c:1183
 #: ../src/protocols/silc/chat.c:597 ../src/protocols/silc/chat.c:726
-#: ../src/protocols/silc/ops.c:1911 ../src/protocols/silc/silc.c:754
-#: ../src/protocols/silc/silc.c:959 ../src/protocols/yahoo/yahoo.c:3060
-#: ../src/protocols/yahoo/yahoo.c:3069 ../src/request.h:1344
+#: ../src/protocols/silc/ops.c:1911 ../src/protocols/silc/silc.c:756
+#: ../src/protocols/silc/silc.c:961 ../src/protocols/yahoo/yahoo.c:3077
+#: ../src/protocols/yahoo/yahoo.c:3086 ../src/request.h:1344
 #: ../src/request.h:1354
 msgid "Cancel"
 msgstr "Peru"
 
-#: ../src/account.c:989 ../src/connection.c:96
+#: ../src/account.c:988 ../src/connection.c:96
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "%s-yhteyskäytäntöliitännäinen puuttuu"
 
-#: ../src/account.c:991 ../src/connection.c:99 ../src/gtkblist.c:3547
+#: ../src/account.c:990 ../src/connection.c:99 ../src/gtkblist.c:3554
 msgid "Connection Error"
 msgstr "Yhteysvirhe"
 
-#: ../src/account.c:1071 ../src/protocols/gg/gg.c:696
-#: ../src/protocols/jabber/jabber.c:1270
+#: ../src/account.c:1070 ../src/protocols/gg/gg.c:696
+#: ../src/protocols/jabber/jabber.c:1284
 msgid "New passwords do not match."
 msgstr "Uudet salasanat eivät täsmää."
 
-#: ../src/account.c:1080
+#: ../src/account.c:1079
 msgid "Fill out all fields completely."
 msgstr "Täytä kaikki kentät kokonaan."
 
-#: ../src/account.c:1103
+#: ../src/account.c:1102
 msgid "Original password"
 msgstr "Vanha salasana"
 
-#: ../src/account.c:1110
+#: ../src/account.c:1109
 msgid "New password"
 msgstr "Uusi salasana"
 
-#: ../src/account.c:1117
+#: ../src/account.c:1116
 msgid "New password (again)"
 msgstr "Uusi salasana (uudelleen)"
 
-#: ../src/account.c:1123
+#: ../src/account.c:1122
 #, c-format
 msgid "Change password for %s"
 msgstr "Vaihda %s:n salasana"
 
-#: ../src/account.c:1131
+#: ../src/account.c:1130
 msgid "Please enter your current password and your new password."
 msgstr "Anna nykyinen sekä uusi salasana."
 
-#: ../src/account.c:1164
+#: ../src/account.c:1163
 #, c-format
 msgid "Change user information for %s"
 msgstr "Vaihda käyttäjätietoja - %s"
 
-#: ../src/account.c:1167 ../src/protocols/toc/toc.c:1684
+#: ../src/account.c:1166 ../src/protocols/toc/toc.c:1684
 msgid "Set User Info"
 msgstr "Aseta käyttäjätiedot"
 
-#: ../src/account.c:1171 ../src/gtkdebug.c:684 ../src/gtkrequest.c:276
-#: ../src/protocols/jabber/buddy.c:574
+#: ../src/account.c:1170 ../src/gtkdebug.c:684 ../src/gtkrequest.c:276
+#: ../src/protocols/jabber/buddy.c:593
 msgid "Save"
 msgstr "Tallenna"
 
-#: ../src/account.c:1681 ../src/gtkft.c:159 ../src/protocols/gg/gg.c:1002
-#: ../src/protocols/jabber/buddy.c:632 ../src/protocols/jabber/buddy.c:1097
-#: ../src/protocols/jabber/buddy.c:1114 ../src/protocols/novell/novell.c:2858
+#: ../src/account.c:1675 ../src/gtkft.c:159 ../src/protocols/gg/gg.c:1002
+#: ../src/protocols/jabber/buddy.c:636 ../src/protocols/jabber/buddy.c:1357
+#: ../src/protocols/jabber/buddy.c:1374 ../src/protocols/novell/novell.c:2858
 msgid "Unknown"
 msgstr "Tuntematon"
 
@@ -2011,59 +2009,59 @@
 msgid "Registration Error"
 msgstr "Rekisteröintivirhe"
 
-#: ../src/connection.c:280
+#: ../src/connection.c:277
 #, c-format
 msgid "+++ %s signed on"
 msgstr "+++ %s kirjautui sisään"
 
-#: ../src/connection.c:313
+#: ../src/connection.c:310
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s kirjautui ulos"
 
-#: ../src/conversation.c:163
+#: ../src/conversation.c:164
 msgid "Unable to send message: The message is too large."
 msgstr "Viestiä ei voitu lähettää: viesti on liian suuri."
 
-#: ../src/conversation.c:166 ../src/conversation.c:179
+#: ../src/conversation.c:167 ../src/conversation.c:180
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "Viestiä ei voitu lähettää käyttäjälle %s."
 
-#: ../src/conversation.c:167
+#: ../src/conversation.c:168
 msgid "The message is too large."
 msgstr "Viesti on liian suuri."
 
-#: ../src/conversation.c:176
+#: ../src/conversation.c:177
 msgid "Unable to send message."
 msgstr "Viestiä ei voitu lähettää."
 
-#: ../src/conversation.c:1517
+#: ../src/conversation.c:1528
 #, c-format
 msgid "%s entered the room."
 msgstr "%s saapui huoneeseen."
 
-#: ../src/conversation.c:1520
+#: ../src/conversation.c:1531
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] saapui huoneeseen."
 
-#: ../src/conversation.c:1627
+#: ../src/conversation.c:1636
 #, c-format
 msgid "You are now known as %s"
 msgstr "Olet nyt nimeltäsi %s"
 
-#: ../src/conversation.c:1647
+#: ../src/conversation.c:1656
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s on nyt nimeltään %s"
 
-#: ../src/conversation.c:1720
+#: ../src/conversation.c:1729
 #, c-format
 msgid "%s left the room."
 msgstr "%s poistui huoneesta."
 
-#: ../src/conversation.c:1723
+#: ../src/conversation.c:1732
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s poistui huoneesta (%s)."
@@ -2138,65 +2136,65 @@
 "Etäkone: %s\n"
 "Portti: %d"
 
-#: ../src/ft.c:391
+#: ../src/ft.c:392
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s tarjoaa tiedostoa %s"
 
-#: ../src/ft.c:443
+#: ../src/ft.c:444
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s ei ole kelvollinen tiedostonimi.\n"
 
-#: ../src/ft.c:464
+#: ../src/ft.c:465
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Tarjotaan tiedostoa %s lähetettäväksi käyttäjälle %s."
 
-#: ../src/ft.c:476
+#: ../src/ft.c:477
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "Aloitetaan tiedoston %s siirto käyttäjältä %s"
 
-#: ../src/ft.c:630
+#: ../src/ft.c:631
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Tiedoston %s siirto valmis"
 
-#: ../src/ft.c:633
+#: ../src/ft.c:634
 msgid "File transfer complete"
 msgstr "Tiedostonsiirto valmis"
 
-#: ../src/ft.c:1028
+#: ../src/ft.c:1023
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Peruutit tiedoston %s siirron"
 
-#: ../src/ft.c:1033
+#: ../src/ft.c:1028
 msgid "File transfer cancelled"
 msgstr "Tiedostonsiirto peruutettu"
 
-#: ../src/ft.c:1091
+#: ../src/ft.c:1086
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s peruutti tiedoston %s siirron"
 
-#: ../src/ft.c:1096
+#: ../src/ft.c:1091
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "Käyttäjä %s peruutti tiedostonsiirron"
 
-#: ../src/ft.c:1153
+#: ../src/ft.c:1148
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "Tiedostonsiirto käyttäjälle %s epäonnistui."
 
-#: ../src/ft.c:1155
+#: ../src/ft.c:1150
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "Tiedostonsiirto käyttäjältä %s epäonnistui."
 
-#: ../src/gtkaccount.c:374
+#: ../src/gtkaccount.c:371
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -2208,66 +2206,66 @@
 "<b>Kuvan koko:</b> %d × %d"
 
 #. Build the login options frame.
-#: ../src/gtkaccount.c:762
+#: ../src/gtkaccount.c:757
 msgid "Login Options"
 msgstr "Sisäänkirjautumisvalinnat"
 
-#: ../src/gtkaccount.c:779 ../src/gtkft.c:642
+#: ../src/gtkaccount.c:774 ../src/gtkft.c:642
 msgid "Protocol:"
 msgstr "Yhteyskäytäntö:"
 
+#: ../src/gtkaccount.c:853
+msgid "Password:"
+msgstr "Salasana:"
+
 #: ../src/gtkaccount.c:858
-msgid "Password:"
-msgstr "Salasana:"
-
-#: ../src/gtkaccount.c:863 ../src/gtkblist.c:4595 ../src/gtkblist.c:4961
-msgid "Alias:"
-msgstr "Alias:"
-
-#: ../src/gtkaccount.c:867
+msgid "Local alias:"
+msgstr "Paikallinen lempinimi:"
+
+#: ../src/gtkaccount.c:862
 msgid "Remember password"
 msgstr "Muista salasana"
 
 #. Build the user options frame.
-#: ../src/gtkaccount.c:919
+#: ../src/gtkaccount.c:914
 msgid "User Options"
 msgstr "Käyttäjän valinnat"
 
-#: ../src/gtkaccount.c:932
+#: ../src/gtkaccount.c:927
 msgid "New mail notifications"
 msgstr "Ilmoita uudesta sähköpostista"
 
-#: ../src/gtkaccount.c:941
+#: ../src/gtkaccount.c:936
 msgid "Buddy icon:"
 msgstr "Tuttavakuvake:"
 
 #. Build the protocol options frame.
-#: ../src/gtkaccount.c:1032
+#: ../src/gtkaccount.c:1027
 #, c-format
 msgid "%s Options"
 msgstr "%s-valinnat"
 
-#: ../src/gtkaccount.c:1233
+#: ../src/gtkaccount.c:1228
 msgid "Use Global Proxy Settings"
 msgstr "Käytä yleistä välipalvelimen asetusta"
 
-#: ../src/gtkaccount.c:1239
+#: ../src/gtkaccount.c:1234
 msgid "No Proxy"
 msgstr "Ei välipalvelinta"
 
-#: ../src/gtkaccount.c:1245
+#: ../src/gtkaccount.c:1240
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../src/gtkaccount.c:1251
+#: ../src/gtkaccount.c:1246
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../src/gtkaccount.c:1257
+#: ../src/gtkaccount.c:1252
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../src/gtkaccount.c:1263 ../src/gtkprefs.c:1058
+#: ../src/gtkaccount.c:1258 ../src/gtkprefs.c:1058
 msgid "Use Environmental Settings"
 msgstr "Käytä ympäristöasetuksia"
 
@@ -2276,186 +2274,186 @@
 #. A) your network is really slow and you have nothing better to do than
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
-#: ../src/gtkaccount.c:1302
+#: ../src/gtkaccount.c:1297
 msgid "If you look real closely"
 msgstr "Jos katsot todella tarkkaan"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../src/gtkaccount.c:1305
+#: ../src/gtkaccount.c:1300
 msgid "you can see the butterflies mating"
 msgstr "voit nähdä perhosten parittelevan"
 
-#: ../src/gtkaccount.c:1326
+#: ../src/gtkaccount.c:1321
 msgid "Proxy Options"
 msgstr "Välipalvelinvalinnat"
 
-#: ../src/gtkaccount.c:1340 ../src/gtkprefs.c:1052
+#: ../src/gtkaccount.c:1335 ../src/gtkprefs.c:1052
 msgid "Proxy _type:"
 msgstr "Välipalvelimen _tyyppi:"
 
-#: ../src/gtkaccount.c:1349 ../src/gtkprefs.c:1073
+#: ../src/gtkaccount.c:1344 ../src/gtkprefs.c:1073
 msgid "_Host:"
 msgstr "P_alvelin:"
 
-#: ../src/gtkaccount.c:1353 ../src/gtkprefs.c:1091
+#: ../src/gtkaccount.c:1348 ../src/gtkprefs.c:1091
 msgid "_Port:"
 msgstr "_Portti:"
 
-#: ../src/gtkaccount.c:1361
+#: ../src/gtkaccount.c:1356
 msgid "_Username:"
 msgstr "_Käyttäjänimi:"
 
-#: ../src/gtkaccount.c:1367 ../src/gtkprefs.c:1128
+#: ../src/gtkaccount.c:1362 ../src/gtkprefs.c:1128
 msgid "Pa_ssword:"
 msgstr "_Salasana:"
 
-#: ../src/gtkaccount.c:1747
+#: ../src/gtkaccount.c:1737
 msgid "Add Account"
 msgstr "Lisää tili"
 
-#: ../src/gtkaccount.c:1749 ../src/gtkblist.c:3550
+#: ../src/gtkaccount.c:1739 ../src/gtkblist.c:3557
 msgid "Modify Account"
 msgstr "Muokkaa tiliä"
 
-#: ../src/gtkaccount.c:1771
+#: ../src/gtkaccount.c:1761
 msgid "_Basic"
 msgstr "_Perus"
 
-#: ../src/gtkaccount.c:1782
+#: ../src/gtkaccount.c:1772
 msgid "_Advanced"
 msgstr "_Lisäasetukset"
 
 #. Register button
-#: ../src/gtkaccount.c:1797 ../src/protocols/jabber/jabber.c:822
+#: ../src/gtkaccount.c:1787 ../src/protocols/jabber/jabber.c:839
 msgid "Register"
 msgstr "Rekisteröi"
 
-#: ../src/gtkaccount.c:2176 ../src/gtksavedstatuses.c:293
+#: ../src/gtkaccount.c:2166 ../src/gtksavedstatuses.c:293
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Haluatko varmasti poistaa %s:n?"
 
-#: ../src/gtkaccount.c:2181 ../src/gtkpounce.c:1076 ../src/gtkrequest.c:273
+#: ../src/gtkaccount.c:2171 ../src/gtkpounce.c:1087 ../src/gtkrequest.c:273
 #: ../src/gtksavedstatuses.c:295
 msgid "Delete"
 msgstr "Poista"
 
-#: ../src/gtkaccount.c:2239 ../src/gtksavedstatuses.c:889
-#: ../src/protocols/oscar/oscar.c:2823
+#: ../src/gtkaccount.c:2235 ../src/gtksavedstatuses.c:893
+#: ../src/protocols/oscar/oscar.c:2827
 msgid "Screen Name"
 msgstr "Näyttönimi"
 
-#: ../src/gtkaccount.c:2270
+#: ../src/gtkaccount.c:2266
 msgid "Protocol"
 msgstr "Yhteyskäytäntö"
 
-#: ../src/gtkaccount.c:2597
+#: ../src/gtkaccount.c:2590
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s on tehnyt käyttäjästä %s tuttavansa%s%s"
 
-#: ../src/gtkaccount.c:2646
+#: ../src/gtkaccount.c:2639
 msgid "Add buddy to your list?"
 msgstr "Lisää tuttava listalle?"
 
-#: ../src/gtkaccount.c:2648 ../src/gtkblist.c:5016 ../src/gtkconv.c:1625
+#: ../src/gtkaccount.c:2641 ../src/gtkblist.c:5022 ../src/gtkconv.c:1617
 #: ../src/gtkrequest.c:274 ../src/protocols/gg/gg.c:870
 #: ../src/protocols/oscar/oscar.c:2453
-#: ../src/protocols/sametime/sametime.c:5400 ../src/protocols/silc/chat.c:596
+#: ../src/protocols/sametime/sametime.c:5405 ../src/protocols/silc/chat.c:596
 msgid "Add"
 msgstr "Lisää"
 
-#: ../src/gtkblist.c:673
+#: ../src/gtkblist.c:671
 msgid "Join a Chat"
 msgstr "Liity ryhmäkeskusteluun"
 
-#: ../src/gtkblist.c:694
+#: ../src/gtkblist.c:692
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "Syötä tiedot ryhmäkeskustelusta, johon haluaisit liittyä.\n"
 
-#: ../src/gtkblist.c:705 ../src/gtkpounce.c:519 ../src/gtkroomlist.c:377
+#: ../src/gtkblist.c:703 ../src/gtkpounce.c:523 ../src/gtkroomlist.c:377
 msgid "_Account:"
 msgstr "_Käyttäjätili:"
 
-#: ../src/gtkblist.c:949
+#: ../src/gtkblist.c:947
 msgid "Get _Info"
 msgstr "Hae _tiedot"
 
-#: ../src/gtkblist.c:952 ../src/gtkstock.c:141
+#: ../src/gtkblist.c:950 ../src/gtkstock.c:141
 msgid "I_M"
 msgstr "_Pikaviesti"
 
-#: ../src/gtkblist.c:958
+#: ../src/gtkblist.c:956
 msgid "_Send File"
 msgstr "_Lähetä tiedosto"
 
-#: ../src/gtkblist.c:965
+#: ../src/gtkblist.c:963
 msgid "Add Buddy _Pounce"
 msgstr "Lisää tuttava_ilmoitin"
 
-#: ../src/gtkblist.c:969 ../src/gtkblist.c:973 ../src/gtkblist.c:1072
-#: ../src/gtkblist.c:1095
+#: ../src/gtkblist.c:967 ../src/gtkblist.c:971 ../src/gtkblist.c:1070
+#: ../src/gtkblist.c:1093
 msgid "View _Log"
 msgstr "Näytä _loki"
 
-#: ../src/gtkblist.c:984
+#: ../src/gtkblist.c:982
 msgid "Alias..."
 msgstr "Alias..."
 
-#: ../src/gtkblist.c:987 ../src/gtkconv.c:1622 ../src/gtkrequest.c:275
+#: ../src/gtkblist.c:985 ../src/gtkconv.c:1614 ../src/gtkrequest.c:275
 msgid "Remove"
 msgstr "Poista"
 
-#: ../src/gtkblist.c:993 ../src/gtkblist.c:1080 ../src/gtkblist.c:1101
+#: ../src/gtkblist.c:991 ../src/gtkblist.c:1078 ../src/gtkblist.c:1099
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: ../src/gtkblist.c:995 ../src/gtkblist.c:1082 ../src/gtkblist.c:1103
+#: ../src/gtkblist.c:993 ../src/gtkblist.c:1080 ../src/gtkblist.c:1101
 msgid "_Remove"
 msgstr "_Poista"
 
-#: ../src/gtkblist.c:1043
+#: ../src/gtkblist.c:1041
 msgid "Add a _Buddy"
 msgstr "Lisää _tuttava"
 
-#: ../src/gtkblist.c:1045
+#: ../src/gtkblist.c:1043
 msgid "Add a C_hat"
 msgstr "Lisää _ryhmäkeskustelu"
 
-#: ../src/gtkblist.c:1048
+#: ../src/gtkblist.c:1046
 msgid "_Delete Group"
 msgstr "_Poista ryhmä"
 
-#: ../src/gtkblist.c:1050
+#: ../src/gtkblist.c:1048
 msgid "_Rename"
 msgstr "Nimeä _uudelleen"
 
 #. join button
-#: ../src/gtkblist.c:1068 ../src/gtkroomlist.c:285 ../src/gtkroomlist.c:441
+#: ../src/gtkblist.c:1066 ../src/gtkroomlist.c:285 ../src/gtkroomlist.c:441
 #: ../src/gtkstock.c:139
 msgid "_Join"
 msgstr "_Liity"
 
-#: ../src/gtkblist.c:1070
+#: ../src/gtkblist.c:1068
 msgid "Auto-Join"
 msgstr "Kirjaudu sisään automaattisesti"
 
-#: ../src/gtkblist.c:1108 ../src/gtkblist.c:1131
+#: ../src/gtkblist.c:1106 ../src/gtkblist.c:1129
 msgid "_Collapse"
 msgstr "_Pienennä"
 
-#: ../src/gtkblist.c:1136
+#: ../src/gtkblist.c:1134
 msgid "_Expand"
 msgstr "_Laajenna"
 
-#: ../src/gtkblist.c:1382 ../src/gtkblist.c:1394 ../src/gtkblist.c:3810
-#: ../src/gtkblist.c:3820
+#: ../src/gtkblist.c:1380 ../src/gtkblist.c:1392 ../src/gtkblist.c:3817
+#: ../src/gtkblist.c:3827
 msgid "/Tools/Mute Sounds"
 msgstr "/Työkalut/Vaimenna äänet"
 
-#: ../src/gtkblist.c:1854 ../src/gtkconv.c:4245 ../src/gtkpounce.c:418
+#: ../src/gtkblist.c:1852 ../src/gtkconv.c:4241 ../src/gtkpounce.c:422
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
@@ -2463,126 +2461,126 @@
 "tuttavan."
 
 #. Buddies menu
-#: ../src/gtkblist.c:2428
+#: ../src/gtkblist.c:2426
 msgid "/_Buddies"
 msgstr "/_Tuttavat"
 
-#: ../src/gtkblist.c:2429
+#: ../src/gtkblist.c:2427
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Tuttavat/Uusi _pikaviesti..."
 
-#: ../src/gtkblist.c:2430
+#: ../src/gtkblist.c:2428
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Tuttavat/Liity _ryhmäkeskusteluun..."
 
-#: ../src/gtkblist.c:2431
+#: ../src/gtkblist.c:2429
 msgid "/Buddies/Get User _Info..."
 msgstr "/Tuttavat/Hae _käyttäjätiedot..."
 
-#: ../src/gtkblist.c:2432
+#: ../src/gtkblist.c:2430
 msgid "/Buddies/View User _Log..."
 msgstr "/Tuttavat/Näytä käyttäjä_loki..."
 
-#: ../src/gtkblist.c:2434
+#: ../src/gtkblist.c:2432
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Tuttavat/Näytä poissaolevat tuttavat"
 
-#: ../src/gtkblist.c:2435
+#: ../src/gtkblist.c:2433
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Tuttavat/Näytä tyhjät ryhmät"
 
-#: ../src/gtkblist.c:2436
+#: ../src/gtkblist.c:2434
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/Tuttavat/Näytä tuttavien tiedot"
 
-#: ../src/gtkblist.c:2437
+#: ../src/gtkblist.c:2435
 msgid "/Buddies/Show Idle _Times"
 msgstr "/Tuttavat/Näytä _joutenoloajat"
 
-#: ../src/gtkblist.c:2438
+#: ../src/gtkblist.c:2436
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Tuttavat/L_ajittele tuttavat"
 
+#: ../src/gtkblist.c:2438
+msgid "/Buddies/_Add Buddy..."
+msgstr "/Tuttavat/_Lisää tuttava..."
+
+#: ../src/gtkblist.c:2439
+msgid "/Buddies/Add C_hat..."
+msgstr "/Tuttavat/Lisää ryhmäkeskustelu..."
+
 #: ../src/gtkblist.c:2440
-msgid "/Buddies/_Add Buddy..."
-msgstr "/Tuttavat/_Lisää tuttava..."
-
-#: ../src/gtkblist.c:2441
-msgid "/Buddies/Add C_hat..."
-msgstr "/Tuttavat/Lisää ryhmäkeskustelu..."
+msgid "/Buddies/Add _Group..."
+msgstr "/Tuttavat/Lisää _ryhmä..."
 
 #: ../src/gtkblist.c:2442
-msgid "/Buddies/Add _Group..."
-msgstr "/Tuttavat/Lisää _ryhmä..."
-
-#: ../src/gtkblist.c:2444
 msgid "/Buddies/_Quit"
 msgstr "/Tuttavat/_Lopeta"
 
 #. Accounts menu
-#: ../src/gtkblist.c:2447
+#: ../src/gtkblist.c:2445
 msgid "/_Accounts"
 msgstr "/_Käyttäjätilit"
 
-#: ../src/gtkblist.c:2448 ../src/gtkblist.c:5593
+#: ../src/gtkblist.c:2446 ../src/gtkblist.c:5599
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Käyttäjätilit/Lisää\\/Muokkaa"
 
 #. Tools
-#: ../src/gtkblist.c:2451
+#: ../src/gtkblist.c:2449
 msgid "/_Tools"
-msgstr "/_Työkalut"
-
-#: ../src/gtkblist.c:2452
+msgstr "/T_yökalut"
+
+#: ../src/gtkblist.c:2450
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Työkalut/Tuttava_ilmoittimet"
 
-#: ../src/gtkblist.c:2453
+#: ../src/gtkblist.c:2451
 msgid "/Tools/Plu_gins"
 msgstr "/Työkalut/_Liitännäiset"
 
-#: ../src/gtkblist.c:2454
+#: ../src/gtkblist.c:2452
 msgid "/Tools/Pr_eferences"
 msgstr "/Työkalut/A_setukset"
 
+#: ../src/gtkblist.c:2453
+msgid "/Tools/Pr_ivacy"
+msgstr "/Työkalut/Yks_ityisyys"
+
 #: ../src/gtkblist.c:2455
-msgid "/Tools/Pr_ivacy"
-msgstr "/Työkalut/Yks_ityisyys"
-
-#: ../src/gtkblist.c:2457
 msgid "/Tools/_File Transfers"
 msgstr "/Työkalut/_Tiedostonsiirrot..."
 
-#: ../src/gtkblist.c:2458
+#: ../src/gtkblist.c:2456
 msgid "/Tools/R_oom List"
 msgstr "/Työkalut/Huone_lista"
 
+#: ../src/gtkblist.c:2457
+msgid "/Tools/System _Log"
+msgstr "/Työkalut/Järjestelmä_loki"
+
 #: ../src/gtkblist.c:2459
-msgid "/Tools/System _Log"
-msgstr "/Työkalut/Järjestelmä_loki"
-
-#: ../src/gtkblist.c:2461
 msgid "/Tools/Mute _Sounds"
 msgstr "/Työkalut/Vaimenna _äänet"
 
 #. Help
-#: ../src/gtkblist.c:2464
+#: ../src/gtkblist.c:2462
 msgid "/_Help"
 msgstr "/_Ohje"
 
-#: ../src/gtkblist.c:2465
+#: ../src/gtkblist.c:2463
 msgid "/Help/Online _Help"
 msgstr "/Ohje/_Ohjeita verkossa"
 
-#: ../src/gtkblist.c:2466
+#: ../src/gtkblist.c:2464
 msgid "/Help/_Debug Window"
 msgstr "/Ohje/_Virheenjäljitysikkuna"
 
-#: ../src/gtkblist.c:2467
+#: ../src/gtkblist.c:2465
 msgid "/Help/_About"
 msgstr "/Ohje/Tietoj_a"
 
-#: ../src/gtkblist.c:2499 ../src/gtkblist.c:2568
+#: ../src/gtkblist.c:2497 ../src/gtkblist.c:2566
 #, c-format
 msgid ""
 "\n"
@@ -2591,7 +2589,7 @@
 "\n"
 "<b>Käyttäjätili:</b> %s"
 
-#: ../src/gtkblist.c:2580
+#: ../src/gtkblist.c:2578
 #, c-format
 msgid ""
 "\n"
@@ -2600,7 +2598,7 @@
 "\n"
 "<b>Tuttavan lempinimi:</b> %s"
 
-#: ../src/gtkblist.c:2592
+#: ../src/gtkblist.c:2590
 #, c-format
 msgid ""
 "\n"
@@ -2609,7 +2607,7 @@
 "\n"
 "<b>Kutsumanimi:</b> %s"
 
-#: ../src/gtkblist.c:2601
+#: ../src/gtkblist.c:2599
 #, c-format
 msgid ""
 "\n"
@@ -2618,7 +2616,7 @@
 "\n"
 "<b>Kirjautuneena sisään:</b> %s"
 
-#: ../src/gtkblist.c:2612
+#: ../src/gtkblist.c:2610
 #, c-format
 msgid ""
 "\n"
@@ -2627,7 +2625,7 @@
 "\n"
 "<b>Jouten:</b> %s"
 
-#: ../src/gtkblist.c:2647
+#: ../src/gtkblist.c:2645
 #, c-format
 msgid ""
 "\n"
@@ -2636,7 +2634,7 @@
 "\n"
 "<b>Viimeksi nähty:</b> %s sitten"
 
-#: ../src/gtkblist.c:2656
+#: ../src/gtkblist.c:2654
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2644,7 +2642,7 @@
 "\n"
 "<b>Tila:</b> Poissa linjoilta"
 
-#: ../src/gtkblist.c:2667
+#: ../src/gtkblist.c:2665
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2652,7 +2650,7 @@
 "\n"
 "<b>Kuvaus:</b> Aavemainen"
 
-#: ../src/gtkblist.c:2669
+#: ../src/gtkblist.c:2667
 msgid ""
 "\n"
 "<b>Status:</b> Awesome"
@@ -2660,7 +2658,7 @@
 "\n"
 "<b>Tila</b>: Mahtava"
 
-#: ../src/gtkblist.c:2671
+#: ../src/gtkblist.c:2669
 msgid ""
 "\n"
 "<b>Status:</b> Rockin'"
@@ -2680,9 +2678,10 @@
 
 #. Idle stuff
 #: ../src/gtkblist.c:2965 ../src/gtkprefs.c:1760
-#: ../src/protocols/bonjour/bonjour.c:333 ../src/protocols/msn/msn.c:550
+#: ../src/protocols/bonjour/bonjour.c:333 ../src/protocols/jabber/buddy.c:641
+#: ../src/protocols/jabber/buddy.c:672 ../src/protocols/msn/msn.c:548
 #: ../src/protocols/msn/state.c:32 ../src/protocols/novell/novell.c:2852
-#: ../src/protocols/oscar/oscar.c:2844 ../src/protocols/yahoo/yahoo.c:2727
+#: ../src/protocols/oscar/oscar.c:2848 ../src/protocols/yahoo/yahoo.c:2744
 #: ../src/protocols/yahoo/yahoo_profile.c:691
 msgid "Idle"
 msgstr "Jouten"
@@ -2739,48 +2738,48 @@
 msgid "By log size"
 msgstr "Lokin koon mukaan"
 
-#: ../src/gtkblist.c:3542 ../src/gtkconn.c:184
+#: ../src/gtkblist.c:3549 ../src/gtkconn.c:186
 #, c-format
 msgid "%s disconnected"
 msgstr "Yhteys katkennut kohteeseen %s"
 
-#: ../src/gtkblist.c:3551 ../src/protocols/sametime/sametime.c:3622
+#: ../src/gtkblist.c:3558 ../src/protocols/sametime/sametime.c:3622
 msgid "Connect"
 msgstr "Yhdistä"
 
-#: ../src/gtkblist.c:3551
+#: ../src/gtkblist.c:3558
 msgid "Re-enable Account"
 msgstr "Ota tili uudelleen käyttöön"
 
-#: ../src/gtkblist.c:3572
+#: ../src/gtkblist.c:3579
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s kirjautui ulos: %s</span>"
 
-#: ../src/gtkblist.c:3699
+#: ../src/gtkblist.c:3706
 msgid "/Accounts"
 msgstr "/Käyttäjätilit"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../src/gtkblist.c:3804
+#: ../src/gtkblist.c:3811
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Tuttavat/Näytä poissaolevat tuttavat"
 
-#: ../src/gtkblist.c:3807
+#: ../src/gtkblist.c:3814
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Tuttavat/Näytä tyhjät ryhmät"
 
-#: ../src/gtkblist.c:3813
+#: ../src/gtkblist.c:3820
 msgid "/Buddies/Show Buddy Details"
 msgstr "/Tuttavat/Näytä tuttavien tiedot"
 
-#: ../src/gtkblist.c:3816
+#: ../src/gtkblist.c:3823
 msgid "/Buddies/Show Idle Times"
 msgstr "/Tuttavat/Näytä joutenoloajat"
 
-#: ../src/gtkblist.c:4552
+#: ../src/gtkblist.c:4559
 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. "
@@ -2790,16 +2789,20 @@
 "myös valita lempinimen tuttavalle. Lempinimi näytetään näyttönimen sijasta "
 "aina kuin mahdollista.\n"
 
+#: ../src/gtkblist.c:4602 ../src/gtkblist.c:4967
+msgid "Alias:"
+msgstr "Alias:"
+
 #. Set up stuff for the account box
-#: ../src/gtkblist.c:4622 ../src/gtkblist.c:4941
+#: ../src/gtkblist.c:4629 ../src/gtkblist.c:4947
 msgid "Account:"
 msgstr "Käyttäjätili:"
 
-#: ../src/gtkblist.c:4874
+#: ../src/gtkblist.c:4880
 msgid "This protocol does not support chat rooms."
 msgstr "Tämä yhteyskäytäntö ei tue keskusteluhuoneita."
 
-#: ../src/gtkblist.c:4890
+#: ../src/gtkblist.c:4896
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -2807,11 +2810,11 @@
 "Et ole kirjautuneena millään yhteyskäytännöllä jolla voisi käyttää "
 "ryhmäkeskustelua."
 
-#: ../src/gtkblist.c:4907
+#: ../src/gtkblist.c:4913
 msgid "Add Chat"
 msgstr "Lisää ryhmäkeskustelu"
 
-#: ../src/gtkblist.c:4931
+#: ../src/gtkblist.c:4937
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2819,40 +2822,40 @@
 "Anna lempinimi, ja tiedot ryhmäkeskustelusta jonka haluat lisätä "
 "tuttavalistalle.\n"
 
-#: ../src/gtkblist.c:5013 ../src/protocols/sametime/sametime.c:5311
-#: ../src/protocols/sametime/sametime.c:5398
+#: ../src/gtkblist.c:5019 ../src/protocols/sametime/sametime.c:5316
+#: ../src/protocols/sametime/sametime.c:5403
 msgid "Add Group"
 msgstr "Lisää ryhmä"
 
-#: ../src/gtkblist.c:5014
+#: ../src/gtkblist.c:5020
 msgid "Please enter the name of the group to be added."
 msgstr "Anna lisättävän ryhmän nimi."
 
-#: ../src/gtkblist.c:5633
+#: ../src/gtkblist.c:5639
 msgid "_Edit Account"
 msgstr "_Muokaa käyttäjätiliä"
 
-#: ../src/gtkblist.c:5666 ../src/gtkblist.c:5672 ../src/gtkconv.c:2753
+#: ../src/gtkblist.c:5672 ../src/gtkblist.c:5678 ../src/gtkconv.c:2743
 msgid "No actions available"
 msgstr "Ei toimintoja saatavilla."
 
-#: ../src/gtkblist.c:5680
+#: ../src/gtkblist.c:5686
 msgid "_Disable"
 msgstr "_Poista käytöstä"
 
-#: ../src/gtkblist.c:5692
+#: ../src/gtkblist.c:5698
 msgid "Enable Account"
 msgstr "Ota tili käyttöön"
 
-#: ../src/gtkblist.c:5745
+#: ../src/gtkblist.c:5751
 msgid "/Tools"
 msgstr "/Työkalut"
 
-#: ../src/gtkblist.c:5831
+#: ../src/gtkblist.c:5837
 msgid "/Buddies/Sort Buddies"
 msgstr "/Tuttavat/Lajittele tuttavat"
 
-#: ../src/gtkconn.c:185
+#: ../src/gtkconn.c:187
 #, c-format
 msgid ""
 "%s was disconnected due to an error: %s\n"
@@ -2863,15 +2866,15 @@
 "Gaim ei yritä uudelleenyhdistää käyttäjätiliä kunnes korjaat virheen ja otat "
 "tilin uudelleen käyttöön."
 
-#: ../src/gtkconv.c:373
+#: ../src/gtkconv.c:366
 msgid "Supported debug options are:  version"
 msgstr "Tuetut vianjäljitysvalinnat ovat: versio"
 
-#: ../src/gtkconv.c:409
+#: ../src/gtkconv.c:402
 msgid "No such command (in this context)."
 msgstr "Komento ei saatavilla (tässä kontekstissa)."
 
-#: ../src/gtkconv.c:412
+#: ../src/gtkconv.c:405
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -2879,376 +2882,364 @@
 "Kirjoita \"/help &lt;komento&gt;\" saadaksesi ohjeen tietystä komennosta.\n"
 "Seuraavat komennot ovat saatavilla tässä kontekstissa:\n"
 
-#: ../src/gtkconv.c:482
+#: ../src/gtkconv.c:472
 msgid "No such command."
 msgstr "Sellaista komentoa ei ole."
 
-#: ../src/gtkconv.c:489
+#: ../src/gtkconv.c:479
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 "Syntaksivirhe: Syötit väärän määrän argumentteja kyseiselle komennolle."
 
-#: ../src/gtkconv.c:494
+#: ../src/gtkconv.c:484
 msgid "Your command failed for an unknown reason."
 msgstr "Komento epäonnistui tuntemattomasta syystä."
 
-#: ../src/gtkconv.c:501
+#: ../src/gtkconv.c:490
 msgid "That command only works in chats, not IMs."
 msgstr "Komento toimii vain ryhmäkeskusteluissa, ei pikaviesteissä."
 
-#: ../src/gtkconv.c:504
+#: ../src/gtkconv.c:493
 msgid "That command only works in IMs, not chats."
 msgstr "Komento toimii vain pikaviesteissä, ei ryhmäkeskusteluissa."
 
-#: ../src/gtkconv.c:508
+#: ../src/gtkconv.c:497
 msgid "That command doesn't work on this protocol."
 msgstr "Tämä komento ei toimi tälle yhteyskäytännölle."
 
-#: ../src/gtkconv.c:743 ../src/gtkconv.c:769
+#: ../src/gtkconv.c:732 ../src/gtkconv.c:758
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Tuttava ei käytä samaa yhteyskäytäntöä kuin tämä ryhmäkeskustelu."
 
-#: ../src/gtkconv.c:763
+#: ../src/gtkconv.c:752
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 "Et ole kirjautuneena millään käyttäjätilillä jolla voisi kutsua tämän "
 "tuttavan."
 
-#: ../src/gtkconv.c:816
+#: ../src/gtkconv.c:805
 msgid "Invite Buddy Into Chat Room"
 msgstr "Kutsu tuttava keskusteluhuoneeseen"
 
 #. Put our happy label in it.
-#: ../src/gtkconv.c:846
+#: ../src/gtkconv.c:835
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr "Anna kutsuttavan käyttäjän nimi sekä vapaaehtoinen viesti."
 
-#: ../src/gtkconv.c:867
+#: ../src/gtkconv.c:856
 msgid "_Buddy:"
 msgstr "_Tuttava:"
 
-#: ../src/gtkconv.c:887 ../src/gtksavedstatuses.c:1107
-#: ../src/gtksavedstatuses.c:1443
+#: ../src/gtkconv.c:876 ../src/gtksavedstatuses.c:1111
+#: ../src/gtksavedstatuses.c:1447
 msgid "_Message:"
 msgstr "_Viesti:"
 
-#: ../src/gtkconv.c:944 ../src/gtkconv.c:2370 ../src/gtkdebug.c:217
+#: ../src/gtkconv.c:933 ../src/gtkconv.c:2360 ../src/gtkdebug.c:217
 #: ../src/gtkft.c:490
 msgid "Unable to open file."
 msgstr "Tiedoston avaaminen epäonnistui."
 
-#: ../src/gtkconv.c:950
+#: ../src/gtkconv.c:939
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Keskustelu käyttäjän %s kanssa</h1>\n"
 
-#: ../src/gtkconv.c:974
+#: ../src/gtkconv.c:963
 msgid "Save Conversation"
 msgstr "Tallenna keskustelu"
 
-#: ../src/gtkconv.c:1095 ../src/gtkdebug.c:165 ../src/gtkdebug.c:678
+#: ../src/gtkconv.c:1084 ../src/gtkdebug.c:165 ../src/gtkdebug.c:678
 msgid "Find"
 msgstr "Etsi"
 
-#: ../src/gtkconv.c:1121 ../src/gtkdebug.c:193
+#: ../src/gtkconv.c:1110 ../src/gtkdebug.c:193
 msgid "_Search for:"
 msgstr "_Haettava termi:"
 
-#: ../src/gtkconv.c:1292
+#: ../src/gtkconv.c:1281
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
 "Kirjaaminen lokiin aloitettu. Tämän keskustelun viestit kirjataan nyt lokiin."
 
-#: ../src/gtkconv.c:1300
+#: ../src/gtkconv.c:1289
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
 "Kirjaaminen lokiin lopetettu. Tämän keskustelun viestejä ei enää kirjata "
 "lokiin."
 
-#: ../src/gtkconv.c:1562
+#: ../src/gtkconv.c:1554
 msgid "IM"
 msgstr "Pikaviesti"
 
-#: ../src/gtkconv.c:1573 ../src/protocols/oscar/oscar.c:640
+#: ../src/gtkconv.c:1565 ../src/protocols/oscar/oscar.c:640
 msgid "Send File"
 msgstr "Lähetä tiedosto"
 
-#: ../src/gtkconv.c:1588
+#: ../src/gtkconv.c:1580
 msgid "Un-Ignore"
 msgstr "Huomioi"
 
-#: ../src/gtkconv.c:1591
+#: ../src/gtkconv.c:1583
 msgid "Ignore"
 msgstr "Jätä huomiotta"
 
-#: ../src/gtkconv.c:1601
+#: ../src/gtkconv.c:1593
 msgid "Info"
 msgstr "Tietoja"
 
-#: ../src/gtkconv.c:1611
+#: ../src/gtkconv.c:1603
 msgid "Get Away Message"
 msgstr "Hae poissaoloviesti"
 
-#: ../src/gtkconv.c:1634
+#: ../src/gtkconv.c:1626
 msgid "Last said"
 msgstr "Viimeksi sanottu"
 
-#: ../src/gtkconv.c:2378
+#: ../src/gtkconv.c:2368
 msgid "Unable to save icon file to disk."
 msgstr "Kuvaketiedostoa ei voida tallentaa levylle."
 
-#: ../src/gtkconv.c:2402
+#: ../src/gtkconv.c:2392
 msgid "Save Icon"
 msgstr "Tallenna kuvake"
 
-#: ../src/gtkconv.c:2451
+#: ../src/gtkconv.c:2441
 msgid "Animate"
 msgstr "Animoi"
 
-#: ../src/gtkconv.c:2456
+#: ../src/gtkconv.c:2446
 msgid "Hide Icon"
 msgstr "Piilota kuvake"
 
-#: ../src/gtkconv.c:2462
+#: ../src/gtkconv.c:2452
 msgid "Save Icon As..."
 msgstr "Tallenna kuvake nimellä..."
 
 #. Conversation menu
-#: ../src/gtkconv.c:2602
+#: ../src/gtkconv.c:2592
 msgid "/_Conversation"
 msgstr "/_Keskustelu"
 
-#: ../src/gtkconv.c:2604
+#: ../src/gtkconv.c:2594
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Keskustelu/Uusi _pikaviesti..."
 
-#: ../src/gtkconv.c:2609
+#: ../src/gtkconv.c:2599
 msgid "/Conversation/_Find..."
 msgstr "/Keskustelu/_Etsi..."
 
-#: ../src/gtkconv.c:2611
+#: ../src/gtkconv.c:2601
 msgid "/Conversation/View _Log"
 msgstr "/Keskustelu/Näytä l_oki..."
 
-#: ../src/gtkconv.c:2612
+#: ../src/gtkconv.c:2602
 msgid "/Conversation/_Save As..."
 msgstr "/Keskustelu/_Tallenna nimellä..."
 
-#: ../src/gtkconv.c:2614
+#: ../src/gtkconv.c:2604
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Keskustelu/T_yhjennä takaisinvieritys"
 
-#: ../src/gtkconv.c:2618
+#: ../src/gtkconv.c:2608
 msgid "/Conversation/Se_nd File..."
 msgstr "/Keskustelu/_Lähetä tiedosto..."
 
-#: ../src/gtkconv.c:2619
+#: ../src/gtkconv.c:2609
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Keskustelu/Lisää tuttava_ilmoitin..."
 
-#: ../src/gtkconv.c:2621
+#: ../src/gtkconv.c:2611
 msgid "/Conversation/_Get Info"
 msgstr "/Keskustelu/_Hae tiedot..."
 
-#: ../src/gtkconv.c:2623
+#: ../src/gtkconv.c:2613
 msgid "/Conversation/In_vite..."
 msgstr "/Keskustelu/Kut_su..."
 
-#: ../src/gtkconv.c:2625
+#: ../src/gtkconv.c:2615
 msgid "/Conversation/M_ore"
 msgstr "/Keskustelu/Lis_ää"
 
-#: ../src/gtkconv.c:2629
+#: ../src/gtkconv.c:2619
 msgid "/Conversation/Al_ias..."
 msgstr "/Keskustelu/_Alias..."
 
-#: ../src/gtkconv.c:2631
+#: ../src/gtkconv.c:2621
 msgid "/Conversation/_Block..."
 msgstr "/Keskustelu/E_stä..."
 
-#: ../src/gtkconv.c:2633
+#: ../src/gtkconv.c:2623
 msgid "/Conversation/_Add..."
 msgstr "/Keskustelu/_Lisää..."
 
-#: ../src/gtkconv.c:2635
+#: ../src/gtkconv.c:2625
 msgid "/Conversation/_Remove..."
 msgstr "/Keskustelu/_Poista..."
 
-#: ../src/gtkconv.c:2640
+#: ../src/gtkconv.c:2630
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Keskustelu/Lisää lin_kki..."
 
-#: ../src/gtkconv.c:2642
+#: ../src/gtkconv.c:2632
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Keskustelu/Liitä _kuva..."
 
-#: ../src/gtkconv.c:2647
+#: ../src/gtkconv.c:2637
 msgid "/Conversation/_Close"
 msgstr "/Keskustelu/_Sulje"
 
 #. Options
-#: ../src/gtkconv.c:2651
+#: ../src/gtkconv.c:2641
 msgid "/_Options"
 msgstr "/_Valinnat"
 
-#: ../src/gtkconv.c:2652
+#: ../src/gtkconv.c:2642
 msgid "/Options/Enable _Logging"
 msgstr "/Valinnat/_Lokiinkirjaus"
 
-#: ../src/gtkconv.c:2653
+#: ../src/gtkconv.c:2643
 msgid "/Options/Enable _Sounds"
 msgstr "/Valinnat/S_oita merkkiäänet"
 
-#: ../src/gtkconv.c:2654
+#: ../src/gtkconv.c:2644
 msgid "/Options/Show Buddy _Icon"
 msgstr "/Valinnat/Näytä tuttava_kuvake"
 
-#: ../src/gtkconv.c:2656
+#: ../src/gtkconv.c:2646
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Valinnat/Näytä muokkaus-_työkalurivit"
 
-#: ../src/gtkconv.c:2657
+#: ../src/gtkconv.c:2647
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Valinnat/Näytä aika_leima"
 
-#: ../src/gtkconv.c:2732
+#: ../src/gtkconv.c:2722
 msgid "/Conversation/More"
 msgstr "/Keskustelu/Lisää"
 
-#: ../src/gtkconv.c:2770 ../src/gtkconv.c:2797
+#: ../src/gtkconv.c:2760 ../src/gtkconv.c:2787
 msgid "/Conversation"
 msgstr "/Keskustelu"
 
-#: ../src/gtkconv.c:2807
+#: ../src/gtkconv.c:2797
 msgid "/Conversation/View Log"
 msgstr "/Keskustelu/Näytä loki..."
 
+#: ../src/gtkconv.c:2803
+msgid "/Conversation/Send File..."
+msgstr "/Keskustelu/Lähetä tiedosto..."
+
+#: ../src/gtkconv.c:2807
+msgid "/Conversation/Add Buddy Pounce..."
+msgstr "/Keskustelu/Lisää tuttavailmoitin..."
+
 #: ../src/gtkconv.c:2813
-msgid "/Conversation/Send File..."
-msgstr "/Keskustelu/Lähetä tiedosto..."
+msgid "/Conversation/Get Info"
+msgstr "/Keskustelu/Hae tiedot..."
 
 #: ../src/gtkconv.c:2817
-msgid "/Conversation/Add Buddy Pounce..."
-msgstr "/Keskustelu/Lisää tuttavailmoitin..."
-
-#: ../src/gtkconv.c:2823
-msgid "/Conversation/Get Info"
-msgstr "/Keskustelu/Hae tiedot..."
-
-#: ../src/gtkconv.c:2827
 msgid "/Conversation/Invite..."
 msgstr "/Keskustelu/Kutsu..."
 
-#: ../src/gtkconv.c:2833
+#: ../src/gtkconv.c:2823
 msgid "/Conversation/Alias..."
 msgstr "/Keskustelu/Alias..."
 
-#: ../src/gtkconv.c:2837
+#: ../src/gtkconv.c:2827
 msgid "/Conversation/Block..."
 msgstr "/Keskustelu/Estä..."
 
-#: ../src/gtkconv.c:2841
+#: ../src/gtkconv.c:2831
 msgid "/Conversation/Add..."
 msgstr "/Keskustelu/Lisää..."
 
-#: ../src/gtkconv.c:2845
+#: ../src/gtkconv.c:2835
 msgid "/Conversation/Remove..."
 msgstr "/Keskustelu/Poista..."
 
-#: ../src/gtkconv.c:2851
+#: ../src/gtkconv.c:2841
 msgid "/Conversation/Insert Link..."
 msgstr "/Keskustelu/Lisää linkki..."
 
-#: ../src/gtkconv.c:2855
+#: ../src/gtkconv.c:2845
 msgid "/Conversation/Insert Image..."
 msgstr "/Keskustelu/Lisää kuva..."
 
-#: ../src/gtkconv.c:2861
+#: ../src/gtkconv.c:2851
 msgid "/Options/Enable Logging"
 msgstr "/Valinnat/Lokiinkirjaus"
 
-#: ../src/gtkconv.c:2864
+#: ../src/gtkconv.c:2854
 msgid "/Options/Enable Sounds"
 msgstr "/Valinnat/Soita merkkiäänet"
 
-#: ../src/gtkconv.c:2877
+#: ../src/gtkconv.c:2867
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Valinnat/Näytä muokkaustyökalurivit"
 
-#: ../src/gtkconv.c:2880
+#: ../src/gtkconv.c:2870
 msgid "/Options/Show Timestamps"
 msgstr "/Valinnat/Näytä aikaleima"
 
-#: ../src/gtkconv.c:2883
+#: ../src/gtkconv.c:2873
 msgid "/Options/Show Buddy Icon"
 msgstr "/Valinnat/Näytä tuttava_kuvake"
 
-#: ../src/gtkconv.c:2963
+#: ../src/gtkconv.c:2949
 msgid "User is typing..."
 msgstr "Käyttäjä kirjoittaa..."
 
-#: ../src/gtkconv.c:2966
+#: ../src/gtkconv.c:2952
 msgid "User has typed something and stopped"
 msgstr "Käyttäjä kirjoitti jotain ja keskeytti"
 
 #. Build the Send To menu
-#: ../src/gtkconv.c:3149
+#: ../src/gtkconv.c:3135
 msgid "_Send To"
 msgstr "_Lähetä käyttäjälle"
 
-#: ../src/gtkconv.c:3801
+#: ../src/gtkconv.c:3841
 msgid "_Send"
 msgstr "_Lähetä"
 
-#: ../src/gtkconv.c:3856 ../src/protocols/sametime/sametime.c:3564
+#: ../src/gtkconv.c:3895 ../src/protocols/sametime/sametime.c:3564
 msgid "Topic:"
 msgstr "Aihe:"
 
 #. Setup the label telling how many people are in the room.
-#: ../src/gtkconv.c:3908
+#: ../src/gtkconv.c:3947
 msgid "0 people in room"
 msgstr "0 ihmistä huoneessa"
 
-#: ../src/gtkconv.c:3987
-msgid "IM the user"
-msgstr "Lähetä pikaviesti käyttäjälle"
-
-#: ../src/gtkconv.c:4000
-msgid "Ignore the user"
-msgstr "Älä huomioi käyttäjää"
-
-#: ../src/gtkconv.c:4012
-msgid "Get the user's information"
-msgstr "Hae käyttäjätiedot"
-
-#: ../src/gtkconv.c:4998 ../src/gtkconv.c:5107
+#: ../src/gtkconv.c:4996 ../src/gtkconv.c:5115
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d ihminen huoneessa"
 msgstr[1] "%d ihmistä huoneessa"
 
-#: ../src/gtkconv.c:5664 ../src/gtkstatusbox.c:366
+#: ../src/gtkconv.c:5661 ../src/gtkstatusbox.c:366
 msgid "Typing"
 msgstr "Kirjoittaa"
 
-#: ../src/gtkconv.c:5670
+#: ../src/gtkconv.c:5667
 msgid "Stopped Typing"
 msgstr "Lopetti kirjoittamisen"
 
-#: ../src/gtkconv.c:5675
+#: ../src/gtkconv.c:5672
 msgid "Nick Said"
 msgstr "Sanoi"
 
-#: ../src/gtkconv.c:5685
+#: ../src/gtkconv.c:5682
 msgid "New Event"
 msgstr "Uusi tapahtuma"
 
-#: ../src/gtkconv.c:6575
+#: ../src/gtkconv.c:6584
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -3256,73 +3247,73 @@
 "say &lt;viesti&gt;: Lähetä viesti normaalisti, niin kuin et olisi "
 "käyttämässä komentoa."
 
-#: ../src/gtkconv.c:6578
+#: ../src/gtkconv.c:6587
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;toiminta&gt;: Lähetä IRC-tyylinen toiminta tuttavalle tai "
 "keskusteluun."
 
-#: ../src/gtkconv.c:6581
+#: ../src/gtkconv.c:6590
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr ""
 "debug &lt;valinta&gt;: Lähetä eri debug-tietoja senhetkiseen keskusteluun."
 
-#: ../src/gtkconv.c:6584
+#: ../src/gtkconv.c:6593
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Tyhjentää keskustelun"
 
-#: ../src/gtkconv.c:6587
+#: ../src/gtkconv.c:6596
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;komento&gt;: Ohje tietylle komennolle."
 
-#: ../src/gtkconv.c:6746
+#: ../src/gtkconv.c:6755
 msgid "Confirm close"
 msgstr "Vahvista sulkeminen"
 
-#: ../src/gtkconv.c:6778
+#: ../src/gtkconv.c:6787
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr ""
 "Sinulla on lukemattomia viestejä. Haluatko varmasti sulkea tämän ikkunan?"
 
-#: ../src/gtkconv.c:7300
+#: ../src/gtkconv.c:7309
 msgid "Close other tabs"
 msgstr "Sulje muut välilehdet"
 
-#: ../src/gtkconv.c:7306
+#: ../src/gtkconv.c:7315
 msgid "Close all tabs"
 msgstr "Sulje kaikki välilehdet"
 
-#: ../src/gtkconv.c:7314
+#: ../src/gtkconv.c:7323
 msgid "Detach this tab"
 msgstr "Irrota tämä välilehti"
 
-#: ../src/gtkconv.c:7320
+#: ../src/gtkconv.c:7329
 msgid "Close this tab"
 msgstr "Sulje tämä välilehti"
 
-#: ../src/gtkconv.c:7580
+#: ../src/gtkconv.c:7589
 msgid "Close conversation"
 msgstr "Sulje keskustelu"
 
-#: ../src/gtkconv.c:8044
+#: ../src/gtkconv.c:8053
 msgid "Last created window"
 msgstr "Viimeksi luotu ikkuna"
 
-#: ../src/gtkconv.c:8046
+#: ../src/gtkconv.c:8055
 msgid "Separate IM and Chat windows"
 msgstr "Näytä pikaviestit ja ryhmäkeskustelut eri ikkunoissa"
 
-#: ../src/gtkconv.c:8048 ../src/gtkprefs.c:1258
+#: ../src/gtkconv.c:8057 ../src/gtkprefs.c:1258
 msgid "New window"
 msgstr "Uusi ikkuna"
 
-#: ../src/gtkconv.c:8050
+#: ../src/gtkconv.c:8059
 msgid "By group"
 msgstr "Ryhmän mukaan"
 
-#: ../src/gtkconv.c:8052
+#: ../src/gtkconv.c:8061
 msgid "By account"
 msgstr "Tilin mukaan"
 
@@ -3609,19 +3600,19 @@
 #: ../src/gtkdialogs.c:269
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, "
-"and Gadu-Gadu all at once.  It is written using GTK+.<BR><BR>You may modify "
-"and redistribute the program under the terms of the GPL (version 2 or "
-"later).  A copy of the GPL is contained in the 'COPYING' file distributed "
-"with Gaim.  Gaim is copyrighted by its contributors.  See the 'COPYRIGHT' "
-"file for the complete list of contributors.  We provide no warranty for this "
-"program.<BR><BR>"
+"Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Zephyr, and Gadu-"
+"Gadu all at once.  It is written using GTK+.<BR><BR>You may modify and "
+"redistribute the program under the terms of the GPL (version 2 or later).  A "
+"copy of the GPL is contained in the 'COPYING' file distributed with Gaim.  "
+"Gaim is copyrighted by its contributors.  See the 'COPYRIGHT' file for the "
+"complete list of contributors.  We provide no warranty for this program."
+"<BR><BR>"
 msgstr ""
 "Gaim on modulaarinen pikaviestinsovellus, joka kykenee käyttämään AIM-, "
 "MSN-, Yahoo!-, Jabber-, ICQ-, IRC-, SILC-, Novell GroupWise-, Lotus "
-"Sametime-, Napster-, Zephyr- ja Gadu-Gadu-yhteyskäytäntöjä yhtäaikaisesti. "
-"Se on ohjelmoitu käyttäen Gtk+-kirjastoa.<BR><BR>Voit muokata ja jakaa "
-"ohjelmaa GPL-lisenssin (versio 2 tai myöhempi) ehdoilla. Kopio GPL:stä on "
+"Sametime-, Zephyr- ja Gadu-Gadu-yhteyskäytäntöjä yhtäaikaisesti. Se on "
+"ohjelmoitu käyttäen Gtk+-kirjastoa.<BR><BR>Voit muokata ja jakaa ohjelmaa "
+"GPL-lisenssin (versio 2 tai myöhempi) ehdoilla. Kopio GPL:stä on "
 "sisällytetty 'COPYING'-tiedostoon, joka tulee Gaimin mukana. Gaimin "
 "tekijänoikeudet on sen tekemiseen osallistuneilla. Täydellinen luettelo "
 "osallistuneista löytyy 'COPYRIGHT'-tiedostosta. Emme anna ohjelmalle "
@@ -3661,77 +3652,77 @@
 msgid "Debugging Information"
 msgstr "Virheenjäljitystietoja"
 
-#: ../src/gtkdialogs.c:589 ../src/gtkdialogs.c:726 ../src/gtkdialogs.c:789
+#: ../src/gtkdialogs.c:595 ../src/gtkdialogs.c:732 ../src/gtkdialogs.c:795
 msgid "_Name"
 msgstr "_Nimi"
 
-#: ../src/gtkdialogs.c:594 ../src/gtkdialogs.c:731 ../src/gtkdialogs.c:794
+#: ../src/gtkdialogs.c:600 ../src/gtkdialogs.c:737 ../src/gtkdialogs.c:800
 msgid "_Account"
 msgstr "_Käyttäjätili"
 
-#: ../src/gtkdialogs.c:602
+#: ../src/gtkdialogs.c:608
 msgid "New Instant Message"
 msgstr "Uusi pikaviesti"
 
-#: ../src/gtkdialogs.c:604
+#: ../src/gtkdialogs.c:610
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr ""
 "Syötä sen henkilön näyttönimi tai lempinimi, jolle haluat lähettää "
 "pikaviestin."
 
-#: ../src/gtkdialogs.c:739
+#: ../src/gtkdialogs.c:745
 msgid "Get User Info"
 msgstr "Hae käyttäjätiedot"
 
-#: ../src/gtkdialogs.c:741
+#: ../src/gtkdialogs.c:747
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
 msgstr ""
 "Syötä sen henkilön näyttönimi tai lempinimi, jonka tiedot haluat nähdä."
 
-#: ../src/gtkdialogs.c:803
+#: ../src/gtkdialogs.c:819
 msgid "View User Log"
 msgstr "Näytä käyttäjäloki"
 
-#: ../src/gtkdialogs.c:805
+#: ../src/gtkdialogs.c:821
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
 msgstr "Syötä sen henkilön näyttönimi jonka lokia haluat katsella."
 
-#: ../src/gtkdialogs.c:824
+#: ../src/gtkdialogs.c:840
 msgid "Alias Contact"
 msgstr "Anna kontaktiryhmälle lempinimi"
 
-#: ../src/gtkdialogs.c:825
+#: ../src/gtkdialogs.c:841
 msgid "Enter an alias for this contact."
 msgstr "Anna lempinimi tälle kontaktiryhmälle."
 
-#: ../src/gtkdialogs.c:827 ../src/gtkdialogs.c:849 ../src/gtkdialogs.c:869
+#: ../src/gtkdialogs.c:843 ../src/gtkdialogs.c:865 ../src/gtkdialogs.c:885
 #: ../src/gtkrequest.c:277 ../src/protocols/silc/chat.c:587
 msgid "Alias"
 msgstr "Alias"
 
-#: ../src/gtkdialogs.c:845
+#: ../src/gtkdialogs.c:861
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Anna %s:n lempinimi."
 
-#: ../src/gtkdialogs.c:847
+#: ../src/gtkdialogs.c:863
 msgid "Alias Buddy"
 msgstr "Anna tuttavalle lempinimi"
 
-#: ../src/gtkdialogs.c:866
+#: ../src/gtkdialogs.c:882
 msgid "Alias Chat"
 msgstr "Anna ryhmäkeskustelulle lempinimi"
 
-#: ../src/gtkdialogs.c:867
+#: ../src/gtkdialogs.c:883
 msgid "Enter an alias for this chat."
 msgstr "Syötä lempinimi tälle ryhmäkeskustelulle."
 
-#: ../src/gtkdialogs.c:904
+#: ../src/gtkdialogs.c:920
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -3746,15 +3737,15 @@
 "Olet poistamassa kontaktin, jossa on %s sekä %d muuta tuttavaa "
 "tuttavalistaltasi.  Haluatko jatkaa?"
 
-#: ../src/gtkdialogs.c:912
+#: ../src/gtkdialogs.c:928
 msgid "Remove Contact"
 msgstr "Poista kontakti"
 
-#: ../src/gtkdialogs.c:913
+#: ../src/gtkdialogs.c:929
 msgid "_Remove Contact"
 msgstr "_Poista kontakti"
 
-#: ../src/gtkdialogs.c:964
+#: ../src/gtkdialogs.c:980
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -3762,29 +3753,29 @@
 msgstr ""
 "Olet poistamassa ryhmää nimeltä \"%s\" tuttavalistaltasi.  Haluatko jatkaa?"
 
-#: ../src/gtkdialogs.c:967
+#: ../src/gtkdialogs.c:983
 msgid "Remove Group"
 msgstr "Poista ryhmä"
 
-#: ../src/gtkdialogs.c:968
+#: ../src/gtkdialogs.c:984
 msgid "_Remove Group"
 msgstr "_Poista ryhmä"
 
-#: ../src/gtkdialogs.c:1001
+#: ../src/gtkdialogs.c:1017
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Olet poistamassa \"%s\":n tuttavalistaltasi.  Haluatko jatkaa?"
 
-#: ../src/gtkdialogs.c:1004
+#: ../src/gtkdialogs.c:1020
 msgid "Remove Buddy"
 msgstr "Poista tuttava"
 
-#: ../src/gtkdialogs.c:1005
+#: ../src/gtkdialogs.c:1021
 msgid "_Remove Buddy"
 msgstr "_Poista tuttava"
 
-#: ../src/gtkdialogs.c:1026
+#: ../src/gtkdialogs.c:1042
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -3793,11 +3784,11 @@
 "Olet poistamassa ryhmäkeskustelun nimeltä \"%s\" tuttavalistaltasi. Haluatko "
 "jatkaa?"
 
-#: ../src/gtkdialogs.c:1029
+#: ../src/gtkdialogs.c:1045
 msgid "Remove Chat"
 msgstr "Poista ryhmäkeskustelu"
 
-#: ../src/gtkdialogs.c:1030
+#: ../src/gtkdialogs.c:1046
 msgid "_Remove Chat"
 msgstr "_Poista ryhmäkeskustelu"
 
@@ -3932,43 +3923,43 @@
 msgid "Failed"
 msgstr "Epäonnistunut"
 
-#: ../src/gtkimhtml.c:821
+#: ../src/gtkimhtml.c:814
 msgid "Paste as Plain _Text"
 msgstr "Liimaa pelkkänä _tekstinä"
 
-#: ../src/gtkimhtml.c:833
+#: ../src/gtkimhtml.c:826
 msgid "_Reset formatting"
 msgstr "_Poista muotoilu"
 
-#: ../src/gtkimhtml.c:1327
+#: ../src/gtkimhtml.c:1318
 msgid "Hyperlink color"
 msgstr "Hyperlinkin väri"
 
-#: ../src/gtkimhtml.c:1328
+#: ../src/gtkimhtml.c:1319
 msgid "Color to draw hyperlinks."
 msgstr "Väri jolla piirretään hyperlinkit"
 
-#: ../src/gtkimhtml.c:1331
+#: ../src/gtkimhtml.c:1322
 msgid "Hyperlink prelight color"
 msgstr "Hyperlinkin ensiväri"
 
-#: ../src/gtkimhtml.c:1332
+#: ../src/gtkimhtml.c:1323
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Väri jolla piirretään hyperlinkit kun hiiren kursori on niiden päällä."
 
-#: ../src/gtkimhtml.c:1553
+#: ../src/gtkimhtml.c:1544
 msgid "_Copy E-Mail Address"
 msgstr "_Kopioi sähköpostiosoite"
 
-#: ../src/gtkimhtml.c:1565
+#: ../src/gtkimhtml.c:1556
 msgid "_Open Link in Browser"
 msgstr "_Avaa linkki selaimessa"
 
-#: ../src/gtkimhtml.c:1575
+#: ../src/gtkimhtml.c:1566
 msgid "_Copy Link Location"
 msgstr "_Kopioi linkin sijainti"
 
-#: ../src/gtkimhtml.c:3272
+#: ../src/gtkimhtml.c:3257
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -3978,7 +3969,7 @@
 "\n"
 "Oletetaan PNG-kuvaksi."
 
-#: ../src/gtkimhtml.c:3275
+#: ../src/gtkimhtml.c:3260
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -3988,7 +3979,7 @@
 "\n"
 "Oletetaan PNG-kuvaksi."
 
-#: ../src/gtkimhtml.c:3288
+#: ../src/gtkimhtml.c:3273
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -3999,7 +3990,7 @@
 "\n"
 "%s"
 
-#: ../src/gtkimhtml.c:3291
+#: ../src/gtkimhtml.c:3276
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -4010,11 +4001,11 @@
 "\n"
 "%s"
 
-#: ../src/gtkimhtml.c:3371 ../src/gtkimhtml.c:3383
+#: ../src/gtkimhtml.c:3356 ../src/gtkimhtml.c:3368
 msgid "Save Image"
 msgstr "Tallenna kuva"
 
-#: ../src/gtkimhtml.c:3411
+#: ../src/gtkimhtml.c:3396
 msgid "_Save Image..."
 msgstr "_Tallenna kuva nimellä..."
 
@@ -4076,70 +4067,70 @@
 msgid "Smile!"
 msgstr "Hymyile!"
 
-#: ../src/gtkimhtmltoolbar.c:923
+#: ../src/gtkimhtmltoolbar.c:922
 msgid "Bold"
 msgstr "Lihavoi"
 
-#: ../src/gtkimhtmltoolbar.c:934
+#: ../src/gtkimhtmltoolbar.c:933
 msgid "Italic"
 msgstr "Kursivoi"
 
-#: ../src/gtkimhtmltoolbar.c:945
+#: ../src/gtkimhtmltoolbar.c:944
 msgid "Underline"
 msgstr "Alleviivaa"
 
-#: ../src/gtkimhtmltoolbar.c:961
+#: ../src/gtkimhtmltoolbar.c:960
 msgid "Larger font size"
 msgstr "Suurempi kirjasinkoko"
 
-#: ../src/gtkimhtmltoolbar.c:973
+#: ../src/gtkimhtmltoolbar.c:972
 msgid "Smaller font size"
 msgstr "Pienempi kirjasinkoko"
 
-#: ../src/gtkimhtmltoolbar.c:990
+#: ../src/gtkimhtmltoolbar.c:989
 msgid "Font Face"
 msgstr "Kirjasintyyppi"
 
-#: ../src/gtkimhtmltoolbar.c:1002
+#: ../src/gtkimhtmltoolbar.c:1001
 msgid "Foreground font color"
 msgstr "Kirjasimen etualaväri"
 
-#: ../src/gtkimhtmltoolbar.c:1014
+#: ../src/gtkimhtmltoolbar.c:1013
 msgid "Background color"
 msgstr "Taustaväri"
 
-#: ../src/gtkimhtmltoolbar.c:1030
+#: ../src/gtkimhtmltoolbar.c:1029
 msgid "Reset formatting"
 msgstr "Poista muotoilu"
 
-#: ../src/gtkimhtmltoolbar.c:1045
+#: ../src/gtkimhtmltoolbar.c:1044
 msgid "Insert link"
 msgstr "Lisää linkki"
 
-#: ../src/gtkimhtmltoolbar.c:1055
+#: ../src/gtkimhtmltoolbar.c:1054
 msgid "Insert image"
 msgstr "Liitä kuva"
 
-#: ../src/gtkimhtmltoolbar.c:1066
+#: ../src/gtkimhtmltoolbar.c:1065
 msgid "Insert smiley"
 msgstr "Lisää hymiö"
 
-#: ../src/gtklog.c:207
+#: ../src/gtklog.c:203
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Keskustelu huoneessa %s: %s</span>"
 
-#: ../src/gtklog.c:212
+#: ../src/gtklog.c:208
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr ""
 "<span size='larger' weight='bold'>Keskustelu käyttäjän %s kanssa %s</span>"
 
-#: ../src/gtklog.c:261
+#: ../src/gtklog.c:257
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../src/gtklog.c:308
+#: ../src/gtklog.c:304
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
@@ -4147,7 +4138,7 @@
 "Järjestelmätapahtumat kirjataan lokiin vain jos \"Kirjaa kaikki "
 "tilamuutokset järjestelmälokiin\" on asetettu."
 
-#: ../src/gtklog.c:312
+#: ../src/gtklog.c:308
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
@@ -4155,32 +4146,32 @@
 "Pikaviestit kirjataan lokiin vain jos \"Kirjaa kaikki pikaviestit lokiin\" "
 "on asetettu."
 
-#: ../src/gtklog.c:315
+#: ../src/gtklog.c:311
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
 "Ryhmäkeskustelut kirjataan lokiin vain jos \"Kirjaa kaikki ryhmäkeskustelut "
 "lokiin\" on asetettu."
 
-#: ../src/gtklog.c:319
+#: ../src/gtklog.c:315
 msgid "No logs were found"
 msgstr "Lokeja ei löytynyt"
 
-#: ../src/gtklog.c:398
+#: ../src/gtklog.c:394
 msgid "Total log size:"
 msgstr "Lokin kokonaiskoko:"
 
-#: ../src/gtklog.c:464
+#: ../src/gtklog.c:460
 #, c-format
 msgid "Conversations in %s"
 msgstr "Keskustelut paikassa %s"
 
-#: ../src/gtklog.c:472 ../src/gtklog.c:523
+#: ../src/gtklog.c:468 ../src/gtklog.c:519
 #, c-format
 msgid "Conversations with %s"
 msgstr "Keskustelut käyttäjän %s kanssa"
 
-#: ../src/gtklog.c:548
+#: ../src/gtklog.c:544
 msgid "System Log"
 msgstr "Järjestelmäloki"
 
@@ -4214,7 +4205,7 @@
 "                      määrittelee käytettävät tilit pilkuin eroteltuina)\n"
 "  -v, --version       näytä nykyinen versionumero ja poistu\n"
 
-#: ../src/gtkmain.c:492
+#: ../src/gtkmain.c:493
 #, c-format
 msgid ""
 "Gaim has segfaulted and attempted to dump a core file.\n"
@@ -4253,34 +4244,34 @@
 "ovat osoitteessa\n"
 "%scontactinfo.php.\n"
 
-#: ../src/gtknotify.c:329
+#: ../src/gtknotify.c:332
 msgid "New Mail"
 msgstr "Uusi sähköposti"
 
-#: ../src/gtknotify.c:345
+#: ../src/gtknotify.c:348
 msgid "Open All Messages"
 msgstr "Avaa kaikki viestit"
 
-#: ../src/gtknotify.c:411 ../src/protocols/jabber/jabber.c:1113
+#: ../src/gtknotify.c:414 ../src/protocols/jabber/jabber.c:1127
 msgid "From"
 msgstr "Lähettäjä"
 
-#: ../src/gtknotify.c:420
+#: ../src/gtknotify.c:423
 msgid "Subject"
 msgstr "Aihe"
 
-#: ../src/gtknotify.c:429
+#: ../src/gtknotify.c:432
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Sinulle on postia!</span>"
 
-#: ../src/gtknotify.c:495
+#: ../src/gtknotify.c:498
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s:lla on %d uusi viesti."
 msgstr[1] "%s:lla on %d uutta viestiä."
 
-#: ../src/gtknotify.c:500
+#: ../src/gtknotify.c:503
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -4291,35 +4282,35 @@
 "\n"
 "%s"
 
-#: ../src/gtknotify.c:688 ../src/protocols/sametime/sametime.c:5451
+#: ../src/gtknotify.c:692 ../src/protocols/sametime/sametime.c:5456
 msgid "Search Results"
 msgstr "Hakutulokset"
 
-#: ../src/gtknotify.c:844 ../src/protocols/oscar/oscar.c:2634
+#: ../src/gtknotify.c:850 ../src/protocols/oscar/oscar.c:2634
 #, c-format
 msgid "Info for %s"
 msgstr "%s tiedot"
 
-#: ../src/gtknotify.c:845 ../src/protocols/toc/toc.c:470
+#: ../src/gtknotify.c:851 ../src/protocols/toc/toc.c:470
 msgid "Buddy Information"
 msgstr "Tuttavan tiedot"
 
-#: ../src/gtknotify.c:884
+#: ../src/gtknotify.c:891
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "Selainkomento \"%s\" on virheellinen."
 
-#: ../src/gtknotify.c:886 ../src/gtknotify.c:898 ../src/gtknotify.c:911
-#: ../src/gtknotify.c:1034
+#: ../src/gtknotify.c:893 ../src/gtknotify.c:905 ../src/gtknotify.c:918
+#: ../src/gtknotify.c:1041
 msgid "Unable to open URL"
 msgstr "URL:n avaaminen epäonnistui"
 
-#: ../src/gtknotify.c:896 ../src/gtknotify.c:909
+#: ../src/gtknotify.c:903 ../src/gtknotify.c:916
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Virhe käynnistettäessä \"%s\": %s"
 
-#: ../src/gtknotify.c:1035
+#: ../src/gtknotify.c:1042
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "Oma selainkomento -asetus valittu, mutta komentoa ei ole asetettu."
@@ -4360,191 +4351,200 @@
 
 #: ../src/gtkplugin.c:543
 msgid "Configure Pl_ugin"
-msgstr "Aseta liitännäistä"
+msgstr "Liitännäisen _asetukset"
 
 #: ../src/gtkplugin.c:601
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Liitännäisen yksityiskohdat</b>"
 
-#: ../src/gtkpounce.c:154
+#: ../src/gtkpounce.c:155
 msgid "Select a file"
 msgstr "Valitse tiedosto"
 
-#: ../src/gtkpounce.c:251
+#: ../src/gtkpounce.c:252
 msgid "Please enter a buddy to pounce."
 msgstr "Syötä ilmoitettava tuttava."
 
-#: ../src/gtkpounce.c:495
+#: ../src/gtkpounce.c:499
 msgid "New Buddy Pounce"
 msgstr "Uusi tuttavailmoitin"
 
-#: ../src/gtkpounce.c:495
+#: ../src/gtkpounce.c:499
 msgid "Edit Buddy Pounce"
 msgstr "Muokkaa tuttavailmoitinta"
 
 #. Create the "Pounce on Whom" frame.
-#: ../src/gtkpounce.c:512
+#: ../src/gtkpounce.c:516
 msgid "Pounce on Whom"
 msgstr "Kenestä ilmoitetaan"
 
-#: ../src/gtkpounce.c:539
+#: ../src/gtkpounce.c:543
 msgid "_Buddy name:"
 msgstr "_Tuttavan nimi:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../src/gtkpounce.c:565
+#: ../src/gtkpounce.c:569
 msgid "Pounce When Buddy..."
 msgstr "Ilmoita kun tuttava..."
 
-#: ../src/gtkpounce.c:573
+#: ../src/gtkpounce.c:577
 msgid "Si_gns on"
 msgstr "_kirjautuu sisään"
 
-#: ../src/gtkpounce.c:575
+#: ../src/gtkpounce.c:579
 msgid "Signs o_ff"
 msgstr "kirjautuu _ulos"
 
-#: ../src/gtkpounce.c:577
+#: ../src/gtkpounce.c:581
 msgid "Goes a_way"
 msgstr "poi_stuu"
 
-#: ../src/gtkpounce.c:579
+#: ../src/gtkpounce.c:583
 msgid "Ret_urns from away"
 msgstr "_palaa"
 
-#: ../src/gtkpounce.c:581
+#: ../src/gtkpounce.c:585
 msgid "Becomes _idle"
 msgstr "on _jouten"
 
-#: ../src/gtkpounce.c:583
+#: ../src/gtkpounce.c:587
 msgid "Is no longer i_dle"
 msgstr "ei enää ole j_outen"
 
-#: ../src/gtkpounce.c:585
+#: ../src/gtkpounce.c:589
 msgid "Starts _typing"
 msgstr "_alkaa kirjoittaa"
 
-#: ../src/gtkpounce.c:587
+#: ../src/gtkpounce.c:591
+msgid "P_auses while typing"
+msgstr "_keskeyttää kirjoittamisen"
+
+#: ../src/gtkpounce.c:593
 msgid "Stops t_yping"
 msgstr "lope_ttaa kirjoittamisen"
 
-#: ../src/gtkpounce.c:589
+#: ../src/gtkpounce.c:595
 msgid "Sends a _message"
 msgstr "lähettää _viestin"
 
 #. Create the "Action" frame.
-#: ../src/gtkpounce.c:621
+#: ../src/gtkpounce.c:630
 msgid "Action"
 msgstr "Toiminto"
 
-#: ../src/gtkpounce.c:629
+#: ../src/gtkpounce.c:638
 msgid "Ope_n an IM window"
 msgstr "Avaa pikav_iesti-ikkuna"
 
-#: ../src/gtkpounce.c:631
+#: ../src/gtkpounce.c:640
 msgid "_Pop up a notification"
 msgstr "_Ponnahdusilmoitus"
 
-#: ../src/gtkpounce.c:633
+#: ../src/gtkpounce.c:642
 msgid "Send a _message"
 msgstr "Lähetä _viesti"
 
-#: ../src/gtkpounce.c:635
+#: ../src/gtkpounce.c:644
 msgid "E_xecute a command"
 msgstr "Suorita _komento"
 
-#: ../src/gtkpounce.c:637
+#: ../src/gtkpounce.c:646
 msgid "P_lay a sound"
 msgstr "S_oita ääni"
 
-#: ../src/gtkpounce.c:642
+#: ../src/gtkpounce.c:651
 msgid "Brows_e..."
 msgstr "_Selaa"
 
-#: ../src/gtkpounce.c:644
+#: ../src/gtkpounce.c:653
 msgid "Br_owse..."
 msgstr "S_elaa"
 
-#: ../src/gtkpounce.c:645
+#: ../src/gtkpounce.c:654
 msgid "Pre_view"
 msgstr "_Esikatselu"
 
 #. Create the "Options" frame.
-#: ../src/gtkpounce.c:757
+#: ../src/gtkpounce.c:766
 msgid "Options"
 msgstr "Valinnat"
 
-#: ../src/gtkpounce.c:765
+#: ../src/gtkpounce.c:774
 msgid "P_ounce only when my status is not available"
 msgstr "I_lmoita vain kun tilani on \"ei tavoitettavissa\""
 
-#: ../src/gtkpounce.c:770
+#: ../src/gtkpounce.c:779
 msgid "_Recurring"
 msgstr "_Toistuva"
 
-#: ../src/gtkpounce.c:1074
+#: ../src/gtkpounce.c:1085
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "Haluatko varmasti poistaa ilmoituksen %s käyttäjältä %s?"
 
-#: ../src/gtkpounce.c:1222
+#: ../src/gtkpounce.c:1233
 msgid "Pounce Target"
 msgstr "Ilmoituksen kohde"
 
-#: ../src/gtkpounce.c:1257
+#: ../src/gtkpounce.c:1268
 msgid "Recurring"
 msgstr "Toistuva"
 
-#: ../src/gtkpounce.c:1304
+#: ../src/gtkpounce.c:1315
 msgid "Buddy Pounces"
 msgstr "Tuttavailmoittimet"
 
-#: ../src/gtkpounce.c:1431
+#: ../src/gtkpounce.c:1442
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s alkoi kirjoittaa sinulle (%s)"
 
-#: ../src/gtkpounce.c:1433
+#: ../src/gtkpounce.c:1444
+#, c-format
+msgid "%s has paused while typing to you (%s)"
+msgstr "%s keskeytti kirjoittamisen sinulle (%s)"
+
+#: ../src/gtkpounce.c:1446
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s on kirjautunut sisään (%s)"
 
-#: ../src/gtkpounce.c:1435
+#: ../src/gtkpounce.c:1448
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s on palannut oltuaan jouten (%s)"
 
-#: ../src/gtkpounce.c:1437
+#: ../src/gtkpounce.c:1450
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s on palannut oltuaan poissa (%s)"
 
-#: ../src/gtkpounce.c:1439
+#: ../src/gtkpounce.c:1452
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s on lopettanut kirjoittamisen sinulle (%s)"
 
-#: ../src/gtkpounce.c:1441
+#: ../src/gtkpounce.c:1454
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s on kirjautunut ulos (%s)"
 
-#: ../src/gtkpounce.c:1443
+#: ../src/gtkpounce.c:1456
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s on jouten (%s)"
 
-#: ../src/gtkpounce.c:1445
+#: ../src/gtkpounce.c:1458
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s on poissa. (%s)"
 
-#: ../src/gtkpounce.c:1447
+#: ../src/gtkpounce.c:1460
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s on lähettämässä sinulle viestiä. (%s)"
 
-#: ../src/gtkpounce.c:1448
+#: ../src/gtkpounce.c:1461
 msgid "Unknown pounce event. Please report this!"
 msgstr "Tuntematon ilmoitinviesti. Raportoi tästä!"
 
@@ -4564,8 +4564,8 @@
 msgid "Icon"
 msgstr "Kuvake"
 
-#: ../src/gtkprefs.c:680 ../src/protocols/jabber/buddy.c:267
-#: ../src/protocols/jabber/buddy.c:820 ../src/protocols/jabber/chat.c:767
+#: ../src/gtkprefs.c:680 ../src/protocols/jabber/buddy.c:286
+#: ../src/protocols/jabber/buddy.c:926 ../src/protocols/jabber/chat.c:767
 msgid "Description"
 msgstr "Kuvaus"
 
@@ -4658,8 +4658,8 @@
 msgid "N_ew conversations:"
 msgstr "_Uudet keskustelut:"
 
-#: ../src/gtkprefs.c:973 ../src/protocols/oscar/oscar.c:795
-#: ../src/protocols/oscar/oscar.c:3631
+#: ../src/gtkprefs.c:973 ../src/protocols/oscar/oscar.c:804
+#: ../src/protocols/oscar/oscar.c:3651
 msgid "IP Address"
 msgstr "IP-osoite"
 
@@ -4816,7 +4816,7 @@
 msgid "Quiet"
 msgstr "Hiljainen"
 
-#: ../src/gtkprefs.c:1483 ../src/protocols/silc/silc.c:670
+#: ../src/gtkprefs.c:1483 ../src/protocols/silc/silc.c:672
 msgid "Normal"
 msgstr "Normaali"
 
@@ -4944,7 +4944,7 @@
 
 #. Signon status stuff
 #: ../src/gtkprefs.c:1821
-msgid "Status at startup"
+msgid "Status at Startup"
 msgstr "Tila käynnistettäessä"
 
 #: ../src/gtkprefs.c:1823
@@ -4953,7 +4953,7 @@
 
 #: ../src/gtkprefs.c:1829
 msgid "Status to a_pply at startup:"
-msgstr "Tila jota käytetään käynnistettäessä:"
+msgstr "Tila jota _käytetään käynnistettäessä:"
 
 #: ../src/gtkprefs.c:1880
 msgid "Smiley Themes"
@@ -4963,7 +4963,7 @@
 msgid "Sounds"
 msgstr "Äänet"
 
-#: ../src/gtkprefs.c:1882 ../src/protocols/silc/silc.c:1850
+#: ../src/gtkprefs.c:1882 ../src/protocols/silc/silc.c:1852
 msgid "Network"
 msgstr "Verkko"
 
@@ -5008,54 +5008,54 @@
 msgid "Set privacy for:"
 msgstr "Yksityisyysasetukset tilille:"
 
-#: ../src/gtkprivacy.c:562 ../src/gtkprivacy.c:578
+#: ../src/gtkprivacy.c:560 ../src/gtkprivacy.c:576
 msgid "Permit User"
 msgstr "Salli käyttäjä"
 
-#: ../src/gtkprivacy.c:563
+#: ../src/gtkprivacy.c:561
 msgid "Type a user you permit to contact you."
 msgstr "Kirjoita tuttavan nimi jonka valtuutat ottamaan yhteyttä sinuun."
 
-#: ../src/gtkprivacy.c:564
+#: ../src/gtkprivacy.c:562
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "Syötä käyttäjän nimi, jonka tahdot voivan ottaa sinuun yhteyttä."
 
-#: ../src/gtkprivacy.c:567 ../src/gtkprivacy.c:580
+#: ../src/gtkprivacy.c:565 ../src/gtkprivacy.c:578
 msgid "_Permit"
 msgstr "_Salli"
 
-#: ../src/gtkprivacy.c:572
+#: ../src/gtkprivacy.c:570
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Sallitaanko %s:n yhteydenotot?"
 
-#: ../src/gtkprivacy.c:574
+#: ../src/gtkprivacy.c:572
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Sallitaanko varmasti %s:n yhteydenotot?"
 
-#: ../src/gtkprivacy.c:601 ../src/gtkprivacy.c:614
+#: ../src/gtkprivacy.c:599 ../src/gtkprivacy.c:612
 msgid "Block User"
 msgstr "Estä käyttäjää"
 
-#: ../src/gtkprivacy.c:602
+#: ../src/gtkprivacy.c:600
 msgid "Type a user to block."
 msgstr "Kirjoita estettävä käyttäjä."
 
-#: ../src/gtkprivacy.c:603
+#: ../src/gtkprivacy.c:601
 msgid "Please enter the name of the user you wish to block."
 msgstr "Kirjoita käyttäjän nimi jonka tahdot estää ottamasta yhteyttä."
 
-#: ../src/gtkprivacy.c:605 ../src/gtkprivacy.c:616
+#: ../src/gtkprivacy.c:603 ../src/gtkprivacy.c:614
 msgid "_Block"
 msgstr "_Estä"
 
-#: ../src/gtkprivacy.c:610
+#: ../src/gtkprivacy.c:608
 #, c-format
 msgid "Block %s?"
 msgstr "Estetäänkö %s?"
 
-#: ../src/gtkprivacy.c:612
+#: ../src/gtkprivacy.c:610
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Haluatko varmasti estää %s?"
@@ -5063,16 +5063,16 @@
 #. *
 #. * 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:557 ../src/protocols/msn/msn.c:566
+#: ../src/gtkrequest.c:267 ../src/protocols/msn/dialog.c:106
+#: ../src/protocols/msn/msn.c:555 ../src/protocols/msn/msn.c:564
 #: ../src/protocols/novell/novell.c:1919 ../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 "Kyllä"
 
-#: ../src/gtkrequest.c:268 ../src/protocols/msn/dialog.c:115
-#: ../src/protocols/msn/msn.c:557 ../src/protocols/msn/msn.c:566
+#: ../src/gtkrequest.c:268 ../src/protocols/msn/dialog.c:107
+#: ../src/protocols/msn/msn.c:555 ../src/protocols/msn/msn.c:564
 #: ../src/protocols/novell/novell.c:1920 ../src/protocols/silc/buddy.c:314
 #: ../src/protocols/silc/pk.c:118 ../src/protocols/silc/wb.c:304
 #: ../src/request.h:1335
@@ -5134,8 +5134,8 @@
 msgid "_Add Chat"
 msgstr "_Lisää ryhmäkeskustelu"
 
-#: ../src/gtksavedstatuses.c:433 ../src/protocols/jabber/buddy.c:264
-#: ../src/protocols/jabber/buddy.c:814 ../src/protocols/novell/novell.c:1484
+#: ../src/gtksavedstatuses.c:433 ../src/protocols/jabber/buddy.c:283
+#: ../src/protocols/jabber/buddy.c:920 ../src/protocols/novell/novell.c:1484
 msgid "Title"
 msgstr "Otsikko"
 
@@ -5143,25 +5143,25 @@
 msgid "Type"
 msgstr "Tyyppi"
 
-#: ../src/gtksavedstatuses.c:459 ../src/gtksavedstatuses.c:919
+#: ../src/gtksavedstatuses.c:459 ../src/gtksavedstatuses.c:923
 #: ../src/protocols/bonjour/bonjour.c:256
 #: ../src/protocols/bonjour/bonjour.c:263 ../src/protocols/gg/gg.c:1591
 #: ../src/protocols/gg/gg.c:1601 ../src/protocols/gg/gg.c:1607
 #: ../src/protocols/gg/gg.c:1616 ../src/protocols/gg/gg.c:1621
-#: ../src/protocols/irc/irc.c:227 ../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:1232 ../src/protocols/novell/novell.c:2866
+#: ../src/protocols/irc/irc.c:227 ../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:1234
+#: ../src/protocols/jabber/jabber.c:1246 ../src/protocols/novell/novell.c:2866
 #: ../src/protocols/novell/novell.c:2972 ../src/protocols/novell/novell.c:2978
-#: ../src/protocols/novell/novell.c:2984 ../src/protocols/oscar/oscar.c:5366
-#: ../src/protocols/oscar/oscar.c:5381 ../src/protocols/oscar/oscar.c:5386
-#: ../src/protocols/oscar/oscar.c:5594 ../src/protocols/oscar/oscar.c:5606
+#: ../src/protocols/novell/novell.c:2984 ../src/protocols/oscar/oscar.c:5408
+#: ../src/protocols/oscar/oscar.c:5423 ../src/protocols/oscar/oscar.c:5428
+#: ../src/protocols/oscar/oscar.c:5636 ../src/protocols/oscar/oscar.c:5648
 #: ../src/protocols/sametime/sametime.c:3266
 #: ../src/protocols/sametime/sametime.c:3272
 #: ../src/protocols/sametime/sametime.c:3278
 #: ../src/protocols/sametime/sametime.c:3357
 #: ../src/protocols/silc/buddy.c:1544 ../src/protocols/simple/simple.c:242
-#: ../src/protocols/yahoo/yahoo.c:3282 ../src/protocols/yahoo/yahoo.c:3288
+#: ../src/protocols/yahoo/yahoo.c:3315 ../src/protocols/yahoo/yahoo.c:3321
 #: ../src/protocols/zephyr/zephyr.c:2281
 msgid "Message"
 msgstr "Viesti"
@@ -5171,7 +5171,7 @@
 msgstr "Tallennetut tilat"
 
 #. Use button
-#: ../src/gtksavedstatuses.c:549 ../src/gtksavedstatuses.c:1179
+#: ../src/gtksavedstatuses.c:549 ../src/gtksavedstatuses.c:1183
 msgid "_Use"
 msgstr "_Käytä"
 
@@ -5179,40 +5179,40 @@
 msgid "Title already in use.  You must choose a unique title."
 msgstr "Otsikko on käytössä. Sinun täytyy valita yksilöllinen otsikko."
 
-#: ../src/gtksavedstatuses.c:879
+#: ../src/gtksavedstatuses.c:883
 msgid "Different"
 msgstr "Eriävyys"
 
-#: ../src/gtksavedstatuses.c:908 ../src/gtksavedstatuses.c:1055
+#: ../src/gtksavedstatuses.c:912 ../src/gtksavedstatuses.c:1059
 #: ../src/protocols/gg/gg.c:1024 ../src/protocols/gg/gg.c:1574
-#: ../src/protocols/gg/gg.c:1578 ../src/protocols/jabber/buddy.c:625
-#: ../src/protocols/jabber/buddy.c:632 ../src/protocols/jabber/buddy.c:643
-#: ../src/protocols/jabber/jabber.c:1151 ../src/protocols/msn/msn.c:548
+#: ../src/protocols/gg/gg.c:1578 ../src/protocols/jabber/buddy.c:629
+#: ../src/protocols/jabber/buddy.c:636 ../src/protocols/jabber/buddy.c:662
+#: ../src/protocols/jabber/jabber.c:1165 ../src/protocols/msn/msn.c:546
 #: ../src/protocols/novell/novell.c:2865 ../src/protocols/novell/novell.c:2869
-#: ../src/protocols/oscar/oscar.c:775 ../src/protocols/oscar/oscar.c:781
-#: ../src/protocols/oscar/oscar.c:784 ../src/protocols/yahoo/yahoo.c:2878
+#: ../src/protocols/oscar/oscar.c:784 ../src/protocols/oscar/oscar.c:790
+#: ../src/protocols/oscar/oscar.c:793 ../src/protocols/yahoo/yahoo.c:2895
 msgid "Status"
 msgstr "Tila"
 
-#: ../src/gtksavedstatuses.c:1072
+#: ../src/gtksavedstatuses.c:1076
 msgid "_Title:"
 msgstr "_Otsikko"
 
-#: ../src/gtksavedstatuses.c:1091 ../src/gtksavedstatuses.c:1412
+#: ../src/gtksavedstatuses.c:1095 ../src/gtksavedstatuses.c:1416
 msgid "_Status:"
 msgstr "_Tila:"
 
 #. Different status message expander
-#: ../src/gtksavedstatuses.c:1123
+#: ../src/gtksavedstatuses.c:1127
 msgid "Use a _different status for some accounts"
 msgstr "Käytä eri tilaa joillekin käyttäjätileille"
 
 #. Save & Use button
-#: ../src/gtksavedstatuses.c:1187
+#: ../src/gtksavedstatuses.c:1191
 msgid "Sa_ve & Use"
 msgstr "Tallenna ja _käytä"
 
-#: ../src/gtksavedstatuses.c:1393
+#: ../src/gtksavedstatuses.c:1397
 #, c-format
 msgid "Status for %s"
 msgstr "%s:n tila"
@@ -5257,34 +5257,12 @@
 msgid "Someone says your screen name in chat"
 msgstr "Joku sanoo kutsumanimesi ryhmäkeskustelussa"
 
-#: ../src/gtksound.c:396
-#, c-format
-msgid "Unable to play sound because the chosen file (%s) does not exist."
-msgstr "Ei voitu soittaa äänitiedostoa (%s) koska sitä ei ole."
-
-#: ../src/gtksound.c:412
-msgid ""
-"Unable to play sound because the 'Command' sound method has been chosen, but "
-"no command has been set."
-msgstr ""
-"Äänen soito ei onnistu. \"Komento\"-metodi on valittu mutta komentoa ei ole "
-"asetettu."
-
-#: ../src/gtksound.c:424
-#, c-format
-msgid ""
-"Unable to play sound because the configured sound command could not be "
-"launched: %s"
-msgstr ""
-"Ei voitu soittaa ääntä, koska asetettua äänikomentoa ei voitu suorittaa: %s"
-
 #. connect to the server
 #: ../src/gtkstatusbox.c:368 ../src/protocols/irc/irc.c:313
-#: ../src/protocols/jabber/jabber.c:977 ../src/protocols/msn/session.c:344
-#: ../src/protocols/napster/napster.c:536
-#: ../src/protocols/novell/novell.c:2181 ../src/protocols/oscar/oscar.c:1250
+#: ../src/protocols/jabber/jabber.c:992 ../src/protocols/msn/session.c:344
+#: ../src/protocols/novell/novell.c:2181 ../src/protocols/oscar/oscar.c:1259
 #: ../src/protocols/sametime/sametime.c:3685
-#: ../src/protocols/simple/simple.c:1609 ../src/protocols/yahoo/yahoo.c:2570
+#: ../src/protocols/simple/simple.c:1615 ../src/protocols/yahoo/yahoo.c:2587
 #: ../src/protocols/zephyr/zephyr.c:1565
 msgid "Connecting"
 msgstr "Yhdistetään"
@@ -5420,15 +5398,15 @@
 msgid "Old Gaim"
 msgstr "Vanha Gaim"
 
-#: ../src/log.c:678
+#: ../src/log.c:690
 msgid "Logging of this conversation failed."
 msgstr "Tämän keskustelun kirjaaminen lokiin epäonnistui."
 
-#: ../src/log.c:1028
+#: ../src/log.c:1040
 msgid "XML"
 msgstr "XML"
 
-#: ../src/log.c:1102
+#: ../src/log.c:1114
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -5437,7 +5415,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;"
 "AUTOMAATTIVASTAUS&gt;:</b></font> %s<br/>\n"
 
-#: ../src/log.c:1104
+#: ../src/log.c:1116
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -5446,21 +5424,21 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;"
 "AUTOMAATTIVASTAUS&gt;:</b></font> %s<br/>\n"
 
-#: ../src/log.c:1162 ../src/log.c:1294
+#: ../src/log.c:1174 ../src/log.c:1305
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>Lokin hakemistopolkua ei löydy!</b></font>"
 
-#: ../src/log.c:1174 ../src/log.c:1308
+#: ../src/log.c:1186 ../src/log.c:1319
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Ei voitu lukea tiedostoa: %s</b></font>"
 
-#: ../src/log.c:1236
+#: ../src/log.c:1248
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTOMAATTIVASTAUS>: %s\n"
 
-#: ../src/plugin.c:281 ../src/protocols/jabber/buddy.c:1385
+#: ../src/plugin.c:281 ../src/protocols/jabber/buddy.c:1645
 #: ../src/protocols/msn/servconn.c:139 ../src/protocols/msn/session.c:321
 #: ../src/protocols/oscar/oscar.c:2701
 msgid "Unknown error"
@@ -5492,21 +5470,21 @@
 msgid "Gaim encountered errors loading the plugin."
 msgstr "Liitännäistä ladattaessa tapahtui virheitä."
 
-#: ../src/plugin.c:551
+#: ../src/plugin.c:550
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "Vaadittu liitännäinen %s ei latautunut."
 
-#: ../src/plugin.c:555
+#: ../src/plugin.c:554
 msgid "Gaim was unable to load your plugin."
 msgstr "Gaim ei kyennyt lataamaan liitännäistäsi."
 
-#: ../src/plugin.c:657
+#: ../src/plugin.c:654
 #, c-format
 msgid "The dependent plugin %s failed to unload."
 msgstr "Riippuvaista liitännäista %s ei voitu poistaa käytöstä."
 
-#: ../src/plugin.c:662
+#: ../src/plugin.c:659
 msgid "Gaim encountered errors unloading the plugin."
 msgstr "Poistettaessa liitännäistä käytöstä tapahtui virheitä."
 
@@ -5550,74 +5528,73 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/bonjour/bonjour.c:433
-#: ../src/protocols/bonjour/bonjour.c:435
+#: ../src/protocols/bonjour/bonjour.c:434
+#: ../src/protocols/bonjour/bonjour.c:436
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour-yhteyskäytäntöliitännäinen"
 
-#: ../src/protocols/bonjour/bonjour.c:471
-#: ../src/protocols/bonjour/bonjour.c:479
-#: ../src/protocols/bonjour/bonjour.c:537
+#: ../src/protocols/bonjour/bonjour.c:472
+#: ../src/protocols/bonjour/bonjour.c:480
+#: ../src/protocols/bonjour/bonjour.c:538 ../src/protocols/silc/silc.c:307
 msgid "Gaim User"
 msgstr "Gaim-käyttäjä"
 
 #. Creating the user splits
-#: ../src/protocols/bonjour/bonjour.c:575 ../src/protocols/silc/silc.c:935
+#: ../src/protocols/bonjour/bonjour.c:576 ../src/protocols/silc/silc.c:937
 msgid "Hostname"
 msgstr "Isäntä"
 
 #. 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:2049 ../src/protocols/napster/napster.c:724
-#: ../src/protocols/oscar/oscar.c:6470
-#: ../src/protocols/sametime/sametime.c:5635 ../src/protocols/silc/silc.c:1858
-#: ../src/protocols/toc/toc.c:2344
-msgid "Port"
-msgstr "Portti"
-
-#: ../src/protocols/bonjour/bonjour.c:582 ../src/protocols/gg/gg.c:622
-#: ../src/protocols/jabber/jabber.c:769
+#: ../src/protocols/bonjour/bonjour.c:580 ../src/protocols/gg/gg.c:622
+#: ../src/protocols/jabber/jabber.c:786
 msgid "First name"
 msgstr "Etunimi"
 
-#: ../src/protocols/bonjour/bonjour.c:585 ../src/protocols/gg/gg.c:617
-#: ../src/protocols/jabber/jabber.c:774
+#: ../src/protocols/bonjour/bonjour.c:583 ../src/protocols/gg/gg.c:617
+#: ../src/protocols/jabber/jabber.c:791
 msgid "Last name"
 msgstr "Sukunimi"
 
-#: ../src/protocols/bonjour/bonjour.c:588 ../src/protocols/gg/gg.c:468
-#: ../src/protocols/jabber/jabber.c:759 ../src/protocols/silc/silc.c:699
-#: ../src/protocols/silc/silc.c:939
+#: ../src/protocols/bonjour/bonjour.c:586 ../src/protocols/gg/gg.c:468
+#: ../src/protocols/jabber/jabber.c:776 ../src/protocols/silc/silc.c:701
+#: ../src/protocols/silc/silc.c:941
 msgid "E-mail"
 msgstr "Sähköposti"
 
+#: ../src/protocols/bonjour/bonjour.c:589
+msgid "AIM Account"
+msgstr "AIM-tili"
+
+#: ../src/protocols/bonjour/bonjour.c:592
+msgid "Jabber Account"
+msgstr "Jabber-tili"
+
 #: ../src/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../src/protocols/bonjour/jabber.c:357
+#: ../src/protocols/bonjour/jabber.c:374
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s on sulkenut keskustelun."
 
-#: ../src/protocols/bonjour/jabber.c:439
+#: ../src/protocols/bonjour/jabber.c:461
 msgid "Cannot open socket"
 msgstr "Pistoketta ei voida avata"
 
-#: ../src/protocols/bonjour/jabber.c:447
+#: ../src/protocols/bonjour/jabber.c:469
 msgid "Error setting socket options"
 msgstr "Virhe asetettaessa pistokevalintoja"
 
-#: ../src/protocols/bonjour/jabber.c:458
-msgid "Cannot bind socket to port"
-msgstr "Ei voida liittää pistoketta porttiin"
-
-#: ../src/protocols/bonjour/jabber.c:465
-msgid "Cannot listen on socket"
-msgstr "Ei voida kuunnella pistoketta"
-
-#: ../src/protocols/bonjour/jabber.c:559
+#: ../src/protocols/bonjour/jabber.c:493
+msgid "Could not bind socket to port"
+msgstr "Ei voitu liittää pistoketta porttiin"
+
+#: ../src/protocols/bonjour/jabber.c:501
+msgid "Could not listen on socket"
+msgstr "Ei voitu kuunnella pistoketta"
+
+#: ../src/protocols/bonjour/jabber.c:594
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Viestiä ei voida lähettää, keskustelua ei voitu aloittaa."
 
@@ -5695,7 +5672,7 @@
 msgstr "Rekisteröinti onnistui!"
 
 #: ../src/protocols/gg/gg.c:473 ../src/protocols/gg/gg.c:764
-#: ../src/protocols/jabber/jabber.c:748 ../src/protocols/jabber/jabber.c:1305
+#: ../src/protocols/jabber/jabber.c:765 ../src/protocols/jabber/jabber.c:1319
 msgid "Password"
 msgstr "Salasana"
 
@@ -5722,10 +5699,10 @@
 #. General
 #: ../src/protocols/gg/gg.c:627 ../src/protocols/gg/gg.c:1038
 #: ../src/protocols/gg/gg.c:1104 ../src/protocols/gg/gg.c:2175
-#: ../src/protocols/jabber/buddy.c:252 ../src/protocols/jabber/buddy.c:697
-#: ../src/protocols/jabber/buddy.c:1262 ../src/protocols/jabber/buddy.c:1444
-#: ../src/protocols/jabber/jabber.c:764 ../src/protocols/msn/msn.c:1368
-#: ../src/protocols/msn/msn.c:1530 ../src/protocols/silc/buddy.c:1528
+#: ../src/protocols/jabber/buddy.c:271 ../src/protocols/jabber/buddy.c:803
+#: ../src/protocols/jabber/buddy.c:1522 ../src/protocols/jabber/buddy.c:1704
+#: ../src/protocols/jabber/jabber.c:781 ../src/protocols/msn/msn.c:1370
+#: ../src/protocols/msn/msn.c:1532 ../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
@@ -5733,8 +5710,8 @@
 msgstr "Kutsumanimi"
 
 #: ../src/protocols/gg/gg.c:632 ../src/protocols/gg/gg.c:1043
-#: ../src/protocols/gg/gg.c:1107 ../src/protocols/jabber/jabber.c:784
-#: ../src/protocols/oscar/oscar.c:3687 ../src/protocols/oscar/oscar.c:3695
+#: ../src/protocols/gg/gg.c:1107 ../src/protocols/jabber/jabber.c:801
+#: ../src/protocols/oscar/oscar.c:3707 ../src/protocols/oscar/oscar.c:3715
 msgid "City"
 msgstr "Paikkakunta"
 
@@ -5742,8 +5719,8 @@
 msgid "Year of birth"
 msgstr "Syntymävuosi"
 
-#: ../src/protocols/gg/gg.c:640 ../src/protocols/msn/msn.c:1532
-#: ../src/protocols/oscar/oscar.c:3651
+#: ../src/protocols/gg/gg.c:640 ../src/protocols/msn/msn.c:1534
+#: ../src/protocols/oscar/oscar.c:3671
 #: ../src/protocols/yahoo/yahoo_profile.c:1066
 msgid "Gender"
 msgstr "Sukupuoli"
@@ -5752,11 +5729,11 @@
 msgid "Male or female"
 msgstr "Mies vai nainen"
 
-#: ../src/protocols/gg/gg.c:642 ../src/protocols/oscar/oscar.c:3651
+#: ../src/protocols/gg/gg.c:642 ../src/protocols/oscar/oscar.c:3671
 msgid "Male"
 msgstr "Mies"
 
-#: ../src/protocols/gg/gg.c:643 ../src/protocols/oscar/oscar.c:3651
+#: ../src/protocols/gg/gg.c:643 ../src/protocols/oscar/oscar.c:3671
 msgid "Female"
 msgstr "Nainen"
 
@@ -5814,13 +5791,13 @@
 msgstr "Lisää ryhmäkeskusteluun..."
 
 #: ../src/protocols/gg/gg.c:1029 ../src/protocols/gg/gg.c:1098
-#: ../src/protocols/oscar/oscar.c:3623
+#: ../src/protocols/oscar/oscar.c:3643
 msgid "UIN"
 msgstr "UIN"
 
 #: ../src/protocols/gg/gg.c:1033 ../src/protocols/gg/gg.c:1101
-#: ../src/protocols/jabber/buddy.c:1258 ../src/protocols/jabber/buddy.c:1434
-#: ../src/protocols/oscar/oscar.c:3634 ../src/protocols/silc/ops.c:1024
+#: ../src/protocols/jabber/buddy.c:1518 ../src/protocols/jabber/buddy.c:1694
+#: ../src/protocols/oscar/oscar.c:3654 ../src/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr "Etunimi"
 
@@ -5829,7 +5806,7 @@
 msgstr "Syntymävuosi"
 
 #: ../src/protocols/gg/gg.c:1092 ../src/protocols/gg/gg.c:1161
-#: ../src/protocols/oscar/oscar.c:3798
+#: ../src/protocols/oscar/oscar.c:3818
 msgid "Unable to display the search results."
 msgstr "Ei voida näyttää hakutuloksia."
 
@@ -5873,7 +5850,7 @@
 msgid "Connection failed."
 msgstr "Yhteys epäonnistui."
 
-#: ../src/protocols/gg/gg.c:1615 ../src/protocols/msn/msn.c:564
+#: ../src/protocols/gg/gg.c:1615 ../src/protocols/msn/msn.c:562
 msgid "Blocked"
 msgstr "Estetty"
 
@@ -5957,19 +5934,19 @@
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu-käyttäjä"
 
-#: ../src/protocols/irc/cmds.c:43 ../src/protocols/silc/silc.c:1585
+#: ../src/protocols/irc/cmds.c:43 ../src/protocols/silc/silc.c:1587
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Tuntematon komento: %s"
 
-#: ../src/protocols/irc/cmds.c:482 ../src/protocols/jabber/chat.c:590
-#: ../src/protocols/silc/silc.c:1293
+#: ../src/protocols/irc/cmds.c:500 ../src/protocols/jabber/chat.c:590
+#: ../src/protocols/silc/silc.c:1295
 #, c-format
 msgid "current topic is: %s"
 msgstr "nykyinen aihe on: %s"
 
-#: ../src/protocols/irc/cmds.c:486 ../src/protocols/jabber/chat.c:594
-#: ../src/protocols/silc/silc.c:1297
+#: ../src/protocols/irc/cmds.c:504 ../src/protocols/jabber/chat.c:594
+#: ../src/protocols/silc/silc.c:1299
 msgid "No topic is set"
 msgstr "Aihetta ei ole asetettu"
 
@@ -6022,26 +5999,26 @@
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC-kutsumanimissä ei tule olla välilyöntejä"
 
-#: ../src/protocols/irc/irc.c:321 ../src/protocols/jabber/jabber.c:549
-#: ../src/protocols/jabber/jabber.c:888
+#: ../src/protocols/irc/irc.c:321 ../src/protocols/jabber/jabber.c:566
+#: ../src/protocols/jabber/jabber.c:905
 msgid "SSL support unavailable"
 msgstr "SSL-tuki ei saatavilla"
 
 #: ../src/protocols/irc/irc.c:333 ../src/protocols/simple/simple.c:452
-#: ../src/protocols/simple/simple.c:1521
+#: ../src/protocols/simple/simple.c:1527
 msgid "Couldn't create socket"
 msgstr "Pistokkeen luominen epäonnistui"
 
-#: ../src/protocols/irc/irc.c:404 ../src/protocols/jabber/jabber.c:421
-#: ../src/protocols/oscar/oscar.c:1246
+#: ../src/protocols/irc/irc.c:404 ../src/protocols/jabber/jabber.c:427
+#: ../src/protocols/oscar/oscar.c:1255
 msgid "Couldn't connect to host"
 msgstr "Yhteyttä isäntään ei voitu muodostaa"
 
-#: ../src/protocols/irc/irc.c:429 ../src/protocols/jabber/jabber.c:448
+#: ../src/protocols/irc/irc.c:429 ../src/protocols/jabber/jabber.c:454
 msgid "Connection Failed"
 msgstr "Yhteysvirhe"
 
-#: ../src/protocols/irc/irc.c:432 ../src/protocols/jabber/jabber.c:451
+#: ../src/protocols/irc/irc.c:432 ../src/protocols/jabber/jabber.c:457
 msgid "SSL Handshake Failed"
 msgstr "SSL-kättely epäonnistui"
 
@@ -6050,13 +6027,13 @@
 msgstr "Virhe luettaessa"
 
 #: ../src/protocols/irc/irc.c:765 ../src/protocols/silc/chat.c:1421
-#: ../src/protocols/yahoo/yahoochat.c:1430
+#: ../src/protocols/yahoo/yahoochat.c:1431
 msgid "Users"
 msgstr "Käyttäjät"
 
 #: ../src/protocols/irc/irc.c:768 ../src/protocols/sametime/sametime.c:3354
 #: ../src/protocols/silc/chat.c:1424 ../src/protocols/silc/ops.c:1380
-#: ../src/protocols/yahoo/yahoochat.c:1439
+#: ../src/protocols/yahoo/yahoochat.c:1440
 msgid "Topic"
 msgstr "Aihe"
 
@@ -6079,28 +6056,36 @@
 
 #. host to connect to
 #: ../src/protocols/irc/irc.c:897 ../src/protocols/irc/msgs.c:235
-#: ../src/protocols/jabber/jabber.c:1903 ../src/protocols/msn/msn.c:2044
-#: ../src/protocols/napster/napster.c:719 ../src/protocols/oscar/oscar.c:6467
-#: ../src/protocols/sametime/sametime.c:5630 ../src/protocols/silc/ops.c:1242
-#: ../src/protocols/silc/ops.c:1344 ../src/protocols/simple/simple.c:1769
+#: ../src/protocols/jabber/jabber.c:1917 ../src/protocols/msn/msn.c:2046
+#: ../src/protocols/oscar/oscar.c:6531
+#: ../src/protocols/sametime/sametime.c:5635 ../src/protocols/silc/ops.c:1242
+#: ../src/protocols/silc/ops.c:1344 ../src/protocols/simple/simple.c:1775
 #: ../src/protocols/toc/toc.c:2340
 msgid "Server"
 msgstr "Palvelin"
 
+#. port to connect to
+#: ../src/protocols/irc/irc.c:900 ../src/protocols/msn/msn.c:2051
+#: ../src/protocols/oscar/oscar.c:6534
+#: ../src/protocols/sametime/sametime.c:5640 ../src/protocols/silc/silc.c:1860
+#: ../src/protocols/toc/toc.c:2344
+msgid "Port"
+msgstr "Portti"
+
 #: ../src/protocols/irc/irc.c:903
 msgid "Encodings"
 msgstr "Merkistöt"
 
 #: ../src/protocols/irc/irc.c:906 ../src/protocols/irc/msgs.c:229
-#: ../src/protocols/jabber/jabber.c:744 ../src/protocols/silc/buddy.c:1531
+#: ../src/protocols/jabber/jabber.c:761 ../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:933
+#: ../src/protocols/silc/silc.c:935
 msgid "Username"
 msgstr "Käyttäjänimi"
 
 #: ../src/protocols/irc/irc.c:909 ../src/protocols/irc/msgs.c:230
-#: ../src/protocols/silc/silc.c:937
+#: ../src/protocols/silc/silc.c:939
 msgid "Real name"
 msgstr "Oikea nimi"
 
@@ -6136,7 +6121,7 @@
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s:</b> %s"
 
-#: ../src/protocols/irc/msgs.c:215 ../src/protocols/oscar/oscar.c:3624
+#: ../src/protocols/irc/msgs.c:215 ../src/protocols/oscar/oscar.c:3644
 #: ../src/protocols/silc/ops.c:1412
 msgid "Nick"
 msgstr "Kutsumanimi"
@@ -6244,27 +6229,27 @@
 msgid "Invitation only"
 msgstr "Vain kutsu"
 
-#: ../src/protocols/irc/msgs.c:718
+#: ../src/protocols/irc/msgs.c:726
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "%s on poistanut sinut kanavalta: (%s)"
 
 #. Remove user from channel
-#: ../src/protocols/irc/msgs.c:723 ../src/protocols/silc/ops.c:721
+#: ../src/protocols/irc/msgs.c:731 ../src/protocols/silc/ops.c:721
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "%s potkaisi (%s)"
 
-#: ../src/protocols/irc/msgs.c:746
+#: ../src/protocols/irc/msgs.c:754
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "moodin (%s %s) asetti %s"
 
-#: ../src/protocols/irc/msgs.c:831 ../src/protocols/irc/msgs.c:832
+#: ../src/protocols/irc/msgs.c:839 ../src/protocols/irc/msgs.c:840
 msgid "Invalid nickname"
 msgstr "Virheellinen lempinimi"
 
-#: ../src/protocols/irc/msgs.c:833
+#: ../src/protocols/irc/msgs.c:841
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -6272,7 +6257,7 @@
 "Palvelin hylkäsi valitsemasi kutsumanimen. Siinä on todennäköisesti "
 "kiellettyjä merkkejä."
 
-#: ../src/protocols/irc/msgs.c:837
+#: ../src/protocols/irc/msgs.c:845
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -6280,42 +6265,42 @@
 "Palvelin hylkäsi valitsemasi tilinimen. Siinä on todennäköisesti kiellettyjä "
 "merkkejä."
 
-#: ../src/protocols/irc/msgs.c:876
+#: ../src/protocols/irc/msgs.c:884
 msgid "Cannot change nick"
 msgstr "Ei kyetty muuttamaan kutsumanimeä"
 
-#: ../src/protocols/irc/msgs.c:876
+#: ../src/protocols/irc/msgs.c:884
 msgid "Could not change nick"
 msgstr "Ei kyetty muuttamaan kutsumanimeä"
 
-#: ../src/protocols/irc/msgs.c:897
+#: ../src/protocols/irc/msgs.c:905
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Olet poistunut kanavalta %s%s"
 
-#: ../src/protocols/irc/msgs.c:939
+#: ../src/protocols/irc/msgs.c:947
 msgid "Error: invalid PONG from server"
 msgstr "Virhe: epäkelpo PONG palvelimelta"
 
-#: ../src/protocols/irc/msgs.c:941
+#: ../src/protocols/irc/msgs.c:949
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING vastaus -- Viive: %lu sekuntia"
 
-#: ../src/protocols/irc/msgs.c:1022
+#: ../src/protocols/irc/msgs.c:1030
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Ei voi liittyä %s:"
 
-#: ../src/protocols/irc/msgs.c:1023 ../src/protocols/silc/ops.c:1128
+#: ../src/protocols/irc/msgs.c:1031 ../src/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Ei voida liittyä kanavalle"
 
-#: ../src/protocols/irc/msgs.c:1057
+#: ../src/protocols/irc/msgs.c:1065
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Kutsumanimi tai kanava ei tilapäisesti ole käytössä."
 
-#: ../src/protocols/irc/msgs.c:1069
+#: ../src/protocols/irc/msgs.c:1077
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops %s:ltä"
@@ -6422,7 +6407,7 @@
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [kanava]: Listaa kanavalla olevat käyttäjät."
 
-#: ../src/protocols/irc/parse.c:129 ../src/protocols/jabber/jabber.c:1741
+#: ../src/protocols/irc/parse.c:129 ../src/protocols/jabber/jabber.c:1755
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;uusi nimi&gt;: Muuta nimesi."
 
@@ -6503,6 +6488,10 @@
 msgstr "umode &lt;nimi1&gt; [nimi2] ...: Aseta tai poista käyttäjän tila."
 
 #: ../src/protocols/irc/parse.c:143
+msgid "version [nick]: send CTCP VERSION request to a user"
+msgstr "version [nimi]: lähetä CTCP VERSION -pyyntö käyttäjälle"
+
+#: ../src/protocols/irc/parse.c:144
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
@@ -6510,7 +6499,7 @@
 "voice &lt;nimi1&gt; [nimi2] ...: Aseta kanavan ääni-tila jollekulle. Sinun "
 "tulee olla kanavaoperaattori tehdäksesi näin."
 
-#: ../src/protocols/irc/parse.c:144
+#: ../src/protocols/irc/parse.c:145
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
@@ -6518,24 +6507,24 @@
 "wallops &lt;viesti&gt;: Jos et tiedä mikä tämä on, sinun ei todennäköisesti "
 "tulee käyttää sitä."
 
-#: ../src/protocols/irc/parse.c:145
+#: ../src/protocols/irc/parse.c:146
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [palvelin] &lt;nimi&gt;: Hae tietoja käyttäjästä."
 
-#: ../src/protocols/irc/parse.c:439
+#: ../src/protocols/irc/parse.c:440
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Vastausaika %s:ltä: %lu sekuntia"
 
-#: ../src/protocols/irc/parse.c:440
+#: ../src/protocols/irc/parse.c:441
 msgid "PONG"
 msgstr "PONG"
 
-#: ../src/protocols/irc/parse.c:440
+#: ../src/protocols/irc/parse.c:441
 msgid "CTCP PING reply"
 msgstr "CTCP PING:n vastaus"
 
-#: ../src/protocols/irc/parse.c:542 ../src/protocols/irc/parse.c:546
+#: ../src/protocols/irc/parse.c:543 ../src/protocols/irc/parse.c:547
 #: ../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."
@@ -6598,83 +6587,83 @@
 msgid "SASL error"
 msgstr "SASL-virhe"
 
-#: ../src/protocols/jabber/buddy.c:249 ../src/protocols/jabber/buddy.c:666
+#: ../src/protocols/jabber/buddy.c:268 ../src/protocols/jabber/buddy.c:772
 #: ../src/protocols/silc/ops.c:1020
 msgid "Full Name"
 msgstr "Koko nimi"
 
-#: ../src/protocols/jabber/buddy.c:250 ../src/protocols/jabber/buddy.c:679
+#: ../src/protocols/jabber/buddy.c:269 ../src/protocols/jabber/buddy.c:785
 #: ../src/protocols/silc/ops.c:1032
 msgid "Family Name"
 msgstr "Sukunimi"
 
-#: ../src/protocols/jabber/buddy.c:251 ../src/protocols/jabber/buddy.c:683
+#: ../src/protocols/jabber/buddy.c:270 ../src/protocols/jabber/buddy.c:789
 msgid "Given Name"
 msgstr "Etunimi"
 
-#: ../src/protocols/jabber/buddy.c:253 ../src/protocols/jabber/jabber.c:804
+#: ../src/protocols/jabber/buddy.c:272 ../src/protocols/jabber/jabber.c:821
 msgid "URL"
 msgstr "URL"
 
-#: ../src/protocols/jabber/buddy.c:254 ../src/protocols/jabber/buddy.c:735
+#: ../src/protocols/jabber/buddy.c:273 ../src/protocols/jabber/buddy.c:841
 msgid "Street Address"
 msgstr "Katuosoite"
 
-#: ../src/protocols/jabber/buddy.c:255 ../src/protocols/jabber/buddy.c:731
+#: ../src/protocols/jabber/buddy.c:274 ../src/protocols/jabber/buddy.c:837
 msgid "Extended Address"
 msgstr "Laajennettu osoite"
 
-#: ../src/protocols/jabber/buddy.c:256 ../src/protocols/jabber/buddy.c:739
+#: ../src/protocols/jabber/buddy.c:275 ../src/protocols/jabber/buddy.c:845
 msgid "Locality"
 msgstr "Alue"
 
-#: ../src/protocols/jabber/buddy.c:257 ../src/protocols/jabber/buddy.c:743
+#: ../src/protocols/jabber/buddy.c:276 ../src/protocols/jabber/buddy.c:849
 msgid "Region"
 msgstr "Seutu"
 
-#: ../src/protocols/jabber/buddy.c:258 ../src/protocols/jabber/buddy.c:747
+#: ../src/protocols/jabber/buddy.c:277 ../src/protocols/jabber/buddy.c:853
 msgid "Postal Code"
 msgstr "Postinumero"
 
-#: ../src/protocols/jabber/buddy.c:259 ../src/protocols/jabber/buddy.c:752
-#: ../src/protocols/silc/silc.c:943
+#: ../src/protocols/jabber/buddy.c:278 ../src/protocols/jabber/buddy.c:858
+#: ../src/protocols/silc/silc.c:945
 msgid "Country"
 msgstr "Maa"
 
-#: ../src/protocols/jabber/buddy.c:260 ../src/protocols/jabber/buddy.c:763
-#: ../src/protocols/jabber/buddy.c:770
+#: ../src/protocols/jabber/buddy.c:279 ../src/protocols/jabber/buddy.c:869
+#: ../src/protocols/jabber/buddy.c:876
 msgid "Telephone"
 msgstr "Puhelin"
 
-#: ../src/protocols/jabber/buddy.c:261 ../src/protocols/jabber/buddy.c:781
-#: ../src/protocols/jabber/buddy.c:789 ../src/protocols/jabber/buddy.c:1264
+#: ../src/protocols/jabber/buddy.c:280 ../src/protocols/jabber/buddy.c:887
+#: ../src/protocols/jabber/buddy.c:895 ../src/protocols/jabber/buddy.c:1524
 #: ../src/protocols/silc/ops.c:1075 ../src/protocols/silc/util.c:526
 #: ../src/protocols/yahoo/yahoo_profile.c:1036
 msgid "E-Mail"
 msgstr "Sähköposti"
 
-#: ../src/protocols/jabber/buddy.c:262 ../src/protocols/jabber/buddy.c:804
+#: ../src/protocols/jabber/buddy.c:281 ../src/protocols/jabber/buddy.c:910
 msgid "Organization Name"
 msgstr "Organisaation nimi"
 
-#: ../src/protocols/jabber/buddy.c:263 ../src/protocols/jabber/buddy.c:808
+#: ../src/protocols/jabber/buddy.c:282 ../src/protocols/jabber/buddy.c:914
 msgid "Organization Unit"
 msgstr "Organisaatioyksikkö"
 
-#: ../src/protocols/jabber/buddy.c:265 ../src/protocols/jabber/buddy.c:817
+#: ../src/protocols/jabber/buddy.c:284 ../src/protocols/jabber/buddy.c:923
 msgid "Role"
 msgstr "Asema"
 
-#: ../src/protocols/jabber/buddy.c:266 ../src/protocols/jabber/buddy.c:700
-#: ../src/protocols/msn/msn.c:1589 ../src/protocols/oscar/oscar.c:3667
+#: ../src/protocols/jabber/buddy.c:285 ../src/protocols/jabber/buddy.c:806
+#: ../src/protocols/msn/msn.c:1591 ../src/protocols/oscar/oscar.c:3687
 msgid "Birthday"
 msgstr "Syntymäpäivä"
 
-#: ../src/protocols/jabber/buddy.c:569 ../src/protocols/jabber/buddy.c:570
+#: ../src/protocols/jabber/buddy.c:588 ../src/protocols/jabber/buddy.c:589
 msgid "Edit Jabber vCard"
 msgstr "Muokkaa Jabberin vCardia"
 
-#: ../src/protocols/jabber/buddy.c:571
+#: ../src/protocols/jabber/buddy.c:590
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -6682,91 +6671,99 @@
 "Kaikki allaolevat kentät ovat valinnaisia. Kirjoita vain tiedot, joiden "
 "luovuttamista pidät sopivana."
 
-#: ../src/protocols/jabber/buddy.c:641 ../src/protocols/jabber/jabber.c:1906
+#: ../src/protocols/jabber/buddy.c:646 ../src/protocols/jabber/buddy.c:677
+msgid "Client:"
+msgstr "Asiakasohjelma:"
+
+#: ../src/protocols/jabber/buddy.c:650 ../src/protocols/jabber/buddy.c:681
+msgid "Operating System"
+msgstr "Käyttöjärjestelmä"
+
+#: ../src/protocols/jabber/buddy.c:660 ../src/protocols/jabber/jabber.c:1920
 msgid "Resource"
 msgstr "Lähde"
 
-#: ../src/protocols/jabber/buddy.c:687 ../src/protocols/silc/ops.c:1028
+#: ../src/protocols/jabber/buddy.c:793 ../src/protocols/silc/ops.c:1028
 msgid "Middle Name"
 msgstr "Muut etunimet"
 
-#: ../src/protocols/jabber/buddy.c:720 ../src/protocols/jabber/jabber.c:779
-#: ../src/protocols/oscar/oscar.c:3686 ../src/protocols/oscar/oscar.c:3694
+#: ../src/protocols/jabber/buddy.c:826 ../src/protocols/jabber/jabber.c:796
+#: ../src/protocols/oscar/oscar.c:3706 ../src/protocols/oscar/oscar.c:3714
 #: ../src/protocols/silc/ops.c:1064
 msgid "Address"
 msgstr "Osoite"
 
-#: ../src/protocols/jabber/buddy.c:727
+#: ../src/protocols/jabber/buddy.c:833
 msgid "P.O. Box"
 msgstr "Postilokero"
 
-#: ../src/protocols/jabber/buddy.c:841
+#: ../src/protocols/jabber/buddy.c:947
 msgid "Photo"
 msgstr "Valokuva"
 
-#: ../src/protocols/jabber/buddy.c:841
+#: ../src/protocols/jabber/buddy.c:947
 msgid "Logo"
 msgstr "Logo"
 
-#: ../src/protocols/jabber/buddy.c:1044
+#: ../src/protocols/jabber/buddy.c:1304
 msgid "Un-hide From"
 msgstr "\"Tule esiin\""
 
-#: ../src/protocols/jabber/buddy.c:1048
+#: ../src/protocols/jabber/buddy.c:1308
 msgid "Temporarily Hide From"
 msgstr "Piiloudu väliaikaisesti tuttavalta"
 
 #. && NOT ME
-#: ../src/protocols/jabber/buddy.c:1056
+#: ../src/protocols/jabber/buddy.c:1316
 msgid "Cancel Presence Notification"
 msgstr "Peru paikallaoloilmoitus"
 
-#: ../src/protocols/jabber/buddy.c:1063
+#: ../src/protocols/jabber/buddy.c:1323
 msgid "(Re-)Request authorization"
 msgstr "Pyydä valtuutusta uudelleen"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../src/protocols/jabber/buddy.c:1072
+#: ../src/protocols/jabber/buddy.c:1332
 msgid "Unsubscribe"
 msgstr "Poista listalta"
 
-#: ../src/protocols/jabber/buddy.c:1099 ../src/protocols/jabber/chat.c:675
-#: ../src/protocols/jabber/chat.c:686 ../src/protocols/jabber/jabber.c:1163
+#: ../src/protocols/jabber/buddy.c:1359 ../src/protocols/jabber/chat.c:675
+#: ../src/protocols/jabber/chat.c:686 ../src/protocols/jabber/jabber.c:1177
 #: ../src/protocols/silc/ops.c:1449
 msgid "Error"
 msgstr "Virhe"
 
-#: ../src/protocols/jabber/buddy.c:1105 ../src/protocols/jabber/jabber.c:1188
+#: ../src/protocols/jabber/buddy.c:1365 ../src/protocols/jabber/jabber.c:1202
 msgid "Chatty"
 msgstr "Juttelutuulella"
 
-#: ../src/protocols/jabber/buddy.c:1109 ../src/status.c:159
+#: ../src/protocols/jabber/buddy.c:1369 ../src/status.c:159
 msgid "Extended Away"
 msgstr "Pidennetty poissaolo"
 
-#: ../src/protocols/jabber/buddy.c:1111 ../src/protocols/jabber/jabber.c:1218
-#: ../src/protocols/oscar/oscar.c:713 ../src/protocols/oscar/oscar.c:5623
+#: ../src/protocols/jabber/buddy.c:1371 ../src/protocols/jabber/jabber.c:1232
+#: ../src/protocols/oscar/oscar.c:713 ../src/protocols/oscar/oscar.c:5665
 #: ../src/protocols/sametime/sametime.c:3277
 msgid "Do Not Disturb"
 msgstr "Älä häiritse"
 
-#: ../src/protocols/jabber/buddy.c:1256
+#: ../src/protocols/jabber/buddy.c:1516
 msgid "JID"
 msgstr "JID"
 
-#: ../src/protocols/jabber/buddy.c:1260 ../src/protocols/jabber/buddy.c:1439
-#: ../src/protocols/oscar/oscar.c:3635
+#: ../src/protocols/jabber/buddy.c:1520 ../src/protocols/jabber/buddy.c:1699
+#: ../src/protocols/oscar/oscar.c:3655
 msgid "Last Name"
 msgstr "Sukunimi"
 
-#: ../src/protocols/jabber/buddy.c:1292
+#: ../src/protocols/jabber/buddy.c:1552
 msgid "The following are the results of your search"
-msgstr "Seuraavat ovat hakusi tuloksia"
+msgstr "Hakutulokset"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../src/protocols/jabber/buddy.c:1367
+#: ../src/protocols/jabber/buddy.c:1627
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -6774,52 +6771,52 @@
 "Etsi henkilöä syöttämällä hakukriteerit kenttiin. Huom: jokainen kenttä "
 "tukee jokerimerkkejä (%)"
 
-#: ../src/protocols/jabber/buddy.c:1387
+#: ../src/protocols/jabber/buddy.c:1647
 msgid "Directory Query Failed"
 msgstr "Hakemistohaku epäonnistui"
 
-#: ../src/protocols/jabber/buddy.c:1388
+#: ../src/protocols/jabber/buddy.c:1648
 msgid "Could not query the directory server."
 msgstr "Ei voitu hakea hakemistopalvelimelta."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../src/protocols/jabber/buddy.c:1422
+#: ../src/protocols/jabber/buddy.c:1682
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Palvelimen ohjeet: %s"
 
-#: ../src/protocols/jabber/buddy.c:1429
+#: ../src/protocols/jabber/buddy.c:1689
 msgid "Fill in one or more fields to search for any matching Jabber users."
 msgstr "Täytä yksi tai useampia kentistä etsiäksesi Jabber-käyttäjiä."
 
-#: ../src/protocols/jabber/buddy.c:1449 ../src/protocols/novell/novell.c:1488
-#: ../src/protocols/oscar/oscar.c:3637 ../src/protocols/oscar/oscar.c:3644
+#: ../src/protocols/jabber/buddy.c:1709 ../src/protocols/novell/novell.c:1488
+#: ../src/protocols/oscar/oscar.c:3657 ../src/protocols/oscar/oscar.c:3664
 msgid "E-Mail Address"
 msgstr "Sähköpostiosoite"
 
-#: ../src/protocols/jabber/buddy.c:1458 ../src/protocols/jabber/buddy.c:1459
+#: ../src/protocols/jabber/buddy.c:1718 ../src/protocols/jabber/buddy.c:1719
 msgid "Search for Jabber users"
 msgstr "Etsi Jabber-käyttäjiä"
 
-#: ../src/protocols/jabber/buddy.c:1473
+#: ../src/protocols/jabber/buddy.c:1733
 msgid "Invalid Directory"
 msgstr "Virheellinen kansio"
 
-#: ../src/protocols/jabber/buddy.c:1490
+#: ../src/protocols/jabber/buddy.c:1750
 msgid "Enter a User Directory"
 msgstr "Syötä käyttäjähakemisto"
 
-#: ../src/protocols/jabber/buddy.c:1491
+#: ../src/protocols/jabber/buddy.c:1751
 msgid "Select a user directory to search"
 msgstr "Valitse käyttäjähakemisto, josta haetaan"
 
-#: ../src/protocols/jabber/buddy.c:1494
+#: ../src/protocols/jabber/buddy.c:1754
 msgid "Search Directory"
 msgstr "Etsi hakemistosta"
 
-#: ../src/protocols/jabber/chat.c:41 ../src/protocols/oscar/oscar.c:5108
-#: ../src/protocols/yahoo/yahoochat.c:998
+#: ../src/protocols/jabber/chat.c:41 ../src/protocols/oscar/oscar.c:5150
+#: ../src/protocols/yahoo/yahoochat.c:999
 msgid "_Room:"
 msgstr "_Huone:"
 
@@ -6907,405 +6904,405 @@
 msgid "Error initializing session"
 msgstr "Virhe istunnon alustuksessa"
 
-#: ../src/protocols/jabber/jabber.c:226 ../src/protocols/jabber/jabber.c:275
-#: ../src/protocols/jabber/jabber.c:303
+#: ../src/protocols/jabber/jabber.c:232 ../src/protocols/jabber/jabber.c:281
+#: ../src/protocols/jabber/jabber.c:309
 msgid "Write error"
 msgstr "Virhe kirjoituksessa"
 
-#: ../src/protocols/jabber/jabber.c:355 ../src/protocols/jabber/jabber.c:388
+#: ../src/protocols/jabber/jabber.c:362 ../src/protocols/jabber/jabber.c:395
 msgid "Read Error"
 msgstr "Epäkelpo käyttäjä"
 
-#: ../src/protocols/jabber/jabber.c:474 ../src/protocols/jabber/jabber.c:898
+#: ../src/protocols/jabber/jabber.c:480 ../src/protocols/jabber/jabber.c:915
 msgid "Unable to create socket"
 msgstr "Pistokkeen luonti epäonnistui"
 
-#: ../src/protocols/jabber/jabber.c:519 ../src/protocols/jabber/jabber.c:856
+#: ../src/protocols/jabber/jabber.c:536 ../src/protocols/jabber/jabber.c:873
 msgid "Invalid Jabber ID"
 msgstr "Epäkelpo Jabber ID"
 
-#: ../src/protocols/jabber/jabber.c:589
+#: ../src/protocols/jabber/jabber.c:606
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s:n rekisteröinti onnistui"
 
-#: ../src/protocols/jabber/jabber.c:591 ../src/protocols/jabber/jabber.c:592
+#: ../src/protocols/jabber/jabber.c:608 ../src/protocols/jabber/jabber.c:609
 msgid "Registration Successful"
 msgstr "Rekisteröinti onnistui"
 
-#: ../src/protocols/jabber/jabber.c:598 ../src/protocols/jabber/jabber.c:1454
+#: ../src/protocols/jabber/jabber.c:615 ../src/protocols/jabber/jabber.c:1468
 msgid "Unknown Error"
 msgstr "Tuntematon virhe"
 
-#: ../src/protocols/jabber/jabber.c:600 ../src/protocols/jabber/jabber.c:601
+#: ../src/protocols/jabber/jabber.c:617 ../src/protocols/jabber/jabber.c:618
 msgid "Registration Failed"
 msgstr "Rekisteröinti epäonnistui"
 
-#: ../src/protocols/jabber/jabber.c:712 ../src/protocols/jabber/jabber.c:713
+#: ../src/protocols/jabber/jabber.c:729 ../src/protocols/jabber/jabber.c:730
 msgid "Already Registered"
 msgstr "Valmiiksi rekisteröity"
 
-#: ../src/protocols/jabber/jabber.c:789 ../src/protocols/oscar/oscar.c:3688
-#: ../src/protocols/oscar/oscar.c:3696
+#: ../src/protocols/jabber/jabber.c:806 ../src/protocols/oscar/oscar.c:3708
+#: ../src/protocols/oscar/oscar.c:3716
 msgid "State"
 msgstr "Lääni"
 
-#: ../src/protocols/jabber/jabber.c:794
+#: ../src/protocols/jabber/jabber.c:811
 msgid "Postal code"
 msgstr "Postinumero"
 
-#: ../src/protocols/jabber/jabber.c:799 ../src/protocols/silc/ops.c:1069
-#: ../src/protocols/silc/silc.c:701 ../src/protocols/silc/util.c:528
+#: ../src/protocols/jabber/jabber.c:816 ../src/protocols/silc/ops.c:1069
+#: ../src/protocols/silc/silc.c:703 ../src/protocols/silc/util.c:528
 msgid "Phone"
 msgstr "Puhelin"
 
-#: ../src/protocols/jabber/jabber.c:809
+#: ../src/protocols/jabber/jabber.c:826
 msgid "Date"
 msgstr "Päiväys"
 
-#: ../src/protocols/jabber/jabber.c:817
+#: ../src/protocols/jabber/jabber.c:834
 msgid "Please fill out the information below to register your new account."
 msgstr "Syötä alla olevat tiedot rekisteröidäksesi uuden tilin."
 
-#: ../src/protocols/jabber/jabber.c:820 ../src/protocols/jabber/jabber.c:821
+#: ../src/protocols/jabber/jabber.c:837 ../src/protocols/jabber/jabber.c:838
 msgid "Register New Jabber Account"
 msgstr "Rekisteröi uusi Jabber-tili"
 
-#: ../src/protocols/jabber/jabber.c:981
+#: ../src/protocols/jabber/jabber.c:996
 msgid "Initializing Stream"
 msgstr "Alustetaan datavirtaa"
 
-#: ../src/protocols/jabber/jabber.c:987 ../src/protocols/msn/session.c:350
+#: ../src/protocols/jabber/jabber.c:1001 ../src/protocols/msn/session.c:350
 msgid "Authenticating"
 msgstr "Todennetaan"
 
-#: ../src/protocols/jabber/jabber.c:996
+#: ../src/protocols/jabber/jabber.c:1010
 msgid "Re-initializing Stream"
 msgstr "Uudelleenalustetaan datavirtaa"
 
-#: ../src/protocols/jabber/jabber.c:1067 ../src/protocols/jabber/jabber.c:1432
-#: ../src/protocols/jabber/jabber.c:1473 ../src/protocols/jabber/jabber.c:1507
-#: ../src/protocols/oscar/oscar.c:782 ../src/protocols/oscar/oscar.c:5414
+#: ../src/protocols/jabber/jabber.c:1081 ../src/protocols/jabber/jabber.c:1446
+#: ../src/protocols/jabber/jabber.c:1487 ../src/protocols/jabber/jabber.c:1521
+#: ../src/protocols/oscar/oscar.c:791 ../src/protocols/oscar/oscar.c:5456
 msgid "Not Authorized"
 msgstr "Ei valtuuksia"
 
-#: ../src/protocols/jabber/jabber.c:1109
+#: ../src/protocols/jabber/jabber.c:1123
 msgid "Both"
 msgstr "molemmille"
 
-#: ../src/protocols/jabber/jabber.c:1111
+#: ../src/protocols/jabber/jabber.c:1125
 msgid "From (To pending)"
 msgstr "vain sinulle (odottaa lupaa)"
 
-#: ../src/protocols/jabber/jabber.c:1116
+#: ../src/protocols/jabber/jabber.c:1130
 msgid "To"
 msgstr "vain sinulta"
 
-#: ../src/protocols/jabber/jabber.c:1118
+#: ../src/protocols/jabber/jabber.c:1132
 msgid "None (To pending)"
 msgstr "Ei mitään (odottaa lupaa)"
 
-#: ../src/protocols/jabber/jabber.c:1122
+#: ../src/protocols/jabber/jabber.c:1136
 msgid "Subscription"
 msgstr "Tilailmoitus"
 
-#: ../src/protocols/jabber/jabber.c:1179 ../src/protocols/jabber/jabber.c:1189
-#: ../src/protocols/jabber/jabber.c:1199 ../src/protocols/jabber/jabber.c:1209
-#: ../src/protocols/jabber/jabber.c:1219
+#: ../src/protocols/jabber/jabber.c:1193 ../src/protocols/jabber/jabber.c:1203
+#: ../src/protocols/jabber/jabber.c:1213 ../src/protocols/jabber/jabber.c:1223
+#: ../src/protocols/jabber/jabber.c:1233
 msgid "Priority"
 msgstr "Tärkeys"
 
-#: ../src/protocols/jabber/jabber.c:1248
+#: ../src/protocols/jabber/jabber.c:1262
 msgid "Password Changed"
 msgstr "Salasana muutettu"
 
-#: ../src/protocols/jabber/jabber.c:1249
+#: ../src/protocols/jabber/jabber.c:1263
 msgid "Your password has been changed."
 msgstr "Salasana vaihdettu"
 
-#: ../src/protocols/jabber/jabber.c:1253 ../src/protocols/jabber/jabber.c:1254
+#: ../src/protocols/jabber/jabber.c:1267 ../src/protocols/jabber/jabber.c:1268
 msgid "Error changing password"
 msgstr "Virhe vaihdettaessa salasanaa"
 
-#: ../src/protocols/jabber/jabber.c:1310
+#: ../src/protocols/jabber/jabber.c:1324
 msgid "Password (again)"
 msgstr "Salasana (uudelleen)"
 
-#: ../src/protocols/jabber/jabber.c:1315 ../src/protocols/jabber/jabber.c:1316
+#: ../src/protocols/jabber/jabber.c:1329 ../src/protocols/jabber/jabber.c:1330
 msgid "Change Jabber Password"
 msgstr "Vaihda Jabber-salasana"
 
-#: ../src/protocols/jabber/jabber.c:1316
+#: ../src/protocols/jabber/jabber.c:1330
 msgid "Please enter your new password"
 msgstr "Anna uusi salasanasi"
 
-#: ../src/protocols/jabber/jabber.c:1326 ../src/protocols/oscar/oscar.c:6184
-#: ../src/protocols/silc/silc.c:1023
+#: ../src/protocols/jabber/jabber.c:1340 ../src/protocols/oscar/oscar.c:6248
+#: ../src/protocols/silc/silc.c:1025
 msgid "Set User Info..."
 msgstr "Aseta käyttäjätiedot..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../src/protocols/jabber/jabber.c:1331 ../src/protocols/oscar/oscar.c:6195
-#: ../src/protocols/silc/silc.c:1019
+#: ../src/protocols/jabber/jabber.c:1345 ../src/protocols/oscar/oscar.c:6259
+#: ../src/protocols/silc/silc.c:1021
 msgid "Change Password..."
 msgstr "Vaihda salasana..."
 
 #. }
-#: ../src/protocols/jabber/jabber.c:1336
+#: ../src/protocols/jabber/jabber.c:1350
 msgid "Search for Users..."
 msgstr "Etsi käyttäjiä..."
 
-#: ../src/protocols/jabber/jabber.c:1412
+#: ../src/protocols/jabber/jabber.c:1426
 msgid "Bad Request"
 msgstr "Virheellinen pyyntö"
 
-#: ../src/protocols/jabber/jabber.c:1414
+#: ../src/protocols/jabber/jabber.c:1428
 msgid "Conflict"
 msgstr "Ristiriita"
 
-#: ../src/protocols/jabber/jabber.c:1416
+#: ../src/protocols/jabber/jabber.c:1430
 msgid "Feature Not Implemented"
 msgstr "Ominaisuutta ei ole implementoitu."
 
-#: ../src/protocols/jabber/jabber.c:1418
+#: ../src/protocols/jabber/jabber.c:1432
 msgid "Forbidden"
 msgstr "Estetty"
 
-#: ../src/protocols/jabber/jabber.c:1420
+#: ../src/protocols/jabber/jabber.c:1434
 msgid "Gone"
 msgstr "Poistunut"
 
-#: ../src/protocols/jabber/jabber.c:1422 ../src/protocols/jabber/jabber.c:1497
+#: ../src/protocols/jabber/jabber.c:1436 ../src/protocols/jabber/jabber.c:1511
 msgid "Internal Server Error"
 msgstr "Sisäinen palvelinvirhe"
 
-#: ../src/protocols/jabber/jabber.c:1424
+#: ../src/protocols/jabber/jabber.c:1438
 msgid "Item Not Found"
 msgstr "Kohdetta ei löytynyt"
 
-#: ../src/protocols/jabber/jabber.c:1426
+#: ../src/protocols/jabber/jabber.c:1440
 msgid "Malformed Jabber ID"
 msgstr "Epäkelpo Jabber ID"
 
-#: ../src/protocols/jabber/jabber.c:1428
+#: ../src/protocols/jabber/jabber.c:1442
 msgid "Not Acceptable"
 msgstr "Ei kelvollinen"
 
-#: ../src/protocols/jabber/jabber.c:1430
+#: ../src/protocols/jabber/jabber.c:1444
 msgid "Not Allowed"
 msgstr "Ei sallittu"
 
-#: ../src/protocols/jabber/jabber.c:1434
+#: ../src/protocols/jabber/jabber.c:1448
 msgid "Payment Required"
 msgstr "Vaatii maksun"
 
-#: ../src/protocols/jabber/jabber.c:1436
+#: ../src/protocols/jabber/jabber.c:1450
 msgid "Recipient Unavailable"
 msgstr "Vastaanottaja ei saatavilla."
 
-#: ../src/protocols/jabber/jabber.c:1440
+#: ../src/protocols/jabber/jabber.c:1454
 msgid "Registration Required"
 msgstr "Vaatii rekisteröinnin"
 
-#: ../src/protocols/jabber/jabber.c:1442
+#: ../src/protocols/jabber/jabber.c:1456
 msgid "Remote Server Not Found"
 msgstr "Palvelinta ei löytynyt"
 
-#: ../src/protocols/jabber/jabber.c:1444
+#: ../src/protocols/jabber/jabber.c:1458
 msgid "Remote Server Timeout"
 msgstr "Palvelin aikakatkaisi"
 
-#: ../src/protocols/jabber/jabber.c:1446
+#: ../src/protocols/jabber/jabber.c:1460
 msgid "Server Overloaded"
 msgstr "Palvelin ylikuormitettu"
 
-#: ../src/protocols/jabber/jabber.c:1448
+#: ../src/protocols/jabber/jabber.c:1462
 msgid "Service Unavailable"
 msgstr "Palvelu ei käytettävissä"
 
-#: ../src/protocols/jabber/jabber.c:1450
+#: ../src/protocols/jabber/jabber.c:1464
 msgid "Subscription Required"
 msgstr "Vaatii tilailmoitukset"
 
-#: ../src/protocols/jabber/jabber.c:1452
+#: ../src/protocols/jabber/jabber.c:1466
 msgid "Unexpected Request"
 msgstr "Odottamaton pyyntö"
 
-#: ../src/protocols/jabber/jabber.c:1459
+#: ../src/protocols/jabber/jabber.c:1473
 msgid "Authorization Aborted"
 msgstr "Valtuutus keskeytetty"
 
-#: ../src/protocols/jabber/jabber.c:1461
-msgid "Incorrect encoding in authorization"
-msgstr "Väärä merkistö valtuutusviestissä"
-
-#: ../src/protocols/jabber/jabber.c:1464
-msgid "Invalid authzid"
-msgstr "Epäkelpo authzid"
-
-#: ../src/protocols/jabber/jabber.c:1467
-msgid "Invalid Authorization Mechanism"
-msgstr "Epäkelpo tunnistautumismekanismi"
-
-#: ../src/protocols/jabber/jabber.c:1470
-msgid "Authorization mechanism too weak"
-msgstr "Tunnistautumismekanismi liian heikko"
-
 #: ../src/protocols/jabber/jabber.c:1475
-msgid "Temporary Authentication Failure"
-msgstr "Väliaikainen todennusvirhe"
+msgid "Incorrect encoding in authorization"
+msgstr "Väärä merkistö valtuutusviestissä"
 
 #: ../src/protocols/jabber/jabber.c:1478
+msgid "Invalid authzid"
+msgstr "Epäkelpo authzid"
+
+#: ../src/protocols/jabber/jabber.c:1481
+msgid "Invalid Authorization Mechanism"
+msgstr "Epäkelpo tunnistautumismekanismi"
+
+#: ../src/protocols/jabber/jabber.c:1484
+msgid "Authorization mechanism too weak"
+msgstr "Tunnistautumismekanismi liian heikko"
+
+#: ../src/protocols/jabber/jabber.c:1489
+msgid "Temporary Authentication Failure"
+msgstr "Väliaikainen todennusvirhe"
+
+#: ../src/protocols/jabber/jabber.c:1492
 msgid "Authentication Failure"
 msgstr "Todennus epäonnistui"
 
-#: ../src/protocols/jabber/jabber.c:1482
+#: ../src/protocols/jabber/jabber.c:1496
 msgid "Bad Format"
 msgstr "Väärä muoto"
 
-#: ../src/protocols/jabber/jabber.c:1484
+#: ../src/protocols/jabber/jabber.c:1498
 msgid "Bad Namespace Prefix"
 msgstr "Väärä nimiavaruuden etuliite"
 
-#: ../src/protocols/jabber/jabber.c:1487
+#: ../src/protocols/jabber/jabber.c:1501
 msgid "Resource Conflict"
 msgstr "Lähdekonflikti"
 
-#: ../src/protocols/jabber/jabber.c:1489 ../src/protocols/silc/ops.c:1728
+#: ../src/protocols/jabber/jabber.c:1503 ../src/protocols/silc/ops.c:1728
 msgid "Connection Timeout"
 msgstr "Ei yhteyttä määräajassa"
 
-#: ../src/protocols/jabber/jabber.c:1491
+#: ../src/protocols/jabber/jabber.c:1505
 msgid "Host Gone"
 msgstr "Verkkoisäntä kadonnut"
 
-#: ../src/protocols/jabber/jabber.c:1493
+#: ../src/protocols/jabber/jabber.c:1507
 msgid "Host Unknown"
 msgstr "Tuntematon isäntä"
 
-#: ../src/protocols/jabber/jabber.c:1495
+#: ../src/protocols/jabber/jabber.c:1509
 msgid "Improper Addressing"
 msgstr "Vääränlainen osoitus"
 
-#: ../src/protocols/jabber/jabber.c:1499
+#: ../src/protocols/jabber/jabber.c:1513
 msgid "Invalid ID"
 msgstr "Epäkelpo ID"
 
-#: ../src/protocols/jabber/jabber.c:1501
+#: ../src/protocols/jabber/jabber.c:1515
 msgid "Invalid Namespace"
 msgstr "Väärä nimiavaruus"
 
-#: ../src/protocols/jabber/jabber.c:1503
+#: ../src/protocols/jabber/jabber.c:1517
 msgid "Invalid XML"
 msgstr "Epäkelpo XML"
 
-#: ../src/protocols/jabber/jabber.c:1505
+#: ../src/protocols/jabber/jabber.c:1519
 msgid "Non-matching Hosts"
 msgstr "Verkkoisännät eivät täsmää"
 
-#: ../src/protocols/jabber/jabber.c:1509
+#: ../src/protocols/jabber/jabber.c:1523
 msgid "Policy Violation"
 msgstr "Menettelykäytäntörikkomus"
 
-#: ../src/protocols/jabber/jabber.c:1511
+#: ../src/protocols/jabber/jabber.c:1525
 msgid "Remote Connection Failed"
 msgstr "Etäyhteydessä yhteydessä virhe"
 
-#: ../src/protocols/jabber/jabber.c:1513
+#: ../src/protocols/jabber/jabber.c:1527
 msgid "Resource Constraint"
 msgstr "Lähderajoite"
 
-#: ../src/protocols/jabber/jabber.c:1515
+#: ../src/protocols/jabber/jabber.c:1529
 msgid "Restricted XML"
 msgstr "Rajoitettu XML"
 
-#: ../src/protocols/jabber/jabber.c:1517
+#: ../src/protocols/jabber/jabber.c:1531
 msgid "See Other Host"
 msgstr "Etsi toinen isäntä"
 
-#: ../src/protocols/jabber/jabber.c:1519
+#: ../src/protocols/jabber/jabber.c:1533
 msgid "System Shutdown"
 msgstr "Järjestelmän alasajo"
 
-#: ../src/protocols/jabber/jabber.c:1521
+#: ../src/protocols/jabber/jabber.c:1535
 msgid "Undefined Condition"
 msgstr "Määrittelemätön tila"
 
-#: ../src/protocols/jabber/jabber.c:1523
+#: ../src/protocols/jabber/jabber.c:1537
 msgid "Unsupported Encoding"
 msgstr "Merkistöä ei tueta"
 
-#: ../src/protocols/jabber/jabber.c:1525
+#: ../src/protocols/jabber/jabber.c:1539
 msgid "Unsupported Stanza Type"
 msgstr "Säkeistötyyppiä(stanza type) ei tuettu"
 
-#: ../src/protocols/jabber/jabber.c:1527
+#: ../src/protocols/jabber/jabber.c:1541
 msgid "Unsupported Version"
 msgstr "Versiota ei tueta"
 
-#: ../src/protocols/jabber/jabber.c:1529
+#: ../src/protocols/jabber/jabber.c:1543
 msgid "XML Not Well Formed"
 msgstr "Huonosti muotoiltua XML:ää"
 
-#: ../src/protocols/jabber/jabber.c:1531
+#: ../src/protocols/jabber/jabber.c:1545
 msgid "Stream Error"
 msgstr "Datavirtavirhe"
 
-#: ../src/protocols/jabber/jabber.c:1598
+#: ../src/protocols/jabber/jabber.c:1612
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Ei voitu kieltää käyttäjää %s."
 
-#: ../src/protocols/jabber/jabber.c:1618
+#: ../src/protocols/jabber/jabber.c:1632
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Tuntematon kytkös: \"%s\""
 
-#: ../src/protocols/jabber/jabber.c:1623
+#: ../src/protocols/jabber/jabber.c:1637
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Ei voitua tehdä käyttäjälle %s kytköstä \"%s\""
 
-#: ../src/protocols/jabber/jabber.c:1642
+#: ../src/protocols/jabber/jabber.c:1656
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Tuntematon rooli: \"%s\""
 
-#: ../src/protocols/jabber/jabber.c:1649
+#: ../src/protocols/jabber/jabber.c:1663
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "Ei voitu asettaa roolia \"%s\" käyttäjälle: %s"
 
-#: ../src/protocols/jabber/jabber.c:1702
+#: ../src/protocols/jabber/jabber.c:1716
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Ei voitu potkaista käyttäjää %s ulos."
 
-#: ../src/protocols/jabber/jabber.c:1733
+#: ../src/protocols/jabber/jabber.c:1747
 msgid "config:  Configure a chat room."
 msgstr "config: Configuroi ryhmäkeskusteluhuone."
 
-#: ../src/protocols/jabber/jabber.c:1737
-msgid "configure:  Configure a chat room."
-msgstr "configure: Configuroi ryhmäkeskusteluhuone."
-
-#: ../src/protocols/jabber/jabber.c:1746
-msgid "part [room]:  Leave the room."
-msgstr "part [huone]: Poistu huoneesta."
-
 #: ../src/protocols/jabber/jabber.c:1751
+msgid "configure:  Configure a chat room."
+msgstr "configure: Configuroi ryhmäkeskusteluhuone."
+
+#: ../src/protocols/jabber/jabber.c:1760
+msgid "part [room]:  Leave the room."
+msgstr "part [huone]: Poistu huoneesta."
+
+#: ../src/protocols/jabber/jabber.c:1765
 msgid "register:  Register with a chat room."
 msgstr "register: Rekisteröidy ryhmäkeskusteluhuoneeseen."
 
-#: ../src/protocols/jabber/jabber.c:1757
+#: ../src/protocols/jabber/jabber.c:1771
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [uusi aihe]: Näytä tai vaihda aihe."
 
-#: ../src/protocols/jabber/jabber.c:1763
+#: ../src/protocols/jabber/jabber.c:1777
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;käyttäjä&gt; [huone]: Kiellä käyttäjä huoneesta."
 
-#: ../src/protocols/jabber/jabber.c:1769
+#: ../src/protocols/jabber/jabber.c:1783
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -7313,7 +7310,7 @@
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Aseta "
 "käyttäjän käyttäjäluokka tälle huoneelle."
 
-#: ../src/protocols/jabber/jabber.c:1775
+#: ../src/protocols/jabber/jabber.c:1789
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -7321,20 +7318,20 @@
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Aseta "
 "käyttäjän rooli huoneessa."
 
-#: ../src/protocols/jabber/jabber.c:1781
+#: ../src/protocols/jabber/jabber.c:1795
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;käyttäjä&gt; [viesti]: Kutsu käyttäjä huoneeseen."
 
-#: ../src/protocols/jabber/jabber.c:1787
+#: ../src/protocols/jabber/jabber.c:1801
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr ""
 "join: &lt;huone&gt; [palvelin]: Liity ryhmäkeskusteluun tällä palvelimella."
 
-#: ../src/protocols/jabber/jabber.c:1793
+#: ../src/protocols/jabber/jabber.c:1807
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;käyttäjä&gt; [huone]: Potkaise käyttäjä ulos huoneesta."
 
-#: ../src/protocols/jabber/jabber.c:1798
+#: ../src/protocols/jabber/jabber.c:1812
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
@@ -7350,32 +7347,32 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/jabber/jabber.c:1881 ../src/protocols/jabber/jabber.c:1883
+#: ../src/protocols/jabber/jabber.c:1895 ../src/protocols/jabber/jabber.c:1897
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber-yhteyskäytäntöliitännäinen"
 
-#: ../src/protocols/jabber/jabber.c:1909
+#: ../src/protocols/jabber/jabber.c:1923
 msgid "Use TLS if available"
 msgstr "Käytä TLS:ää jos mahdollista"
 
-#: ../src/protocols/jabber/jabber.c:1914
+#: ../src/protocols/jabber/jabber.c:1928
 msgid "Require TLS"
 msgstr "Vaadi TLS"
 
-#: ../src/protocols/jabber/jabber.c:1917
+#: ../src/protocols/jabber/jabber.c:1931
 msgid "Force old (port 5223) SSL"
 msgstr "Käytä vanhaa (portti 5223) SSL:ää"
 
-#: ../src/protocols/jabber/jabber.c:1922
+#: ../src/protocols/jabber/jabber.c:1936
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Salli salaamaton tunnistautuminen salaamattoman yhteyden yli"
 
-#: ../src/protocols/jabber/jabber.c:1927 ../src/protocols/simple/simple.c:1775
+#: ../src/protocols/jabber/jabber.c:1941 ../src/protocols/simple/simple.c:1781
 msgid "Connect port"
 msgstr "Yhdistä porttiin"
 
 #. Account options
-#: ../src/protocols/jabber/jabber.c:1931 ../src/protocols/silc/silc.c:1854
+#: ../src/protocols/jabber/jabber.c:1945 ../src/protocols/silc/silc.c:1856
 msgid "Connect server"
 msgstr "Yhdistä palvelimeen"
 
@@ -7403,40 +7400,40 @@
 msgid "Jabber Message Error"
 msgstr "Jabber viestivirhe"
 
-#: ../src/protocols/jabber/message.c:319
+#: ../src/protocols/jabber/message.c:316
 #, c-format
 msgid " (Code %s)"
 msgstr " (Koodi %s)"
 
-#: ../src/protocols/jabber/parser.c:131
+#: ../src/protocols/jabber/parser.c:279 ../src/protocols/jabber/parser.c:288
 msgid "XML Parse error"
 msgstr "Virhe XML-jäsennyksessä"
 
-#: ../src/protocols/jabber/presence.c:309
+#: ../src/protocols/jabber/presence.c:305
 msgid "Unknown Error in presence"
 msgstr "Tuntematon virhe tavoitettavuudessa"
 
-#: ../src/protocols/jabber/presence.c:314 ../src/protocols/msn/userlist.c:104
+#: ../src/protocols/jabber/presence.c:310 ../src/protocols/msn/userlist.c:98
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list."
 msgstr "Käyttäjä %s haluaa lisätä käyttäjän %s tuttavalistalleen."
 
-#: ../src/protocols/jabber/presence.c:323 ../src/protocols/oscar/oscar.c:2381
-#: ../src/protocols/oscar/oscar.c:5039
+#: ../src/protocols/jabber/presence.c:319 ../src/protocols/oscar/oscar.c:2381
+#: ../src/protocols/oscar/oscar.c:5081
 msgid "_Authorize"
 msgstr "_Valtuuta"
 
-#: ../src/protocols/jabber/presence.c:324 ../src/protocols/oscar/oscar.c:2383
-#: ../src/protocols/oscar/oscar.c:5040
+#: ../src/protocols/jabber/presence.c:320 ../src/protocols/oscar/oscar.c:2383
+#: ../src/protocols/oscar/oscar.c:5082
 msgid "_Deny"
 msgstr "_Kiellä"
 
-#: ../src/protocols/jabber/presence.c:381
-#: ../src/protocols/jabber/presence.c:382
+#: ../src/protocols/jabber/presence.c:377
+#: ../src/protocols/jabber/presence.c:378
 msgid "Create New Room"
 msgstr "Luo uusi huone"
 
-#: ../src/protocols/jabber/presence.c:383
+#: ../src/protocols/jabber/presence.c:379
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -7444,20 +7441,20 @@
 "Olet luomassa uutta huonetta. Haluatko muuttaa asetuksia vai käytetäänkö "
 "oletusasetuksia?"
 
-#: ../src/protocols/jabber/presence.c:386
+#: ../src/protocols/jabber/presence.c:382
 msgid "_Configure Room"
 msgstr "_Aseta huoneen asetuksia"
 
-#: ../src/protocols/jabber/presence.c:388
+#: ../src/protocols/jabber/presence.c:384
 msgid "_Accept Defaults"
 msgstr "_Hyväksy oletusasetukset"
 
-#: ../src/protocols/jabber/presence.c:426
+#: ../src/protocols/jabber/presence.c:422
 #, c-format
 msgid "Error in chat %s"
 msgstr "Virhe ryhmäkeskustelussa: %s"
 
-#: ../src/protocols/jabber/presence.c:429
+#: ../src/protocols/jabber/presence.c:425
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Virhe liityttäessä ryhmäkeskusteluun %s"
@@ -7472,12 +7469,12 @@
 msgid "File Send Failed"
 msgstr "Tiedoston lähetys epäonnistui"
 
-#: ../src/protocols/msn/dialog.c:92
+#: ../src/protocols/msn/dialog.c:84
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "Tuttavalistan synkronointiongelma käyttäjätilillä %s (%s)"
 
-#: ../src/protocols/msn/dialog.c:98
+#: ../src/protocols/msn/dialog.c:90
 #, c-format
 msgid ""
 "%s on the local list is inside the group \"%s\" but not on the server list. "
@@ -7486,7 +7483,7 @@
 "%s paikallisella listalla on ryhmässä \"%s\" mutta ei ole palvelimen "
 "listalla. Haluatko että tämä tuttava lisätään?"
 
-#: ../src/protocols/msn/dialog.c:106
+#: ../src/protocols/msn/dialog.c:98
 #, c-format
 msgid ""
 "%s is on the local list but not on the server list. Do you want this buddy "
@@ -7684,7 +7681,7 @@
 msgid "Server too busy"
 msgstr "Palvelimella liikaa ruuhkaa "
 
-#: ../src/protocols/msn/error.c:198 ../src/protocols/oscar/oscar.c:1331
+#: ../src/protocols/msn/error.c:198 ../src/protocols/oscar/oscar.c:1340
 #: ../src/protocols/silc/ops.c:1717 ../src/protocols/toc/toc.c:722
 msgid "Authentication failed"
 msgstr "Todennus epäonnistui"
@@ -7779,9 +7776,9 @@
 msgid "Page"
 msgstr "Lähetä"
 
-#: ../src/protocols/msn/msn.c:548 ../src/protocols/msn/msn.c:555
-#: ../src/protocols/msn/msn.c:564 ../src/protocols/sametime/sametime.c:3239
-#: ../src/protocols/yahoo/yahoo.c:2878 ../src/protocols/yahoo/yahoo.c:2884
+#: ../src/protocols/msn/msn.c:546 ../src/protocols/msn/msn.c:553
+#: ../src/protocols/msn/msn.c:562 ../src/protocols/sametime/sametime.c:3239
+#: ../src/protocols/yahoo/yahoo.c:2895 ../src/protocols/yahoo/yahoo.c:2901
 #, c-format
 msgid ""
 "\n"
@@ -7790,69 +7787,69 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: ../src/protocols/msn/msn.c:555
+#: ../src/protocols/msn/msn.c:553
 msgid "Has you"
 msgstr "Olet hänen listallaan"
 
-#: ../src/protocols/msn/msn.c:585 ../src/protocols/msn/state.c:33
-#: ../src/protocols/yahoo/yahoo.c:2707 ../src/protocols/yahoo/yahoo.c:3292
+#: ../src/protocols/msn/msn.c:583 ../src/protocols/msn/state.c:33
+#: ../src/protocols/yahoo/yahoo.c:2724 ../src/protocols/yahoo/yahoo.c:3325
 msgid "Be Right Back"
 msgstr "Tulen pian takaisin"
 
-#: ../src/protocols/msn/msn.c:589 ../src/protocols/msn/state.c:31
+#: ../src/protocols/msn/msn.c:587 ../src/protocols/msn/state.c:31
 #: ../src/protocols/novell/novell.c:2849 ../src/protocols/novell/novell.c:2983
 #: ../src/protocols/silc/buddy.c:1473 ../src/protocols/silc/silc.c:53
-#: ../src/protocols/yahoo/yahoo.c:2709 ../src/protocols/yahoo/yahoo.c:3295
+#: ../src/protocols/yahoo/yahoo.c:2726 ../src/protocols/yahoo/yahoo.c:3328
 msgid "Busy"
 msgstr "Varattu"
 
-#: ../src/protocols/msn/msn.c:593 ../src/protocols/yahoo/yahoo.c:2717
-#: ../src/protocols/yahoo/yahoo.c:3307
+#: ../src/protocols/msn/msn.c:591 ../src/protocols/yahoo/yahoo.c:2734
+#: ../src/protocols/yahoo/yahoo.c:3340
 msgid "On the Phone"
 msgstr "Puhelimessa"
 
-#: ../src/protocols/msn/msn.c:597 ../src/protocols/yahoo/yahoo.c:2721
-#: ../src/protocols/yahoo/yahoo.c:3313
+#: ../src/protocols/msn/msn.c:595 ../src/protocols/yahoo/yahoo.c:2738
+#: ../src/protocols/yahoo/yahoo.c:3346
 msgid "Out to Lunch"
 msgstr "Lounaalla"
 
-#: ../src/protocols/msn/msn.c:621
+#: ../src/protocols/msn/msn.c:619
 msgid "Set Friendly Name..."
 msgstr "Aseta tuttavanimi..."
 
-#: ../src/protocols/msn/msn.c:626
+#: ../src/protocols/msn/msn.c:624
 msgid "Set Home Phone Number..."
 msgstr "Aseta kotipuhelinnumero..."
 
-#: ../src/protocols/msn/msn.c:630
+#: ../src/protocols/msn/msn.c:628
 msgid "Set Work Phone Number..."
 msgstr "Aseta työpuhelinnumero..."
 
-#: ../src/protocols/msn/msn.c:634
+#: ../src/protocols/msn/msn.c:632
 msgid "Set Mobile Phone Number..."
 msgstr "Aseta matkapuhelinnumero..."
 
-#: ../src/protocols/msn/msn.c:640
+#: ../src/protocols/msn/msn.c:638
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Aseta päälle/pois mobiililaitteet..."
 
-#: ../src/protocols/msn/msn.c:645
+#: ../src/protocols/msn/msn.c:643
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Salli/estä mobiilihaut..."
 
-#: ../src/protocols/msn/msn.c:655
+#: ../src/protocols/msn/msn.c:653
 msgid "Open Hotmail Inbox"
 msgstr "Avaa Hotmailin saapuneet-kansio"
 
-#: ../src/protocols/msn/msn.c:679
+#: ../src/protocols/msn/msn.c:677
 msgid "Send to Mobile"
 msgstr "Lähetä mobiililaitteeseen"
 
-#: ../src/protocols/msn/msn.c:689 ../src/protocols/novell/novell.c:3439
+#: ../src/protocols/msn/msn.c:687 ../src/protocols/novell/novell.c:3439
 msgid "Initiate _Chat"
 msgstr "Aloita _ryhmäkeskustelu"
 
-#: ../src/protocols/msn/msn.c:727
+#: ../src/protocols/msn/msn.c:725
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -7860,230 +7857,230 @@
 "MSN vaatii SSL-tuen. Asenna tuettu SSL-kirjasto. Lisätietoja osoitteesta "
 "http://gaim.sf.net/faq-ssl.php."
 
-#: ../src/protocols/msn/msn.c:755
+#: ../src/protocols/msn/msn.c:752
 msgid "Failed to connect to server."
 msgstr "Palvelimeen ei saatu yhteyttä."
 
-#: ../src/protocols/msn/msn.c:1361 ../src/protocols/yahoo/yahoo_profile.c:685
+#: ../src/protocols/msn/msn.c:1363 ../src/protocols/yahoo/yahoo_profile.c:685
 #: ../src/protocols/zephyr/zephyr.c:736 ../src/protocols/zephyr/zephyr.c:1153
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>Alias:</b> %s<br>"
 
 #. put a link to the actual profile URL
-#: ../src/protocols/msn/msn.c:1368 ../src/protocols/yahoo/yahoo_profile.c:1208
-#: ../src/util.c:1061
+#: ../src/protocols/msn/msn.c:1370 ../src/protocols/yahoo/yahoo_profile.c:1208
+#: ../src/util.c:1059
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b> "
 
-#: ../src/protocols/msn/msn.c:1458
+#: ../src/protocols/msn/msn.c:1460
 msgid "MSN Profile"
 msgstr "MSN-profiili"
 
-#: ../src/protocols/msn/msn.c:1463 ../src/protocols/msn/msn.c:1789
+#: ../src/protocols/msn/msn.c:1465 ../src/protocols/msn/msn.c:1791
 #: ../src/protocols/yahoo/yahoo_profile.c:795
 msgid "Error retrieving profile"
 msgstr "Virhe haettaessa profiilia"
 
-#: ../src/protocols/msn/msn.c:1531 ../src/protocols/oscar/oscar.c:3673
+#: ../src/protocols/msn/msn.c:1533 ../src/protocols/oscar/oscar.c:3693
 #: ../src/protocols/yahoo/yahoo_profile.c:1056
 msgid "Age"
 msgstr "Ikä"
 
-#: ../src/protocols/msn/msn.c:1533 ../src/protocols/yahoo/yahoo_profile.c:1071
+#: ../src/protocols/msn/msn.c:1535 ../src/protocols/yahoo/yahoo_profile.c:1071
 msgid "Occupation"
 msgstr "Ammatti"
 
-#: ../src/protocols/msn/msn.c:1534 ../src/protocols/novell/novell.c:1478
+#: ../src/protocols/msn/msn.c:1536 ../src/protocols/novell/novell.c:1478
 #: ../src/protocols/yahoo/yahoo_profile.c:1051
 msgid "Location"
 msgstr "Sijainti"
 
-#: ../src/protocols/msn/msn.c:1539 ../src/protocols/msn/msn.c:1718
-#: ../src/protocols/msn/msn.c:1724 ../src/protocols/msn/msn.c:1731
+#: ../src/protocols/msn/msn.c:1541 ../src/protocols/msn/msn.c:1720
+#: ../src/protocols/msn/msn.c:1726 ../src/protocols/msn/msn.c:1733
 msgid "Hobbies and Interests"
 msgstr "Harrastukset"
 
-#: ../src/protocols/msn/msn.c:1545 ../src/protocols/msn/msn.c:1652
-#: ../src/protocols/msn/msn.c:1658 ../src/protocols/msn/msn.c:1665
-#: ../src/protocols/msn/msn.c:1673 ../src/protocols/msn/msn.c:1680
+#: ../src/protocols/msn/msn.c:1547 ../src/protocols/msn/msn.c:1654
+#: ../src/protocols/msn/msn.c:1660 ../src/protocols/msn/msn.c:1667
+#: ../src/protocols/msn/msn.c:1675 ../src/protocols/msn/msn.c:1682
 msgid "A Little About Me"
 msgstr "Oma kuvaus"
 
-#: ../src/protocols/msn/msn.c:1551
+#: ../src/protocols/msn/msn.c:1553
 #, c-format
 msgid "%s<b>General</b><br>%s"
 msgstr "%s<b>Yleinen</b><br>%s"
 
 #. Social
-#: ../src/protocols/msn/msn.c:1560 ../src/protocols/yahoo/yahoo_profile.c:1061
+#: ../src/protocols/msn/msn.c:1562 ../src/protocols/yahoo/yahoo_profile.c:1061
 msgid "Marital Status"
 msgstr "Siviilisääty"
 
-#: ../src/protocols/msn/msn.c:1561
+#: ../src/protocols/msn/msn.c:1563
 msgid "Interests"
 msgstr "Kiinnostukset"
 
-#: ../src/protocols/msn/msn.c:1562
+#: ../src/protocols/msn/msn.c:1564
 msgid "Pets"
 msgstr "Lemmikit"
 
-#: ../src/protocols/msn/msn.c:1563
+#: ../src/protocols/msn/msn.c:1565
 msgid "Hometown"
 msgstr "Kotikunta"
 
-#: ../src/protocols/msn/msn.c:1564
+#: ../src/protocols/msn/msn.c:1566
 msgid "Places Lived"
 msgstr "Asumispaikat"
 
-#: ../src/protocols/msn/msn.c:1565
+#: ../src/protocols/msn/msn.c:1567
 msgid "Fashion"
 msgstr "Tyyli"
 
-#: ../src/protocols/msn/msn.c:1566
+#: ../src/protocols/msn/msn.c:1568
 msgid "Humor"
 msgstr "Huumorintaju"
 
-#: ../src/protocols/msn/msn.c:1567
+#: ../src/protocols/msn/msn.c:1569
 msgid "Music"
 msgstr "Musiikki"
 
-#: ../src/protocols/msn/msn.c:1568 ../src/protocols/msn/msn.c:1740
-#: ../src/protocols/msn/msn.c:1746 ../src/protocols/yahoo/yahoo_profile.c:1113
+#: ../src/protocols/msn/msn.c:1570 ../src/protocols/msn/msn.c:1742
+#: ../src/protocols/msn/msn.c:1748 ../src/protocols/yahoo/yahoo_profile.c:1113
 msgid "Favorite Quote"
 msgstr "Lempisanonta"
 
-#: ../src/protocols/msn/msn.c:1572
+#: ../src/protocols/msn/msn.c:1574
 #, c-format
 msgid "%s<b>Social</b><br>%s"
 msgstr "%s<b>Vapaa-aika</b><br>%s"
 
-#: ../src/protocols/msn/msn.c:1581
+#: ../src/protocols/msn/msn.c:1583
 msgid "Significant Other"
 msgstr "Elämänkumppani"
 
-#: ../src/protocols/msn/msn.c:1582
+#: ../src/protocols/msn/msn.c:1584
 msgid "Home Phone"
 msgstr "Kotipuhelin"
 
-#: ../src/protocols/msn/msn.c:1583
+#: ../src/protocols/msn/msn.c:1585
 msgid "Home Phone 2"
 msgstr "Kotipuhelin 2"
 
-#: ../src/protocols/msn/msn.c:1584 ../src/protocols/oscar/oscar.c:3685
+#: ../src/protocols/msn/msn.c:1586 ../src/protocols/oscar/oscar.c:3705
 msgid "Home Address"
 msgstr "Kotiosoite"
 
-#: ../src/protocols/msn/msn.c:1585
+#: ../src/protocols/msn/msn.c:1587
 msgid "Personal Mobile"
 msgstr "Oma matkapuhelin"
 
-#: ../src/protocols/msn/msn.c:1586
+#: ../src/protocols/msn/msn.c:1588
 msgid "Home Fax"
 msgstr "Kotifaksi"
 
-#: ../src/protocols/msn/msn.c:1587
+#: ../src/protocols/msn/msn.c:1589
 msgid "Personal E-Mail"
 msgstr "Oma sähköposti"
 
-#: ../src/protocols/msn/msn.c:1588
+#: ../src/protocols/msn/msn.c:1590
 msgid "Personal IM"
 msgstr "Oma pikaviestin"
 
-#: ../src/protocols/msn/msn.c:1590
+#: ../src/protocols/msn/msn.c:1592
 msgid "Anniversary"
 msgstr "Vuosipäivä"
 
-#: ../src/protocols/msn/msn.c:1591 ../src/protocols/msn/msn.c:1615
+#: ../src/protocols/msn/msn.c:1593 ../src/protocols/msn/msn.c:1617
 msgid "Notes"
 msgstr "Huomautuksia"
 
-#: ../src/protocols/msn/msn.c:1595
+#: ../src/protocols/msn/msn.c:1597
 #, c-format
 msgid "<br><b>Personal</b><br>%s"
 msgstr "<br><b>Koti</b><br>%s"
 
-#: ../src/protocols/msn/msn.c:1602 ../src/protocols/silc/ops.c:1044
+#: ../src/protocols/msn/msn.c:1604 ../src/protocols/silc/ops.c:1044
 msgid "Job Title"
 msgstr "Tehtävänimike"
 
-#: ../src/protocols/msn/msn.c:1603 ../src/protocols/oscar/oscar.c:3702
+#: ../src/protocols/msn/msn.c:1605 ../src/protocols/oscar/oscar.c:3722
 msgid "Company"
 msgstr "Yritys"
 
-#: ../src/protocols/msn/msn.c:1604 ../src/protocols/novell/novell.c:1480
+#: ../src/protocols/msn/msn.c:1606 ../src/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "Osasto"
 
-#: ../src/protocols/msn/msn.c:1605
+#: ../src/protocols/msn/msn.c:1607
 msgid "Profession"
 msgstr "Asmatti"
 
-#: ../src/protocols/msn/msn.c:1606
+#: ../src/protocols/msn/msn.c:1608
 msgid "Work Phone"
 msgstr "Työpuhelin"
 
-#: ../src/protocols/msn/msn.c:1607
+#: ../src/protocols/msn/msn.c:1609
 msgid "Work Phone 2"
 msgstr "Työpuhelin 2"
 
-#: ../src/protocols/msn/msn.c:1608 ../src/protocols/oscar/oscar.c:3693
+#: ../src/protocols/msn/msn.c:1610 ../src/protocols/oscar/oscar.c:3713
 msgid "Work Address"
 msgstr "Työosoite"
 
-#: ../src/protocols/msn/msn.c:1609
+#: ../src/protocols/msn/msn.c:1611
 msgid "Work Mobile"
 msgstr "Työmatkapuhelin"
 
-#: ../src/protocols/msn/msn.c:1610
-msgid "Work Pager"
-msgstr "Työhakulaite"
-
-#: ../src/protocols/msn/msn.c:1611
-msgid "Work Fax"
-msgstr "Työfaksi"
-
 #: ../src/protocols/msn/msn.c:1612
+msgid "Work Pager"
+msgstr "Työhakulaite"
+
+#: ../src/protocols/msn/msn.c:1613
+msgid "Work Fax"
+msgstr "Työfaksi"
+
+#: ../src/protocols/msn/msn.c:1614
 msgid "Work E-Mail"
 msgstr "Työsähköposti"
 
-#: ../src/protocols/msn/msn.c:1613
+#: ../src/protocols/msn/msn.c:1615
 msgid "Work IM"
 msgstr "Työ pikaviestin"
 
-#: ../src/protocols/msn/msn.c:1614
+#: ../src/protocols/msn/msn.c:1616
 msgid "Start Date"
 msgstr "Aloituspäivä"
 
-#: ../src/protocols/msn/msn.c:1619
+#: ../src/protocols/msn/msn.c:1621
 #, c-format
 msgid "<br><b>Business</b><br>%s"
 msgstr "<br><b>Työ</b><br>%s"
 
-#: ../src/protocols/msn/msn.c:1630
+#: ../src/protocols/msn/msn.c:1632
 #, c-format
 msgid "<hr><b>Contact Info</b>%s%s"
 msgstr "<hr><b>Yhteystiedot</b>%s%s"
 
-#: ../src/protocols/msn/msn.c:1689 ../src/protocols/msn/msn.c:1695
-#: ../src/protocols/msn/msn.c:1702 ../src/protocols/msn/msn.c:1709
+#: ../src/protocols/msn/msn.c:1691 ../src/protocols/msn/msn.c:1697
+#: ../src/protocols/msn/msn.c:1704 ../src/protocols/msn/msn.c:1711
 msgid "Favorite Things"
 msgstr "Lempiasiat"
 
-#: ../src/protocols/msn/msn.c:1754
+#: ../src/protocols/msn/msn.c:1756
 msgid "Last Updated"
 msgstr "Edellinen päivitys"
 
-#: ../src/protocols/msn/msn.c:1766 ../src/protocols/silc/ops.c:1060
+#: ../src/protocols/msn/msn.c:1768 ../src/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "Kotisivu"
 
-#: ../src/protocols/msn/msn.c:1791
+#: ../src/protocols/msn/msn.c:1793
 msgid "The user has not created a public profile."
 msgstr "Käyttäjällä ei ole julkista profiilia."
 
-#: ../src/protocols/msn/msn.c:1792
+#: ../src/protocols/msn/msn.c:1794
 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 "
@@ -8092,7 +8089,7 @@
 "MSN ilmoitti ettei voida löytää käyttäjän profiilia. Tämä tarkoittaa joko "
 "sitä että käyttäjää ei ole tai käyttäjä ei ole luonut julkista profiilia."
 
-#: ../src/protocols/msn/msn.c:1796
+#: ../src/protocols/msn/msn.c:1798
 msgid ""
 "Gaim could not find any information in the user's profile. The user most "
 "likely does not exist."
@@ -8101,12 +8098,12 @@
 "todennäköisesti ole olemassa."
 
 #. put a link to the actual profile URL
-#: ../src/protocols/msn/msn.c:1801
+#: ../src/protocols/msn/msn.c:1803
 #, c-format
 msgid "<hr><b>%s:</b> "
 msgstr "<hr><b>%s:</b> "
 
-#: ../src/protocols/msn/msn.c:1801 ../src/protocols/yahoo/yahoo_profile.c:1208
+#: ../src/protocols/msn/msn.c:1803 ../src/protocols/yahoo/yahoo_profile.c:1208
 msgid "Profile URL"
 msgstr "Profiilin URL"
 
@@ -8120,25 +8117,25 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/msn/msn.c:2023 ../src/protocols/msn/msn.c:2025
+#: ../src/protocols/msn/msn.c:2025 ../src/protocols/msn/msn.c:2027
 msgid "MSN Protocol Plugin"
 msgstr "MSN-yhteyskäytäntöliitännäinen"
 
-#: ../src/protocols/msn/msn.c:2053
+#: ../src/protocols/msn/msn.c:2055
 msgid "Use HTTP Method"
 msgstr "Käytä HTTP-menetelmää"
 
-#: ../src/protocols/msn/msn.c:2058
+#: ../src/protocols/msn/msn.c:2060
 msgid "Show custom smileys"
 msgstr "Näytä itse tehdyt / lisätyt hymiöt"
 
-#: ../src/protocols/msn/msn.c:2066
+#: ../src/protocols/msn/msn.c:2068
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: tönäise tuttavaa huomion saamiseksi"
 
 #: ../src/protocols/msn/nexus.c:141 ../src/protocols/msn/servconn.c:133
-#: ../src/protocols/yahoo/yahoochat.c:1345
-#: ../src/protocols/yahoo/yahoochat.c:1372
+#: ../src/protocols/yahoo/yahoochat.c:1346
+#: ../src/protocols/yahoo/yahoochat.c:1373
 msgid "Unable to connect"
 msgstr "Yhteyden muodostaminen epäonnistui"
 
@@ -8248,10 +8245,8 @@
 msgid "Error parsing HTTP."
 msgstr "Virhe jäsennettäessä HTTP:tä."
 
-#. MSG_SERVER_GHOST
-#. Looks like someone logged in as us! =-O
-#: ../src/protocols/msn/session.c:307 ../src/protocols/napster/napster.c:456
-#: ../src/protocols/oscar/oscar.c:3416 ../src/protocols/yahoo/yahoo.c:191
+#: ../src/protocols/msn/session.c:307 ../src/protocols/oscar/oscar.c:3430
+#: ../src/protocols/yahoo/yahoo.c:191
 msgid "You have signed on from another location."
 msgstr "Olet kirjautunut sisään toisesta paikasta."
 
@@ -8348,105 +8343,38 @@
 msgid "%s just sent you a Nudge!"
 msgstr "Käyttäjä %s lähetti sinulle juuri tönäisyn!"
 
-#: ../src/protocols/msn/userlist.c:96
+#: ../src/protocols/msn/userlist.c:90
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "Käyttäjä %s (%s) haluaa lisätä käyttäjän %s tuttavalistalleen."
 
-#: ../src/protocols/msn/userlist.c:111 ../src/protocols/yahoo/yahoo.c:913
+#: ../src/protocols/msn/userlist.c:105 ../src/protocols/yahoo/yahoo.c:920
 msgid "Authorize"
 msgstr "Valtuuta"
 
-#: ../src/protocols/msn/userlist.c:112 ../src/protocols/yahoo/yahoo.c:915
+#: ../src/protocols/msn/userlist.c:106 ../src/protocols/yahoo/yahoo.c:922
 msgid "Deny"
 msgstr "Kiellä"
 
-#: ../src/protocols/msn/userlist.c:286
+#: ../src/protocols/msn/userlist.c:280
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "Käyttäjä %s on lisännyt sinut tuttavalistalleen."
 
-#: ../src/protocols/msn/userlist.c:350
+#: ../src/protocols/msn/userlist.c:344
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s on poistanut sinut tuttavalistaltaan."
 
-#: ../src/protocols/msn/userlist.c:667
+#: ../src/protocols/msn/userlist.c:661
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Ei voitu lisätä \"%s\"."
 
-#: ../src/protocols/msn/userlist.c:669
+#: ../src/protocols/msn/userlist.c:663
 msgid "The screen name specified is invalid."
 msgstr "Syötetty näyttönimi on virheellinen."
 
-#: ../src/protocols/napster/napster.c:266
-msgid "Unable to read header from server"
-msgstr "Otsikkotietoja ei kyetty lukemaan palvelimelta."
-
-#: ../src/protocols/napster/napster.c:280
-#, c-format
-msgid "Unable to read message from server: %s.  Command is %hd, length is %hd."
-msgstr ""
-"Palvelimelta ei kyetty lukemaan viestiä: %s.  Komento on %hd, pituus on %hd."
-
-#: ../src/protocols/napster/napster.c:296
-msgid "Unknown server error."
-msgstr "Tuntematon palvelinvirhe."
-
-#: ../src/protocols/napster/napster.c:345
-#, c-format
-msgid "users: %s, files: %s, size: %sGB"
-msgstr "käyttäjiä: %s, tiedostoja: %s, koko: %sGt"
-
-#. MSG_SERVER_HOTLIST_ERROR
-#: ../src/protocols/napster/napster.c:356
-#, c-format
-msgid "Unable to add \"%s\" to your Napster hotlist"
-msgstr "Ei voitu lisätä \"%s\" Napster-hotlistiin"
-
-#. MSG_CLIENT_WHOIS
-#: ../src/protocols/napster/napster.c:420
-#, c-format
-msgid "%s requested your information"
-msgstr "%s pyysi tietojasi"
-
-#. MSG_CLIENT_PING
-#: ../src/protocols/napster/napster.c:460
-#, c-format
-msgid "%s requested a PING"
-msgstr "%s pyysi PING-sanoman"
-
-#. 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:2237 ../src/protocols/yahoo/yahoo.c:2264
-#: ../src/protocols/yahoo/yahoo.c:2347 ../src/protocols/yahoo/yahoo.c:2362
-#: ../src/protocols/yahoo/yahoo_filexfer.c:74
-#: ../src/protocols/yahoo/yahoo_filexfer.c:137
-#: ../src/protocols/yahoo/ycht.c:540
-msgid "Unable to connect."
-msgstr "Yhteyden muodostaminen epäonnistui."
-
-#: ../src/protocols/napster/napster.c:599 ../src/protocols/toc/toc.c:1367
-msgid "_Group:"
-msgstr "_Ryhmä:"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../src/protocols/napster/napster.c:699
-#: ../src/protocols/napster/napster.c:701
-msgid "NAPSTER Protocol Plugin"
-msgstr "NAPSTER-yhteyskäytäntöliitännäinen"
-
 #: ../src/protocols/novell/nmuser.c:1868
 msgid "Required parameters not passed in"
 msgstr "Vaadittuja parametreja ei syötetty"
@@ -8795,43 +8723,43 @@
 msgid "Server port"
 msgstr "Palvelimen portti"
 
-#: ../src/protocols/oscar/flap_connection.c:222
+#: ../src/protocols/oscar/flap_connection.c:221
 msgid "Server closed the connection."
 msgstr "Palvelin on katkaissut yhteyden."
 
-#: ../src/protocols/oscar/flap_connection.c:224
+#: ../src/protocols/oscar/flap_connection.c:223
 msgid "Lost connection with server for an unknown reason."
 msgstr "Yhteys palvelimeen katkesi tuntemattomasta syystä."
 
-#: ../src/protocols/oscar/flap_connection.c:226
+#: ../src/protocols/oscar/flap_connection.c:225
 msgid "Received invalid data on connection with server."
 msgstr "Palvelimeen yhdistettäessä vastaanotettiin virheellisiä tietoja."
 
-#: ../src/protocols/oscar/flap_connection.c:228
+#: ../src/protocols/oscar/flap_connection.c:227
 msgid "Could not establish a connection with the server."
 msgstr "Ei voitu muodostaa yhteyttä palvelimeen."
 
-#: ../src/protocols/oscar/odc.c:41
+#: ../src/protocols/oscar/odc.c:40
 msgid "The remote user has closed the connection."
 msgstr "Käyttäjä on katkaissut yhteyden."
 
-#: ../src/protocols/oscar/odc.c:45
+#: ../src/protocols/oscar/odc.c:42
 msgid "The remote user has declined your request."
 msgstr "Käyttäjä on kieltäytynyt pyynnöstäsi."
 
-#: ../src/protocols/oscar/odc.c:49
+#: ../src/protocols/oscar/odc.c:44
 msgid "Lost connection with the remote user for an unknown reason."
 msgstr "Yhteys käyttäjään katkesi tuntemattomasta syystä."
 
-#: ../src/protocols/oscar/odc.c:53
+#: ../src/protocols/oscar/odc.c:46
 msgid "Received invalid data on connection with remote user."
 msgstr "Vastaanotettiin virheellisiä tietoja luotaessa yhteyttä käyttäjään."
 
-#: ../src/protocols/oscar/odc.c:57
+#: ../src/protocols/oscar/odc.c:48
 msgid "Could not establish a connection with the remote user."
 msgstr "Ei voitu muodostaa yhteyttä käyttäjän kanssa."
 
-#: ../src/protocols/oscar/odc.c:567
+#: ../src/protocols/oscar/odc.c:557
 msgid "Direct IM established"
 msgstr "Suora pikaviestiyhteys muodostettu"
 
@@ -8959,12 +8887,12 @@
 msgid "AIM Direct IM"
 msgstr "AIM:n suora pikaviesti"
 
-#: ../src/protocols/oscar/oscar.c:634 ../src/protocols/silc/silc.c:697
+#: ../src/protocols/oscar/oscar.c:634 ../src/protocols/silc/silc.c:699
 #: ../src/protocols/silc/util.c:524
 msgid "Chat"
 msgstr "Keskustelu"
 
-#: ../src/protocols/oscar/oscar.c:637 ../src/protocols/oscar/oscar.c:5793
+#: ../src/protocols/oscar/oscar.c:637 ../src/protocols/oscar/oscar.c:5857
 msgid "Get File"
 msgstr "Vastaanota tiedosto"
 
@@ -9036,15 +8964,15 @@
 msgid "Camera"
 msgstr "Kamera"
 
-#: ../src/protocols/oscar/oscar.c:711 ../src/protocols/oscar/oscar.c:5600
+#: ../src/protocols/oscar/oscar.c:711 ../src/protocols/oscar/oscar.c:5642
 msgid "Free For Chat"
 msgstr "Vapaana keskusteluun"
 
-#: ../src/protocols/oscar/oscar.c:715 ../src/protocols/oscar/oscar.c:5628
+#: ../src/protocols/oscar/oscar.c:715 ../src/protocols/oscar/oscar.c:5670
 msgid "Not Available"
 msgstr "Ei tavoittevissa"
 
-#: ../src/protocols/oscar/oscar.c:717 ../src/protocols/oscar/oscar.c:5618
+#: ../src/protocols/oscar/oscar.c:717 ../src/protocols/oscar/oscar.c:5660
 msgid "Occupied"
 msgstr "Varattu"
 
@@ -9056,36 +8984,36 @@
 msgid "Online"
 msgstr "Linjoilla"
 
-#: ../src/protocols/oscar/oscar.c:802 ../src/protocols/oscar/oscar.c:2824
+#: ../src/protocols/oscar/oscar.c:811 ../src/protocols/oscar/oscar.c:2828
 msgid "Warning Level"
 msgstr "Varoitustaso"
 
-#: ../src/protocols/oscar/oscar.c:811
+#: ../src/protocols/oscar/oscar.c:820
 msgid "Buddy Comment"
 msgstr "Tuttavakommentti"
 
-#: ../src/protocols/oscar/oscar.c:966
+#: ../src/protocols/oscar/oscar.c:975
 msgid "Could not connect to authentication server"
 msgstr "Ei saatu yhteyttä todentamispalvelimeen"
 
-#: ../src/protocols/oscar/oscar.c:968
+#: ../src/protocols/oscar/oscar.c:977
 msgid "Could not connect to BOS server"
 msgstr "Ei saatu yhteyttä BOS-palvelimeen"
 
-#: ../src/protocols/oscar/oscar.c:998
+#: ../src/protocols/oscar/oscar.c:1007
 msgid "Screen name sent"
 msgstr "Näyttönimi lähetetty"
 
-#: ../src/protocols/oscar/oscar.c:1003
+#: ../src/protocols/oscar/oscar.c:1012
 msgid "Connection established, cookie sent"
 msgstr "Yhteys muodostettu, eväste lähetetty"
 
 #. TODO: Don't call this with ssi
-#: ../src/protocols/oscar/oscar.c:1034
+#: ../src/protocols/oscar/oscar.c:1043
 msgid "Finalizing connection"
 msgstr "Viimeistellään yhteyttä"
 
-#: ../src/protocols/oscar/oscar.c:1219
+#: ../src/protocols/oscar/oscar.c:1227
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -9096,20 +9024,20 @@
 "virheellinen. Näyttönimien tulee alkaa joko kirjaimella ja sisältää vain "
 "kirjaimia, numeroita ja välilyöntejä tai sisältää vain numeroita."
 
-#: ../src/protocols/oscar/oscar.c:1308 ../src/protocols/toc/toc.c:543
+#: ../src/protocols/oscar/oscar.c:1317 ../src/protocols/toc/toc.c:543
 msgid "Incorrect nickname or password."
 msgstr "Virheellinen kutsumanimi tai salasana."
 
-#: ../src/protocols/oscar/oscar.c:1313
+#: ../src/protocols/oscar/oscar.c:1322
 msgid "Your account is currently suspended."
 msgstr "Käyttäjätilisi palvelu on parhaillaan keskeytetty."
 
 #. service temporarily unavailable
-#: ../src/protocols/oscar/oscar.c:1317
+#: ../src/protocols/oscar/oscar.c:1326
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL-pikaviestipalvelu ei tilapäisesti ole käytössä."
 
-#: ../src/protocols/oscar/oscar.c:1322
+#: ../src/protocols/oscar/oscar.c:1331
 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."
@@ -9118,32 +9046,32 @@
 "ja yritä uudelleen. Jos jatkat yrittämistä, joudut odottamaan vielä "
 "pidempään."
 
-#: ../src/protocols/oscar/oscar.c:1327
+#: ../src/protocols/oscar/oscar.c:1336
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "Asiakasohjelmasi versio on liian vanha. Päivitä osoitteessa %s"
 
-#: ../src/protocols/oscar/oscar.c:1363
+#: ../src/protocols/oscar/oscar.c:1372
 msgid "Could Not Connect"
 msgstr "Yhteyttä ei voitu muodostaa"
 
-#: ../src/protocols/oscar/oscar.c:1368
+#: ../src/protocols/oscar/oscar.c:1377
 msgid "Received authorization"
 msgstr "Saatiin lupa"
 
-#: ../src/protocols/oscar/oscar.c:1391
+#: ../src/protocols/oscar/oscar.c:1400
 msgid "The SecurID key entered is invalid."
 msgstr "Syötetty SecurID-avain on virheellinen."
 
-#: ../src/protocols/oscar/oscar.c:1405
+#: ../src/protocols/oscar/oscar.c:1414
 msgid "Enter SecurID"
 msgstr "Syötä SecurID"
 
-#: ../src/protocols/oscar/oscar.c:1406
+#: ../src/protocols/oscar/oscar.c:1415
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Syötä 6 numeroinen luku digitaaliselta näytöltä."
 
-#: ../src/protocols/oscar/oscar.c:1446 ../src/protocols/oscar/oscar.c:1480
+#: ../src/protocols/oscar/oscar.c:1455 ../src/protocols/oscar/oscar.c:1489
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -9152,36 +9080,36 @@
 "Yhteytesi saatetaan katkaista kohta. Saatat haluta käyttää TOC-"
 "yhteyskäytäntöä kunnes tämä on korjattu. Tarkista päivitykset: %s"
 
-#: ../src/protocols/oscar/oscar.c:1449 ../src/protocols/oscar/oscar.c:1483
+#: ../src/protocols/oscar/oscar.c:1458 ../src/protocols/oscar/oscar.c:1492
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim ei saanut kelvollista AIM-sisäänkirjautumistiivistettä."
 
-#: ../src/protocols/oscar/oscar.c:1569
+#: ../src/protocols/oscar/oscar.c:1578
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "Yhteytesi saatetaan katkaista kohta. Tarkista päivitykset: %s."
 
-#: ../src/protocols/oscar/oscar.c:1572
+#: ../src/protocols/oscar/oscar.c:1581
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim ei saanut kelvollista sisäänkirjautumistiivistettä."
 
-#: ../src/protocols/oscar/oscar.c:1598
+#: ../src/protocols/oscar/oscar.c:1607
 msgid "Password sent"
 msgstr "Salasana lähetetty"
 
-#: ../src/protocols/oscar/oscar.c:2156
+#: ../src/protocols/oscar/oscar.c:2164
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Valtuuta minut jotta voin lisätä sinut tuttavalistalleni."
 
-#: ../src/protocols/oscar/oscar.c:2165
+#: ../src/protocols/oscar/oscar.c:2173
 msgid "Authorization Request Message:"
 msgstr "Valtuutuksen pyyntöviesti:"
 
-#: ../src/protocols/oscar/oscar.c:2166
+#: ../src/protocols/oscar/oscar.c:2174
 msgid "Please authorize me!"
 msgstr "Valtuuta minut."
 
-#: ../src/protocols/oscar/oscar.c:2200
+#: ../src/protocols/oscar/oscar.c:2206
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -9190,21 +9118,21 @@
 "Käyttäjä %s vaatii valtuutuksen ennenkuin hänet voi lisätä tuttavalistalle. "
 "Haluatko lähettää valtuutuspyynnön?"
 
-#: ../src/protocols/oscar/oscar.c:2205
+#: ../src/protocols/oscar/oscar.c:2211
 msgid "Request Authorization"
 msgstr "Pyydä valtuutusta"
 
-#: ../src/protocols/oscar/oscar.c:2207
+#: ../src/protocols/oscar/oscar.c:2213
 msgid "_Request Authorization"
 msgstr "_Pyydä valtuutusta"
 
-#: ../src/protocols/oscar/oscar.c:2251 ../src/protocols/oscar/oscar.c:2259
+#: ../src/protocols/oscar/oscar.c:2254 ../src/protocols/oscar/oscar.c:2261
 #: ../src/protocols/oscar/oscar.c:2367 ../src/protocols/oscar/oscar.c:2391
-#: ../src/protocols/oscar/oscar.c:5025 ../src/protocols/oscar/oscar.c:5077
+#: ../src/protocols/oscar/oscar.c:5067 ../src/protocols/oscar/oscar.c:5119
 msgid "No reason given."
 msgstr "Syytä ei annettu."
 
-#: ../src/protocols/oscar/oscar.c:2258
+#: ../src/protocols/oscar/oscar.c:2260
 msgid "Authorization Denied Message:"
 msgstr "Valtuutuspyyntö evätty:"
 
@@ -9217,7 +9145,7 @@
 "Käyttäjä %u haluaa lisätä %s:n tuttavalistalleen seuraavasta syystä:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:2379 ../src/protocols/oscar/oscar.c:5037
+#: ../src/protocols/oscar/oscar.c:2379 ../src/protocols/oscar/oscar.c:5079
 msgid "Authorization Request"
 msgstr "Valtuutuspyyntö"
 
@@ -9355,7 +9283,7 @@
 msgstr "Viestiä ei voitu lähettää: %s"
 
 #: ../src/protocols/oscar/oscar.c:2736 ../src/protocols/oscar/oscar.c:2741
-#: ../src/protocols/oscar/oscar.c:2799 ../src/protocols/oscar/oscar.c:2803
+#: ../src/protocols/oscar/oscar.c:2803 ../src/protocols/oscar/oscar.c:2807
 msgid "Unknown reason."
 msgstr "Tuntematon syy."
 
@@ -9365,39 +9293,39 @@
 msgid "Unable to send message to %s:"
 msgstr "Viestiä ei voitu lähettää käyttäjälle %s."
 
-#: ../src/protocols/oscar/oscar.c:2799
+#: ../src/protocols/oscar/oscar.c:2803
 #, c-format
 msgid "User information not available: %s"
 msgstr "Käyttäjätiedot eivät ole saatavilla: %s"
 
-#: ../src/protocols/oscar/oscar.c:2802
+#: ../src/protocols/oscar/oscar.c:2806
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "%s:n käyttäjätiedot eivät ole saatavilla"
 
-#: ../src/protocols/oscar/oscar.c:2828
+#: ../src/protocols/oscar/oscar.c:2832
 msgid "Online Since"
 msgstr "Kirjautunut"
 
-#: ../src/protocols/oscar/oscar.c:2833
+#: ../src/protocols/oscar/oscar.c:2837
 #: ../src/protocols/yahoo/yahoo_profile.c:1159
 msgid "Member Since"
 msgstr "Rekisteröitynyt"
 
-#: ../src/protocols/oscar/oscar.c:2838
+#: ../src/protocols/oscar/oscar.c:2842
 msgid "Capabilities"
 msgstr "Kyvyt"
 
-#: ../src/protocols/oscar/oscar.c:2856
+#: ../src/protocols/oscar/oscar.c:2860
 msgid "Available Message"
 msgstr "Paikallaoloviesti"
 
-#: ../src/protocols/oscar/oscar.c:2945
+#: ../src/protocols/oscar/oscar.c:2957
 msgid "Your AIM connection may be lost."
 msgstr "AIM-yhteytesi saattaa olla katkennut."
 
 #. The conversion failed!
-#: ../src/protocols/oscar/oscar.c:3126
+#: ../src/protocols/oscar/oscar.c:3138
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -9405,11 +9333,11 @@
 "[Ei voitu näyttää viestiä tältä käyttäjältä koska se sisälsi epäkelpoja "
 "merkkejä.]"
 
-#: ../src/protocols/oscar/oscar.c:3345
+#: ../src/protocols/oscar/oscar.c:3359
 msgid "Rate limiting error."
 msgstr "Määrärajoitusvirhe"
 
-#: ../src/protocols/oscar/oscar.c:3346
+#: ../src/protocols/oscar/oscar.c:3360
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -9417,81 +9345,81 @@
 "Viimeistä viestiä ei lähetetty koska olet ylittänyt taajuusrajan. Odota 10 "
 "sekuntia ja yritä uudelleen."
 
-#: ../src/protocols/oscar/oscar.c:3418
+#: ../src/protocols/oscar/oscar.c:3432
 msgid "You have been signed off for an unknown reason."
 msgstr "Yhteytesi on katkaistu tuntemattomasta syystä."
 
-#: ../src/protocols/oscar/oscar.c:3431 ../src/protocols/toc/toc.c:971
+#: ../src/protocols/oscar/oscar.c:3445 ../src/protocols/toc/toc.c:971
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Yhteytesi keskusteluhuoneeseen %s on katkennut."
 
-#: ../src/protocols/oscar/oscar.c:3649 ../src/protocols/silc/util.c:556
+#: ../src/protocols/oscar/oscar.c:3669 ../src/protocols/silc/util.c:556
 msgid "Mobile Phone"
 msgstr "Matkapuhelin"
 
-#: ../src/protocols/oscar/oscar.c:3676
+#: ../src/protocols/oscar/oscar.c:3696
 msgid "Personal Web Page"
 msgstr "Henkilökohtainen kotisivu"
 
-#: ../src/protocols/oscar/oscar.c:3680
+#: ../src/protocols/oscar/oscar.c:3700
 msgid "Additional Information"
 msgstr "Lisätiedot"
 
-#: ../src/protocols/oscar/oscar.c:3689 ../src/protocols/oscar/oscar.c:3697
+#: ../src/protocols/oscar/oscar.c:3709 ../src/protocols/oscar/oscar.c:3717
 msgid "Zip Code"
 msgstr "Postinumero"
 
-#: ../src/protocols/oscar/oscar.c:3701
+#: ../src/protocols/oscar/oscar.c:3721
 msgid "Work Information"
 msgstr "Työtiedot"
 
-#: ../src/protocols/oscar/oscar.c:3703
+#: ../src/protocols/oscar/oscar.c:3723
 msgid "Division"
 msgstr "Osasto"
 
-#: ../src/protocols/oscar/oscar.c:3704
+#: ../src/protocols/oscar/oscar.c:3724
 msgid "Position"
 msgstr "Asema"
 
-#: ../src/protocols/oscar/oscar.c:3706
+#: ../src/protocols/oscar/oscar.c:3726
 msgid "Web Page"
 msgstr "Kotisivu"
 
-#: ../src/protocols/oscar/oscar.c:3764
+#: ../src/protocols/oscar/oscar.c:3784
 msgid "Pop-Up Message"
 msgstr "Ponnahdusviesti"
 
-#: ../src/protocols/oscar/oscar.c:3804
+#: ../src/protocols/oscar/oscar.c:3824
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "Seuraava näyttönimi on assosioitu %s kanssa"
 msgstr[1] "Seuraavat näyttönimet on assosioitu %s kanssa"
 
-#: ../src/protocols/oscar/oscar.c:3809
+#: ../src/protocols/oscar/oscar.c:3829
 msgid "Screen name"
 msgstr "Näyttönimi"
 
-#: ../src/protocols/oscar/oscar.c:3835
+#: ../src/protocols/oscar/oscar.c:3855
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Ei hakutuloksia sähköpostiosoitteelle %s"
 
-#: ../src/protocols/oscar/oscar.c:3856
+#: ../src/protocols/oscar/oscar.c:3876
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Sinun tulisi saada sähköpostiviesti %s:n varmistusta varten."
 
-#: ../src/protocols/oscar/oscar.c:3858
+#: ../src/protocols/oscar/oscar.c:3878
 msgid "Account Confirmation Requested"
 msgstr "Tilin varmistusta pyydetty"
 
-#: ../src/protocols/oscar/oscar.c:3889
+#: ../src/protocols/oscar/oscar.c:3909
 msgid "Error Changing Account Info"
 msgstr "Virhe muutettaessa käyttäjätilin tietoja"
 
-#: ../src/protocols/oscar/oscar.c:3892
+#: ../src/protocols/oscar/oscar.c:3912
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -9500,14 +9428,14 @@
 "Virhe 0x%04x: Näyttönimeä ei voi muotoilla koska pyydetty näyttönimi eroaa "
 "alkuperäisestä."
 
-#: ../src/protocols/oscar/oscar.c:3895
+#: ../src/protocols/oscar/oscar.c:3915
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr ""
 "Virhe 0x%04x: Näyttönimeä ei voi muotoilla koska pyydetty näyttönimi on "
 "virheellinen."
 
-#: ../src/protocols/oscar/oscar.c:3898
+#: ../src/protocols/oscar/oscar.c:3918
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -9516,7 +9444,7 @@
 "Virhe 0x%04x: Näyttönimeä ei voi muotoilla koska pyydetty näyttönimi on "
 "liian pitkä."
 
-#: ../src/protocols/oscar/oscar.c:3901
+#: ../src/protocols/oscar/oscar.c:3921
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -9525,7 +9453,7 @@
 "Virhe 0x%04x: Sähköpostiosoitetta ei voida muuttaa koska tälle näyttönimelle "
 "on jo käsittelemätön muutospyyntö."
 
-#: ../src/protocols/oscar/oscar.c:3904
+#: ../src/protocols/oscar/oscar.c:3924
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -9534,7 +9462,7 @@
 "Virhe 0x%04x: Sähköpostiosoitetta ei voida muuttaa koska annettu osoite on "
 "assosioitu liian moneen näyttönimeen."
 
-#: ../src/protocols/oscar/oscar.c:3907
+#: ../src/protocols/oscar/oscar.c:3927
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -9543,12 +9471,12 @@
 "Virhe 0x%04x: Sähköpostiosoitetta ei voida muuttaa koska annettu osoite on "
 "virheellinen."
 
-#: ../src/protocols/oscar/oscar.c:3910
+#: ../src/protocols/oscar/oscar.c:3930
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Virhe 0x%04x: Tuntematon virhe."
 
-#: ../src/protocols/oscar/oscar.c:3920
+#: ../src/protocols/oscar/oscar.c:3940
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -9557,27 +9485,27 @@
 "Näyttönimesi on tällä hetkellä muotoiltu seuraavasti:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:3921 ../src/protocols/oscar/oscar.c:3928
+#: ../src/protocols/oscar/oscar.c:3941 ../src/protocols/oscar/oscar.c:3948
 msgid "Account Info"
 msgstr "Tilin tiedot"
 
-#: ../src/protocols/oscar/oscar.c:3926
+#: ../src/protocols/oscar/oscar.c:3946
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "%s:n sähköpostiosoite on %s"
 
-#: ../src/protocols/oscar/oscar.c:4101
+#: ../src/protocols/oscar/oscar.c:4121
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "Pikaviesti kuvaasi ei lähetetty. Sinun tulee käyttää suorayhteyttä "
 "lähettääksesi pikaviestikuvia."
 
-#: ../src/protocols/oscar/oscar.c:4341
+#: ../src/protocols/oscar/oscar.c:4366
 msgid "Unable to set AIM profile."
 msgstr "AIM-profiilia ei saatu asetettua."
 
-#: ../src/protocols/oscar/oscar.c:4342
+#: ../src/protocols/oscar/oscar.c:4367
 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 "
@@ -9587,7 +9515,7 @@
 "suoritettua loppuun. Profiilia ei asetettu. Yritä asettaa se kun "
 "kirjautuminen on suoritettu."
 
-#: ../src/protocols/oscar/oscar.c:4356
+#: ../src/protocols/oscar/oscar.c:4381
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -9600,11 +9528,11 @@
 msgstr[1] ""
 "Maksimi profiilin koko %d tavua ylitetty. Gaim on lyhentänyt sen puolestasi."
 
-#: ../src/protocols/oscar/oscar.c:4361
+#: ../src/protocols/oscar/oscar.c:4386
 msgid "Profile too long."
 msgstr "Profiili on liian pitkä."
 
-#: ../src/protocols/oscar/oscar.c:4408
+#: ../src/protocols/oscar/oscar.c:4429
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -9617,11 +9545,11 @@
 msgstr[1] ""
 "Maksimi profiilin koko %d tavua ylitetty. Gaim on lyhentänyt sen puolestasi."
 
-#: ../src/protocols/oscar/oscar.c:4413
+#: ../src/protocols/oscar/oscar.c:4434
 msgid "Away message too long."
 msgstr "Poissaoloviesti on liian pitkä."
 
-#: ../src/protocols/oscar/oscar.c:4482
+#: ../src/protocols/oscar/oscar.c:4503
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -9632,16 +9560,16 @@
 "tulee alkaa joko kirjaimella ja sisältää vain kirjaimia, numeroita ja \n"
 "välilyöntejä tai sisältää vain numeroita."
 
-#: ../src/protocols/oscar/oscar.c:4484 ../src/protocols/oscar/oscar.c:4883
-#: ../src/protocols/oscar/oscar.c:4897
+#: ../src/protocols/oscar/oscar.c:4505 ../src/protocols/oscar/oscar.c:4915
+#: ../src/protocols/oscar/oscar.c:4929
 msgid "Unable To Add"
 msgstr "Lisääminen epäonnistui"
 
-#: ../src/protocols/oscar/oscar.c:4588
+#: ../src/protocols/oscar/oscar.c:4609
 msgid "Unable To Retrieve Buddy List"
 msgstr "Tuttavalistan nouto ei onnistunut"
 
-#: ../src/protocols/oscar/oscar.c:4589
+#: ../src/protocols/oscar/oscar.c:4610
 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 "
@@ -9650,13 +9578,13 @@
 "Gaim epäonnistui hakiessaan tuttavalistaa AIM-pavelimelta. Tuttavalistasi ei "
 "ole kadonnut, se tulee luultavasti saataville muutamassa tunnissa."
 
-#: ../src/protocols/oscar/oscar.c:4781 ../src/protocols/oscar/oscar.c:4782
-#: ../src/protocols/oscar/oscar.c:4787 ../src/protocols/oscar/oscar.c:4941
-#: ../src/protocols/oscar/oscar.c:4942 ../src/protocols/oscar/oscar.c:4947
+#: ../src/protocols/oscar/oscar.c:4813 ../src/protocols/oscar/oscar.c:4814
+#: ../src/protocols/oscar/oscar.c:4819 ../src/protocols/oscar/oscar.c:4983
+#: ../src/protocols/oscar/oscar.c:4984 ../src/protocols/oscar/oscar.c:4989
 msgid "Orphans"
 msgstr "Orvot"
 
-#: ../src/protocols/oscar/oscar.c:4881
+#: ../src/protocols/oscar/oscar.c:4913
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -9665,11 +9593,11 @@
 "Ei voitu lisätä tuttavaa %s koska listallasi on liian monta tuttavaa. Ole "
 "hyvä ja poista joku ja yritä uudelleen."
 
-#: ../src/protocols/oscar/oscar.c:4881 ../src/protocols/oscar/oscar.c:4895
+#: ../src/protocols/oscar/oscar.c:4913 ../src/protocols/oscar/oscar.c:4927
 msgid "(no name)"
 msgstr "(nimetön)"
 
-#: ../src/protocols/oscar/oscar.c:4895
+#: ../src/protocols/oscar/oscar.c:4927
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -9679,7 +9607,7 @@
 "Ei voitu lisätä tuttavaa %s tuntemattomasta syystä. Yleisin syy tälle on se "
 "että listasi maksimituttavamäärä on ylittynyt."
 
-#: ../src/protocols/oscar/oscar.c:4978
+#: ../src/protocols/oscar/oscar.c:5020
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -9688,11 +9616,11 @@
 "Käyttäjälle %s on annettu lupa lisätä sinut heidän tuttavalistalleen. "
 "Haluatko lisätä heidät omalle listallesi?"
 
-#: ../src/protocols/oscar/oscar.c:4984
+#: ../src/protocols/oscar/oscar.c:5026
 msgid "Authorization Given"
 msgstr "Valtuutus annettu"
 
-#: ../src/protocols/oscar/oscar.c:5028
+#: ../src/protocols/oscar/oscar.c:5070
 #, c-format
 msgid ""
 "The user %s wants to add %s to their buddy list for the following reason:\n"
@@ -9703,17 +9631,17 @@
 "%s"
 
 #. Granted
-#: ../src/protocols/oscar/oscar.c:5073
+#: ../src/protocols/oscar/oscar.c:5115
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "Käyttäjä %s on hyväksynyt pyyntösi lisätä hänet tuttavalistallesi."
 
-#: ../src/protocols/oscar/oscar.c:5074
+#: ../src/protocols/oscar/oscar.c:5116
 msgid "Authorization Granted"
 msgstr "Valtuutus hyväksytty"
 
 #. Denied
-#: ../src/protocols/oscar/oscar.c:5077
+#: ../src/protocols/oscar/oscar.c:5119
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -9724,43 +9652,43 @@
 "syystä:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:5078
+#: ../src/protocols/oscar/oscar.c:5120
 msgid "Authorization Denied"
 msgstr "Valtuutus evätty"
 
-#: ../src/protocols/oscar/oscar.c:5114 ../src/protocols/toc/toc.c:1372
+#: ../src/protocols/oscar/oscar.c:5156 ../src/protocols/toc/toc.c:1372
 msgid "_Exchange:"
 msgstr "_Vaihto:"
 
-#: ../src/protocols/oscar/oscar.c:5154
+#: ../src/protocols/oscar/oscar.c:5196
 msgid "Invalid chat name specified."
 msgstr "Virheellinen ryhmäkeskustelun nimi annettu."
 
-#: ../src/protocols/oscar/oscar.c:5224
+#: ../src/protocols/oscar/oscar.c:5266
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "Pikaviestikuvaasi ei lähetetty. Et voi lähettää pikaviestikuvia AIM- "
 "ryhmäkeskustelussa."
 
-#: ../src/protocols/oscar/oscar.c:5386
+#: ../src/protocols/oscar/oscar.c:5428
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(vastaanotetaan)</i>"
 
-#: ../src/protocols/oscar/oscar.c:5691
+#: ../src/protocols/oscar/oscar.c:5733
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Tuttavakommentti käyttäjälle %s"
 
-#: ../src/protocols/oscar/oscar.c:5692
+#: ../src/protocols/oscar/oscar.c:5734
 msgid "Buddy Comment:"
 msgstr "Kommentti"
 
-#: ../src/protocols/oscar/oscar.c:5738
+#: ../src/protocols/oscar/oscar.c:5780
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Olet päättänyt avata suoran pikaviestiyhteyden %s:n kanssa."
 
-#: ../src/protocols/oscar/oscar.c:5742
+#: ../src/protocols/oscar/oscar.c:5784
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -9768,65 +9696,69 @@
 "Koska tämä paljastaa IP-osoitteesi, sitä voidaan pitää turvallisuusriskinä.  "
 "Haluatko jatkaa?"
 
-#: ../src/protocols/oscar/oscar.c:5746 ../src/protocols/oscar/peer.c:941
+#: ../src/protocols/oscar/oscar.c:5788 ../src/protocols/oscar/peer.c:941
 msgid "_Connect"
 msgstr "_Yhdistä"
 
-#: ../src/protocols/oscar/oscar.c:5764
+#: ../src/protocols/oscar/oscar.c:5822
+msgid "Get AIM Info"
+msgstr "Hae AIM-tiedot"
+
+#: ../src/protocols/oscar/oscar.c:5828
 msgid "Edit Buddy Comment"
 msgstr "Muokkaa kommenttia"
 
-#: ../src/protocols/oscar/oscar.c:5772
+#: ../src/protocols/oscar/oscar.c:5836
 msgid "Get Status Msg"
 msgstr "Hae tilaviesti"
 
-#: ../src/protocols/oscar/oscar.c:5785
+#: ../src/protocols/oscar/oscar.c:5849
 msgid "Direct IM"
 msgstr "Suora pikaviesti"
 
-#: ../src/protocols/oscar/oscar.c:5807
+#: ../src/protocols/oscar/oscar.c:5871
 msgid "Re-request Authorization"
 msgstr "Pyydä valtuutus uudelleen"
 
-#: ../src/protocols/oscar/oscar.c:5864
+#: ../src/protocols/oscar/oscar.c:5928
 msgid "Require authorization"
 msgstr "Pyydä valtuutusta"
 
-#: ../src/protocols/oscar/oscar.c:5867
+#: ../src/protocols/oscar/oscar.c:5931
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Web-tietoinen (tämän käyttö altistaa sinut roskaposteille)"
 
-#: ../src/protocols/oscar/oscar.c:5872
+#: ../src/protocols/oscar/oscar.c:5936
 msgid "ICQ Privacy Options"
 msgstr "ICQ-yksityisyysvalinnat"
 
-#: ../src/protocols/oscar/oscar.c:5889
+#: ../src/protocols/oscar/oscar.c:5953
 msgid "The new formatting is invalid."
 msgstr "Uusi muotoilu on virheellinen."
 
-#: ../src/protocols/oscar/oscar.c:5890
+#: ../src/protocols/oscar/oscar.c:5954
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "Näyttönimen muotoilu voi vaikuttaa ainoastaan alkukirjaimeen sekä "
 "välilyönteihin."
 
-#: ../src/protocols/oscar/oscar.c:5897
+#: ../src/protocols/oscar/oscar.c:5961
 msgid "New screen name formatting:"
 msgstr "Uusi näyttönimen muotoilu:"
 
-#: ../src/protocols/oscar/oscar.c:5953
+#: ../src/protocols/oscar/oscar.c:6017
 msgid "Change Address To:"
 msgstr "Vaihda osoite:"
 
-#: ../src/protocols/oscar/oscar.c:5998
+#: ../src/protocols/oscar/oscar.c:6062
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>Et odota valtuutusta</i>"
 
-#: ../src/protocols/oscar/oscar.c:6001
+#: ../src/protocols/oscar/oscar.c:6065
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Odotat valtuutusta seuraavilta tuttavilta"
 
-#: ../src/protocols/oscar/oscar.c:6002
+#: ../src/protocols/oscar/oscar.c:6066
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -9834,69 +9766,69 @@
 "Voit pyytää valtuutuksen uudelleen näiltä tuttavilta napsauttamalla oikeaa "
 "nappia heihin ja valitsemalla \"Pyydä valtuutus uudelleen\"."
 
-#: ../src/protocols/oscar/oscar.c:6019
+#: ../src/protocols/oscar/oscar.c:6083
 msgid "Find Buddy by E-Mail"
 msgstr "Etsi tuttava sähköpostiosoitteen perusteella"
 
-#: ../src/protocols/oscar/oscar.c:6020
+#: ../src/protocols/oscar/oscar.c:6084
 msgid "Search for a buddy by e-mail address"
 msgstr "Etsi tuttava sähköpostiosoitteen perusteella"
 
-#: ../src/protocols/oscar/oscar.c:6021
+#: ../src/protocols/oscar/oscar.c:6085
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Syötä etsimäsi tuttavan sähköpostiosoite."
 
-#: ../src/protocols/oscar/oscar.c:6190
+#: ../src/protocols/oscar/oscar.c:6254
 msgid "Set User Info (URL)..."
 msgstr "Aseta käyttäjätiedot (URL)..."
 
-#: ../src/protocols/oscar/oscar.c:6201
+#: ../src/protocols/oscar/oscar.c:6265
 msgid "Change Password (URL)"
 msgstr "Vaihda salasana (URL)"
 
-#: ../src/protocols/oscar/oscar.c:6205
+#: ../src/protocols/oscar/oscar.c:6269
 msgid "Configure IM Forwarding (URL)"
 msgstr "Aseta pikaviestien edelleenlähetys (URL)"
 
 #. ICQ actions
-#: ../src/protocols/oscar/oscar.c:6215
+#: ../src/protocols/oscar/oscar.c:6279
 msgid "Set Privacy Options..."
 msgstr "Aseta yksityisyysvalinnat..."
 
 #. AIM actions
-#: ../src/protocols/oscar/oscar.c:6222
+#: ../src/protocols/oscar/oscar.c:6286
 msgid "Format Screen Name..."
 msgstr "Muotoile näyttönimi..."
 
-#: ../src/protocols/oscar/oscar.c:6226
+#: ../src/protocols/oscar/oscar.c:6290
 msgid "Confirm Account"
 msgstr "Vahvista tili"
 
-#: ../src/protocols/oscar/oscar.c:6230
+#: ../src/protocols/oscar/oscar.c:6294
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Näytä tällä hetkellä rekisteröity sähköpostiosoite"
 
-#: ../src/protocols/oscar/oscar.c:6234
+#: ../src/protocols/oscar/oscar.c:6298
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Muuta tällä hetkellä rekisteröityä sähköpostiosoitetta..."
 
-#: ../src/protocols/oscar/oscar.c:6241
+#: ../src/protocols/oscar/oscar.c:6305
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Näytä tuttavat jotka odottavat valtuutusta"
 
-#: ../src/protocols/oscar/oscar.c:6247
+#: ../src/protocols/oscar/oscar.c:6311
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Etsi tuttavaa sähköpostiosoitteen perusteella..."
 
-#: ../src/protocols/oscar/oscar.c:6252
+#: ../src/protocols/oscar/oscar.c:6316
 msgid "Search for Buddy by Information"
 msgstr "Etsi tuttavaa tietojen perusteella"
 
-#: ../src/protocols/oscar/oscar.c:6318
+#: ../src/protocols/oscar/oscar.c:6382
 msgid "Use recent buddies group"
 msgstr "Käytä viimeaikaisten tuttavien ryhmää"
 
-#: ../src/protocols/oscar/oscar.c:6321
+#: ../src/protocols/oscar/oscar.c:6385
 msgid "Show how long you have been idle"
 msgstr "Näyttää kuinka kauan olet ollut jouten."
 
@@ -9910,15 +9842,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/oscar/oscar.c:6446 ../src/protocols/oscar/oscar.c:6448
+#: ../src/protocols/oscar/oscar.c:6510 ../src/protocols/oscar/oscar.c:6512
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ-yhteyskäytäntöliitännäinen"
 
-#: ../src/protocols/oscar/oscar.c:6473 ../src/protocols/zephyr/zephyr.c:2920
+#: ../src/protocols/oscar/oscar.c:6537 ../src/protocols/zephyr/zephyr.c:2927
 msgid "Encoding"
 msgstr "Merkistö"
 
-#: ../src/protocols/oscar/oscar.c:6477
+#: ../src/protocols/oscar/oscar.c:6541
 msgid ""
 "Always use AIM/ICQ proxy server\n"
 "(slower, but does not reveal your IP address)"
@@ -10179,54 +10111,54 @@
 msgid "No Sametime Community Server Specified"
 msgstr "Sametime-yhteisöpalvelinta ei ole määritelty"
 
-#: ../src/protocols/sametime/sametime.c:4077
+#: ../src/protocols/sametime/sametime.c:4082
 msgid "<b>External User</b><br>"
 msgstr "<b>Ulkoinen käyttäjä</b><br>"
 
-#: ../src/protocols/sametime/sametime.c:4080
+#: ../src/protocols/sametime/sametime.c:4085
 #, c-format
 msgid "<b>User ID:</b> %s<br>"
 msgstr "<b>Käyttäjän ID:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:4086
+#: ../src/protocols/sametime/sametime.c:4091
 #, c-format
 msgid "<b>Full Name:</b> %s<br>"
 msgstr "<b>Koko nimi:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:4092
+#: ../src/protocols/sametime/sametime.c:4097
 msgid "<b>Last Known Client:</b> "
 msgstr "<b>Viimeksi nähty asiakas:</b> "
 
-#: ../src/protocols/sametime/sametime.c:4100
+#: ../src/protocols/sametime/sametime.c:4105
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Tuntematon (0x%04x)<br>"
 
-#: ../src/protocols/sametime/sametime.c:4107
+#: ../src/protocols/sametime/sametime.c:4112
 #, c-format
 msgid "<b>Supports:</b> %s<br>"
 msgstr "<b>Tukee:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:4113
+#: ../src/protocols/sametime/sametime.c:4118
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>Tila:</b> %s"
 
-#: ../src/protocols/sametime/sametime.c:4256
-#: ../src/protocols/sametime/sametime.c:5419
+#: ../src/protocols/sametime/sametime.c:4261
+#: ../src/protocols/sametime/sametime.c:5424
 msgid "User Name"
 msgstr "Käyttäjänimi"
 
-#: ../src/protocols/sametime/sametime.c:4259
-#: ../src/protocols/sametime/sametime.c:5422
+#: ../src/protocols/sametime/sametime.c:4264
+#: ../src/protocols/sametime/sametime.c:5427
 msgid "Sametime ID"
 msgstr "Sametime-tunnus"
 
-#: ../src/protocols/sametime/sametime.c:4283
+#: ../src/protocols/sametime/sametime.c:4288
 msgid "An ambiguous user ID was entered"
 msgstr "Epäselvä käyttäjätunnus syötetty"
 
-#: ../src/protocols/sametime/sametime.c:4284
+#: ../src/protocols/sametime/sametime.c:4289
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -10235,15 +10167,15 @@
 "Tunniste '%s' voi viitata keneen tahansa seuraavista käyttäjistä. Valitse "
 "oikea käyttäjä alla olevasta luettelosta lisätäksesi hänet tuttavalistallesi."
 
-#: ../src/protocols/sametime/sametime.c:4289
+#: ../src/protocols/sametime/sametime.c:4294
 msgid "Select User"
 msgstr "Valitse käyttäjä"
 
-#: ../src/protocols/sametime/sametime.c:4359
+#: ../src/protocols/sametime/sametime.c:4364
 msgid "Unable to add user: user not found"
 msgstr "Ei voitu lisätä käyttäjää: käyttäjää ei löydy"
 
-#: ../src/protocols/sametime/sametime.c:4361
+#: ../src/protocols/sametime/sametime.c:4366
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
@@ -10252,11 +10184,11 @@
 "Tunnisteella '%s' ei löytynyt osumia Sametime-yhteisöstäsi. Tämä hakusana "
 "onpoistettu tuttavalistaltasi."
 
-#: ../src/protocols/sametime/sametime.c:4366
+#: ../src/protocols/sametime/sametime.c:4371
 msgid "Unable to add user"
 msgstr "Ei voitu lisätä käyttäjää"
 
-#: ../src/protocols/sametime/sametime.c:4938
+#: ../src/protocols/sametime/sametime.c:4943
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -10265,64 +10197,64 @@
 "Virhe luettaessa tiedostoa %s:  \n"
 "%s.\n"
 
-#: ../src/protocols/sametime/sametime.c:5069
+#: ../src/protocols/sametime/sametime.c:5074
 msgid "Remotely Stored Buddy List"
 msgstr "Etätallennettu tuttavalista"
 
 # NOTE source: gftt glossary
-#: ../src/protocols/sametime/sametime.c:5074
+#: ../src/protocols/sametime/sametime.c:5079
 msgid "Buddy List Storage Mode"
 msgstr "Tuttavalistan tallennustapa"
 
-#: ../src/protocols/sametime/sametime.c:5077
+#: ../src/protocols/sametime/sametime.c:5082
 msgid "Local Buddy List Only"
 msgstr "Vain paikallinen tuttavalista"
 
-#: ../src/protocols/sametime/sametime.c:5079
+#: ../src/protocols/sametime/sametime.c:5084
 msgid "Merge List from Server"
 msgstr "Yhdistä tuttavalista palvelimelta"
 
-#: ../src/protocols/sametime/sametime.c:5081
+#: ../src/protocols/sametime/sametime.c:5086
 msgid "Merge and Save List to Server"
 msgstr "Yhdistä ja tallenna lista palvelimelle"
 
-#: ../src/protocols/sametime/sametime.c:5083
+#: ../src/protocols/sametime/sametime.c:5088
 msgid "Synchronize List with Server"
 msgstr "Täsmää lista palvelimen kanssa"
 
-#: ../src/protocols/sametime/sametime.c:5132
+#: ../src/protocols/sametime/sametime.c:5137
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Tuo Sametime-lista käyttäjätililtä %s"
 
-#: ../src/protocols/sametime/sametime.c:5171
+#: ../src/protocols/sametime/sametime.c:5176
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Vie Sametime-lista käyttäjätilille %s"
 
-#: ../src/protocols/sametime/sametime.c:5224
+#: ../src/protocols/sametime/sametime.c:5229
 msgid "Unable to add group: group exists"
 msgstr "Ei voitu lisätä ryhmää: ryhmä on jo olemassa"
 
-#: ../src/protocols/sametime/sametime.c:5225
+#: ../src/protocols/sametime/sametime.c:5230
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "Ryhmä '%s' on jo tuttavalistallasi."
 
-#: ../src/protocols/sametime/sametime.c:5228
-#: ../src/protocols/sametime/sametime.c:5357
+#: ../src/protocols/sametime/sametime.c:5233
+#: ../src/protocols/sametime/sametime.c:5362
 msgid "Unable to add group"
 msgstr "Ryhmää ei voitu lisätä"
 
-#: ../src/protocols/sametime/sametime.c:5287
+#: ../src/protocols/sametime/sametime.c:5292
 msgid "Possible Matches"
 msgstr "Mahdollisia osumia"
 
-#: ../src/protocols/sametime/sametime.c:5303
+#: ../src/protocols/sametime/sametime.c:5308
 msgid "Notes Address Book group results"
 msgstr "Notesin osoitekirjan ryhmätulokset"
 
-#: ../src/protocols/sametime/sametime.c:5304
+#: ../src/protocols/sametime/sametime.c:5309
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -10333,15 +10265,15 @@
 "ryhmistä. Valitse oikea ryhmä alla olevasta luettelosta lisätäksesi sen "
 "tuttavalistallesi."
 
-#: ../src/protocols/sametime/sametime.c:5309
+#: ../src/protocols/sametime/sametime.c:5314
 msgid "Select Notes Address Book"
 msgstr "Valitse Notesin osoitekirja"
 
-#: ../src/protocols/sametime/sametime.c:5351
+#: ../src/protocols/sametime/sametime.c:5356
 msgid "Unable to add group: group not found"
 msgstr "Ei voitu lisätä ryhmää: ryhmää ei löytynyt"
 
-#: ../src/protocols/sametime/sametime.c:5353
+#: ../src/protocols/sametime/sametime.c:5358
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
@@ -10350,11 +10282,11 @@
 "Tunnisteella '%s' ei löytynyt osumia Sametime-yhteisösi Notesin osoitekirjan "
 "ryhmistä."
 
-#: ../src/protocols/sametime/sametime.c:5394
+#: ../src/protocols/sametime/sametime.c:5399
 msgid "Notes Address Book Group"
 msgstr "Notesin osoitekirjan ryhmä"
 
-#: ../src/protocols/sametime/sametime.c:5395
+#: ../src/protocols/sametime/sametime.c:5400
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
@@ -10362,12 +10294,12 @@
 "Kirjoita Notesin osoitekirjan ryhmän nimi allaolevaan kenttään lisätäksesi "
 "ryhmän ja sen jäsenet tuttavalistallesi."
 
-#: ../src/protocols/sametime/sametime.c:5443
+#: ../src/protocols/sametime/sametime.c:5448
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Hakutulokset haulle '%s'"
 
-#: ../src/protocols/sametime/sametime.c:5444
+#: ../src/protocols/sametime/sametime.c:5449
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -10378,24 +10310,24 @@
 "lisätä nämä käyttäjät tuttavalistallesi tai lähettää heille viestejä alla "
 "olevilla painikkeilla."
 
-#: ../src/protocols/sametime/sametime.c:5476
+#: ../src/protocols/sametime/sametime.c:5481
 msgid "No matches"
 msgstr "Ei tuloksia"
 
-#: ../src/protocols/sametime/sametime.c:5477
+#: ../src/protocols/sametime/sametime.c:5482
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr "Tunnisteella '%s' ei löytynyt osumia Sametime-yhteisöstäsi."
 
-#: ../src/protocols/sametime/sametime.c:5481
+#: ../src/protocols/sametime/sametime.c:5486
 msgid "No Matches"
 msgstr "Ei tuloksia"
 
-#: ../src/protocols/sametime/sametime.c:5518
+#: ../src/protocols/sametime/sametime.c:5523
 msgid "Search for a user"
 msgstr "Etsi käyttäjiä"
 
-#: ../src/protocols/sametime/sametime.c:5519
+#: ../src/protocols/sametime/sametime.c:5524
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
@@ -10403,32 +10335,32 @@
 "Kirjoita nimi tai osittainen käyttäjätunnus alla olevaan kenttään etsiäksesi "
 "käyttäjiä Sametime-yhteisöstäsi."
 
-#: ../src/protocols/sametime/sametime.c:5522
+#: ../src/protocols/sametime/sametime.c:5527
 msgid "User Search"
 msgstr "Käyttäjähaku"
 
-#: ../src/protocols/sametime/sametime.c:5534
+#: ../src/protocols/sametime/sametime.c:5539
 msgid "Import Sametime List..."
 msgstr "Tuo Sametime-lista..."
 
-#: ../src/protocols/sametime/sametime.c:5538
+#: ../src/protocols/sametime/sametime.c:5543
 msgid "Export Sametime List..."
 msgstr "Vie Sametime-lista..."
 
-#: ../src/protocols/sametime/sametime.c:5542
+#: ../src/protocols/sametime/sametime.c:5547
 msgid "Add Notes Address Book Group..."
 msgstr "Lisää Notesin osoitekirjan ryhmä..."
 
-#: ../src/protocols/sametime/sametime.c:5546
+#: ../src/protocols/sametime/sametime.c:5551
 msgid "User Search..."
 msgstr "Käyttäjähaku..."
 
-#: ../src/protocols/sametime/sametime.c:5643
+#: ../src/protocols/sametime/sametime.c:5648
 msgid "Force login (ignore server redirects)"
 msgstr "Pakota sisäänkirjautuminen (älä välitä palvelinuudelleenohjauksista)"
 
 #. pretend to be Sametime Connect
-#: ../src/protocols/sametime/sametime.c:5653
+#: ../src/protocols/sametime/sametime.c:5658
 msgid "Hide client identity"
 msgstr "Piilota asiakasohjelman tunniste"
 
@@ -10621,32 +10553,32 @@
 msgid "Robot"
 msgstr "Robotti"
 
-#: ../src/protocols/silc/buddy.c:1486 ../src/protocols/silc/silc.c:672
+#: ../src/protocols/silc/buddy.c:1486 ../src/protocols/silc/silc.c:674
 #: ../src/protocols/silc/util.c:487
 msgid "Happy"
 msgstr "Onnellinen"
 
-#: ../src/protocols/silc/buddy.c:1488 ../src/protocols/silc/silc.c:674
+#: ../src/protocols/silc/buddy.c:1488 ../src/protocols/silc/silc.c:676
 #: ../src/protocols/silc/util.c:489
 msgid "Sad"
 msgstr "Surullinen"
 
-#: ../src/protocols/silc/buddy.c:1490 ../src/protocols/silc/silc.c:676
+#: ../src/protocols/silc/buddy.c:1490 ../src/protocols/silc/silc.c:678
 #: ../src/protocols/silc/util.c:491
 msgid "Angry"
 msgstr "Vihainen"
 
-#: ../src/protocols/silc/buddy.c:1492 ../src/protocols/silc/silc.c:678
+#: ../src/protocols/silc/buddy.c:1492 ../src/protocols/silc/silc.c:680
 #: ../src/protocols/silc/util.c:493
 msgid "Jealous"
 msgstr "Mustasukkainen"
 
-#: ../src/protocols/silc/buddy.c:1494 ../src/protocols/silc/silc.c:680
+#: ../src/protocols/silc/buddy.c:1494 ../src/protocols/silc/silc.c:682
 #: ../src/protocols/silc/util.c:495
 msgid "Ashamed"
 msgstr "Häpeää"
 
-#: ../src/protocols/silc/buddy.c:1496 ../src/protocols/silc/silc.c:682
+#: ../src/protocols/silc/buddy.c:1496 ../src/protocols/silc/silc.c:684
 #: ../src/protocols/silc/util.c:497
 msgid "Invincible"
 msgstr "Haavoittumaton"
@@ -10655,22 +10587,22 @@
 msgid "In Love"
 msgstr "Rakastunut"
 
-#: ../src/protocols/silc/buddy.c:1500 ../src/protocols/silc/silc.c:686
+#: ../src/protocols/silc/buddy.c:1500 ../src/protocols/silc/silc.c:688
 #: ../src/protocols/silc/util.c:501
 msgid "Sleepy"
 msgstr "Unelias"
 
-#: ../src/protocols/silc/buddy.c:1502 ../src/protocols/silc/silc.c:688
+#: ../src/protocols/silc/buddy.c:1502 ../src/protocols/silc/silc.c:690
 #: ../src/protocols/silc/util.c:503
 msgid "Bored"
 msgstr "Tylsistynyt"
 
-#: ../src/protocols/silc/buddy.c:1504 ../src/protocols/silc/silc.c:690
+#: ../src/protocols/silc/buddy.c:1504 ../src/protocols/silc/silc.c:692
 #: ../src/protocols/silc/util.c:505
 msgid "Excited"
 msgstr "Innostunut"
 
-#: ../src/protocols/silc/buddy.c:1506 ../src/protocols/silc/silc.c:692
+#: ../src/protocols/silc/buddy.c:1506 ../src/protocols/silc/silc.c:694
 #: ../src/protocols/silc/util.c:507
 msgid "Anxious"
 msgstr "Levoton"
@@ -10696,7 +10628,7 @@
 msgstr "Laite"
 
 #: ../src/protocols/silc/buddy.c:1570 ../src/protocols/silc/ops.c:1232
-#: ../src/protocols/silc/silc.c:740 ../src/protocols/silc/silc.c:742
+#: ../src/protocols/silc/silc.c:742 ../src/protocols/silc/silc.c:744
 msgid "Timezone"
 msgstr "Aikavyöhyke"
 
@@ -10836,7 +10768,7 @@
 msgstr "Ryhmän nimi"
 
 #: ../src/protocols/silc/chat.c:582 ../src/protocols/silc/ops.c:1908
-#: ../src/protocols/silc/silc.c:948
+#: ../src/protocols/silc/silc.c:950
 msgid "Passphrase"
 msgstr "Salasana"
 
@@ -10935,15 +10867,15 @@
 msgid "Cannot join private group"
 msgstr "Ei voida liittyä yksityiseen ryhmään"
 
-#: ../src/protocols/silc/chat.c:1294 ../src/protocols/silc/silc.c:1156
+#: ../src/protocols/silc/chat.c:1294 ../src/protocols/silc/silc.c:1158
 msgid "Call Command"
 msgstr "Kutsu komentoa"
 
-#: ../src/protocols/silc/chat.c:1294 ../src/protocols/silc/silc.c:1156
+#: ../src/protocols/silc/chat.c:1294 ../src/protocols/silc/silc.c:1158
 msgid "Cannot call command"
 msgstr "Komentoa ei voida kutsua"
 
-#: ../src/protocols/silc/chat.c:1295 ../src/protocols/silc/silc.c:1157
+#: ../src/protocols/silc/chat.c:1295 ../src/protocols/silc/silc.c:1159
 msgid "Unknown command"
 msgstr "Tuntematon komento"
 
@@ -11052,7 +10984,7 @@
 msgid "Job Role"
 msgstr "Asema työssä"
 
-#: ../src/protocols/silc/ops.c:1052 ../src/protocols/silc/silc.c:941
+#: ../src/protocols/silc/ops.c:1052 ../src/protocols/silc/silc.c:943
 msgid "Organization"
 msgstr "Organisaatio"
 
@@ -11089,7 +11021,7 @@
 msgid "_More..."
 msgstr "_Lisää..."
 
-#: ../src/protocols/silc/ops.c:1369 ../src/protocols/silc/silc.c:1007
+#: ../src/protocols/silc/ops.c:1369 ../src/protocols/silc/silc.c:1009
 msgid "Detach From Server"
 msgstr "Irroita palvelimelta"
 
@@ -11212,7 +11144,7 @@
 msgstr "Palvelin katkaisi yhteyden"
 
 #: ../src/protocols/silc/ops.c:1819 ../src/protocols/silc/ops.c:1866
-#: ../src/protocols/silc/silc.c:199
+#: ../src/protocols/silc/silc.c:195
 msgid "Resuming session"
 msgstr "Palautetaan istunto"
 
@@ -11307,53 +11239,53 @@
 msgid "Unsupported public key type"
 msgstr "Julkisen avaimen tyyppiä ei tuettu"
 
-#: ../src/protocols/silc/silc.c:158
+#: ../src/protocols/silc/silc.c:162
 msgid "Connection failed"
 msgstr "Yhteys epäonnistui"
 
-#: ../src/protocols/silc/silc.c:191
+#: ../src/protocols/silc/silc.c:187
 msgid "Cannot initialize SILC Client connection"
 msgstr "Ei voida alustaa SILC-asiakasyhteyttä"
 
-#: ../src/protocols/silc/silc.c:202
+#: ../src/protocols/silc/silc.c:198
 msgid "Performing key exchange"
 msgstr "Suoritetaan avaintenvaihto"
 
-#: ../src/protocols/silc/silc.c:287
+#: ../src/protocols/silc/silc.c:284
 msgid "Out of memory"
 msgstr "Muisti loppu"
 
-#: ../src/protocols/silc/silc.c:328
+#: ../src/protocols/silc/silc.c:330
 msgid "Cannot initialize SILC protocol"
 msgstr "Ei voida alustaa SILC-yhteyskäytäntöä"
 
-#: ../src/protocols/silc/silc.c:335
+#: ../src/protocols/silc/silc.c:337
 msgid "Cannot find/access ~/.silc directory"
 msgstr "Ei voida löytää/käyttää ~/.silc-hakemistoa"
 
 #. Progress
-#: ../src/protocols/silc/silc.c:340
+#: ../src/protocols/silc/silc.c:342
 msgid "Connecting to SILC Server"
 msgstr "Yhdistetään SILC-palvelimelle"
 
-#: ../src/protocols/silc/silc.c:349
+#: ../src/protocols/silc/silc.c:351
 #, c-format
 msgid "Could not load SILC key pair: %s"
 msgstr "Ei voitu ladata SILC-avainparia: %s"
 
-#: ../src/protocols/silc/silc.c:369
+#: ../src/protocols/silc/silc.c:371
 msgid "Unable to create connection"
 msgstr "Yhteyden luominen epäonnistui"
 
-#: ../src/protocols/silc/silc.c:668
+#: ../src/protocols/silc/silc.c:670
 msgid "Your Current Mood"
 msgstr "Tämänhetkinen mielialasi"
 
-#: ../src/protocols/silc/silc.c:684
+#: ../src/protocols/silc/silc.c:686
 msgid "In love"
 msgstr "Rakastunut"
 
-#: ../src/protocols/silc/silc.c:695
+#: ../src/protocols/silc/silc.c:697
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -11361,43 +11293,43 @@
 "\n"
 "Suosimasi yhteystavat"
 
-#: ../src/protocols/silc/silc.c:703 ../src/protocols/silc/util.c:532
+#: ../src/protocols/silc/silc.c:705 ../src/protocols/silc/util.c:532
 msgid "SMS"
 msgstr "SMS"
 
-#: ../src/protocols/silc/silc.c:705 ../src/protocols/silc/util.c:534
+#: ../src/protocols/silc/silc.c:707 ../src/protocols/silc/util.c:534
 msgid "MMS"
 msgstr "MMS"
 
-#: ../src/protocols/silc/silc.c:707
+#: ../src/protocols/silc/silc.c:709
 msgid "Video conferencing"
 msgstr "Videoneuvottelu"
 
-#: ../src/protocols/silc/silc.c:712
+#: ../src/protocols/silc/silc.c:714
 msgid "Your Current Status"
 msgstr "Tämänhetkinen tilasi"
 
-#: ../src/protocols/silc/silc.c:719
+#: ../src/protocols/silc/silc.c:721
 msgid "Online Services"
 msgstr "Online-palvelut"
 
-#: ../src/protocols/silc/silc.c:722
+#: ../src/protocols/silc/silc.c:724
 msgid "Let others see what services you are using"
 msgstr "Anna muiden nähdä mitä palveluja käytät"
 
-#: ../src/protocols/silc/silc.c:728
+#: ../src/protocols/silc/silc.c:730
 msgid "Let others see what computer you are using"
 msgstr "Anna muiden nähdä mitä tietokonetta käytät"
 
-#: ../src/protocols/silc/silc.c:735
+#: ../src/protocols/silc/silc.c:737
 msgid "Your VCard File"
 msgstr "VCard-tiedostosi"
 
-#: ../src/protocols/silc/silc.c:747 ../src/protocols/silc/silc.c:748
+#: ../src/protocols/silc/silc.c:749 ../src/protocols/silc/silc.c:750
 msgid "User Online Status Attributes"
 msgstr "Käyttäjän paikallaolo-ominaisuudet"
 
-#: ../src/protocols/silc/silc.c:749
+#: ../src/protocols/silc/silc.c:751
 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 "
@@ -11407,163 +11339,163 @@
 "henkilökohtaiset tietosi. Syötä tiedot jotka haluat toisten näkevän "
 "itsestäsi."
 
-#: ../src/protocols/silc/silc.c:789 ../src/protocols/silc/silc.c:795
-#: ../src/protocols/silc/silc.c:1434
+#: ../src/protocols/silc/silc.c:791 ../src/protocols/silc/silc.c:797
+#: ../src/protocols/silc/silc.c:1436
 msgid "Message of the Day"
 msgstr "Päivän viesti"
 
-#: ../src/protocols/silc/silc.c:789
+#: ../src/protocols/silc/silc.c:791
 msgid "No Message of the Day available"
 msgstr "Päivän viestiä ei ole"
 
-#: ../src/protocols/silc/silc.c:790 ../src/protocols/silc/silc.c:1429
+#: ../src/protocols/silc/silc.c:792 ../src/protocols/silc/silc.c:1431
 msgid "There is no Message of the Day associated with this connection"
 msgstr "Ei ole Päivän viestiä joka olisi assosioitu tälle yhteydelle."
 
-#: ../src/protocols/silc/silc.c:841 ../src/protocols/silc/silc.c:885
-#: ../src/protocols/silc/silc.c:956 ../src/protocols/silc/silc.c:957
+#: ../src/protocols/silc/silc.c:843 ../src/protocols/silc/silc.c:887
+#: ../src/protocols/silc/silc.c:958 ../src/protocols/silc/silc.c:959
 msgid "Create New SILC Key Pair"
 msgstr "Luo uusi SILC-avainpari"
 
-#: ../src/protocols/silc/silc.c:841
+#: ../src/protocols/silc/silc.c:843
 msgid "Passphrases do not match"
 msgstr "Salasanat eivät täsmää"
 
-#: ../src/protocols/silc/silc.c:885
+#: ../src/protocols/silc/silc.c:887
 msgid "Key Pair Generation failed"
 msgstr "Avainparin luonti epäonnistui"
 
-#: ../src/protocols/silc/silc.c:924
+#: ../src/protocols/silc/silc.c:926
 msgid "Key length"
 msgstr "Avaimen pituus"
 
-#: ../src/protocols/silc/silc.c:926
+#: ../src/protocols/silc/silc.c:928
 msgid "Public key file"
 msgstr "Julkinen avaintiedosto"
 
-#: ../src/protocols/silc/silc.c:928
+#: ../src/protocols/silc/silc.c:930
 msgid "Private key file"
 msgstr "Yksityinen avaintiedosto"
 
-#: ../src/protocols/silc/silc.c:951
+#: ../src/protocols/silc/silc.c:953
 msgid "Passphrase (retype)"
 msgstr "Salasana (uudelleen)"
 
-#: ../src/protocols/silc/silc.c:958
+#: ../src/protocols/silc/silc.c:960
 msgid "Generate Key Pair"
 msgstr "Luo avainpari"
 
-#: ../src/protocols/silc/silc.c:1002
+#: ../src/protocols/silc/silc.c:1004
 msgid "Online Status"
 msgstr "Tila"
 
-#: ../src/protocols/silc/silc.c:1011
+#: ../src/protocols/silc/silc.c:1013
 msgid "View Message of the Day"
 msgstr "Näytä päivän viesti"
 
-#: ../src/protocols/silc/silc.c:1015
+#: ../src/protocols/silc/silc.c:1017
 msgid "Create SILC Key Pair..."
 msgstr "Luo SILC-avainpari..."
 
-#: ../src/protocols/silc/silc.c:1114
+#: ../src/protocols/silc/silc.c:1116
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "Käyttäjä <I>%s</I> ei ole verkossa"
 
-#: ../src/protocols/silc/silc.c:1305
+#: ../src/protocols/silc/silc.c:1307
 msgid "Topic too long"
 msgstr "Aihe liian pitkä"
 
-#: ../src/protocols/silc/silc.c:1386
+#: ../src/protocols/silc/silc.c:1388
 msgid "You must specify a nick"
 msgstr "Sinun täytyy syöttää lempinimi"
 
-#: ../src/protocols/silc/silc.c:1488
+#: ../src/protocols/silc/silc.c:1490
 #, c-format
 msgid "channel %s not found"
 msgstr "Kanavaa %s ei löydy"
 
-#: ../src/protocols/silc/silc.c:1493
+#: ../src/protocols/silc/silc.c:1495
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "kanavan tilat kanavalle %s: %s"
 
-#: ../src/protocols/silc/silc.c:1495
+#: ../src/protocols/silc/silc.c:1497
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "ei kanavan tiloja asetettu kanavalle %s"
 
-#: ../src/protocols/silc/silc.c:1508
+#: ../src/protocols/silc/silc.c:1510
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "cmodes asetus epäonnistui, %s"
 
-#: ../src/protocols/silc/silc.c:1538
+#: ../src/protocols/silc/silc.c:1540
 #, c-format
 msgid "Unknown command: %s, (may be a Gaim bug)"
 msgstr "Tuntematon komento: %s, (mahdollisesti Gaimin virhe)"
 
-#: ../src/protocols/silc/silc.c:1601
+#: ../src/protocols/silc/silc.c:1603
 msgid "part [channel]:  Leave the chat"
 msgstr "part [kanava]:  Poistu keskustelusta"
 
-#: ../src/protocols/silc/silc.c:1605
+#: ../src/protocols/silc/silc.c:1607
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [kanava]:  Poistu keskustelusta"
 
-#: ../src/protocols/silc/silc.c:1609
+#: ../src/protocols/silc/silc.c:1611
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;uusi aihe&gt;]: Näytä tai aseta aihe"
 
-#: ../src/protocols/silc/silc.c:1614
+#: ../src/protocols/silc/silc.c:1616
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join &lt;kanava&gt; [&lt;salasana&gt;]: Liity kanavalle tässä verkossa"
 
-#: ../src/protocols/silc/silc.c:1618
+#: ../src/protocols/silc/silc.c:1620
 msgid "list:  List channels on this network"
 msgstr "list: Listaa kanavat tässä verkossa"
 
-#: ../src/protocols/silc/silc.c:1622
+#: ../src/protocols/silc/silc.c:1624
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;nimi&gt;: Näytä nimen tiedot"
 
-#: ../src/protocols/silc/silc.c:1626 ../src/protocols/zephyr/zephyr.c:2622
+#: ../src/protocols/silc/silc.c:1628 ../src/protocols/zephyr/zephyr.c:2629
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;nimi&gt; &lt;viesti&gt;: Lähetä yksityisviesti käyttäjälle"
 
-#: ../src/protocols/silc/silc.c:1630
+#: ../src/protocols/silc/silc.c:1632
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr "query &lt;nimi&gt; [&lt;viesti&gt;]: Lähetä yksityisviesti käyttäjälle"
 
-#: ../src/protocols/silc/silc.c:1634
+#: ../src/protocols/silc/silc.c:1636
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd: Näytä palvelimen päivän viesti"
 
-#: ../src/protocols/silc/silc.c:1638
+#: ../src/protocols/silc/silc.c:1640
 msgid "detach:  Detach this session"
 msgstr "detach: Irroita tämä istunto"
 
-#: ../src/protocols/silc/silc.c:1642
+#: ../src/protocols/silc/silc.c:1644
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [viesti]: Katkaise yhteys palvelimelle, valinnainen viesti"
 
-#: ../src/protocols/silc/silc.c:1646
+#: ../src/protocols/silc/silc.c:1648
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;komento&gt;: Kutsu mitä vain silc:n asiakaskomentoa."
 
-#: ../src/protocols/silc/silc.c:1652
+#: ../src/protocols/silc/silc.c:1654
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;nimi&gt; [-pubkey|&lt;syy&gt;]: Tuhoa nimi"
 
-#: ../src/protocols/silc/silc.c:1656
+#: ../src/protocols/silc/silc.c:1658
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;uusi nimi&gt;: Muuta (lempi)nimesi."
 
-#: ../src/protocols/silc/silc.c:1660
+#: ../src/protocols/silc/silc.c:1662
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;nimi&gt;: Näytä nimen tiedot"
 
-#: ../src/protocols/silc/silc.c:1664
+#: ../src/protocols/silc/silc.c:1666
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -11571,7 +11503,7 @@
 "cmode &lt;kanava&gt; [+|-&lt;tila&gt;] [argumentit]: Aseta tai näytä kanavan "
 "tilat."
 
-#: ../src/protocols/silc/silc.c:1668
+#: ../src/protocols/silc/silc.c:1670
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -11579,15 +11511,15 @@
 "cumode &lt;kanava&gt; +|-&lt;tila&gt; &lt;nimi&gt;: Muuta nimen tilaa "
 "kanavalla."
 
-#: ../src/protocols/silc/silc.c:1672
+#: ../src/protocols/silc/silc.c:1674
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;käyttäjätilat&gt;: Aseta omat tilasi verkossa"
 
-#: ../src/protocols/silc/silc.c:1676
+#: ../src/protocols/silc/silc.c:1678
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;nimi&gt; [-pubkey]: Palvelinoperaattorin oikeudet"
 
-#: ../src/protocols/silc/silc.c:1680
+#: ../src/protocols/silc/silc.c:1682
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -11595,37 +11527,37 @@
 "invite &lt;kanava&gt; [-|+]&lt;nimi&gt;: Kutsu käyttäjä tai lisää/poista "
 "kanavan kutsu- listalta"
 
-#: ../src/protocols/silc/silc.c:1684
+#: ../src/protocols/silc/silc.c:1686
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 "kick &lt;kanava&gt; &lt;nimi&gt; [kommentti]: Poista käyttäjä kanavalta"
 
-#: ../src/protocols/silc/silc.c:1688
+#: ../src/protocols/silc/silc.c:1690
 msgid "info [server]:  View server administrative details"
 msgstr "info [palvelin]: Näytä palvelimen ylläpidolliset yksityiskohdat"
 
-#: ../src/protocols/silc/silc.c:1692
+#: ../src/protocols/silc/silc.c:1694
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [%lt;kanava%gt; +|-&lt;nimi&gt;]: Kiellä käyttäjä kanavalta"
 
-#: ../src/protocols/silc/silc.c:1696
+#: ../src/protocols/silc/silc.c:1698
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 "getkey &lt;nimi|palvelin&gt;: Hae käyttäjän tai palvelimen julkinen avain"
 
-#: ../src/protocols/silc/silc.c:1700
+#: ../src/protocols/silc/silc.c:1702
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Näytä palvelimen ja verkon tilastot"
 
-#: ../src/protocols/silc/silc.c:1704
+#: ../src/protocols/silc/silc.c:1706
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Lähetä PING palvelimelle, johon ollaan yhteydessä"
 
-#: ../src/protocols/silc/silc.c:1709
+#: ../src/protocols/silc/silc.c:1711
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;kanava&gt;: Näytä käyttäjät kanavalla"
 
-#: ../src/protocols/silc/silc.c:1713
+#: ../src/protocols/silc/silc.c:1715
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -11642,60 +11574,60 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../src/protocols/silc/silc.c:1822
+#: ../src/protocols/silc/silc.c:1824
 msgid "SILC Protocol Plugin"
 msgstr "SILC-yhteyskäytäntöliitännäinen"
 
 #. *  description
-#: ../src/protocols/silc/silc.c:1824
+#: ../src/protocols/silc/silc.c:1826
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Secure Internet Live Conferencing (SILC) -yhteyskäytäntö"
 
-#: ../src/protocols/silc/silc.c:1861
+#: ../src/protocols/silc/silc.c:1863
 msgid "Public Key file"
 msgstr "Julkinen avaintiedosto"
 
-#: ../src/protocols/silc/silc.c:1865
+#: ../src/protocols/silc/silc.c:1867
 msgid "Private Key file"
 msgstr "Yksityinen avaintiedosto"
 
-#: ../src/protocols/silc/silc.c:1875
+#: ../src/protocols/silc/silc.c:1877
 msgid "Cipher"
 msgstr "Salaus"
 
-#: ../src/protocols/silc/silc.c:1885
+#: ../src/protocols/silc/silc.c:1887
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../src/protocols/silc/silc.c:1888
+#: ../src/protocols/silc/silc.c:1890
 msgid "Public key authentication"
 msgstr "Julkisella avaimella todentaminen"
 
-#: ../src/protocols/silc/silc.c:1891
+#: ../src/protocols/silc/silc.c:1893
 msgid "Reject watching by other users"
 msgstr "Evää katsominen toisilta käyttäjiltä"
 
-#: ../src/protocols/silc/silc.c:1894
+#: ../src/protocols/silc/silc.c:1896
 msgid "Block invites"
 msgstr "Estä kutsut"
 
-#: ../src/protocols/silc/silc.c:1897
+#: ../src/protocols/silc/silc.c:1899
 msgid "Block IMs without Key Exchange"
 msgstr "Estä pikaviestit ilman avaintenvaihtoa"
 
-#: ../src/protocols/silc/silc.c:1900
+#: ../src/protocols/silc/silc.c:1902
 msgid "Reject online status attribute requests"
 msgstr "Evää paikallaolotilan pyynnöt"
 
-#: ../src/protocols/silc/silc.c:1903
+#: ../src/protocols/silc/silc.c:1905
 msgid "Block messages to whiteboard"
 msgstr "Estä viestit kirjoitustaululle"
 
-#: ../src/protocols/silc/silc.c:1906
+#: ../src/protocols/silc/silc.c:1908
 msgid "Automatically open whiteboard"
 msgstr "_Avaa kirjoitustaulu automaattisesti"
 
-#: ../src/protocols/silc/silc.c:1909
+#: ../src/protocols/silc/silc.c:1911
 msgid "Digitally sign and verify all messages"
 msgstr "Allekirjoita ja tarkista kaikki viestit digitaalisesti"
 
@@ -11814,7 +11746,7 @@
 msgid "Could not write"
 msgstr "Ei voitu kirjoittaa"
 
-#: ../src/protocols/simple/simple.c:426 ../src/protocols/simple/simple.c:1425
+#: ../src/protocols/simple/simple.c:426 ../src/protocols/simple/simple.c:1431
 msgid "Could not connect"
 msgstr "Ei voitu yhdistää"
 
@@ -11822,16 +11754,16 @@
 msgid "Wrong Password"
 msgstr "Väärä salasana"
 
-#: ../src/protocols/simple/simple.c:1456 ../src/protocols/simple/simple.c:1495
-#: ../src/protocols/simple/simple.c:1507 ../src/protocols/simple/simple.c:1565
+#: ../src/protocols/simple/simple.c:1462 ../src/protocols/simple/simple.c:1501
+#: ../src/protocols/simple/simple.c:1513 ../src/protocols/simple/simple.c:1571
 msgid "Could not create listen socket"
 msgstr "Kuuntelupistokkeen luominen epäonnistui"
 
-#: ../src/protocols/simple/simple.c:1477
+#: ../src/protocols/simple/simple.c:1483
 msgid "Couldn't resolve host"
 msgstr "Yhteyttä isäntään ei voitu löytää"
 
-#: ../src/protocols/simple/simple.c:1587
+#: ../src/protocols/simple/simple.c:1593
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP-käyttäjänimissä ei tule olla välilyöntejä tai @-merkkejä"
 
@@ -11843,36 +11775,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../src/protocols/simple/simple.c:1749
+#: ../src/protocols/simple/simple.c:1755
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE-yhteyskäytäntöliitännäinen"
 
 #. *  summary
-#: ../src/protocols/simple/simple.c:1750
+#: ../src/protocols/simple/simple.c:1756
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE-yhteyskäytäntöliitännäinen"
 
-#: ../src/protocols/simple/simple.c:1772
+#: ../src/protocols/simple/simple.c:1778
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Julkaise tilasi (huom: kuka tahansa voi seurata tilaasi)"
 
-#: ../src/protocols/simple/simple.c:1778
+#: ../src/protocols/simple/simple.c:1784
 msgid "Use UDP"
 msgstr "Käytä UDP:tä"
 
-#: ../src/protocols/simple/simple.c:1780
+#: ../src/protocols/simple/simple.c:1786
 msgid "Use proxy"
 msgstr "Käytä välipalvelinta"
 
-#: ../src/protocols/simple/simple.c:1782
+#: ../src/protocols/simple/simple.c:1788
 msgid "Proxy"
 msgstr "Välipalvelin"
 
-#: ../src/protocols/simple/simple.c:1784
+#: ../src/protocols/simple/simple.c:1790
 msgid "Auth User"
 msgstr "Todennus/käyttäjä"
 
-#: ../src/protocols/simple/simple.c:1786
+#: ../src/protocols/simple/simple.c:1792
 msgid "Auth Domain"
 msgstr "Todennus/verkkoalue"
 
@@ -11886,6 +11818,16 @@
 msgid "Connect to %s failed"
 msgstr "%s: yhteyden muodostaminen epäonnistui"
 
+#. we didn't successfully connect. tdt->toc_fd is valid here
+#: ../src/protocols/toc/toc.c:172 ../src/protocols/yahoo/yahoo.c:2254
+#: ../src/protocols/yahoo/yahoo.c:2281 ../src/protocols/yahoo/yahoo.c:2364
+#: ../src/protocols/yahoo/yahoo.c:2379
+#: ../src/protocols/yahoo/yahoo_filexfer.c:74
+#: ../src/protocols/yahoo/yahoo_filexfer.c:137
+#: ../src/protocols/yahoo/ycht.c:540
+msgid "Unable to connect."
+msgstr "Yhteyden muodostaminen epäonnistui."
+
 #: ../src/protocols/toc/toc.c:200
 #, c-format
 msgid "Signon: %s"
@@ -12042,6 +11984,10 @@
 "voi potkaista sinut ulos jos lähetät viestin. Gaim estää kaiken läpimenon. "
 "Tämä on vain väliaikaista, ole kärsivällinen."
 
+#: ../src/protocols/toc/toc.c:1367
+msgid "_Group:"
+msgstr "_Ryhmä:"
+
 #: ../src/protocols/toc/toc.c:1549
 msgid "Get Dir Info"
 msgstr "Hae hakemistotiedot"
@@ -12103,15 +12049,15 @@
 msgid "TOC Protocol Plugin"
 msgstr "TOC-yhteyskäytäntöliitännäinen"
 
-#: ../src/protocols/yahoo/yahoo.c:710
+#: ../src/protocols/yahoo/yahoo.c:711
 msgid "Your Yahoo! message did not get sent."
 msgstr "Yahoo!-viestiäsi ei lähetetty."
 
-#: ../src/protocols/yahoo/yahoo.c:764 ../src/protocols/yahoo/yahoo.c:3564
+#: ../src/protocols/yahoo/yahoo.c:770 ../src/protocols/yahoo/yahoo.c:3597
 msgid "Buzz!!"
 msgstr "Huomio!"
 
-#: ../src/protocols/yahoo/yahoo.c:809
+#: ../src/protocols/yahoo/yahoo.c:816
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo!-järjestelmäviesti käyttäjälle %s:"
@@ -12119,23 +12065,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:905
+#: ../src/protocols/yahoo/yahoo.c:912
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list%s%s."
 msgstr "Käyttäjä %s haluaa lisätä käyttäjän %s tuttavalistalleen %s%s."
 
-#: ../src/protocols/yahoo/yahoo.c:911
+#: ../src/protocols/yahoo/yahoo.c:918
 msgid "Message (optional) :"
 msgstr "Viesti (valinnainen) :"
 
-#: ../src/protocols/yahoo/yahoo.c:953
+#: ../src/protocols/yahoo/yahoo.c:960
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 "Käyttäjä %s on (taannehtivasti) evännyt pyyntösi lisätä hänet "
 "tuttavalistallesi."
 
-#: ../src/protocols/yahoo/yahoo.c:956
+#: ../src/protocols/yahoo/yahoo.c:963
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -12144,11 +12090,11 @@
 "Käyttäjä %s on (taannehtivasti) evännyt pyyntösi lisätä hänet "
 "tuttavalistallesi seuraavasta syystä: %s."
 
-#: ../src/protocols/yahoo/yahoo.c:959
+#: ../src/protocols/yahoo/yahoo.c:966
 msgid "Add buddy rejected"
 msgstr "Tuttavan lisääminen estetty"
 
-#: ../src/protocols/yahoo/yahoo.c:1702
+#: ../src/protocols/yahoo/yahoo.c:1716
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -12159,11 +12105,11 @@
 "versio ei todennäköisesti pysty kirjautumaan Yahoo-palveluun. Tarkista "
 "päivitykset osoitteesta: %s."
 
-#: ../src/protocols/yahoo/yahoo.c:1705
+#: ../src/protocols/yahoo/yahoo.c:1719
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo!:n todennus epäonnistui"
 
-#: ../src/protocols/yahoo/yahoo.c:1771
+#: ../src/protocols/yahoo/yahoo.c:1785
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -12173,19 +12119,19 @@
 "tuttavalistalla. Painaessasi \"Kyllä\" poistat hänet tuttavalistalta eikä "
 "häneltä saapuneista viesteistä enää välitetä."
 
-#: ../src/protocols/yahoo/yahoo.c:1774
+#: ../src/protocols/yahoo/yahoo.c:1788
 msgid "Ignore buddy?"
 msgstr "Jätä tuttava huomiotta?"
 
-#: ../src/protocols/yahoo/yahoo.c:1808
+#: ../src/protocols/yahoo/yahoo.c:1822
 msgid "Invalid username."
 msgstr "Epäkelpo käyttäjänimi."
 
-#: ../src/protocols/yahoo/yahoo.c:1819
+#: ../src/protocols/yahoo/yahoo.c:1833
 msgid "Normal authentication failed!"
 msgstr "Tavallinen tunnistautumismenetelmä epäonnistui!"
 
-#: ../src/protocols/yahoo/yahoo.c:1820
+#: ../src/protocols/yahoo/yahoo.c:1834
 msgid ""
 "The normal authentication method has failed. This means either your password "
 "is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
@@ -12197,137 +12143,137 @@
 "muuttunut. Gaim yrittää nyt kirjautua käyttäen Web Messenger- "
 "tunnistautumista josta seuraa vähentynyt toiminnallisuus ja ominaisuudet."
 
-#: ../src/protocols/yahoo/yahoo.c:1828
+#: ../src/protocols/yahoo/yahoo.c:1842
 msgid "Incorrect password."
 msgstr "Virheellinen salasana."
 
-#: ../src/protocols/yahoo/yahoo.c:1831
+#: ../src/protocols/yahoo/yahoo.c:1845
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "Käyttäjätilisi on lukittu, kirjaudu sisään yahoo-websivustolta."
 
-#: ../src/protocols/yahoo/yahoo.c:1834
+#: ../src/protocols/yahoo/yahoo.c:1848
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Tuntematon viesti numero %d. Kirjautumalla Yahoo! verkkosivuille saattaa "
 "korjata tämän."
 
-#: ../src/protocols/yahoo/yahoo.c:1888
+#: ../src/protocols/yahoo/yahoo.c:1902
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Ei voitu lisätä tuttavaa %s ryhmään %s palvelimen listalle, tilillä %s."
 
-#: ../src/protocols/yahoo/yahoo.c:1891
+#: ../src/protocols/yahoo/yahoo.c:1905
 msgid "Could not add buddy to server list"
 msgstr "Ei voitu lisätä tuttavaa palvelimen listalle"
 
-#: ../src/protocols/yahoo/yahoo.c:2010
+#: ../src/protocols/yahoo/yahoo.c:2024
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Ääniäinen %s/%s/%s.swf ] %s"
 
-#: ../src/protocols/yahoo/yahoo.c:2149 ../src/protocols/yahoo/yahoo.c:2296
-#: ../src/protocols/yahoo/yahoo.c:2311 ../src/protocols/yahoo/ycht.c:472
+#: ../src/protocols/yahoo/yahoo.c:2166 ../src/protocols/yahoo/yahoo.c:2313
+#: ../src/protocols/yahoo/yahoo.c:2328 ../src/protocols/yahoo/ycht.c:472
 msgid "Unable to read"
 msgstr "Ei kyetty lukemaan"
 
-#: ../src/protocols/yahoo/yahoo.c:2335 ../src/protocols/yahoo/yahoo.c:2492
-#: ../src/protocols/yahoo/yahoo.c:2594 ../src/protocols/yahoo/yahoo.c:2604
-#: ../src/protocols/yahoo/yahoochat.c:1447
-#: ../src/protocols/yahoo/yahoochat.c:1517 ../src/protocols/yahoo/ycht.c:576
+#: ../src/protocols/yahoo/yahoo.c:2352 ../src/protocols/yahoo/yahoo.c:2509
+#: ../src/protocols/yahoo/yahoo.c:2612 ../src/protocols/yahoo/yahoo.c:2622
+#: ../src/protocols/yahoo/yahoochat.c:1448
+#: ../src/protocols/yahoo/yahoochat.c:1518 ../src/protocols/yahoo/ycht.c:576
 msgid "Connection problem"
 msgstr "Yhteysvirhe"
 
-#: ../src/protocols/yahoo/yahoo.c:2711 ../src/protocols/yahoo/yahoo.c:3298
+#: ../src/protocols/yahoo/yahoo.c:2728 ../src/protocols/yahoo/yahoo.c:3331
 msgid "Not at Home"
 msgstr "Poissa kotoa"
 
-#: ../src/protocols/yahoo/yahoo.c:2713 ../src/protocols/yahoo/yahoo.c:3301
+#: ../src/protocols/yahoo/yahoo.c:2730 ../src/protocols/yahoo/yahoo.c:3334
 msgid "Not at Desk"
 msgstr "Poissa työpöydältä"
 
-#: ../src/protocols/yahoo/yahoo.c:2715 ../src/protocols/yahoo/yahoo.c:3304
+#: ../src/protocols/yahoo/yahoo.c:2732 ../src/protocols/yahoo/yahoo.c:3337
 msgid "Not in Office"
 msgstr "Poissa toimistolta"
 
-#: ../src/protocols/yahoo/yahoo.c:2719 ../src/protocols/yahoo/yahoo.c:3310
+#: ../src/protocols/yahoo/yahoo.c:2736 ../src/protocols/yahoo/yahoo.c:3343
 msgid "On Vacation"
 msgstr "Lomalla"
 
-#: ../src/protocols/yahoo/yahoo.c:2723 ../src/protocols/yahoo/yahoo.c:3316
+#: ../src/protocols/yahoo/yahoo.c:2740 ../src/protocols/yahoo/yahoo.c:3349
 msgid "Stepped Out"
 msgstr "Piipahdan ulkona"
 
-#: ../src/protocols/yahoo/yahoo.c:2816 ../src/protocols/yahoo/yahoo.c:2846
+#: ../src/protocols/yahoo/yahoo.c:2833 ../src/protocols/yahoo/yahoo.c:2863
 msgid "Not on server list"
 msgstr "Ei palvelimen listalla"
 
-#: ../src/protocols/yahoo/yahoo.c:2863 ../src/protocols/yahoo/yahoo.c:2922
+#: ../src/protocols/yahoo/yahoo.c:2880 ../src/protocols/yahoo/yahoo.c:2939
 msgid "Appear Online"
 msgstr "Näytä linjoilla olevalta"
 
-#: ../src/protocols/yahoo/yahoo.c:2866 ../src/protocols/yahoo/yahoo.c:2943
+#: ../src/protocols/yahoo/yahoo.c:2883 ../src/protocols/yahoo/yahoo.c:2960
 msgid "Appear Permanently Offline"
 msgstr "Näytä pysyvästi poissaolevalta"
 
-#: ../src/protocols/yahoo/yahoo.c:2885
+#: ../src/protocols/yahoo/yahoo.c:2902
 msgid "Presence"
 msgstr "Läsnäolo"
 
-#: ../src/protocols/yahoo/yahoo.c:2928
+#: ../src/protocols/yahoo/yahoo.c:2945
 msgid "Appear Offline"
 msgstr "Näytä poissaolevalta"
 
-#: ../src/protocols/yahoo/yahoo.c:2937
+#: ../src/protocols/yahoo/yahoo.c:2954
 msgid "Don't Appear Permanently Offline"
 msgstr "Älä näytä pysyvästi poissaolevalta"
 
-#: ../src/protocols/yahoo/yahoo.c:2985
+#: ../src/protocols/yahoo/yahoo.c:3002
 msgid "Join in Chat"
 msgstr "Liity ryhmäkeskusteluun"
 
-#: ../src/protocols/yahoo/yahoo.c:2991
+#: ../src/protocols/yahoo/yahoo.c:3008
 msgid "Initiate Conference"
 msgstr "Aloita neuvottelu"
 
-#: ../src/protocols/yahoo/yahoo.c:3019
+#: ../src/protocols/yahoo/yahoo.c:3036
 msgid "Presence Settings"
 msgstr "Läsnäoloasetukset"
 
-#: ../src/protocols/yahoo/yahoo.c:3025
+#: ../src/protocols/yahoo/yahoo.c:3042
 msgid "Start Doodling"
 msgstr "Aloita piirtely"
 
-#: ../src/protocols/yahoo/yahoo.c:3057
+#: ../src/protocols/yahoo/yahoo.c:3074
 msgid "Active which ID?"
 msgstr "Minkä tunnuksen (ID) haluat aktivoida?"
 
-#: ../src/protocols/yahoo/yahoo.c:3066
+#: ../src/protocols/yahoo/yahoo.c:3083
 msgid "Join who in chat?"
 msgstr "Kenen seuraan liitytään ryhmäkeskustelussa?"
 
-#: ../src/protocols/yahoo/yahoo.c:3076
+#: ../src/protocols/yahoo/yahoo.c:3093
 msgid "Activate ID..."
 msgstr "Aktivoi tunnus (ID)..."
 
-#: ../src/protocols/yahoo/yahoo.c:3080
+#: ../src/protocols/yahoo/yahoo.c:3097
 msgid "Join User in Chat..."
 msgstr "Liity käyttäjän seuraan ryhmäkeskustelussa..."
 
-#: ../src/protocols/yahoo/yahoo.c:3623
+#: ../src/protocols/yahoo/yahoo.c:3656
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt;huone&gt;: Liity keskusteluhuoneeseen Yahoo-verkossa"
 
-#: ../src/protocols/yahoo/yahoo.c:3628
+#: ../src/protocols/yahoo/yahoo.c:3661
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: Listaa kanavat Yahoo-verkossa"
 
-#: ../src/protocols/yahoo/yahoo.c:3632
+#: ../src/protocols/yahoo/yahoo.c:3665
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Anna tuttavalle äänimerkki huomion saamiseksi"
 
-#: ../src/protocols/yahoo/yahoo.c:3636
+#: ../src/protocols/yahoo/yahoo.c:3669
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Pyydä käyttäjää aloittamaan piirtelyistunto"
 
@@ -12341,55 +12287,55 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/yahoo/yahoo.c:3729 ../src/protocols/yahoo/yahoo.c:3731
+#: ../src/protocols/yahoo/yahoo.c:3762 ../src/protocols/yahoo/yahoo.c:3764
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo-yhteyskäytäntöliitännäinen"
 
-#: ../src/protocols/yahoo/yahoo.c:3748
+#: ../src/protocols/yahoo/yahoo.c:3781
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: ../src/protocols/yahoo/yahoo.c:3751
+#: ../src/protocols/yahoo/yahoo.c:3784
 msgid "Pager server"
 msgstr "Hakulaitepalvelin"
 
-#: ../src/protocols/yahoo/yahoo.c:3754
+#: ../src/protocols/yahoo/yahoo.c:3787
 msgid "Japan Pager server"
 msgstr "Hakulaitepalvelin (Japani)"
 
-#: ../src/protocols/yahoo/yahoo.c:3757
+#: ../src/protocols/yahoo/yahoo.c:3790
 msgid "Pager port"
 msgstr "Hakulaiteportti"
 
-#: ../src/protocols/yahoo/yahoo.c:3760
+#: ../src/protocols/yahoo/yahoo.c:3793
 msgid "File transfer server"
 msgstr "Tiedostonsiirtopalvelin"
 
-#: ../src/protocols/yahoo/yahoo.c:3763
+#: ../src/protocols/yahoo/yahoo.c:3796
 msgid "Japan file transfer server"
 msgstr "Tiedostonsiirtopalvelin (Japani)"
 
-#: ../src/protocols/yahoo/yahoo.c:3766
+#: ../src/protocols/yahoo/yahoo.c:3799
 msgid "File transfer port"
 msgstr "Tiedostonsiirtoportti"
 
-#: ../src/protocols/yahoo/yahoo.c:3769
+#: ../src/protocols/yahoo/yahoo.c:3802
 msgid "Chat room locale"
 msgstr "Keskusteluhuoneen paikallisasetus"
 
-#: ../src/protocols/yahoo/yahoo.c:3772
+#: ../src/protocols/yahoo/yahoo.c:3805
 msgid "Ignore conference and chatroom invitations"
 msgstr "Jätä konferenssi- ja keskusteluhuonekutsut huomiotta"
 
-#: ../src/protocols/yahoo/yahoo.c:3776
+#: ../src/protocols/yahoo/yahoo.c:3809
 msgid "Chat room list URL"
 msgstr "Keskusteluhuoneluettelon URL"
 
-#: ../src/protocols/yahoo/yahoo.c:3779
+#: ../src/protocols/yahoo/yahoo.c:3812
 msgid "Yahoo Chat server"
 msgstr "Yahoo-ryhmäkeskustelupalvelin"
 
-#: ../src/protocols/yahoo/yahoo.c:3782
+#: ../src/protocols/yahoo/yahoo.c:3815
 msgid "Yahoo Chat port"
 msgstr "Yahoo-ryhmäkeskustelupalvelimen portti"
 
@@ -12407,7 +12353,7 @@
 msgstr "Ei kyetty muodostamaan tiedostokahvaa."
 
 #. TODO: what to do here - do we really have to disconnect?
-#: ../src/protocols/yahoo/yahoo_packet.c:265
+#: ../src/protocols/yahoo/yahoo_packet.c:279
 msgid "Write Error"
 msgstr "Virhe kirjoituksessa"
 
@@ -12552,33 +12498,33 @@
 msgid "You are now chatting in %s."
 msgstr "Olet nyt keskustelemassa huoneessa %s"
 
-#: ../src/protocols/yahoo/yahoochat.c:626
+#: ../src/protocols/yahoo/yahoochat.c:627
 msgid "Failed to join buddy in chat"
 msgstr "Liittyminen tuttavan seuraan keskusteluhuoneeseen epäonnistui"
 
-#: ../src/protocols/yahoo/yahoochat.c:627
+#: ../src/protocols/yahoo/yahoochat.c:628
 msgid "Maybe they're not in a chat?"
 msgstr "Ehkä he eivät ole ryhmäkeskustelussa?"
 
-#: ../src/protocols/yahoo/yahoochat.c:1345
-#: ../src/protocols/yahoo/yahoochat.c:1372
+#: ../src/protocols/yahoo/yahoochat.c:1346
+#: ../src/protocols/yahoo/yahoochat.c:1373
 msgid "Fetching the room list failed."
 msgstr "Huonelistan haku epäonnistui."
 
-#: ../src/protocols/yahoo/yahoochat.c:1433
+#: ../src/protocols/yahoo/yahoochat.c:1434
 msgid "Voices"
 msgstr "Äänet"
 
-#: ../src/protocols/yahoo/yahoochat.c:1436
+#: ../src/protocols/yahoo/yahoochat.c:1437
 msgid "Webcams"
 msgstr "Web-kamerat"
 
-#: ../src/protocols/yahoo/yahoochat.c:1447
-#: ../src/protocols/yahoo/yahoochat.c:1517
+#: ../src/protocols/yahoo/yahoochat.c:1448
+#: ../src/protocols/yahoo/yahoochat.c:1518
 msgid "Unable to fetch room list."
 msgstr "Huonelistaa ei voida hakea."
 
-#: ../src/protocols/yahoo/yahoochat.c:1510
+#: ../src/protocols/yahoo/yahoochat.c:1511
 msgid "User Rooms"
 msgstr "Käyttäjän huoneet"
 
@@ -12634,39 +12580,39 @@
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "Yritys tilata %s,%s,%s epäonnistui"
 
-#: ../src/protocols/zephyr/zephyr.c:2627
+#: ../src/protocols/zephyr/zephyr.c:2634
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;nimi&gt;: Paikanna käyttäjä"
 
-#: ../src/protocols/zephyr/zephyr.c:2632
+#: ../src/protocols/zephyr/zephyr.c:2639
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;nimi&gt;: Paikanna käyttäjä"
 
-#: ../src/protocols/zephyr/zephyr.c:2637
+#: ../src/protocols/zephyr/zephyr.c:2644
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 "instance &lt;ilmentymä&gt;: Aseta ilmentymä jota käytetään tässä luokassa"
 
-#: ../src/protocols/zephyr/zephyr.c:2642
+#: ../src/protocols/zephyr/zephyr.c:2649
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;ilmentymä&gt;: Aseta ilmentymä jota käytetään tässä luokassa"
 
-#: ../src/protocols/zephyr/zephyr.c:2647
+#: ../src/protocols/zephyr/zephyr.c:2654
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "topic &lt;ilmentymä&gt;: Aseta ilmentymä jota käytetään tässä luokassa"
 
-#: ../src/protocols/zephyr/zephyr.c:2653
+#: ../src/protocols/zephyr/zephyr.c:2660
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 "sub &lt;luokka&gt; &lt;ilmentymä&gt; &lt;vastaanottaja&gt;: Liity uuteen "
 "ryhmäkeskusteluun"
 
-#: ../src/protocols/zephyr/zephyr.c:2658
+#: ../src/protocols/zephyr/zephyr.c:2665
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr "zi &lt;ilmentymä&gt;: Lähetä viesti &lt;viesti,<i>ilmentymä</i>,*&gt;"
 
-#: ../src/protocols/zephyr/zephyr.c:2664
+#: ../src/protocols/zephyr/zephyr.c:2671
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
@@ -12674,7 +12620,7 @@
 "zci &lt;luokka&gt; &lt;ilmentymä&gt;: Lähetä viesti &lt;<i>luokka</i>,"
 "<i>ilmentymä</i>,*&gt;"
 
-#: ../src/protocols/zephyr/zephyr.c:2670
+#: ../src/protocols/zephyr/zephyr.c:2677
 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;"
@@ -12682,7 +12628,7 @@
 "zcir &lt;luokka&gt; &lt;ilmentymä&gt; &lt;vastaanottaja&gt;: Lähetä viesti "
 "&lt;<i>luokka</i>,<i>ilmentymä</i>,<i>vastaanottaja</i>&gt;"
 
-#: ../src/protocols/zephyr/zephyr.c:2676
+#: ../src/protocols/zephyr/zephyr.c:2683
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -12690,15 +12636,15 @@
 "zir &lt;ilmentymä&gt; &lt;vastaanottaja&gt;: Lähetä viesti &lt;VIESTI,"
 "<i>ilmentymä</i>,<i>vastaanottaja</i>&gt;"
 
-#: ../src/protocols/zephyr/zephyr.c:2681
+#: ../src/protocols/zephyr/zephyr.c:2688
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr "zc &lt;luokka&gt;: Lähetä viesti &lt;<i>luokka</i>,YKSITYINEN,*&gt;"
 
-#: ../src/protocols/zephyr/zephyr.c:2787
+#: ../src/protocols/zephyr/zephyr.c:2794
 msgid "Resubscribe"
 msgstr "Uudelleentilaa"
 
-#: ../src/protocols/zephyr/zephyr.c:2790
+#: ../src/protocols/zephyr/zephyr.c:2797
 msgid "Retrieve subscriptions from server"
 msgstr "Hae tilaukset palvelimelta"
 
@@ -12712,50 +12658,50 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/zephyr/zephyr.c:2875 ../src/protocols/zephyr/zephyr.c:2877
+#: ../src/protocols/zephyr/zephyr.c:2882 ../src/protocols/zephyr/zephyr.c:2884
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr-yhteyskäytäntöliitännäinen"
 
-#: ../src/protocols/zephyr/zephyr.c:2896
+#: ../src/protocols/zephyr/zephyr.c:2903
 msgid "Use tzc"
 msgstr "Käytä tzc"
 
-#: ../src/protocols/zephyr/zephyr.c:2899
+#: ../src/protocols/zephyr/zephyr.c:2906
 msgid "tzc command"
 msgstr "tzc-komento"
 
-#: ../src/protocols/zephyr/zephyr.c:2902
+#: ../src/protocols/zephyr/zephyr.c:2909
 msgid "Export to .anyone"
 msgstr "Vie tiedostoon .anyone"
 
-#: ../src/protocols/zephyr/zephyr.c:2905
+#: ../src/protocols/zephyr/zephyr.c:2912
 msgid "Export to .zephyr.subs"
 msgstr "Vie tiedostoon .zephyr.subs"
 
-#: ../src/protocols/zephyr/zephyr.c:2908
+#: ../src/protocols/zephyr/zephyr.c:2915
 msgid "Import from .anyone"
 msgstr "Tuo tiedostosta .anyone"
 
-#: ../src/protocols/zephyr/zephyr.c:2911
+#: ../src/protocols/zephyr/zephyr.c:2918
 msgid "Import from .zephyr.subs"
 msgstr "Tuo tiedostosta .zephyr.subs"
 
-#: ../src/protocols/zephyr/zephyr.c:2914
+#: ../src/protocols/zephyr/zephyr.c:2921
 msgid "Realm"
 msgstr "Alue(realm)"
 
-#: ../src/protocols/zephyr/zephyr.c:2917
+#: ../src/protocols/zephyr/zephyr.c:2924
 msgid "Exposure"
 msgstr "Altistus"
 
-#: ../src/proxy.c:1217 ../src/proxy.c:1273 ../src/proxy.c:1321
-#: ../src/proxy.c:1348
+#: ../src/proxy.c:1211 ../src/proxy.c:1267 ../src/proxy.c:1315
+#: ../src/proxy.c:1342
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "Välipalvelimen yhteysvirhe %d"
 
 #. Forbidden
-#: ../src/proxy.c:1337
+#: ../src/proxy.c:1331
 #, c-format
 msgid "Access denied: proxy server forbids port %d tunnelling."
 msgstr "Pääsy evätty: välipalvelin estää portin %d tunneloinnin."
@@ -12778,12 +12724,12 @@
 msgid "saved statuses"
 msgstr "tallennetut tilat"
 
-#: ../src/server.c:227
+#: ../src/server.c:225
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s on nyt nimeltään %s.\n"
 
-#: ../src/server.c:681
+#: ../src/server.c:678
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -12792,12 +12738,12 @@
 "Käyttäjä %s on kutsunut käyttäjän %s keskusteluhuoneeseen %s:\n"
 "%s"
 
-#: ../src/server.c:686
+#: ../src/server.c:683
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "Käyttäjä %s on kutsunut käyttäjän %s keskusteluhuoneeseen %s\n"
 
-#: ../src/server.c:690
+#: ../src/server.c:687
 msgid "Accept chat invitation?"
 msgstr "Hyväksy ryhmäkeskustelukutsu?"
 
@@ -12813,37 +12759,37 @@
 msgid "Mobile"
 msgstr "Liikkeellä"
 
-#: ../src/status.c:622
+#: ../src/status.c:611
 #, c-format
 msgid "%s changed status from %s to %s"
 msgstr "%s on vaihtanut tilasta %s tilaan %s"
 
-#: ../src/status.c:632
+#: ../src/status.c:621
 #, c-format
 msgid "%s is now %s"
 msgstr "%s on nyt %s"
 
-#: ../src/status.c:637
+#: ../src/status.c:626
 #, c-format
 msgid "%s is no longer %s"
 msgstr "%s ei ole enää %s"
 
-#: ../src/status.c:1311
+#: ../src/status.c:1296
 #, c-format
 msgid "%s became idle"
 msgstr "%s on jouten"
 
-#: ../src/status.c:1328
+#: ../src/status.c:1313
 #, c-format
 msgid "%s became unidle"
 msgstr "%s on aktiivinen"
 
-#: ../src/status.c:1394
+#: ../src/status.c:1379
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s on jouten"
 
-#: ../src/status.c:1396
+#: ../src/status.c:1381
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s on aktiivinen"
@@ -12853,12 +12799,12 @@
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../src/util.c:2453
+#: ../src/util.c:2449
 #, c-format
 msgid "Error Reading %s"
 msgstr "Virhe luettaessa %s"
 
-#: ../src/util.c:2454
+#: ../src/util.c:2450
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -12921,6 +12867,62 @@
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Virhe avattaessa yhteyttä.\n"
 
+#~ msgid "DBus"
+#~ msgstr "DBus"
+
+#~ msgid "IM the user"
+#~ msgstr "Lähetä pikaviesti käyttäjälle"
+
+#~ msgid "Ignore the user"
+#~ msgstr "Älä huomioi käyttäjää"
+
+#~ msgid "Get the user's information"
+#~ msgstr "Hae käyttäjätiedot"
+
+#~ msgid "Unable to read header from server"
+#~ msgstr "Otsikkotietoja ei kyetty lukemaan palvelimelta."
+
+#~ msgid ""
+#~ "Unable to read message from server: %s.  Command is %hd, length is %hd."
+#~ msgstr ""
+#~ "Palvelimelta ei kyetty lukemaan viestiä: %s.  Komento on %hd, pituus on %"
+#~ "hd."
+
+#~ msgid "Unknown server error."
+#~ msgstr "Tuntematon palvelinvirhe."
+
+#~ msgid "users: %s, files: %s, size: %sGB"
+#~ msgstr "käyttäjiä: %s, tiedostoja: %s, koko: %sGt"
+
+#~ msgid "Unable to add \"%s\" to your Napster hotlist"
+#~ msgstr "Ei voitu lisätä \"%s\" Napster-hotlistiin"
+
+#~ msgid "%s requested your information"
+#~ msgstr "%s pyysi tietojasi"
+
+#~ msgid "%s requested a PING"
+#~ msgstr "%s pyysi PING-sanoman"
+
+#~ msgid "NAPSTER Protocol Plugin"
+#~ msgstr "NAPSTER-yhteyskäytäntöliitännäinen"
+
+#~ msgid "Unable to play sound because the chosen file (%s) does not exist."
+#~ msgstr "Ei voitu soittaa äänitiedostoa (%s) koska sitä ei ole."
+
+#~ msgid ""
+#~ "Unable to play sound because the 'Command' sound method has been chosen, "
+#~ "but no command has been set."
+#~ msgstr ""
+#~ "Äänen soito ei onnistu. \"Komento\"-metodi on valittu mutta komentoa ei "
+#~ "ole asetettu."
+
+#~ msgid ""
+#~ "Unable to play sound because the configured sound command could not be "
+#~ "launched: %s"
+#~ msgstr ""
+#~ "Ei voitu soittaa ääntä, koska asetettua äänikomentoa ei voitu suorittaa: %"
+#~ "s"
+
 #~ msgid "Auth host"
 #~ msgstr "Kirjautumispalvelin"
 
@@ -14295,9 +14297,6 @@
 #~ msgid "Logged out"
 #~ msgstr "Kirjautui ulos"
 
-#~ msgid "Hide Operating System"
-#~ msgstr "Piilota käyttöjärjestelmä"
-
 #~ msgid "The user %s wants to add you to their buddy list."
 #~ msgstr "Käyttäjä %s haluaa lisätä sinut tuttavalistalleen."
 
--- a/po/gl.po	Wed Aug 09 06:23:18 2006 +0000
+++ b/po/gl.po	Wed Aug 09 14:47:37 2006 +0000
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: gl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-23 23:05+0200\n"
-"PO-Revision-Date: 2006-04-23 23:09+0200\n"
+"POT-Creation-Date: 2006-05-30 22:29+0200\n"
+"PO-Revision-Date: 2006-05-30 22:34+0200\n"
 "Last-Translator: Ignacio Casal Quinteiro <nacho.resa@gmail.com>\n"
 "Language-Team: Galego <trasno@ceu.fi.udc.es>\n"
 "MIME-Version: 1.0\n"
@@ -158,7 +158,7 @@
 msgstr "Axuste da función"
 
 #. add enabled / disabled
-#: ../plugins/crazychat/cc_gaim_plugin.c:345 ../src/gtkaccount.c:2253
+#: ../plugins/crazychat/cc_gaim_plugin.c:345 ../src/gtkaccount.c:2262
 #: ../src/gtkplugin.c:574
 msgid "Enabled"
 msgstr "Activado"
@@ -189,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:3230
+#: ../plugins/docklet/docklet.c:157 ../src/gtkblist.c:3241
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
@@ -201,10 +201,10 @@
 msgstr "Cambiar estado"
 
 #: ../plugins/docklet/docklet.c:435 ../src/gtkstatusbox.c:673
-#: ../src/protocols/gg/gg.c:996 ../src/protocols/jabber/buddy.c:1101
+#: ../src/protocols/gg/gg.c:996 ../src/protocols/jabber/buddy.c:1363
 #: ../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:2735
+#: ../src/protocols/novell/novell.c:2843 ../src/protocols/yahoo/yahoo.c:2731
 #: ../src/status.c:155
 msgid "Available"
 msgstr "Dispoñible"
@@ -215,25 +215,25 @@
 #: ../plugins/docklet/docklet.c:439 ../src/gtkprefs.c:1774
 #: ../src/gtkstatusbox.c:674 ../src/protocols/gg/gg.c:999
 #: ../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:719 ../src/protocols/oscar/oscar.c:4391
-#: ../src/protocols/oscar/oscar.c:5430 ../src/protocols/silc/buddy.c:1469
-#: ../src/protocols/yahoo/yahoo.c:3189 ../src/protocols/yahoo/yahoo.c:3262
+#: ../src/protocols/jabber/buddy.c:1367 ../src/protocols/novell/novell.c:2846
+#: ../src/protocols/oscar/oscar.c:719 ../src/protocols/oscar/oscar.c:4401
+#: ../src/protocols/oscar/oscar.c:5444 ../src/protocols/silc/buddy.c:1469
+#: ../src/protocols/yahoo/yahoo.c:3185 ../src/protocols/yahoo/yahoo.c:3258
 #: ../src/status.c:158
 msgid "Away"
 msgstr "Ausente"
 
 #: ../plugins/docklet/docklet.c:443 ../src/gtkstatusbox.c:675
-#: ../src/protocols/oscar/oscar.c:723 ../src/protocols/yahoo/yahoo.c:2729
+#: ../src/protocols/oscar/oscar.c:723 ../src/protocols/yahoo/yahoo.c:2725
 #: ../src/status.c:157
 msgid "Invisible"
 msgstr "Invisible"
 
-#: ../plugins/docklet/docklet.c:447 ../src/gtkblist.c:2960
+#: ../plugins/docklet/docklet.c:447 ../src/gtkblist.c:2971
 #: ../src/gtkstatusbox.c:676 ../src/protocols/gg/gg.c:993
-#: ../src/protocols/jabber/buddy.c:1099 ../src/protocols/novell/novell.c:2857
-#: ../src/protocols/oscar/oscar.c:785 ../src/protocols/oscar/oscar.c:5402
-#: ../src/protocols/yahoo/yahoo.c:2733 ../src/status.c:154
+#: ../src/protocols/jabber/buddy.c:1361 ../src/protocols/novell/novell.c:2855
+#: ../src/protocols/oscar/oscar.c:785 ../src/protocols/oscar/oscar.c:5416
+#: ../src/protocols/yahoo/yahoo.c:2729 ../src/status.c:154
 msgid "Offline"
 msgstr "Desconectado"
 
@@ -249,7 +249,7 @@
 msgid "Show Buddy List"
 msgstr "Amosar lista de amigos"
 
-#: ../plugins/docklet/docklet.c:489 ../src/gtkconv.c:5633
+#: ../plugins/docklet/docklet.c:489 ../src/gtkconv.c:5680
 msgid "Unread Messages"
 msgstr "Mensaxes sen ler"
 
@@ -257,7 +257,7 @@
 msgid "New Message..."
 msgstr "Nova mensaxe..."
 
-#: ../plugins/docklet/docklet.c:519 ../src/gtkaccount.c:2469
+#: ../plugins/docklet/docklet.c:519 ../src/gtkaccount.c:2478
 msgid "Accounts"
 msgstr "Contas"
 
@@ -289,7 +289,7 @@
 msgstr "Mensaxes _instantáneas:"
 
 #: ../plugins/docklet/docklet.c:684 ../plugins/docklet/docklet.c:692
-#: ../plugins/win32/winprefs/winprefs.c:424 ../src/gtkprefs.c:823
+#: ../plugins/win32/winprefs/winprefs.c:462 ../src/gtkprefs.c:823
 #: ../src/gtkprefs.c:1764 ../src/gtkprefs.c:1778
 msgid "Never"
 msgstr "Nunca"
@@ -300,7 +300,7 @@
 
 #: ../plugins/docklet/docklet.c:686 ../plugins/docklet/docklet.c:694
 #: ../plugins/timestamp_format.c:39 ../plugins/timestamp_format.c:48
-#: ../plugins/win32/winprefs/winprefs.c:425 ../src/gtkprefs.c:825
+#: ../plugins/win32/winprefs/winprefs.c:463 ../src/gtkprefs.c:825
 msgid "Always"
 msgstr "Sempre"
 
@@ -605,9 +605,9 @@
 #. 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:1532 ../src/protocols/msn/msn.c:1585
-#: ../src/protocols/msn/msn.c:1606
+#: ../src/gtkroomlist.c:604 ../src/protocols/jabber/jabber.c:754
+#: ../src/protocols/msn/msn.c:1527 ../src/protocols/msn/msn.c:1580
+#: ../src/protocols/msn/msn.c:1601
 msgid "Name"
 msgstr "Nome"
 
@@ -615,35 +615,43 @@
 msgid "Instant Messaging"
 msgstr "Mensaxería instantánea"
 
+#: ../plugins/gevolution/add_buddy_dialog.c:442 ../src/gtkblist.c:4530
+#: ../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:2974
+msgid "Add Buddy"
+msgstr "Engadir amigo"
+
 #. Add the label.
-#: ../plugins/gevolution/add_buddy_dialog.c:454
+#: ../plugins/gevolution/add_buddy_dialog.c:455
 msgid "Select a person from your address book below, or add a new person."
 msgstr ""
 "Seleccione unha persoa da súa axenda mostrada abaixo, ou engada unha nova "
 "persoa."
 
 #. "Search"
-#: ../plugins/gevolution/add_buddy_dialog.c:467
+#: ../plugins/gevolution/add_buddy_dialog.c:468
 #: ../plugins/gevolution/assoc-buddy.c:353
-#: ../src/protocols/jabber/buddy.c:1457 ../src/protocols/oscar/oscar.c:6010
-#: ../src/protocols/sametime/sametime.c:5531
+#: ../src/protocols/jabber/buddy.c:1720 ../src/protocols/oscar/oscar.c:6024
+#: ../src/protocols/sametime/sametime.c:5524
 msgid "Search"
 msgstr "Buscar"
 
-#: ../plugins/gevolution/add_buddy_dialog.c:548
-#: ../plugins/gevolution/new_person_dialog.c:306 ../src/gtkblist.c:4610
-#: ../src/gtkblist.c:4974
+#: ../plugins/gevolution/add_buddy_dialog.c:549
+#: ../plugins/gevolution/new_person_dialog.c:307 ../src/gtkblist.c:4614
+#: ../src/gtkblist.c:4978
 msgid "Group:"
 msgstr "Grupo:"
 
 #. "New Person" button
-#: ../plugins/gevolution/add_buddy_dialog.c:574
+#: ../plugins/gevolution/add_buddy_dialog.c:575
 #: ../plugins/gevolution/assoc-buddy.c:464
+#: ../plugins/gevolution/new_person_dialog.c:251
 msgid "New Person"
 msgstr "Nova persoa"
 
 #. "Select Buddy" button
-#: ../plugins/gevolution/add_buddy_dialog.c:591
+#: ../plugins/gevolution/add_buddy_dialog.c:592
 msgid "Select Buddy"
 msgstr "Seleccionar amigo"
 
@@ -667,13 +675,13 @@
 msgstr "_Asociar amigo"
 
 #: ../plugins/gevolution/eds-utils.c:73 ../plugins/gevolution/eds-utils.c:86
-#: ../src/protocols/jabber/jabber.c:1122
+#: ../src/protocols/jabber/jabber.c:1120
 msgid "None"
 msgstr "Ningún"
 
 #: ../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:4419 ../src/protocols/jabber/roster.c:65
+#: ../src/gtkblist.c:4423 ../src/protocols/jabber/roster.c:65
 msgid "Buddies"
 msgstr "Amigos"
 
@@ -709,7 +717,7 @@
 msgstr "Seleccione todas as contas aos que os amigos engadiranse de forma automática"
 
 #: ../plugins/gevolution/gevolution.c:450 ../plugins/idle.c:150
-#: ../plugins/idle.c:186 ../src/gtknotify.c:399 ../src/gtkpounce.c:1262
+#: ../plugins/idle.c:186 ../src/gtknotify.c:399 ../src/gtkpounce.c:1244
 msgid "Account"
 msgstr "Conta"
 
@@ -732,43 +740,43 @@
 msgid "Provides integration with Evolution."
 msgstr "Ofrece integración con Evolution."
 
-#: ../plugins/gevolution/new_person_dialog.c:266
+#: ../plugins/gevolution/new_person_dialog.c:267
 msgid "Please enter the person's information below."
 msgstr "Introduza a información da persoa a continuación."
 
-#: ../plugins/gevolution/new_person_dialog.c:270
+#: ../plugins/gevolution/new_person_dialog.c:271
 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."
 
-#: ../plugins/gevolution/new_person_dialog.c:290
+#: ../plugins/gevolution/new_person_dialog.c:291
 msgid "Account type:"
 msgstr "Tipo de conta:"
 
-#: ../plugins/gevolution/new_person_dialog.c:294 ../src/gtkaccount.c:784
-#: ../src/gtkblist.c:4572
+#: ../plugins/gevolution/new_person_dialog.c:295 ../src/gtkaccount.c:784
+#: ../src/gtkblist.c:4576
 msgid "Screen name:"
 msgstr "Nome de usuario:"
 
 #. Optional Information section
-#: ../plugins/gevolution/new_person_dialog.c:314
+#: ../plugins/gevolution/new_person_dialog.c:315
 msgid "Optional information:"
 msgstr "Información opcional:"
 
 #. Label
-#: ../plugins/gevolution/new_person_dialog.c:337 ../src/gtkaccount.c:424
+#: ../plugins/gevolution/new_person_dialog.c:338 ../src/gtkaccount.c:424
 #: ../src/gtkaccount.c:446 ../src/protocols/oscar/oscar.c:625
 msgid "Buddy Icon"
 msgstr "Icona de amigo"
 
-#: ../plugins/gevolution/new_person_dialog.c:349
+#: ../plugins/gevolution/new_person_dialog.c:350
 msgid "First name:"
 msgstr "Nome:"
 
-#: ../plugins/gevolution/new_person_dialog.c:361
+#: ../plugins/gevolution/new_person_dialog.c:362
 msgid "Last name:"
 msgstr "Apelidos:"
 
-#: ../plugins/gevolution/new_person_dialog.c:381
+#: ../plugins/gevolution/new_person_dialog.c:382
 msgid "E-mail:"
 msgstr "E-mail:"
 
@@ -851,8 +859,10 @@
 msgid "Minutes"
 msgstr "Minutos"
 
+#. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
+#. If that doesn't translate well into your language, drop the 's before translating.
 #: ../plugins/idle.c:162 ../plugins/idle.c:195 ../plugins/idle.c:220
-#: ../plugins/idle.c:309
+#: ../plugins/idle.c:312
 msgid "I'dle Mak'er"
 msgstr "Xenerador de ausencia"
 
@@ -888,7 +898,7 @@
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr "Desactivar o tempo de inactividade para todas as contas inactivas"
 
-#: ../plugins/idle.c:311 ../plugins/idle.c:312
+#: ../plugins/idle.c:314 ../plugins/idle.c:315
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr "Permite alterar canto tempo estivo ausente"
 
@@ -982,41 +992,56 @@
 msgid "Message could not be sent."
 msgstr "A mensaxe non puido ser enviada."
 
-#: ../plugins/log_reader.c:1835 ../plugins/log_reader.c:1928
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../plugins/log_reader.c:1838 ../plugins/log_reader.c:1943
 msgid "Adium"
 msgstr "Adium"
 
-#: ../plugins/log_reader.c:1844 ../plugins/log_reader.c:1932
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../plugins/log_reader.c:1850 ../plugins/log_reader.c:1947
 msgid "Fire"
 msgstr "Fogo"
 
-#: ../plugins/log_reader.c:1853 ../plugins/log_reader.c:1936
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../plugins/log_reader.c:1862 ../plugins/log_reader.c:1951
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
-#: ../plugins/log_reader.c:1862 ../plugins/log_reader.c:1940
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../plugins/log_reader.c:1874 ../plugins/log_reader.c:1955
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: ../plugins/log_reader.c:1871 ../plugins/log_reader.c:1944
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../plugins/log_reader.c:1886 ../plugins/log_reader.c:1959
 msgid "Trillian"
 msgstr "Trillian"
 
 #. Add general preferences.
-#: ../plugins/log_reader.c:1910
+#: ../plugins/log_reader.c:1925
 msgid "General Log Reading Configuration"
 msgstr "Configuración de lectura de rexistro xeral"
 
-#: ../plugins/log_reader.c:1914
+#: ../plugins/log_reader.c:1929
 msgid "Fast size calculations"
 msgstr "Cálculos de tamaño rápido"
 
-#: ../plugins/log_reader.c:1918
+#: ../plugins/log_reader.c:1933
 msgid "Use name heuristics"
 msgstr "Usar nomes heurísticos"
 
 #. Add Log Directory preferences.
-#: ../plugins/log_reader.c:1924
+#: ../plugins/log_reader.c:1939
 msgid "Log Directory"
 msgstr "Directorio de rexistro"
 
@@ -1026,19 +1051,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/log_reader.c:1967
+#: ../plugins/log_reader.c:1982
 msgid "Log Reader"
 msgstr "Lector de rexistro"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../plugins/log_reader.c:1971
+#: ../plugins/log_reader.c:1986
 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:1975
+#: ../plugins/log_reader.c:1990
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, Fire, Messenger Plus!, MSN Messenger, and "
@@ -1241,15 +1266,15 @@
 msgid "Provides support for loading perl plugins."
 msgstr "Provee soporte para cargar complementos en perl."
 
-#: ../plugins/psychic.c:22
+#: ../plugins/psychic.c:19
 msgid "Psychic Mode"
 msgstr "Modo psíquico"
 
-#: ../plugins/psychic.c:23
+#: ../plugins/psychic.c:20
 msgid "Psychic mode for incoming conversation"
 msgstr "Modo psíquico para conversación entrantes"
 
-#: ../plugins/psychic.c:24
+#: ../plugins/psychic.c:21
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
 "This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
@@ -1257,19 +1282,25 @@
 "Fai que aparezan as fiestras de conversación cando un usuario empeza a "
 "enviarlle unha mensaxe. Isto funciona con AIM, ICQ, Jabber, Sametime e Yahoo!"
 
-#: ../plugins/psychic.c:60
+#. This is a quote from Star Wars.  You should
+#. probably not translate it literally.  If
+#. you can't find a fitting cultural reference
+#. in your language, consider translating
+#. something like this instead:
+#. "You feel a new message coming."
+#: ../plugins/psychic.c:63
 msgid "You feel a disturbance in the force..."
 msgstr "Sentiches unha perturbación na forza..."
 
-#: ../plugins/psychic.c:79
+#: ../plugins/psychic.c:82
 msgid "Only enable for users on the buddy list"
 msgstr "Activar só para usuarios da lista de amigos"
 
-#: ../plugins/psychic.c:84
+#: ../plugins/psychic.c:87
 msgid "Disable when away"
 msgstr "Desactivar cando está ausente"
 
-#: ../plugins/psychic.c:88
+#: ../plugins/psychic.c:91
 msgid "Display notification message in conversations"
 msgstr "Amosa a mensaxe de notificación nas conversación"
 
@@ -1367,7 +1398,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/simple.c:34
+#: ../plugins/simple.c:37
 msgid "Simple Plugin"
 msgstr "Complemento sinxelo"
 
@@ -1375,7 +1406,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/simple.c:37 ../plugins/simple.c:39
+#: ../plugins/simple.c:40 ../plugins/simple.c:42
 msgid "Tests to see that most things are working."
 msgstr "Fai probas para determinar se a maior parte das cousas funcionan."
 
@@ -1607,7 +1638,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/timestamp.c:254
+#: ../plugins/timestamp.c:256
 msgid "Timestamp"
 msgstr "Marca temporal"
 
@@ -1615,7 +1646,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/timestamp.c:257 ../plugins/timestamp.c:259
+#: ../plugins/timestamp.c:259 ../plugins/timestamp.c:261
 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."
 
@@ -1744,57 +1775,57 @@
 "\n"
 "* Nota: Este complemento require Win2000 ou outro máis novo."
 
-#: ../plugins/win32/winprefs/winprefs.c:397
+#: ../plugins/win32/winprefs/winprefs.c:434
 msgid "GTK+ Runtime Version"
 msgstr "Versión en execución de GTK+"
 
 #. Autostart
-#: ../plugins/win32/winprefs/winprefs.c:405
+#: ../plugins/win32/winprefs/winprefs.c:442
 msgid "Startup"
 msgstr "Inicio"
 
-#: ../plugins/win32/winprefs/winprefs.c:406
+#: ../plugins/win32/winprefs/winprefs.c:443
 msgid "_Start Gaim on Windows startup"
 msgstr "_Iniciar Gaim ao iniciar Windows"
 
 #. Buddy List
-#: ../plugins/win32/winprefs/winprefs.c:417 ../src/gtkblist.c:3663
+#: ../plugins/win32/winprefs/winprefs.c:455 ../src/gtkblist.c:3667
 msgid "Buddy List"
 msgstr "Lista de amigos"
 
-#: ../plugins/win32/winprefs/winprefs.c:418
+#: ../plugins/win32/winprefs/winprefs.c:456
 msgid "_Dockable Buddy List"
 msgstr "Lista de amigos a_pilable"
 
 #. Blist On Top
-#: ../plugins/win32/winprefs/winprefs.c:422
+#: ../plugins/win32/winprefs/winprefs.c:460
 msgid "_Keep Buddy List window on top:"
 msgstr "_Manter a fiestra de amigos por enriba:"
 
 #. XXX: Did this ever work?
-#: ../plugins/win32/winprefs/winprefs.c:427
+#: ../plugins/win32/winprefs/winprefs.c:465
 msgid "Only when docked"
 msgstr "Só cando está empotrado"
 
 #. Conversations
-#: ../plugins/win32/winprefs/winprefs.c:431 ../src/gtkprefs.c:819
+#: ../plugins/win32/winprefs/winprefs.c:469 ../src/gtkprefs.c:819
 #: ../src/gtkprefs.c:1879
 msgid "Conversations"
 msgstr "Conversacións"
 
-#: ../plugins/win32/winprefs/winprefs.c:432
+#: ../plugins/win32/winprefs/winprefs.c:470
 msgid "_Flash window when messages are received"
 msgstr "_Destello de fiestra cando se reciben mensaxes"
 
-#: ../plugins/win32/winprefs/winprefs.c:456
+#: ../plugins/win32/winprefs/winprefs.c:494
 msgid "WinGaim Options"
 msgstr "Opcións WinGaim"
 
-#: ../plugins/win32/winprefs/winprefs.c:458
+#: ../plugins/win32/winprefs/winprefs.c:496
 msgid "Options specific to Windows Gaim."
 msgstr "Opcións específicas de Gaim para Windows."
 
-#: ../plugins/win32/winprefs/winprefs.c:459
+#: ../plugins/win32/winprefs/winprefs.c:497
 msgid ""
 "Provides options specific to Windows Gaim, such as buddy list docking and "
 "conversation flashing."
@@ -1806,139 +1837,138 @@
 msgid "accounts"
 msgstr "contas"
 
-#: ../src/account.c:923
+#: ../src/account.c:918
 msgid "Password is required to sign on."
 msgstr "O contrasinal é necesario para iniciar sesión."
 
-#: ../src/account.c:948
+#: ../src/account.c:943
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Introduza o contrasinal para %s (%s)"
 
-#: ../src/account.c:955
+#: ../src/account.c:950
 msgid "Enter Password"
 msgstr "Introducir contrasinal"
 
-#: ../src/account.c:960
+#: ../src/account.c:955
 msgid "Save password"
 msgstr "Gardar contrasinal"
 
 #. *
 #. * 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:3546
-#: ../src/gtkdialogs.c:600 ../src/gtkdialogs.c:737 ../src/gtkdialogs.c:801
+#: ../src/account.c:963 ../src/account.c:1134 ../src/gtkblist.c:3551
+#: ../src/gtkdialogs.c:607 ../src/gtkdialogs.c:744 ../src/gtkdialogs.c:808
 #: ../src/gtkrequest.c:269 ../src/protocols/gg/gg.c:497
 #: ../src/protocols/gg/gg.c:655 ../src/protocols/gg/gg.c:791
-#: ../src/protocols/jabber/jabber.c:1319 ../src/protocols/jabber/xdata.c:337
+#: ../src/protocols/jabber/jabber.c:1317 ../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:1408 ../src/protocols/oscar/oscar.c:2167
-#: ../src/protocols/oscar/oscar.c:2260 ../src/protocols/oscar/oscar.c:5680
-#: ../src/protocols/oscar/oscar.c:5860 ../src/protocols/oscar/oscar.c:5885
-#: ../src/protocols/oscar/oscar.c:5941 ../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/oscar/oscar.c:2260 ../src/protocols/oscar/oscar.c:5694
+#: ../src/protocols/oscar/oscar.c:5874 ../src/protocols/oscar/oscar.c:5899
+#: ../src/protocols/oscar/oscar.c:5955 ../src/protocols/silc/buddy.c:466
+#: ../src/protocols/silc/buddy.c:1182 ../src/protocols/silc/chat.c:424
+#: ../src/protocols/silc/chat.c:462 ../src/protocols/silc/chat.c:725
 #: ../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/request.h:1344
+#: ../src/protocols/silc/silc.c:753 ../src/protocols/yahoo/yahoo.c:3059
+#: ../src/protocols/yahoo/yahoo.c:3068 ../src/request.h:1344
 msgid "OK"
 msgstr "Aceptar"
 
-#: ../src/account.c:969 ../src/account.c:1140 ../src/account.c:1177
-#: ../src/gtkaccount.c:2173 ../src/gtkaccount.c:2640 ../src/gtkblist.c:5015
-#: ../src/gtkdialogs.c:601 ../src/gtkdialogs.c:738 ../src/gtkdialogs.c:802
-#: ../src/gtkdialogs.c:821 ../src/gtkdialogs.c:843 ../src/gtkdialogs.c:863
-#: ../src/gtkdialogs.c:907 ../src/gtkdialogs.c:962 ../src/gtkdialogs.c:999
-#: ../src/gtkdialogs.c:1024 ../src/gtkimhtmltoolbar.c:419
-#: ../src/gtkplugin.c:296 ../src/gtkpounce.c:1095 ../src/gtkprivacy.c:568
+#: ../src/account.c:964 ../src/account.c:1135 ../src/account.c:1172
+#: ../src/gtkaccount.c:2182 ../src/gtkaccount.c:2649 ../src/gtkblist.c:5019
+#: ../src/gtkdialogs.c:608 ../src/gtkdialogs.c:745 ../src/gtkdialogs.c:809
+#: ../src/gtkdialogs.c:828 ../src/gtkdialogs.c:850 ../src/gtkdialogs.c:870
+#: ../src/gtkdialogs.c:914 ../src/gtkdialogs.c:969 ../src/gtkdialogs.c:1006
+#: ../src/gtkdialogs.c:1031 ../src/gtkimhtmltoolbar.c:419
+#: ../src/gtkplugin.c:296 ../src/gtkpounce.c:1077 ../src/gtkprivacy.c:568
 #: ../src/gtkprivacy.c:581 ../src/gtkprivacy.c:606 ../src/gtkprivacy.c:617
 #: ../src/gtkrequest.c:270 ../src/gtksavedstatuses.c:296
 #: ../src/protocols/gg/gg.c:498 ../src/protocols/gg/gg.c:656
 #: ../src/protocols/gg/gg.c:792 ../src/protocols/gg/gg.c:871
-#: ../src/protocols/jabber/buddy.c:573 ../src/protocols/jabber/buddy.c:1458
-#: ../src/protocols/jabber/buddy.c:1492 ../src/protocols/jabber/chat.c:780
-#: ../src/protocols/jabber/jabber.c:824 ../src/protocols/jabber/jabber.c:1320
+#: ../src/protocols/jabber/buddy.c:594 ../src/protocols/jabber/buddy.c:1721
+#: ../src/protocols/jabber/buddy.c:1755 ../src/protocols/jabber/chat.c:778
+#: ../src/protocols/jabber/jabber.c:823 ../src/protocols/jabber/jabber.c:1318
 #: ../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:1409 ../src/protocols/oscar/oscar.c:2168
 #: ../src/protocols/oscar/oscar.c:2209 ../src/protocols/oscar/oscar.c:2261
-#: ../src/protocols/oscar/oscar.c:5681 ../src/protocols/oscar/oscar.c:5733
-#: ../src/protocols/oscar/oscar.c:5861 ../src/protocols/oscar/oscar.c:5886
-#: ../src/protocols/oscar/oscar.c:5942 ../src/protocols/oscar/oscar.c:6011
-#: ../src/protocols/sametime/sametime.c:3375
-#: ../src/protocols/sametime/sametime.c:3460
-#: ../src/protocols/sametime/sametime.c:3630
-#: ../src/protocols/sametime/sametime.c:5319
-#: ../src/protocols/sametime/sametime.c:5408
-#: ../src/protocols/sametime/sametime.c:5532 ../src/protocols/silc/buddy.c:467
+#: ../src/protocols/oscar/oscar.c:5695 ../src/protocols/oscar/oscar.c:5747
+#: ../src/protocols/oscar/oscar.c:5875 ../src/protocols/oscar/oscar.c:5900
+#: ../src/protocols/oscar/oscar.c:5956 ../src/protocols/oscar/oscar.c:6025
+#: ../src/protocols/oscar/peer.c:942 ../src/protocols/sametime/sametime.c:3368
+#: ../src/protocols/sametime/sametime.c:3453
+#: ../src/protocols/sametime/sametime.c:3623
+#: ../src/protocols/sametime/sametime.c:5312
+#: ../src/protocols/sametime/sametime.c:5401
+#: ../src/protocols/sametime/sametime.c:5525 ../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/chat.c:597 ../src/protocols/silc/chat.c:726
 #: ../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/request.h:1344
+#: ../src/protocols/silc/silc.c:959 ../src/protocols/yahoo/yahoo.c:3060
+#: ../src/protocols/yahoo/yahoo.c:3069 ../src/request.h:1344
 #: ../src/request.h:1354
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../src/account.c:994 ../src/connection.c:96
+#: ../src/account.c:989 ../src/connection.c:96
 #, c-format
 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:3538
-#: ../src/gtkblist.c:3544
+#: ../src/account.c:991 ../src/connection.c:99 ../src/gtkblist.c:3549
 msgid "Connection Error"
 msgstr "Erro de conexión"
 
-#: ../src/account.c:1076 ../src/protocols/gg/gg.c:696
-#: ../src/protocols/jabber/jabber.c:1272
+#: ../src/account.c:1071 ../src/protocols/gg/gg.c:696
+#: ../src/protocols/jabber/jabber.c:1270
 msgid "New passwords do not match."
 msgstr "Os novos contrasinais non coinciden."
 
-#: ../src/account.c:1085
+#: ../src/account.c:1080
 msgid "Fill out all fields completely."
 msgstr "Encha todos os campos completamente."
 
-#: ../src/account.c:1108
+#: ../src/account.c:1103
 msgid "Original password"
 msgstr "Contrasinal orixinal"
 
-#: ../src/account.c:1115
+#: ../src/account.c:1110
 msgid "New password"
 msgstr "Novo contrasinal"
 
-#: ../src/account.c:1122
+#: ../src/account.c:1117
 msgid "New password (again)"
 msgstr "Novo contrasinal (outra vez)"
 
-#: ../src/account.c:1128
+#: ../src/account.c:1123
 #, c-format
 msgid "Change password for %s"
 msgstr "Cambiar o contrasinal de %s"
 
-#: ../src/account.c:1136
+#: ../src/account.c:1131
 msgid "Please enter your current password and your new password."
 msgstr "Introduza seu contrasinal actual e o contrasinal novo."
 
-#: ../src/account.c:1169
+#: ../src/account.c:1164
 #, c-format
 msgid "Change user information for %s"
 msgstr "Cambiar a información do usuario %s"
 
-#: ../src/account.c:1172 ../src/protocols/toc/toc.c:1684
+#: ../src/account.c:1167 ../src/protocols/toc/toc.c:1684
 msgid "Set User Info"
 msgstr "Establecer súa información de usuario"
 
-#: ../src/account.c:1176 ../src/gtkdebug.c:684 ../src/gtkrequest.c:276
-#: ../src/protocols/jabber/buddy.c:572
+#: ../src/account.c:1171 ../src/gtkdebug.c:684 ../src/gtkrequest.c:276
+#: ../src/protocols/jabber/buddy.c:593
 msgid "Save"
 msgstr "Gardar"
 
-#: ../src/account.c:1679 ../src/gtkft.c:159 ../src/protocols/gg/gg.c:1002
-#: ../src/protocols/jabber/buddy.c:630 ../src/protocols/jabber/buddy.c:1095
-#: ../src/protocols/jabber/buddy.c:1112 ../src/protocols/novell/novell.c:2860
+#: ../src/account.c:1681 ../src/gtkft.c:159 ../src/protocols/gg/gg.c:1002
+#: ../src/protocols/jabber/buddy.c:636 ../src/protocols/jabber/buddy.c:1357
+#: ../src/protocols/jabber/buddy.c:1374 ../src/protocols/novell/novell.c:2858
 msgid "Unknown"
 msgstr "Descoñecido"
 
@@ -1984,49 +2014,49 @@
 msgid "+++ %s signed off"
 msgstr "+++ %s desconectouse"
 
-#: ../src/conversation.c:161
+#: ../src/conversation.c:163
 msgid "Unable to send message: The message is too large."
 msgstr "Non se puido enviar a mensaxe. É demasiado longa."
 
-#: ../src/conversation.c:164 ../src/conversation.c:177
+#: ../src/conversation.c:166 ../src/conversation.c:179
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "Non se puido enviar a mensaxe a %s."
 
-#: ../src/conversation.c:165
+#: ../src/conversation.c:167
 msgid "The message is too large."
 msgstr "A mensaxe é demasiado longa."
 
-#: ../src/conversation.c:174
+#: ../src/conversation.c:176
 msgid "Unable to send message."
 msgstr "Non se puido enviar a mensaxe."
 
-#: ../src/conversation.c:1515
+#: ../src/conversation.c:1517
 #, c-format
 msgid "%s entered the room."
 msgstr "%s entrou na sala."
 
-#: ../src/conversation.c:1518
+#: ../src/conversation.c:1520
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] entrou na sala."
 
-#: ../src/conversation.c:1625
+#: ../src/conversation.c:1627
 #, c-format
 msgid "You are now known as %s"
 msgstr "Agora se chama %s"
 
-#: ../src/conversation.c:1645
+#: ../src/conversation.c:1647
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s agora se chama %s"
 
-#: ../src/conversation.c:1718
+#: ../src/conversation.c:1720
 #, c-format
 msgid "%s left the room."
 msgstr "%s saíu da sala."
 
-#: ../src/conversation.c:1721
+#: ../src/conversation.c:1723
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s saíu da sala (%s)."
@@ -2035,7 +2065,7 @@
 msgid "No name"
 msgstr "Sen nome"
 
-#: ../src/ft.c:189 ../src/protocols/msn/msn.c:412
+#: ../src/ft.c:189 ../src/protocols/msn/msn.c:410
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -2130,31 +2160,31 @@
 msgid "File transfer complete"
 msgstr "Transferencia de ficheiros completa"
 
-#: ../src/ft.c:1028
+#: ../src/ft.c:1030
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Cancelou a transferencia de %s"
 
-#: ../src/ft.c:1033
+#: ../src/ft.c:1035
 msgid "File transfer cancelled"
 msgstr "Transferencia de ficheiros cancelada"
 
-#: ../src/ft.c:1091
+#: ../src/ft.c:1093
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s cancelou a transferencia de %s"
 
-#: ../src/ft.c:1096
+#: ../src/ft.c:1098
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s cancelou a transferencia de ficheiros"
 
-#: ../src/ft.c:1153
+#: ../src/ft.c:1155
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "Transferencia de ficheiro a %s fallou."
 
-#: ../src/ft.c:1155
+#: ../src/ft.c:1157
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "Transferencia de ficheiro desde %s fallou."
@@ -2183,7 +2213,7 @@
 msgid "Password:"
 msgstr "Contrasinal:"
 
-#: ../src/gtkaccount.c:863 ../src/gtkblist.c:4593 ../src/gtkblist.c:4959
+#: ../src/gtkaccount.c:863 ../src/gtkblist.c:4597 ../src/gtkblist.c:4963
 msgid "Alias:"
 msgstr "Alcume:"
 
@@ -2234,309 +2264,315 @@
 msgid "Use Environmental Settings"
 msgstr "Usar configuración do entorno"
 
-#: ../src/gtkaccount.c:1297
+#. This is an easter egg.
+#. It means one of two things, both intended as humourus:
+#. A) your network is really slow and you have nothing better to do than
+#. look at butterflies.
+#. B)You are looking really closely at something that shouldn't matter.
+#: ../src/gtkaccount.c:1302
+msgid "If you look real closely"
+msgstr "Se miras de cerca"
+
+#. This is an easter egg. See the comment on the previous line in the source.
+#: ../src/gtkaccount.c:1305
 msgid "you can see the butterflies mating"
 msgstr "podes ver as volvoretas apareándose"
 
-#: ../src/gtkaccount.c:1301
-msgid "If you look real closely"
-msgstr "Se miras de cerca"
-
-#: ../src/gtkaccount.c:1317
+#: ../src/gtkaccount.c:1326
 msgid "Proxy Options"
 msgstr "Opcións do proxy"
 
-#: ../src/gtkaccount.c:1331 ../src/gtkprefs.c:1052
+#: ../src/gtkaccount.c:1340 ../src/gtkprefs.c:1052
 msgid "Proxy _type:"
 msgstr "_Tipo de proxy:"
 
-#: ../src/gtkaccount.c:1340 ../src/gtkprefs.c:1073
+#: ../src/gtkaccount.c:1349 ../src/gtkprefs.c:1073
 msgid "_Host:"
 msgstr "_Servidor:"
 
-#: ../src/gtkaccount.c:1344 ../src/gtkprefs.c:1091
+#: ../src/gtkaccount.c:1353 ../src/gtkprefs.c:1091
 msgid "_Port:"
 msgstr "_Porto:"
 
-#: ../src/gtkaccount.c:1352
+#: ../src/gtkaccount.c:1361
 msgid "_Username:"
 msgstr "Nome de _usuario:"
 
-#: ../src/gtkaccount.c:1358 ../src/gtkprefs.c:1128
+#: ../src/gtkaccount.c:1367 ../src/gtkprefs.c:1128
 msgid "Pa_ssword:"
 msgstr "Co_ntrasinal:"
 
-#: ../src/gtkaccount.c:1738
+#: ../src/gtkaccount.c:1747
 msgid "Add Account"
 msgstr "Engadir conta"
 
-#: ../src/gtkaccount.c:1740 ../src/gtkblist.c:3547
+#: ../src/gtkaccount.c:1749 ../src/gtkblist.c:3552
 msgid "Modify Account"
 msgstr "Modificar conta"
 
-#: ../src/gtkaccount.c:1762
+#: ../src/gtkaccount.c:1771
 msgid "_Basic"
 msgstr "_Básico"
 
-#: ../src/gtkaccount.c:1773
+#: ../src/gtkaccount.c:1782
 msgid "_Advanced"
 msgstr "_Avanzado"
 
 #. Register button
-#: ../src/gtkaccount.c:1788 ../src/protocols/jabber/jabber.c:823
+#: ../src/gtkaccount.c:1797 ../src/protocols/jabber/jabber.c:822
 msgid "Register"
 msgstr "Rexistrar"
 
-#: ../src/gtkaccount.c:2167 ../src/gtksavedstatuses.c:293
+#: ../src/gtkaccount.c:2176 ../src/gtksavedstatuses.c:293
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Está seguro de que quere borrar %s?"
 
-#: ../src/gtkaccount.c:2172 ../src/gtkpounce.c:1094 ../src/gtkrequest.c:273
+#: ../src/gtkaccount.c:2181 ../src/gtkpounce.c:1076 ../src/gtkrequest.c:273
 #: ../src/gtksavedstatuses.c:295
 msgid "Delete"
 msgstr "Borrar"
 
-#: ../src/gtkaccount.c:2230 ../src/gtksavedstatuses.c:889
+#: ../src/gtkaccount.c:2239 ../src/gtksavedstatuses.c:889
 #: ../src/protocols/oscar/oscar.c:2823
 msgid "Screen Name"
 msgstr "Nome de usuario"
 
-#: ../src/gtkaccount.c:2261
+#: ../src/gtkaccount.c:2270
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../src/gtkaccount.c:2588
+#: ../src/gtkaccount.c:2597
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s fixo a %s seu amigo/a%s%s"
 
-#: ../src/gtkaccount.c:2637
+#: ../src/gtkaccount.c:2646
 msgid "Add buddy to your list?"
 msgstr "Engadir o amigo a súa lista?"
 
-#: ../src/gtkaccount.c:2639 ../src/gtkblist.c:5014 ../src/gtkconv.c:1623
+#: ../src/gtkaccount.c:2648 ../src/gtkblist.c:5018 ../src/gtkconv.c:1625
 #: ../src/gtkrequest.c:274 ../src/protocols/gg/gg.c:870
 #: ../src/protocols/oscar/oscar.c:2453
-#: ../src/protocols/sametime/sametime.c:5407 ../src/protocols/silc/chat.c:595
+#: ../src/protocols/sametime/sametime.c:5400 ../src/protocols/silc/chat.c:596
 msgid "Add"
 msgstr "Engadir"
 
-#: ../src/gtkblist.c:664
+#: ../src/gtkblist.c:673
 msgid "Join a Chat"
 msgstr "Unirse a un Chat"
 
-#: ../src/gtkblist.c:685
+#: ../src/gtkblist.c:694
 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:696 ../src/gtkpounce.c:527 ../src/gtkroomlist.c:377
+#: ../src/gtkblist.c:705 ../src/gtkpounce.c:519 ../src/gtkroomlist.c:377
 msgid "_Account:"
 msgstr "Con_ta:"
 
-#: ../src/gtkblist.c:940
+#: ../src/gtkblist.c:949
 msgid "Get _Info"
 msgstr "Obter _información:"
 
-#: ../src/gtkblist.c:943 ../src/gtkstock.c:141
+#: ../src/gtkblist.c:952 ../src/gtkstock.c:141
 msgid "I_M"
 msgstr "_MI"
 
-#: ../src/gtkblist.c:949
+#: ../src/gtkblist.c:958
 msgid "_Send File"
 msgstr "E_nviar ficheiro"
 
-#: ../src/gtkblist.c:956
+#: ../src/gtkblist.c:965
 msgid "Add Buddy _Pounce"
 msgstr "Engadir _aviso de amigo"
 
-#: ../src/gtkblist.c:960 ../src/gtkblist.c:964 ../src/gtkblist.c:1063
-#: ../src/gtkblist.c:1086
+#: ../src/gtkblist.c:969 ../src/gtkblist.c:973 ../src/gtkblist.c:1072
+#: ../src/gtkblist.c:1095
 msgid "View _Log"
 msgstr "Ver _rexistro"
 
-#: ../src/gtkblist.c:975
+#: ../src/gtkblist.c:984
 msgid "Alias..."
 msgstr "Alcume..."
 
-#: ../src/gtkblist.c:978 ../src/gtkconv.c:1620 ../src/gtkrequest.c:275
+#: ../src/gtkblist.c:987 ../src/gtkconv.c:1622 ../src/gtkrequest.c:275
 msgid "Remove"
 msgstr "Eliminar"
 
-#: ../src/gtkblist.c:984 ../src/gtkblist.c:1071 ../src/gtkblist.c:1092
+#: ../src/gtkblist.c:993 ../src/gtkblist.c:1080 ../src/gtkblist.c:1101
 msgid "_Alias..."
 msgstr "_Alcume..."
 
-#: ../src/gtkblist.c:986 ../src/gtkblist.c:1073 ../src/gtkblist.c:1094
+#: ../src/gtkblist.c:995 ../src/gtkblist.c:1082 ../src/gtkblist.c:1103
 msgid "_Remove"
 msgstr "_Eliminar"
 
-#: ../src/gtkblist.c:1034
+#: ../src/gtkblist.c:1043
 msgid "Add a _Buddy"
 msgstr "Engadir un a_migo"
 
-#: ../src/gtkblist.c:1036
+#: ../src/gtkblist.c:1045
 msgid "Add a C_hat"
 msgstr "Engadir un C_hat"
 
-#: ../src/gtkblist.c:1039
+#: ../src/gtkblist.c:1048
 msgid "_Delete Group"
 msgstr "_Borrar grupo"
 
-#: ../src/gtkblist.c:1041
+#: ../src/gtkblist.c:1050
 msgid "_Rename"
 msgstr "_Renomear"
 
 #. join button
-#: ../src/gtkblist.c:1059 ../src/gtkroomlist.c:285 ../src/gtkroomlist.c:441
+#: ../src/gtkblist.c:1068 ../src/gtkroomlist.c:285 ../src/gtkroomlist.c:441
 #: ../src/gtkstock.c:139
 msgid "_Join"
 msgstr "_Unirse"
 
-#: ../src/gtkblist.c:1061
+#: ../src/gtkblist.c:1070
 msgid "Auto-Join"
 msgstr "Conectarse automaticamente"
 
-#: ../src/gtkblist.c:1099 ../src/gtkblist.c:1122
+#: ../src/gtkblist.c:1108 ../src/gtkblist.c:1131
 msgid "_Collapse"
 msgstr "_Contraer"
 
-#: ../src/gtkblist.c:1127
+#: ../src/gtkblist.c:1136
 msgid "_Expand"
 msgstr "_Expandir"
 
-#: ../src/gtkblist.c:1373 ../src/gtkblist.c:1385 ../src/gtkblist.c:3808
-#: ../src/gtkblist.c:3818
+#: ../src/gtkblist.c:1382 ../src/gtkblist.c:1394 ../src/gtkblist.c:3812
+#: ../src/gtkblist.c:3822
 msgid "/Tools/Mute Sounds"
 msgstr "/Ferramentas/Silenciar sons"
 
-#: ../src/gtkblist.c:1845 ../src/gtkconv.c:4202 ../src/gtkpounce.c:426
+#: ../src/gtkblist.c:1854 ../src/gtkconv.c:4245 ../src/gtkpounce.c:418
 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:2419
+#: ../src/gtkblist.c:2428
 msgid "/_Buddies"
 msgstr "/_Amigos"
 
-#: ../src/gtkblist.c:2420
+#: ../src/gtkblist.c:2429
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Amigos/_Mensaxe instantánea nova..."
 
-#: ../src/gtkblist.c:2421
+#: ../src/gtkblist.c:2430
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Amigos/Unirse a un _Chat..."
 
-#: ../src/gtkblist.c:2422
+#: ../src/gtkblist.c:2431
 msgid "/Buddies/Get User _Info..."
 msgstr "/Amigos/Obter _información do usuario..."
 
-#: ../src/gtkblist.c:2423
+#: ../src/gtkblist.c:2432
 msgid "/Buddies/View User _Log..."
 msgstr "/Amigos/Ver _rexistro do usuario..."
 
-#: ../src/gtkblist.c:2425
+#: ../src/gtkblist.c:2434
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Amigos/Amosar amigos _desconectados"
 
-#: ../src/gtkblist.c:2426
+#: ../src/gtkblist.c:2435
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Amigos/Amosar grupos _baleiros"
 
-#: ../src/gtkblist.c:2427
+#: ../src/gtkblist.c:2436
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/Amigos/Amosar _detalles de amigos"
 
-#: ../src/gtkblist.c:2428
+#: ../src/gtkblist.c:2437
 msgid "/Buddies/Show Idle _Times"
 msgstr "/Amigos/Amosar _tempo de ausencia"
 
-#: ../src/gtkblist.c:2429
+#: ../src/gtkblist.c:2438
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Amigos/A_rranxar amigos"
 
-#: ../src/gtkblist.c:2431
+#: ../src/gtkblist.c:2440
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Amigos/_Engadir un amigo..."
 
-#: ../src/gtkblist.c:2432
+#: ../src/gtkblist.c:2441
 msgid "/Buddies/Add C_hat..."
 msgstr "/Amigos/Engadir un _Chat..."
 
-#: ../src/gtkblist.c:2433
+#: ../src/gtkblist.c:2442
 msgid "/Buddies/Add _Group..."
 msgstr "/Amigos/Engadir un _grupo..."
 
-#: ../src/gtkblist.c:2435
+#: ../src/gtkblist.c:2444
 msgid "/Buddies/_Quit"
 msgstr "/Amigos/_Saír"
 
 #. Accounts menu
-#: ../src/gtkblist.c:2438
+#: ../src/gtkblist.c:2447
 msgid "/_Accounts"
 msgstr "/_Contas"
 
-#: ../src/gtkblist.c:2439 ../src/gtkblist.c:5591
+#: ../src/gtkblist.c:2448 ../src/gtkblist.c:5595
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Contas/Engadir\\/Editar"
 
 #. Tools
-#: ../src/gtkblist.c:2442
+#: ../src/gtkblist.c:2451
 msgid "/_Tools"
 msgstr "/_Ferramentas"
 
-#: ../src/gtkblist.c:2443
+#: ../src/gtkblist.c:2452
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Ferramentas/_Avisos de amigo"
 
-#: ../src/gtkblist.c:2444
+#: ../src/gtkblist.c:2453
 msgid "/Tools/Plu_gins"
 msgstr "/Ferramentas/C_omplementos"
 
-#: ../src/gtkblist.c:2445
+#: ../src/gtkblist.c:2454
 msgid "/Tools/Pr_eferences"
 msgstr "/Ferramentas/Pr_eferencias"
 
-#: ../src/gtkblist.c:2446
+#: ../src/gtkblist.c:2455
 msgid "/Tools/Pr_ivacy"
 msgstr "/Ferramentas/Pr_ivacidade"
 
-#: ../src/gtkblist.c:2448
+#: ../src/gtkblist.c:2457
 msgid "/Tools/_File Transfers"
 msgstr "/Ferramentas/Transferencias de _ficheiros"
 
-#: ../src/gtkblist.c:2449
+#: ../src/gtkblist.c:2458
 msgid "/Tools/R_oom List"
 msgstr "/Ferramentas/Lista de _salas"
 
-#: ../src/gtkblist.c:2450
+#: ../src/gtkblist.c:2459
 msgid "/Tools/System _Log"
 msgstr "/Ferramentas/_Rexistro do sistema"
 
-#: ../src/gtkblist.c:2452
+#: ../src/gtkblist.c:2461
 msgid "/Tools/Mute _Sounds"
 msgstr "/Ferramentas/Silenciar _sons"
 
 #. Help
-#: ../src/gtkblist.c:2455
+#: ../src/gtkblist.c:2464
 msgid "/_Help"
 msgstr "/A_xuda"
 
-#: ../src/gtkblist.c:2456
+#: ../src/gtkblist.c:2465
 msgid "/Help/Online _Help"
 msgstr "/Axuda/A_xuda en liña"
 
-#: ../src/gtkblist.c:2457
+#: ../src/gtkblist.c:2466
 msgid "/Help/_Debug Window"
 msgstr "/Axuda/Fiestra de _depuración"
 
-#: ../src/gtkblist.c:2458
+#: ../src/gtkblist.c:2467
 msgid "/Help/_About"
 msgstr "/Axuda/_Acerca de"
 
-#: ../src/gtkblist.c:2490 ../src/gtkblist.c:2559
+#: ../src/gtkblist.c:2499 ../src/gtkblist.c:2568
 #, c-format
 msgid ""
 "\n"
@@ -2545,7 +2581,7 @@
 "\n"
 "<b>Conta:</b> %s"
 
-#: ../src/gtkblist.c:2571
+#: ../src/gtkblist.c:2580
 #, c-format
 msgid ""
 "\n"
@@ -2554,7 +2590,7 @@
 "\n"
 "<b>Alcume de amigo:</b> %s"
 
-#: ../src/gtkblist.c:2583
+#: ../src/gtkblist.c:2592
 #, c-format
 msgid ""
 "\n"
@@ -2563,7 +2599,7 @@
 "\n"
 "<b>Alcume:</b> %s"
 
-#: ../src/gtkblist.c:2592
+#: ../src/gtkblist.c:2601
 #, c-format
 msgid ""
 "\n"
@@ -2572,7 +2608,7 @@
 "\n"
 "<b>Conectado:</b> %s"
 
-#: ../src/gtkblist.c:2603
+#: ../src/gtkblist.c:2612
 #, c-format
 msgid ""
 "\n"
@@ -2581,7 +2617,7 @@
 "\n"
 "<b>Inactivo:</b> %s"
 
-#: ../src/gtkblist.c:2638
+#: ../src/gtkblist.c:2647
 #, c-format
 msgid ""
 "\n"
@@ -2590,7 +2626,7 @@
 "\n"
 "<b>Visto por última vez</b> fai %s"
 
-#: ../src/gtkblist.c:2647
+#: ../src/gtkblist.c:2656
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2598,7 +2634,7 @@
 "\n"
 "<b>Estado:</b> Desconectado"
 
-#: ../src/gtkblist.c:2658
+#: ../src/gtkblist.c:2667
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2606,7 +2642,7 @@
 "\n"
 "<b>Descrición:</b> Terrorífica"
 
-#: ../src/gtkblist.c:2660
+#: ../src/gtkblist.c:2669
 msgid ""
 "\n"
 "<b>Status:</b> Awesome"
@@ -2614,7 +2650,7 @@
 "\n"
 "<b>Estado</b>: Xenial"
 
-#: ../src/gtkblist.c:2662
+#: ../src/gtkblist.c:2671
 msgid ""
 "\n"
 "<b>Status:</b> Rockin'"
@@ -2622,125 +2658,120 @@
 "\n"
 "<b>Estado</b>: Rock & roll"
 
-#: ../src/gtkblist.c:2951
+#: ../src/gtkblist.c:2962
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Inactivo %dh %02dm"
 
-#: ../src/gtkblist.c:2953
+#: ../src/gtkblist.c:2964
 #, c-format
 msgid "Idle %dm"
 msgstr "Inactivo %dm"
 
 #. Idle stuff
-#: ../src/gtkblist.c:2956 ../src/gtkprefs.c:1760
-#: ../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:2844 ../src/protocols/yahoo/yahoo.c:2731
+#: ../src/gtkblist.c:2967 ../src/gtkprefs.c:1760
+#: ../src/protocols/bonjour/bonjour.c:333 ../src/protocols/jabber/buddy.c:641
+#: ../src/protocols/jabber/buddy.c:672 ../src/protocols/msn/msn.c:550
+#: ../src/protocols/msn/state.c:32 ../src/protocols/novell/novell.c:2852
+#: ../src/protocols/oscar/oscar.c:2844 ../src/protocols/yahoo/yahoo.c:2727
 #: ../src/protocols/yahoo/yahoo_profile.c:691
 msgid "Idle"
 msgstr "Inactivo"
 
-#: ../src/gtkblist.c:3088
+#: ../src/gtkblist.c:3099
 msgid "/Buddies/New Instant Message..."
 msgstr "/Amigos/Mensaxe instantánea _nova..."
 
-#: ../src/gtkblist.c:3089 ../src/gtkblist.c:3122
+#: ../src/gtkblist.c:3100 ../src/gtkblist.c:3133
 msgid "/Buddies/Join a Chat..."
 msgstr "/Amigos/Unirse a un Chat..."
 
-#: ../src/gtkblist.c:3090
+#: ../src/gtkblist.c:3101
 msgid "/Buddies/Get User Info..."
 msgstr "/Amigos/Obter información do usuario..."
 
-#: ../src/gtkblist.c:3091
+#: ../src/gtkblist.c:3102
 msgid "/Buddies/Add Buddy..."
 msgstr "/Amigos/Engadir un amigo..."
 
-#: ../src/gtkblist.c:3092 ../src/gtkblist.c:3125
+#: ../src/gtkblist.c:3103 ../src/gtkblist.c:3136
 msgid "/Buddies/Add Chat..."
 msgstr "/Amigos/Engadir un Chat..."
 
-#: ../src/gtkblist.c:3093
+#: ../src/gtkblist.c:3104
 msgid "/Buddies/Add Group..."
 msgstr "/Amigos/Engadir un grupo..."
 
-#: ../src/gtkblist.c:3128
+#: ../src/gtkblist.c:3139
 msgid "/Tools/Buddy Pounces"
 msgstr "/Ferramentas/Avisos de amigo"
 
-#: ../src/gtkblist.c:3131
+#: ../src/gtkblist.c:3142
 msgid "/Tools/Privacy"
 msgstr "/Ferramentas/Privacidade"
 
-#: ../src/gtkblist.c:3134
+#: ../src/gtkblist.c:3145
 msgid "/Tools/Room List"
 msgstr "/Ferramentas/Lista de salas"
 
-#: ../src/gtkblist.c:3328
+#: ../src/gtkblist.c:3339
 msgid "Manually"
 msgstr "Manualmente"
 
-#: ../src/gtkblist.c:3330
+#: ../src/gtkblist.c:3341
 msgid "Alphabetically"
 msgstr "Alfabeticamente"
 
-#: ../src/gtkblist.c:3331
+#: ../src/gtkblist.c:3342
 msgid "By status"
 msgstr "Por estado"
 
-#: ../src/gtkblist.c:3332
+#: ../src/gtkblist.c:3343
 msgid "By log size"
 msgstr "Por tamaño de rexistro"
 
-#: ../src/gtkblist.c:3532 ../src/gtkconn.c:196
+#: ../src/gtkblist.c:3544 ../src/gtkconn.c:184
 #, c-format
 msgid "%s disconnected"
 msgstr "%s desconectado"
 
-#: ../src/gtkblist.c:3548 ../src/protocols/sametime/sametime.c:3629
+#: ../src/gtkblist.c:3553 ../src/protocols/sametime/sametime.c:3622
 msgid "Connect"
 msgstr "Conectar"
 
-#: ../src/gtkblist.c:3548
+#: ../src/gtkblist.c:3553
 msgid "Re-enable Account"
 msgstr "Re-activar conta"
 
-#: ../src/gtkblist.c:3570
+#: ../src/gtkblist.c:3574
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s desconectado: %s</span>"
 
-#: ../src/gtkblist.c:3697
+#: ../src/gtkblist.c:3701
 msgid "/Accounts"
 msgstr "/Contas"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../src/gtkblist.c:3802
+#: ../src/gtkblist.c:3806
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Amigos/Amosar amigos desconectados"
 
-#: ../src/gtkblist.c:3805
+#: ../src/gtkblist.c:3809
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Amigos/Amosar grupos baleiros"
 
-#: ../src/gtkblist.c:3811
+#: ../src/gtkblist.c:3815
 msgid "/Buddies/Show Buddy Details"
 msgstr "/Amigos/Amosar detalles de amigos"
 
-#: ../src/gtkblist.c:3814
+#: ../src/gtkblist.c:3818
 msgid "/Buddies/Show Idle Times"
 msgstr "/Amigos/Amosar tempos de ausencia"
 
-#: ../src/gtkblist.c:4526 ../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 "Engadir amigo"
-
-#: ../src/gtkblist.c:4550
+#: ../src/gtkblist.c:4554
 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. "
@@ -2751,25 +2782,25 @@
 "lugar do nome de usuario sempre que sexa posible.\n"
 
 #. Set up stuff for the account box
-#: ../src/gtkblist.c:4620 ../src/gtkblist.c:4939
+#: ../src/gtkblist.c:4624 ../src/gtkblist.c:4943
 msgid "Account:"
 msgstr "Conta:"
 
-#: ../src/gtkblist.c:4872
+#: ../src/gtkblist.c:4876
 msgid "This protocol does not support chat rooms."
 msgstr "Este protocolo non está soportado nas salas de chats."
 
-#: ../src/gtkblist.c:4888
+#: ../src/gtkblist.c:4892
 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:4905
+#: ../src/gtkblist.c:4909
 msgid "Add Chat"
 msgstr "Engadir Chat"
 
-#: ../src/gtkblist.c:4929
+#: ../src/gtkblist.c:4933
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2777,40 +2808,40 @@
 "Introduza un alcume, e a información que crea apropiada do chat que "
 "desexaría engadir na lista de amigos.\n"
 
-#: ../src/gtkblist.c:5011 ../src/protocols/sametime/sametime.c:5318
-#: ../src/protocols/sametime/sametime.c:5405
+#: ../src/gtkblist.c:5015 ../src/protocols/sametime/sametime.c:5311
+#: ../src/protocols/sametime/sametime.c:5398
 msgid "Add Group"
 msgstr "Engadir grupo"
 
-#: ../src/gtkblist.c:5012
+#: ../src/gtkblist.c:5016
 msgid "Please enter the name of the group to be added."
 msgstr "Introduza o nome do grupo a engadir."
 
-#: ../src/gtkblist.c:5631
+#: ../src/gtkblist.c:5635
 msgid "_Edit Account"
 msgstr "_Editar conta"
 
-#: ../src/gtkblist.c:5664 ../src/gtkblist.c:5670
+#: ../src/gtkblist.c:5668 ../src/gtkblist.c:5674 ../src/gtkconv.c:2753
 msgid "No actions available"
 msgstr "Non hai accións dispoñibles"
 
-#: ../src/gtkblist.c:5678
+#: ../src/gtkblist.c:5682
 msgid "_Disable"
 msgstr "_Desactivar"
 
-#: ../src/gtkblist.c:5690
+#: ../src/gtkblist.c:5694
 msgid "Enable Account"
 msgstr "Activar conta"
 
-#: ../src/gtkblist.c:5743
+#: ../src/gtkblist.c:5747
 msgid "/Tools"
 msgstr "/Ferramentas"
 
-#: ../src/gtkblist.c:5829
+#: ../src/gtkblist.c:5833
 msgid "/Buddies/Sort Buddies"
 msgstr "/Amigos/Ordenar amigos"
 
-#: ../src/gtkconn.c:197
+#: ../src/gtkconn.c:185
 #, c-format
 msgid ""
 "%s was disconnected due to an error: %s\n"
@@ -2861,20 +2892,20 @@
 msgid "That command doesn't work on this protocol."
 msgstr "Ese comando só funciona neste protocolo."
 
-#: ../src/gtkconv.c:742 ../src/gtkconv.c:768
+#: ../src/gtkconv.c:743 ../src/gtkconv.c:769
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Ese amigo non utiliza o mesmo protocolo que este chat."
 
-#: ../src/gtkconv.c:762
+#: ../src/gtkconv.c:763
 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:815
+#: ../src/gtkconv.c:816
 msgid "Invite Buddy Into Chat Room"
 msgstr "Invitar a un amigo á sala de Chat"
 
 #. Put our happy label in it.
-#: ../src/gtkconv.c:845
+#: ../src/gtkconv.c:846
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2882,317 +2913,329 @@
 "Introduza o nome de usuario ao que desexa invitar, xunto cunha mensaxe de "
 "invitación opcional."
 
-#: ../src/gtkconv.c:866
+#: ../src/gtkconv.c:867
 msgid "_Buddy:"
 msgstr "_Amigo:"
 
-#: ../src/gtkconv.c:886 ../src/gtksavedstatuses.c:1107
+#: ../src/gtkconv.c:887 ../src/gtksavedstatuses.c:1107
 #: ../src/gtksavedstatuses.c:1443
 msgid "_Message:"
 msgstr "_Mensaxe:"
 
-#: ../src/gtkconv.c:943 ../src/gtkconv.c:2385 ../src/gtkdebug.c:217
+#: ../src/gtkconv.c:944 ../src/gtkconv.c:2370 ../src/gtkdebug.c:217
 #: ../src/gtkft.c:490
 msgid "Unable to open file."
 msgstr "Non se puido abrir o ficheiro."
 
-#: ../src/gtkconv.c:949
+#: ../src/gtkconv.c:950
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Conversacións con %s</h1>\n"
 
-#: ../src/gtkconv.c:973
+#: ../src/gtkconv.c:974
 msgid "Save Conversation"
 msgstr "Gardar conversación"
 
-#: ../src/gtkconv.c:1094 ../src/gtkdebug.c:165 ../src/gtkdebug.c:678
+#: ../src/gtkconv.c:1095 ../src/gtkdebug.c:165 ../src/gtkdebug.c:678
 msgid "Find"
 msgstr "Buscar"
 
-#: ../src/gtkconv.c:1120 ../src/gtkdebug.c:193
+#: ../src/gtkconv.c:1121 ../src/gtkdebug.c:193
 msgid "_Search for:"
 msgstr "Termo a _buscar:"
 
-#: ../src/gtkconv.c:1291
+#: ../src/gtkconv.c:1292
 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:1299
+#: ../src/gtkconv.c:1300
 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:1560
+#: ../src/gtkconv.c:1562
 msgid "IM"
 msgstr "MI"
 
-#: ../src/gtkconv.c:1571 ../src/protocols/oscar/oscar.c:640
+#: ../src/gtkconv.c:1573 ../src/protocols/oscar/oscar.c:640
 msgid "Send File"
 msgstr "Enviar ficheiro"
 
-#: ../src/gtkconv.c:1586
+#: ../src/gtkconv.c:1588
 msgid "Un-Ignore"
 msgstr "Non ignorar"
 
-#: ../src/gtkconv.c:1589
+#: ../src/gtkconv.c:1591
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../src/gtkconv.c:1599
+#: ../src/gtkconv.c:1601
 msgid "Info"
 msgstr "Info"
 
-#: ../src/gtkconv.c:1609
+#: ../src/gtkconv.c:1611
 msgid "Get Away Message"
 msgstr "Mensaxe de ausencia"
 
-#: ../src/gtkconv.c:1632
+#: ../src/gtkconv.c:1634
 msgid "Last said"
 msgstr "Dito a última vez"
 
-#: ../src/gtkconv.c:2393
+#: ../src/gtkconv.c:2378
 msgid "Unable to save icon file to disk."
 msgstr "Non se puido gardar o ficheiro de iconas ao disco."
 
-#: ../src/gtkconv.c:2417
+#: ../src/gtkconv.c:2402
 msgid "Save Icon"
 msgstr "Gardar icona"
 
-#: ../src/gtkconv.c:2466
+#: ../src/gtkconv.c:2451
 msgid "Animate"
 msgstr "Animar"
 
-#: ../src/gtkconv.c:2471
+#: ../src/gtkconv.c:2456
 msgid "Hide Icon"
 msgstr "Agochar icona"
 
-#: ../src/gtkconv.c:2477
+#: ../src/gtkconv.c:2462
 msgid "Save Icon As..."
 msgstr "Gardar icona como..."
 
 #. Conversation menu
-#: ../src/gtkconv.c:2618
+#: ../src/gtkconv.c:2602
 msgid "/_Conversation"
 msgstr "/_Conversación"
 
-#: ../src/gtkconv.c:2620
+#: ../src/gtkconv.c:2604
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversación/_Mensaxe instantánea nova..."
 
-#: ../src/gtkconv.c:2625
+#: ../src/gtkconv.c:2609
 msgid "/Conversation/_Find..."
 msgstr "/Conversación/_Buscar..."
 
-#: ../src/gtkconv.c:2627
+#: ../src/gtkconv.c:2611
 msgid "/Conversation/View _Log"
 msgstr "/Conversación/Ver _rexistro"
 
-#: ../src/gtkconv.c:2628
+#: ../src/gtkconv.c:2612
 msgid "/Conversation/_Save As..."
 msgstr "/Conversación/_Gardar como..."
 
-#: ../src/gtkconv.c:2630
+#: ../src/gtkconv.c:2614
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Conversación/_Limpar deslizante"
 
-#: ../src/gtkconv.c:2634
+#: ../src/gtkconv.c:2618
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversación/E_nviar ficheiro..."
 
-#: ../src/gtkconv.c:2635
+#: ../src/gtkconv.c:2619
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversación/Engadir _aviso de amigo..."
 
-#: ../src/gtkconv.c:2637
+#: ../src/gtkconv.c:2621
 msgid "/Conversation/_Get Info"
 msgstr "/Conversación/_Obter información"
 
-#: ../src/gtkconv.c:2639
+#: ../src/gtkconv.c:2623
 msgid "/Conversation/In_vite..."
 msgstr "/Conversación/In_vitar..."
 
-#: ../src/gtkconv.c:2644
+#: ../src/gtkconv.c:2625
+msgid "/Conversation/M_ore"
+msgstr "/Conversación/_Máis"
+
+#: ../src/gtkconv.c:2629
 msgid "/Conversation/Al_ias..."
 msgstr "/Conversación/Alc_ume..."
 
-#: ../src/gtkconv.c:2646
+#: ../src/gtkconv.c:2631
 msgid "/Conversation/_Block..."
 msgstr "/Conversación/_Bloquear..."
 
-#: ../src/gtkconv.c:2648
+#: ../src/gtkconv.c:2633
 msgid "/Conversation/_Add..."
 msgstr "/Conversación/_Engadir..."
 
-#: ../src/gtkconv.c:2650
+#: ../src/gtkconv.c:2635
 msgid "/Conversation/_Remove..."
 msgstr "/Conversación/El_iminar..."
 
-#: ../src/gtkconv.c:2655
+#: ../src/gtkconv.c:2640
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Conversación/Inserir li_gazón..."
 
-#: ../src/gtkconv.c:2657
+#: ../src/gtkconv.c:2642
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Conversación/Inserir ima_xe..."
 
-#: ../src/gtkconv.c:2662
+#: ../src/gtkconv.c:2647
 msgid "/Conversation/_Close"
 msgstr "/Conversación/_Pechar"
 
 #. Options
-#: ../src/gtkconv.c:2666
+#: ../src/gtkconv.c:2651
 msgid "/_Options"
 msgstr "/_Opcións"
 
-#: ../src/gtkconv.c:2667
+#: ../src/gtkconv.c:2652
 msgid "/Options/Enable _Logging"
 msgstr "/Opcións/Activar _rexistro"
 
-#: ../src/gtkconv.c:2668
+#: ../src/gtkconv.c:2653
 msgid "/Options/Enable _Sounds"
 msgstr "/Opcións/Activar _sons"
 
-#: ../src/gtkconv.c:2669
+#: ../src/gtkconv.c:2654
 msgid "/Options/Show Buddy _Icon"
 msgstr "/Opcións/Amosar _iconas dos amigos"
 
-#: ../src/gtkconv.c:2671
+#: ../src/gtkconv.c:2656
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Opcións/Amosar _barra de formato"
 
-#: ../src/gtkconv.c:2672
+#: ../src/gtkconv.c:2657
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Opcións/Amosar _marcas de tempo"
 
-#: ../src/gtkconv.c:2764
+#: ../src/gtkconv.c:2732
+msgid "/Conversation/More"
+msgstr "/Conversación/Máis"
+
+#: ../src/gtkconv.c:2770 ../src/gtkconv.c:2797
+msgid "/Conversation"
+msgstr "/Conversación"
+
+#: ../src/gtkconv.c:2807
 msgid "/Conversation/View Log"
 msgstr "/Conversación/Ver rexistro"
 
-#: ../src/gtkconv.c:2770
+#: ../src/gtkconv.c:2813
 msgid "/Conversation/Send File..."
 msgstr "/Conversación/Enviar ficheiro..."
 
-#: ../src/gtkconv.c:2774
+#: ../src/gtkconv.c:2817
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversación/Engadir aviso de amigo..."
 
-#: ../src/gtkconv.c:2780
+#: ../src/gtkconv.c:2823
 msgid "/Conversation/Get Info"
 msgstr "/Conversación/Obter información"
 
-#: ../src/gtkconv.c:2784
+#: ../src/gtkconv.c:2827
 msgid "/Conversation/Invite..."
 msgstr "/Conversación/Invitar..."
 
-#: ../src/gtkconv.c:2790
+#: ../src/gtkconv.c:2833
 msgid "/Conversation/Alias..."
 msgstr "/Conversación/Alcume..."
 
-#: ../src/gtkconv.c:2794
+#: ../src/gtkconv.c:2837
 msgid "/Conversation/Block..."
 msgstr "/Conversación/Bloquear..."
 
-#: ../src/gtkconv.c:2798
+#: ../src/gtkconv.c:2841
 msgid "/Conversation/Add..."
 msgstr "/Conversación/Engadir..."
 
-#: ../src/gtkconv.c:2802
+#: ../src/gtkconv.c:2845
 msgid "/Conversation/Remove..."
 msgstr "/Conversación/Eliminar..."
 
-#: ../src/gtkconv.c:2808
+#: ../src/gtkconv.c:2851
 msgid "/Conversation/Insert Link..."
 msgstr "/Conversación/Inserir ligazón..."
 
-#: ../src/gtkconv.c:2812
+#: ../src/gtkconv.c:2855
 msgid "/Conversation/Insert Image..."
 msgstr "/Conversación/Inserir imaxe..."
 
-#: ../src/gtkconv.c:2818
+#: ../src/gtkconv.c:2861
 msgid "/Options/Enable Logging"
 msgstr "/Opcións/Activar rexistro"
 
-#: ../src/gtkconv.c:2821
+#: ../src/gtkconv.c:2864
 msgid "/Options/Enable Sounds"
 msgstr "/Opcións/Activar sons"
 
-#: ../src/gtkconv.c:2834
+#: ../src/gtkconv.c:2877
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Opcións/Amosar barra de formato"
 
-#: ../src/gtkconv.c:2837
+#: ../src/gtkconv.c:2880
 msgid "/Options/Show Timestamps"
 msgstr "/Opcións/Amosar marcas de tempo"
 
-#: ../src/gtkconv.c:2840
+#: ../src/gtkconv.c:2883
 msgid "/Options/Show Buddy Icon"
 msgstr "/Opcións/Amosar iconas dos amigos"
 
-#: ../src/gtkconv.c:2920
+#: ../src/gtkconv.c:2963
 msgid "User is typing..."
 msgstr "O usuario está escribindo..."
 
-#: ../src/gtkconv.c:2923
+#: ../src/gtkconv.c:2966
 msgid "User has typed something and stopped"
 msgstr "O usuario escribiu algo e parou"
 
 #. Build the Send To menu
-#: ../src/gtkconv.c:3106
+#: ../src/gtkconv.c:3149
 msgid "_Send To"
 msgstr "_Enviar a"
 
-#: ../src/gtkconv.c:3758
+#: ../src/gtkconv.c:3801
 msgid "_Send"
 msgstr "_Enviar"
 
-#: ../src/gtkconv.c:3813 ../src/protocols/sametime/sametime.c:3571
+#: ../src/gtkconv.c:3856 ../src/protocols/sametime/sametime.c:3564
 msgid "Topic:"
 msgstr "Tópico:"
 
 #. Setup the label telling how many people are in the room.
-#: ../src/gtkconv.c:3865
+#: ../src/gtkconv.c:3908
 msgid "0 people in room"
 msgstr "0 persoas na conversación"
 
-#: ../src/gtkconv.c:3944
+#: ../src/gtkconv.c:3987
 msgid "IM the user"
 msgstr "Enviar un MI ao usuario"
 
-#: ../src/gtkconv.c:3957
+#: ../src/gtkconv.c:4000
 msgid "Ignore the user"
 msgstr "Ignorar ao usuario"
 
-#: ../src/gtkconv.c:3969
+#: ../src/gtkconv.c:4012
 msgid "Get the user's information"
 msgstr "Obter a información do usuario"
 
-#: ../src/gtkconv.c:4951 ../src/gtkconv.c:5060
+#: ../src/gtkconv.c:4998 ../src/gtkconv.c:5107
 #, 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:5617 ../src/gtkstatusbox.c:366
+#: ../src/gtkconv.c:5664 ../src/gtkstatusbox.c:366
 msgid "Typing"
 msgstr "Escribindo"
 
-#: ../src/gtkconv.c:5623
+#: ../src/gtkconv.c:5670
 msgid "Stopped Typing"
 msgstr "Deixa de escribir"
 
-#: ../src/gtkconv.c:5628
+#: ../src/gtkconv.c:5675
 msgid "Nick Said"
 msgstr "Alcume"
 
-#: ../src/gtkconv.c:5638
+#: ../src/gtkconv.c:5685
 msgid "New Event"
 msgstr "Evento novo"
 
-#: ../src/gtkconv.c:6537
+#: ../src/gtkconv.c:6575
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -3200,11 +3243,11 @@
 "say &lt;mensaxe&gt;:  Enviar unha mensaxe como se non se estivera utilizando "
 "un comando."
 
-#: ../src/gtkconv.c:6540
+#: ../src/gtkconv.c:6578
 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:6543
+#: ../src/gtkconv.c:6581
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -3212,59 +3255,59 @@
 "debug &lt;opción&gt;:  Enviar información de depuración sobre a conversación "
 "actual."
 
-#: ../src/gtkconv.c:6546
+#: ../src/gtkconv.c:6584
 msgid "clear: Clears the conversation scrollback."
 msgstr "limpar: Limpa a conversación desprazada."
 
-#: ../src/gtkconv.c:6549
+#: ../src/gtkconv.c:6587
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;comando&gt;:  Recibir axuda dun comando específico."
 
-#: ../src/gtkconv.c:6708
+#: ../src/gtkconv.c:6746
 msgid "Confirm close"
 msgstr "Confirmar peche"
 
-#: ../src/gtkconv.c:6740
+#: ../src/gtkconv.c:6778
 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:7262
+#: ../src/gtkconv.c:7300
 msgid "Close other tabs"
 msgstr "Pechar outras solapas"
 
-#: ../src/gtkconv.c:7268
+#: ../src/gtkconv.c:7306
 msgid "Close all tabs"
 msgstr "Pechar todas as solapas"
 
-#: ../src/gtkconv.c:7276
+#: ../src/gtkconv.c:7314
 msgid "Detach this tab"
 msgstr "Desacoplar esta solapa"
 
-#: ../src/gtkconv.c:7282
+#: ../src/gtkconv.c:7320
 msgid "Close this tab"
 msgstr "Pechar esta solapa"
 
-#: ../src/gtkconv.c:7542
+#: ../src/gtkconv.c:7580
 msgid "Close conversation"
 msgstr "Pechar conversación"
 
-#: ../src/gtkconv.c:8006
+#: ../src/gtkconv.c:8044
 msgid "Last created window"
 msgstr "Última fiestra creada"
 
-#: ../src/gtkconv.c:8008
+#: ../src/gtkconv.c:8046
 msgid "Separate IM and Chat windows"
 msgstr "Separar fiestras de MIs e Chats"
 
-#: ../src/gtkconv.c:8010 ../src/gtkprefs.c:1258
+#: ../src/gtkconv.c:8048 ../src/gtkprefs.c:1258
 msgid "New window"
 msgstr "Nova fiestra"
 
-#: ../src/gtkconv.c:8012
+#: ../src/gtkconv.c:8050
 msgid "By group"
 msgstr "Por grupo"
 
-#: ../src/gtkconv.c:8014
+#: ../src/gtkconv.c:8052
 msgid "By account"
 msgstr "Por conta"
 
@@ -3304,7 +3347,7 @@
 msgid "Right click for more options."
 msgstr "Premer co botón dereito para máis opcións."
 
-#: ../src/gtkdialogs.c:61 ../src/gtkdialogs.c:103
+#: ../src/gtkdialogs.c:61 ../src/gtkdialogs.c:104
 msgid "lead developer"
 msgstr "desenrolador principal"
 
@@ -3336,210 +3379,219 @@
 msgid "libfaim maintainer"
 msgstr "mantedor de libfaim"
 
-#: ../src/gtkdialogs.c:100
+#. If "lazy bum" translates literally into a serious insult, use something else or omit it.
+#: ../src/gtkdialogs.c:101
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker e deseñador de controladores [lazy bum]"
 
-#: ../src/gtkdialogs.c:101
+#: ../src/gtkdialogs.c:102
 msgid "Jabber developer"
 msgstr "desenrolador de Jabber"
 
-#: ../src/gtkdialogs.c:102
+#: ../src/gtkdialogs.c:103
 msgid "original author"
 msgstr "autor orixinal"
 
-#: ../src/gtkdialogs.c:109 ../src/gtkdialogs.c:110 ../src/gtkdialogs.c:168
+#: ../src/gtkdialogs.c:110 ../src/gtkdialogs.c:111 ../src/gtkdialogs.c:174
 msgid "Bulgarian"
 msgstr "Búlgaro"
 
-#: ../src/gtkdialogs.c:111 ../src/gtkdialogs.c:112
+#: ../src/gtkdialogs.c:112 ../src/gtkdialogs.c:113
 msgid "Bengali"
 msgstr "Bengalí"
 
-#: ../src/gtkdialogs.c:113
+#: ../src/gtkdialogs.c:114
 msgid "Bosnian"
 msgstr "Bosnia"
 
-#: ../src/gtkdialogs.c:114 ../src/gtkdialogs.c:169 ../src/gtkdialogs.c:170
+#: ../src/gtkdialogs.c:115 ../src/gtkdialogs.c:175 ../src/gtkdialogs.c:176
 msgid "Catalan"
 msgstr "Catalán"
 
-#: ../src/gtkdialogs.c:115
-msgid "Valencian"
+#: ../src/gtkdialogs.c:116 ../src/gtkdialogs.c:117
+msgid "Valencian-Catalan"
 msgstr "Valenciano"
 
-#: ../src/gtkdialogs.c:116 ../src/gtkdialogs.c:171
+#: ../src/gtkdialogs.c:118 ../src/gtkdialogs.c:177
 msgid "Czech"
 msgstr "Checo"
 
-#: ../src/gtkdialogs.c:117
+#: ../src/gtkdialogs.c:119
 msgid "Danish"
 msgstr "Danés"
 
-#: ../src/gtkdialogs.c:118 ../src/gtkdialogs.c:119 ../src/gtkdialogs.c:172
+#: ../src/gtkdialogs.c:120 ../src/gtkdialogs.c:121 ../src/gtkdialogs.c:178
 msgid "German"
 msgstr "Alemán"
 
-#: ../src/gtkdialogs.c:120 ../src/gtkdialogs.c:121
+#: ../src/gtkdialogs.c:122 ../src/gtkdialogs.c:123
 msgid "Greek"
 msgstr "Grego"
 
-#: ../src/gtkdialogs.c:122
+#: ../src/gtkdialogs.c:124
 msgid "Australian English"
 msgstr "Inglés australiano"
 
-#: ../src/gtkdialogs.c:123
+#: ../src/gtkdialogs.c:125
 msgid "Canadian English"
 msgstr "Inglés canadiense"
 
-#: ../src/gtkdialogs.c:124
+#: ../src/gtkdialogs.c:126
 msgid "British English"
 msgstr "Inglés británico"
 
-#: ../src/gtkdialogs.c:125 ../src/gtkdialogs.c:173 ../src/gtkdialogs.c:174
-#: ../src/gtkdialogs.c:175 ../src/gtkdialogs.c:176
+#: ../src/gtkdialogs.c:127 ../src/gtkdialogs.c:179 ../src/gtkdialogs.c:180
+#: ../src/gtkdialogs.c:181 ../src/gtkdialogs.c:182
 msgid "Spanish"
 msgstr "Español"
 
-#: ../src/gtkdialogs.c:126 ../src/gtkdialogs.c:127
+#: ../src/gtkdialogs.c:128 ../src/gtkdialogs.c:129
+msgid "Euskera(Basque)"
+msgstr "Euskera"
+
+#: ../src/gtkdialogs.c:130 ../src/gtkdialogs.c:131
 msgid "Persian"
 msgstr "Perso"
 
-#: ../src/gtkdialogs.c:128 ../src/gtkdialogs.c:177 ../src/gtkdialogs.c:178
+#: ../src/gtkdialogs.c:132 ../src/gtkdialogs.c:183 ../src/gtkdialogs.c:184
 msgid "Finnish"
 msgstr "Finlandés"
 
-#: ../src/gtkdialogs.c:129 ../src/gtkdialogs.c:179 ../src/gtkdialogs.c:180
-#: ../src/gtkdialogs.c:181 ../src/gtkdialogs.c:182
+#: ../src/gtkdialogs.c:133 ../src/gtkdialogs.c:185 ../src/gtkdialogs.c:186
+#: ../src/gtkdialogs.c:187 ../src/gtkdialogs.c:188
 msgid "French"
 msgstr "Francés"
 
-#: ../src/gtkdialogs.c:130
+#: ../src/gtkdialogs.c:134
 msgid "Galician"
 msgstr "Galego"
 
-#: ../src/gtkdialogs.c:131
+#: ../src/gtkdialogs.c:135 ../src/gtkdialogs.c:189
 msgid "Hebrew"
 msgstr "Hebreo"
 
-#: ../src/gtkdialogs.c:132
+#: ../src/gtkdialogs.c:136
 msgid "Hindi"
 msgstr "Hindú"
 
-#: ../src/gtkdialogs.c:133
+#: ../src/gtkdialogs.c:137
 msgid "Hungarian"
 msgstr "Húngaro"
 
-#: ../src/gtkdialogs.c:134 ../src/gtkdialogs.c:183
+#: ../src/gtkdialogs.c:138 ../src/gtkdialogs.c:190
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../src/gtkdialogs.c:135 ../src/gtkdialogs.c:184 ../src/gtkdialogs.c:185
-#: ../src/gtkdialogs.c:186
+#: ../src/gtkdialogs.c:139 ../src/gtkdialogs.c:191 ../src/gtkdialogs.c:192
+#: ../src/gtkdialogs.c:193
 msgid "Japanese"
 msgstr "Xaponés"
 
-#: ../src/gtkdialogs.c:136 ../src/gtkdialogs.c:187
+#: ../src/gtkdialogs.c:140 ../src/gtkdialogs.c:194
 msgid "Georgian"
 msgstr "Xeorxiano"
 
-#: ../src/gtkdialogs.c:137 ../src/gtkdialogs.c:188
+#: ../src/gtkdialogs.c:141 ../src/gtkdialogs.c:195
 msgid "Korean"
 msgstr "Coreano"
 
-#: ../src/gtkdialogs.c:138 ../src/gtkdialogs.c:139 ../src/gtkdialogs.c:140
+#: ../src/gtkdialogs.c:142 ../src/gtkdialogs.c:143 ../src/gtkdialogs.c:144
 msgid "Kurdish"
 msgstr "Curdo"
 
-#: ../src/gtkdialogs.c:141 ../src/gtkdialogs.c:189 ../src/gtkdialogs.c:190
+#: ../src/gtkdialogs.c:145 ../src/gtkdialogs.c:196 ../src/gtkdialogs.c:197
 msgid "Lithuanian"
 msgstr "Lituano"
 
-#: ../src/gtkdialogs.c:142
+#: ../src/gtkdialogs.c:146
 msgid "Macedonian"
 msgstr "Macedonio"
 
-#: ../src/gtkdialogs.c:143
+#: ../src/gtkdialogs.c:147
 msgid "Dutch, Flemish"
 msgstr "Holandés, Flamenco"
 
-#: ../src/gtkdialogs.c:144
+#: ../src/gtkdialogs.c:148
 msgid "Norwegian"
 msgstr "Noruego"
 
-#: ../src/gtkdialogs.c:145 ../src/gtkdialogs.c:146 ../src/gtkdialogs.c:191
+#: ../src/gtkdialogs.c:149 ../src/gtkdialogs.c:150 ../src/gtkdialogs.c:198
 msgid "Polish"
 msgstr "Polaco"
 
-#: ../src/gtkdialogs.c:147
+#: ../src/gtkdialogs.c:151
 msgid "Portuguese"
 msgstr "Portugués"
 
-#: ../src/gtkdialogs.c:148
+#: ../src/gtkdialogs.c:152
 msgid "Portuguese-Brazil"
 msgstr "Portugués brasileiro"
 
-#: ../src/gtkdialogs.c:149
+#: ../src/gtkdialogs.c:153
 msgid "Romanian"
 msgstr "Rumano"
 
-#: ../src/gtkdialogs.c:150 ../src/gtkdialogs.c:192 ../src/gtkdialogs.c:193
+#: ../src/gtkdialogs.c:154 ../src/gtkdialogs.c:199 ../src/gtkdialogs.c:200
 msgid "Russian"
 msgstr "Ruso"
 
-#: ../src/gtkdialogs.c:151 ../src/gtkdialogs.c:152
+#: ../src/gtkdialogs.c:155 ../src/gtkdialogs.c:156
 msgid "Serbian"
 msgstr "Servio"
 
-#: ../src/gtkdialogs.c:153
-msgid "Slovenian"
-msgstr "Esloveno"
-
-#: ../src/gtkdialogs.c:154 ../src/gtkdialogs.c:195
-msgid "Swedish"
-msgstr "Sueco"
-
-#: ../src/gtkdialogs.c:155
-msgid "Tamil"
-msgstr "Tamil"
-
-#: ../src/gtkdialogs.c:156
-msgid "Telugu"
-msgstr "Telugu"
-
-#: ../src/gtkdialogs.c:157
-msgid "Turkish"
-msgstr "Turco"
-
-#: ../src/gtkdialogs.c:158
-msgid "Vietnamese"
-msgstr "Vietnamita"
+#: ../src/gtkdialogs.c:157 ../src/gtkdialogs.c:201
+msgid "Slovak"
+msgstr "Eslovaco"
 
 #: ../src/gtkdialogs.c:158
+msgid "Slovenian"
+msgstr "Esloveno"
+
+#: ../src/gtkdialogs.c:159 ../src/gtkdialogs.c:202
+msgid "Swedish"
+msgstr "Sueco"
+
+#: ../src/gtkdialogs.c:160
+msgid "Tamil"
+msgstr "Tamil"
+
+#: ../src/gtkdialogs.c:161
+msgid "Telugu"
+msgstr "Telugu"
+
+#: ../src/gtkdialogs.c:162
+msgid "Thai"
+msgstr "Thai"
+
+#: ../src/gtkdialogs.c:163
+msgid "Turkish"
+msgstr "Turco"
+
+#: ../src/gtkdialogs.c:164
+msgid "Vietnamese"
+msgstr "Vietnamita"
+
+#: ../src/gtkdialogs.c:164
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh eo equipo Gnome-Vi"
 
-#: ../src/gtkdialogs.c:159 ../src/gtkdialogs.c:196
+#: ../src/gtkdialogs.c:165 ../src/gtkdialogs.c:203
 msgid "Simplified Chinese"
 msgstr "Chinés simplificado"
 
-#: ../src/gtkdialogs.c:160 ../src/gtkdialogs.c:161 ../src/gtkdialogs.c:197
+#: ../src/gtkdialogs.c:166 ../src/gtkdialogs.c:167 ../src/gtkdialogs.c:204
 msgid "Traditional Chinese"
 msgstr "Chinés tradicional"
 
-#: ../src/gtkdialogs.c:167
+#: ../src/gtkdialogs.c:173
 msgid "Amharic"
 msgstr "Amhárico"
 
-#: ../src/gtkdialogs.c:194
-msgid "Slovak"
-msgstr "Eslovaco"
-
-#: ../src/gtkdialogs.c:238
+#: ../src/gtkdialogs.c:245
 msgid "About Gaim"
 msgstr "Acerca de Gaim"
 
-#: ../src/gtkdialogs.c:262
+#: ../src/gtkdialogs.c:269
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, "
@@ -3560,59 +3612,59 @@
 "lista completa de persoas que contribuíron. Este programa distribúese "
 "senningunha garantía.<BR><BR>"
 
-#: ../src/gtkdialogs.c:276
+#: ../src/gtkdialogs.c:283
 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:279
+#: ../src/gtkdialogs.c:286
 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:285
+#: ../src/gtkdialogs.c:292
 msgid "Current Developers"
 msgstr "Desenroladores actuais"
 
-#: ../src/gtkdialogs.c:300
+#: ../src/gtkdialogs.c:307
 msgid "Crazy Patch Writers"
 msgstr "Tolos escritores de parches"
 
-#: ../src/gtkdialogs.c:315
+#: ../src/gtkdialogs.c:322
 msgid "Retired Developers"
 msgstr "Desenroladores retirados"
 
-#: ../src/gtkdialogs.c:330
+#: ../src/gtkdialogs.c:337
 msgid "Current Translators"
 msgstr "Traductores actuais"
 
-#: ../src/gtkdialogs.c:350
+#: ../src/gtkdialogs.c:357
 msgid "Past Translators"
 msgstr "Traductores anteriores"
 
-#: ../src/gtkdialogs.c:368
+#: ../src/gtkdialogs.c:375
 msgid "Debugging Information"
 msgstr "Información de depuración"
 
-#: ../src/gtkdialogs.c:582 ../src/gtkdialogs.c:719 ../src/gtkdialogs.c:782
+#: ../src/gtkdialogs.c:589 ../src/gtkdialogs.c:726 ../src/gtkdialogs.c:789
 msgid "_Name"
 msgstr "_Nome"
 
-#: ../src/gtkdialogs.c:587 ../src/gtkdialogs.c:724 ../src/gtkdialogs.c:787
+#: ../src/gtkdialogs.c:594 ../src/gtkdialogs.c:731 ../src/gtkdialogs.c:794
 msgid "_Account"
 msgstr "_Conta"
 
-#: ../src/gtkdialogs.c:595
+#: ../src/gtkdialogs.c:602
 msgid "New Instant Message"
 msgstr "Mensaxe instantánea nova"
 
-#: ../src/gtkdialogs.c:597
+#: ../src/gtkdialogs.c:604
 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:732
+#: ../src/gtkdialogs.c:739
 msgid "Get User Info"
 msgstr "Obter información do usuario"
 
-#: ../src/gtkdialogs.c:734
+#: ../src/gtkdialogs.c:741
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
@@ -3620,11 +3672,11 @@
 "Introduza o nome de usuario ou alcume da persoa da cal quere ver a "
 "información."
 
-#: ../src/gtkdialogs.c:796
+#: ../src/gtkdialogs.c:803
 msgid "View User Log"
 msgstr "Ver rexistro de usuario"
 
-#: ../src/gtkdialogs.c:798
+#: ../src/gtkdialogs.c:805
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
@@ -3632,37 +3684,37 @@
 "Introduza o nome de usuario ou alcume da persoa da cal quere ver a "
 "información de rexistro."
 
-#: ../src/gtkdialogs.c:817
+#: ../src/gtkdialogs.c:824
 msgid "Alias Contact"
 msgstr "Alcume para contacto"
 
-#: ../src/gtkdialogs.c:818
+#: ../src/gtkdialogs.c:825
 msgid "Enter an alias for this contact."
 msgstr "Introduza un alcume para este contacto"
 
-#: ../src/gtkdialogs.c:820 ../src/gtkdialogs.c:842 ../src/gtkdialogs.c:862
-#: ../src/gtkrequest.c:277 ../src/protocols/silc/chat.c:586
+#: ../src/gtkdialogs.c:827 ../src/gtkdialogs.c:849 ../src/gtkdialogs.c:869
+#: ../src/gtkrequest.c:277 ../src/protocols/silc/chat.c:587
 msgid "Alias"
 msgstr "Alcume"
 
-#: ../src/gtkdialogs.c:838
+#: ../src/gtkdialogs.c:845
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Introduza un alcume para %s."
 
-#: ../src/gtkdialogs.c:840
+#: ../src/gtkdialogs.c:847
 msgid "Alias Buddy"
 msgstr "Alcume de amigo"
 
-#: ../src/gtkdialogs.c:859
+#: ../src/gtkdialogs.c:866
 msgid "Alias Chat"
 msgstr "Alcume no Chat"
 
-#: ../src/gtkdialogs.c:860
+#: ../src/gtkdialogs.c:867
 msgid "Enter an alias for this chat."
 msgstr "Introduza un alcume para este chat."
 
-#: ../src/gtkdialogs.c:897
+#: ../src/gtkdialogs.c:904
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -3677,15 +3729,15 @@
 "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:905
+#: ../src/gtkdialogs.c:912
 msgid "Remove Contact"
 msgstr "Eliminar contacto"
 
-#: ../src/gtkdialogs.c:906
+#: ../src/gtkdialogs.c:913
 msgid "_Remove Contact"
 msgstr "_Eliminar contacto"
 
-#: ../src/gtkdialogs.c:957
+#: ../src/gtkdialogs.c:964
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -3694,39 +3746,39 @@
 "Está a punto de borrar o grupo %s xunto con todos seus membros da lista de "
 "amigos. Desexa continuar?"
 
-#: ../src/gtkdialogs.c:960
+#: ../src/gtkdialogs.c:967
 msgid "Remove Group"
 msgstr "Eliminar grupo"
 
-#: ../src/gtkdialogs.c:961
+#: ../src/gtkdialogs.c:968
 msgid "_Remove Group"
 msgstr "_Eliminar grupo"
 
-#: ../src/gtkdialogs.c:994
+#: ../src/gtkdialogs.c:1001
 #, c-format
 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:997
+#: ../src/gtkdialogs.c:1004
 msgid "Remove Buddy"
 msgstr "Eliminar amigo"
 
-#: ../src/gtkdialogs.c:998
+#: ../src/gtkdialogs.c:1005
 msgid "_Remove Buddy"
 msgstr "_Eliminar amigo"
 
-#: ../src/gtkdialogs.c:1019
+#: ../src/gtkdialogs.c:1026
 #, c-format
 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?"
 
-#: ../src/gtkdialogs.c:1022
+#: ../src/gtkdialogs.c:1029
 msgid "Remove Chat"
 msgstr "Eliminar Chat"
 
-#: ../src/gtkdialogs.c:1023
+#: ../src/gtkdialogs.c:1030
 msgid "_Remove Chat"
 msgstr "_Eliminar Chat"
 
@@ -4189,7 +4241,7 @@
 msgid "Open All Messages"
 msgstr "Abrir todas as mensaxes"
 
-#: ../src/gtknotify.c:411 ../src/protocols/jabber/jabber.c:1115
+#: ../src/gtknotify.c:411 ../src/protocols/jabber/jabber.c:1113
 msgid "From"
 msgstr "De"
 
@@ -4219,7 +4271,7 @@
 "\n"
 "%s"
 
-#: ../src/gtknotify.c:688 ../src/protocols/sametime/sametime.c:5458
+#: ../src/gtknotify.c:688 ../src/protocols/sametime/sametime.c:5451
 msgid "Search Results"
 msgstr "Resultados da busca"
 
@@ -4295,185 +4347,185 @@
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Detalles do complemento</b>"
 
-#: ../src/gtkpounce.c:162
+#: ../src/gtkpounce.c:154
 msgid "Select a file"
 msgstr "Seleccionar un ficheiro"
 
-#: ../src/gtkpounce.c:259
+#: ../src/gtkpounce.c:251
 msgid "Please enter a buddy to pounce."
 msgstr "Indique o amigo do que avisar."
 
-#: ../src/gtkpounce.c:503
+#: ../src/gtkpounce.c:495
 msgid "New Buddy Pounce"
 msgstr "Novo aviso de amigo"
 
-#: ../src/gtkpounce.c:503
+#: ../src/gtkpounce.c:495
 msgid "Edit Buddy Pounce"
 msgstr "Editar aviso de amigo"
 
 #. Create the "Pounce on Whom" frame.
-#: ../src/gtkpounce.c:520
+#: ../src/gtkpounce.c:512
 msgid "Pounce on Whom"
 msgstr "A quén avisar"
 
-#: ../src/gtkpounce.c:547
+#: ../src/gtkpounce.c:539
 msgid "_Buddy name:"
 msgstr "Nome do _amigo:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../src/gtkpounce.c:573
+#: ../src/gtkpounce.c:565
 msgid "Pounce When Buddy..."
 msgstr "Avisar cando un amigo..."
 
-#: ../src/gtkpounce.c:581
+#: ../src/gtkpounce.c:573
 msgid "Si_gns on"
 msgstr "_Conectarse"
 
-#: ../src/gtkpounce.c:583
+#: ../src/gtkpounce.c:575
 msgid "Signs o_ff"
 msgstr "_Desconectarse"
 
-#: ../src/gtkpounce.c:585
+#: ../src/gtkpounce.c:577
 msgid "Goes a_way"
 msgstr "_Auséntarse"
 
-#: ../src/gtkpounce.c:587
+#: ../src/gtkpounce.c:579
 msgid "Ret_urns from away"
 msgstr "_Deixar de estar ausente"
 
-#: ../src/gtkpounce.c:589
+#: ../src/gtkpounce.c:581
 msgid "Becomes _idle"
 msgstr "Agora está _inactivo"
 
-#: ../src/gtkpounce.c:591
+#: ../src/gtkpounce.c:583
 msgid "Is no longer i_dle"
 msgstr "_Xa non está inactivo"
 
-#: ../src/gtkpounce.c:593
+#: ../src/gtkpounce.c:585
 msgid "Starts _typing"
 msgstr "Comeza a _escribir"
 
-#: ../src/gtkpounce.c:595
+#: ../src/gtkpounce.c:587
 msgid "Stops t_yping"
 msgstr "Deixa de escr_ibir"
 
-#: ../src/gtkpounce.c:597
+#: ../src/gtkpounce.c:589
 msgid "Sends a _message"
 msgstr "Enviar unha _mensaxe"
 
 #. Create the "Action" frame.
-#: ../src/gtkpounce.c:629
+#: ../src/gtkpounce.c:621
 msgid "Action"
 msgstr "Acción"
 
-#: ../src/gtkpounce.c:637
+#: ../src/gtkpounce.c:629
 msgid "Ope_n an IM window"
 msgstr "_Abrir unha fiestra de MI"
 
-#: ../src/gtkpounce.c:639
+#: ../src/gtkpounce.c:631
 msgid "_Pop up a notification"
 msgstr "_Notificación cunha fiestra emerxente"
 
-#: ../src/gtkpounce.c:641
+#: ../src/gtkpounce.c:633
 msgid "Send a _message"
 msgstr "Enviar unha _mensaxe"
 
-#: ../src/gtkpounce.c:643
+#: ../src/gtkpounce.c:635
 msgid "E_xecute a command"
 msgstr "E_xecutar un comando"
 
-#: ../src/gtkpounce.c:645
+#: ../src/gtkpounce.c:637
 msgid "P_lay a sound"
 msgstr "Re_producir un son"
 
-#: ../src/gtkpounce.c:650
+#: ../src/gtkpounce.c:642
 msgid "Brows_e..."
 msgstr "Exa_minar..."
 
-#: ../src/gtkpounce.c:652
+#: ../src/gtkpounce.c:644
 msgid "Br_owse..."
 msgstr "Exa_minar..."
 
-#: ../src/gtkpounce.c:653
+#: ../src/gtkpounce.c:645
 msgid "Pre_view"
 msgstr "Pre_visualizar..."
 
 #. Create the "Options" frame.
-#: ../src/gtkpounce.c:765
+#: ../src/gtkpounce.c:757
 msgid "Options"
 msgstr "Opcións"
 
-#: ../src/gtkpounce.c:773
+#: ../src/gtkpounce.c:765
 msgid "P_ounce only when my status is not available"
 msgstr "Só _avisar cando o meu estado non está dispoñible"
 
-#: ../src/gtkpounce.c:778
+#: ../src/gtkpounce.c:770
 msgid "_Recurring"
 msgstr "_Recorrente"
 
-#: ../src/gtkpounce.c:1092
+#: ../src/gtkpounce.c:1074
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "Está seguro de que quere borrar o aviso en %s para %s?"
 
-#: ../src/gtkpounce.c:1240
+#: ../src/gtkpounce.c:1222
 msgid "Pounce Target"
 msgstr "Obxectivo a avisar"
 
-#: ../src/gtkpounce.c:1275
+#: ../src/gtkpounce.c:1257
 msgid "Recurring"
 msgstr "Recorrente"
 
-#: ../src/gtkpounce.c:1322
+#: ../src/gtkpounce.c:1304
 msgid "Buddy Pounces"
 msgstr "Avisos de amigo"
 
-#: ../src/gtkpounce.c:1449
+#: ../src/gtkpounce.c:1431
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s comezou a escribirlle (%s)"
 
-#: ../src/gtkpounce.c:1451
+#: ../src/gtkpounce.c:1433
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s conectouse (%s)"
 
-#: ../src/gtkpounce.c:1453
+#: ../src/gtkpounce.c:1435
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s volveu da súa inactividade (%s)"
 
-#: ../src/gtkpounce.c:1455
+#: ../src/gtkpounce.c:1437
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s deixou de estar ausente (%s)"
 
-#: ../src/gtkpounce.c:1457
+#: ../src/gtkpounce.c:1439
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s deixou de escribirlle (%s)"
 
-#: ../src/gtkpounce.c:1459
+#: ../src/gtkpounce.c:1441
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s desconectouse (%s)"
 
-#: ../src/gtkpounce.c:1461
+#: ../src/gtkpounce.c:1443
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s está inactivo (%s)"
 
-#: ../src/gtkpounce.c:1463
+#: ../src/gtkpounce.c:1445
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s marchouse. (%s)"
 
-#: ../src/gtkpounce.c:1465
+#: ../src/gtkpounce.c:1447
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s envioulle unha mensaxe. (%s)"
 
-#: ../src/gtkpounce.c:1466
+#: ../src/gtkpounce.c:1448
 msgid "Unknown pounce event. Please report this!"
 msgstr "Evento de aviso descoñecido. Por favor, informe disto!"
 
@@ -4493,8 +4545,8 @@
 msgid "Icon"
 msgstr "Icona"
 
-#: ../src/gtkprefs.c:680 ../src/protocols/jabber/buddy.c:267
-#: ../src/protocols/jabber/buddy.c:818 ../src/protocols/jabber/chat.c:769
+#: ../src/gtkprefs.c:680 ../src/protocols/jabber/buddy.c:286
+#: ../src/protocols/jabber/buddy.c:926 ../src/protocols/jabber/chat.c:767
 msgid "Description"
 msgstr "Descrición"
 
@@ -4993,16 +5045,16 @@
 #. * 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/msn/msn.c:557 ../src/protocols/msn/msn.c:566
+#: ../src/protocols/novell/novell.c:1919 ../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 "Si"
 
 #: ../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/msn/msn.c:557 ../src/protocols/msn/msn.c:566
+#: ../src/protocols/novell/novell.c:1920 ../src/protocols/silc/buddy.c:314
 #: ../src/protocols/silc/pk.c:118 ../src/protocols/silc/wb.c:304
 #: ../src/request.h:1335
 msgid "No"
@@ -5063,8 +5115,8 @@
 msgid "_Add Chat"
 msgstr "_Engadir Chat"
 
-#: ../src/gtksavedstatuses.c:433 ../src/protocols/jabber/buddy.c:264
-#: ../src/protocols/jabber/buddy.c:812 ../src/protocols/novell/novell.c:1486
+#: ../src/gtksavedstatuses.c:433 ../src/protocols/jabber/buddy.c:283
+#: ../src/protocols/jabber/buddy.c:920 ../src/protocols/novell/novell.c:1484
 msgid "Title"
 msgstr "Título"
 
@@ -5077,20 +5129,20 @@
 #: ../src/protocols/bonjour/bonjour.c:263 ../src/protocols/gg/gg.c:1591
 #: ../src/protocols/gg/gg.c:1601 ../src/protocols/gg/gg.c:1607
 #: ../src/protocols/gg/gg.c:1616 ../src/protocols/gg/gg.c:1621
-#: ../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:5352
-#: ../src/protocols/oscar/oscar.c:5367 ../src/protocols/oscar/oscar.c:5372
-#: ../src/protocols/oscar/oscar.c:5580 ../src/protocols/oscar/oscar.c:5592
-#: ../src/protocols/sametime/sametime.c:3273
-#: ../src/protocols/sametime/sametime.c:3279
-#: ../src/protocols/sametime/sametime.c:3285
-#: ../src/protocols/sametime/sametime.c:3364
+#: ../src/protocols/irc/irc.c:227 ../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:1232 ../src/protocols/novell/novell.c:2866
+#: ../src/protocols/novell/novell.c:2972 ../src/protocols/novell/novell.c:2978
+#: ../src/protocols/novell/novell.c:2984 ../src/protocols/oscar/oscar.c:5366
+#: ../src/protocols/oscar/oscar.c:5381 ../src/protocols/oscar/oscar.c:5386
+#: ../src/protocols/oscar/oscar.c:5594 ../src/protocols/oscar/oscar.c:5606
+#: ../src/protocols/sametime/sametime.c:3266
+#: ../src/protocols/sametime/sametime.c:3272
+#: ../src/protocols/sametime/sametime.c:3278
+#: ../src/protocols/sametime/sametime.c:3357
 #: ../src/protocols/silc/buddy.c:1544 ../src/protocols/simple/simple.c:242
-#: ../src/protocols/yahoo/yahoo.c:3286 ../src/protocols/yahoo/yahoo.c:3292
+#: ../src/protocols/yahoo/yahoo.c:3282 ../src/protocols/yahoo/yahoo.c:3288
 #: ../src/protocols/zephyr/zephyr.c:2281
 msgid "Message"
 msgstr "Mensaxe"
@@ -5114,12 +5166,12 @@
 
 #: ../src/gtksavedstatuses.c:908 ../src/gtksavedstatuses.c:1055
 #: ../src/protocols/gg/gg.c:1024 ../src/protocols/gg/gg.c:1574
-#: ../src/protocols/gg/gg.c:1578 ../src/protocols/jabber/buddy.c:623
-#: ../src/protocols/jabber/buddy.c:630 ../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/gg/gg.c:1578 ../src/protocols/jabber/buddy.c:629
+#: ../src/protocols/jabber/buddy.c:636 ../src/protocols/jabber/buddy.c:662
+#: ../src/protocols/jabber/jabber.c:1151 ../src/protocols/msn/msn.c:548
+#: ../src/protocols/novell/novell.c:2865 ../src/protocols/novell/novell.c:2869
 #: ../src/protocols/oscar/oscar.c:775 ../src/protocols/oscar/oscar.c:781
-#: ../src/protocols/oscar/oscar.c:784 ../src/protocols/yahoo/yahoo.c:2882
+#: ../src/protocols/oscar/oscar.c:784 ../src/protocols/yahoo/yahoo.c:2878
 msgid "Status"
 msgstr "Estado"
 
@@ -5146,75 +5198,53 @@
 msgid "Status for %s"
 msgstr "Estado para %s"
 
-#: ../src/gtksound.c:61
+#: ../src/gtksound.c:59
 msgid "Buddy logs in"
 msgstr "Conéctase un amigo"
 
-#: ../src/gtksound.c:62
+#: ../src/gtksound.c:60
 msgid "Buddy logs out"
 msgstr "Desconéctase un amigo"
 
-#: ../src/gtksound.c:63
+#: ../src/gtksound.c:61
 msgid "Message received"
 msgstr "Recíbese unha mensaxe"
 
-#: ../src/gtksound.c:64
+#: ../src/gtksound.c:62
 msgid "Message received begins conversation"
 msgstr "Recíbese unha mensaxe que comeza unha conversación "
 
-#: ../src/gtksound.c:65
+#: ../src/gtksound.c:63
 msgid "Message sent"
 msgstr "Envíase unha mensaxe "
 
-#: ../src/gtksound.c:66
+#: ../src/gtksound.c:64
 msgid "Person enters chat"
 msgstr "Alguén entra ao chat"
 
-#: ../src/gtksound.c:67
+#: ../src/gtksound.c:65
 msgid "Person leaves chat"
 msgstr "Alguén deixa o chat"
 
-#: ../src/gtksound.c:68
+#: ../src/gtksound.c:66
 msgid "You talk in chat"
 msgstr "Fala no chat"
 
-#: ../src/gtksound.c:69
+#: ../src/gtksound.c:67
 msgid "Others talk in chat"
 msgstr "Outros falan no chat"
 
-#: ../src/gtksound.c:72
+#: ../src/gtksound.c:70
 msgid "Someone says your screen name in chat"
 msgstr "Alguén menciona o seu nome no chat"
 
-#: ../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:501
-msgid ""
-"Unable to play sound because the 'Command' sound method has been chosen, but "
-"no command has been set."
-msgstr ""
-"Non foi posible reproducir o son porque escolleuse o método de 'Comando',"
-"pero non se especificou o comando."
-
-#: ../src/gtksound.c:513
-#, c-format
-msgid ""
-"Unable to play sound because the configured sound command could not be "
-"launched: %s"
-msgstr ""
-"Non foi posible reproducir o son porque o comando de son establecido non se "
-"puido lanzar: %s"
-
 #. 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:351
+#: ../src/protocols/jabber/jabber.c:977 ../src/protocols/msn/session.c:344
 #: ../src/protocols/napster/napster.c:536
-#: ../src/protocols/novell/novell.c:2183 ../src/protocols/oscar/oscar.c:1250
-#: ../src/protocols/sametime/sametime.c:3692
-#: ../src/protocols/simple/simple.c:1608 ../src/protocols/yahoo/yahoo.c:2572
+#: ../src/protocols/novell/novell.c:2181 ../src/protocols/oscar/oscar.c:1250
+#: ../src/protocols/sametime/sametime.c:3685
+#: ../src/protocols/simple/simple.c:1609 ../src/protocols/yahoo/yahoo.c:2570
 #: ../src/protocols/zephyr/zephyr.c:1565
 msgid "Connecting"
 msgstr "Conectando"
@@ -5334,31 +5364,31 @@
 msgid "Select color"
 msgstr "Seleccionar cor"
 
-#: ../src/log.c:177
+#: ../src/log.c:180
 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>"
 
-#: ../src/log.c:558
+#: ../src/log.c:561
 msgid "HTML"
 msgstr "HTML"
 
-#: ../src/log.c:569
+#: ../src/log.c:572
 msgid "Plain text"
 msgstr "Texto plano"
 
-#: ../src/log.c:580
+#: ../src/log.c:583
 msgid "Old Gaim"
 msgstr "Gaim antigo"
 
-#: ../src/log.c:675
+#: ../src/log.c:678
 msgid "Logging of this conversation failed."
 msgstr "O rexistro desta conversación fallou."
 
-#: ../src/log.c:1025
+#: ../src/log.c:1028
 msgid "XML"
 msgstr "XML"
 
-#: ../src/log.c:1099
+#: ../src/log.c:1102
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -5367,7 +5397,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;RESPOSTA "
 "AUTOMÁTICA&gt;:</b></font> %s<br/>\n"
 
-#: ../src/log.c:1101
+#: ../src/log.c:1104
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -5376,22 +5406,22 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;RESPOSTA "
 "AUTOMÁTICA&gt;:</b></font> %s<br/>\n"
 
-#: ../src/log.c:1159 ../src/log.c:1291
+#: ../src/log.c:1162 ../src/log.c:1294
 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:1171 ../src/log.c:1305
+#: ../src/log.c:1174 ../src/log.c:1308
 #, 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:1233
+#: ../src/log.c:1236
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <RESPOSTA AUTOMÁTICA>: %s\n"
 
-#: ../src/plugin.c:281 ../src/protocols/jabber/buddy.c:1382
-#: ../src/protocols/msn/servconn.c:139 ../src/protocols/msn/session.c:328
+#: ../src/plugin.c:281 ../src/protocols/jabber/buddy.c:1645
+#: ../src/protocols/msn/servconn.c:139 ../src/protocols/msn/session.c:321
 #: ../src/protocols/oscar/oscar.c:2701
 msgid "Unknown error"
 msgstr "Erro descoñecido"
@@ -5451,7 +5481,7 @@
 msgstr "Imposible establecer a conexión co servidor local mDNS. Estase executando?"
 
 #: ../src/protocols/bonjour/bonjour.c:337
-#: ../src/protocols/sametime/sametime.c:3250
+#: ../src/protocols/sametime/sametime.c:3243
 #, c-format
 msgid ""
 "\n"
@@ -5498,23 +5528,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:2054 ../src/protocols/napster/napster.c:724
-#: ../src/protocols/sametime/sametime.c:5642 ../src/protocols/silc/silc.c:1858
+#: ../src/protocols/msn/msn.c:2049 ../src/protocols/napster/napster.c:724
+#: ../src/protocols/oscar/oscar.c:6470
+#: ../src/protocols/sametime/sametime.c:5635 ../src/protocols/silc/silc.c:1858
+#: ../src/protocols/toc/toc.c:2344
 msgid "Port"
 msgstr "Porto"
 
 #: ../src/protocols/bonjour/bonjour.c:582 ../src/protocols/gg/gg.c:622
-#: ../src/protocols/jabber/jabber.c:770
+#: ../src/protocols/jabber/jabber.c:769
 msgid "First name"
 msgstr "Nome"
 
 #: ../src/protocols/bonjour/bonjour.c:585 ../src/protocols/gg/gg.c:617
-#: ../src/protocols/jabber/jabber.c:775
+#: ../src/protocols/jabber/jabber.c:774
 msgid "Last name"
 msgstr "Apelidos"
 
 #: ../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/jabber/jabber.c:759 ../src/protocols/silc/silc.c:699
 #: ../src/protocols/silc/silc.c:939
 msgid "E-mail"
 msgstr "E-mail"
@@ -5548,11 +5580,11 @@
 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:76 ../src/proxy.c:2345
+#: ../src/protocols/gg/gg.c:76 ../src/proxy.c:2346
 msgid "Invalid proxy settings"
 msgstr "Configuración inválida de proxy"
 
-#: ../src/protocols/gg/gg.c:77 ../src/proxy.c:2345
+#: ../src/protocols/gg/gg.c:77 ../src/proxy.c:2346
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
@@ -5623,7 +5655,7 @@
 msgstr "Rexistro completado satisfactoriamente!"
 
 #: ../src/protocols/gg/gg.c:473 ../src/protocols/gg/gg.c:764
-#: ../src/protocols/jabber/jabber.c:749 ../src/protocols/jabber/jabber.c:1307
+#: ../src/protocols/jabber/jabber.c:748 ../src/protocols/jabber/jabber.c:1305
 msgid "Password"
 msgstr "Contrasinal"
 
@@ -5650,10 +5682,10 @@
 #. General
 #: ../src/protocols/gg/gg.c:627 ../src/protocols/gg/gg.c:1038
 #: ../src/protocols/gg/gg.c:1104 ../src/protocols/gg/gg.c:2175
-#: ../src/protocols/jabber/buddy.c:252 ../src/protocols/jabber/buddy.c:695
-#: ../src/protocols/jabber/buddy.c:1259 ../src/protocols/jabber/buddy.c:1441
-#: ../src/protocols/jabber/jabber.c:765 ../src/protocols/msn/msn.c:1373
-#: ../src/protocols/msn/msn.c:1535 ../src/protocols/silc/buddy.c:1528
+#: ../src/protocols/jabber/buddy.c:271 ../src/protocols/jabber/buddy.c:803
+#: ../src/protocols/jabber/buddy.c:1522 ../src/protocols/jabber/buddy.c:1704
+#: ../src/protocols/jabber/jabber.c:764 ../src/protocols/msn/msn.c:1368
+#: ../src/protocols/msn/msn.c:1530 ../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
@@ -5661,8 +5693,8 @@
 msgstr "Alcume"
 
 #: ../src/protocols/gg/gg.c:632 ../src/protocols/gg/gg.c:1043
-#: ../src/protocols/gg/gg.c:1107 ../src/protocols/jabber/jabber.c:785
-#: ../src/protocols/oscar/oscar.c:3677 ../src/protocols/oscar/oscar.c:3685
+#: ../src/protocols/gg/gg.c:1107 ../src/protocols/jabber/jabber.c:784
+#: ../src/protocols/oscar/oscar.c:3687 ../src/protocols/oscar/oscar.c:3695
 msgid "City"
 msgstr "Cidade"
 
@@ -5670,7 +5702,7 @@
 msgid "Year of birth"
 msgstr "Cumpreanos"
 
-#: ../src/protocols/gg/gg.c:640 ../src/protocols/msn/msn.c:1537
+#: ../src/protocols/gg/gg.c:640 ../src/protocols/msn/msn.c:1532
 #: ../src/protocols/oscar/oscar.c:3651
 #: ../src/protocols/yahoo/yahoo_profile.c:1066
 msgid "Gender"
@@ -5747,7 +5779,7 @@
 msgstr "UIN"
 
 #: ../src/protocols/gg/gg.c:1033 ../src/protocols/gg/gg.c:1101
-#: ../src/protocols/jabber/buddy.c:1255 ../src/protocols/jabber/buddy.c:1431
+#: ../src/protocols/jabber/buddy.c:1518 ../src/protocols/jabber/buddy.c:1694
 #: ../src/protocols/oscar/oscar.c:3634 ../src/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr "Nome"
@@ -5757,7 +5789,7 @@
 msgstr "Data de nacemento"
 
 #: ../src/protocols/gg/gg.c:1092 ../src/protocols/gg/gg.c:1161
-#: ../src/protocols/oscar/oscar.c:3788
+#: ../src/protocols/oscar/oscar.c:3798
 msgid "Unable to display the search results."
 msgstr "Non se poden amosar os resultados da busca."
 
@@ -5801,7 +5833,7 @@
 msgid "Connection failed."
 msgstr "Fallou a conexión."
 
-#: ../src/protocols/gg/gg.c:1615 ../src/protocols/msn/msn.c:566
+#: ../src/protocols/gg/gg.c:1615 ../src/protocols/msn/msn.c:564
 msgid "Blocked"
 msgstr "Bloqueado"
 
@@ -5890,13 +5922,13 @@
 msgid "Unknown command: %s"
 msgstr "Comando descoñecido: %s"
 
-#: ../src/protocols/irc/cmds.c:482 ../src/protocols/jabber/chat.c:592
+#: ../src/protocols/irc/cmds.c:482 ../src/protocols/jabber/chat.c:590
 #: ../src/protocols/silc/silc.c:1293
 #, 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/irc/cmds.c:486 ../src/protocols/jabber/chat.c:594
 #: ../src/protocols/silc/silc.c:1297
 msgid "No topic is set"
 msgstr "Non hai un tópico establecido"
@@ -5950,13 +5982,13 @@
 msgid "IRC nicks may not contain whitespace"
 msgstr "Os alcumes de IRC non poden ter espacios en branco"
 
-#: ../src/protocols/irc/irc.c:321 ../src/protocols/jabber/jabber.c:550
-#: ../src/protocols/jabber/jabber.c:890
+#: ../src/protocols/irc/irc.c:321 ../src/protocols/jabber/jabber.c:549
+#: ../src/protocols/jabber/jabber.c:888
 msgid "SSL support unavailable"
 msgstr "Soporte SSL non dispoñible"
 
-#: ../src/protocols/irc/irc.c:333 ../src/protocols/simple/simple.c:451
-#: ../src/protocols/simple/simple.c:1520
+#: ../src/protocols/irc/irc.c:333 ../src/protocols/simple/simple.c:452
+#: ../src/protocols/simple/simple.c:1521
 msgid "Couldn't create socket"
 msgstr "Non se puido crear o socket"
 
@@ -5977,13 +6009,13 @@
 msgid "Read error"
 msgstr "Erro de lectura"
 
-#: ../src/protocols/irc/irc.c:765 ../src/protocols/silc/chat.c:1420
+#: ../src/protocols/irc/irc.c:765 ../src/protocols/silc/chat.c:1421
 #: ../src/protocols/yahoo/yahoochat.c:1430
 msgid "Users"
 msgstr "Usuarios"
 
-#: ../src/protocols/irc/irc.c:768 ../src/protocols/sametime/sametime.c:3361
-#: ../src/protocols/silc/chat.c:1423 ../src/protocols/silc/ops.c:1380
+#: ../src/protocols/irc/irc.c:768 ../src/protocols/sametime/sametime.c:3354
+#: ../src/protocols/silc/chat.c:1424 ../src/protocols/silc/ops.c:1380
 #: ../src/protocols/yahoo/yahoochat.c:1439
 msgid "Topic"
 msgstr "Tópico"
@@ -6007,10 +6039,11 @@
 
 #. host to connect to
 #: ../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:5637 ../src/protocols/silc/ops.c:1242
-#: ../src/protocols/silc/ops.c:1344 ../src/protocols/simple/simple.c:1768
+#: ../src/protocols/jabber/jabber.c:1903 ../src/protocols/msn/msn.c:2044
+#: ../src/protocols/napster/napster.c:719 ../src/protocols/oscar/oscar.c:6467
+#: ../src/protocols/sametime/sametime.c:5630 ../src/protocols/silc/ops.c:1242
+#: ../src/protocols/silc/ops.c:1344 ../src/protocols/simple/simple.c:1769
+#: ../src/protocols/toc/toc.c:2340
 msgid "Server"
 msgstr "Servidor"
 
@@ -6019,7 +6052,7 @@
 msgstr "Codificacións"
 
 #: ../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/jabber/jabber.c:744 ../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:933
@@ -6349,7 +6382,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:1743
+#: ../src/protocols/irc/parse.c:129 ../src/protocols/jabber/jabber.c:1741
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;novo alcume&gt;:  Cambia seu alcume."
 
@@ -6524,83 +6557,83 @@
 msgid "SASL error"
 msgstr "Erro de SASL"
 
-#: ../src/protocols/jabber/buddy.c:249 ../src/protocols/jabber/buddy.c:664
+#: ../src/protocols/jabber/buddy.c:268 ../src/protocols/jabber/buddy.c:772
 #: ../src/protocols/silc/ops.c:1020
 msgid "Full Name"
 msgstr "Nome completo"
 
-#: ../src/protocols/jabber/buddy.c:250 ../src/protocols/jabber/buddy.c:677
+#: ../src/protocols/jabber/buddy.c:269 ../src/protocols/jabber/buddy.c:785
 #: ../src/protocols/silc/ops.c:1032
 msgid "Family Name"
 msgstr "Apelidos"
 
-#: ../src/protocols/jabber/buddy.c:251 ../src/protocols/jabber/buddy.c:681
+#: ../src/protocols/jabber/buddy.c:270 ../src/protocols/jabber/buddy.c:789
 msgid "Given Name"
 msgstr "Nome propio"
 
-#: ../src/protocols/jabber/buddy.c:253 ../src/protocols/jabber/jabber.c:805
+#: ../src/protocols/jabber/buddy.c:272 ../src/protocols/jabber/jabber.c:804
 msgid "URL"
 msgstr "URL"
 
-#: ../src/protocols/jabber/buddy.c:254 ../src/protocols/jabber/buddy.c:733
+#: ../src/protocols/jabber/buddy.c:273 ../src/protocols/jabber/buddy.c:841
 msgid "Street Address"
 msgstr "Rúa"
 
-#: ../src/protocols/jabber/buddy.c:255 ../src/protocols/jabber/buddy.c:729
+#: ../src/protocols/jabber/buddy.c:274 ../src/protocols/jabber/buddy.c:837
 msgid "Extended Address"
 msgstr "Enderezo extendido"
 
-#: ../src/protocols/jabber/buddy.c:256 ../src/protocols/jabber/buddy.c:737
+#: ../src/protocols/jabber/buddy.c:275 ../src/protocols/jabber/buddy.c:845
 msgid "Locality"
 msgstr "Localidade"
 
-#: ../src/protocols/jabber/buddy.c:257 ../src/protocols/jabber/buddy.c:741
+#: ../src/protocols/jabber/buddy.c:276 ../src/protocols/jabber/buddy.c:849
 msgid "Region"
 msgstr "Rexión"
 
-#: ../src/protocols/jabber/buddy.c:258 ../src/protocols/jabber/buddy.c:745
+#: ../src/protocols/jabber/buddy.c:277 ../src/protocols/jabber/buddy.c:853
 msgid "Postal Code"
 msgstr "Código postal"
 
-#: ../src/protocols/jabber/buddy.c:259 ../src/protocols/jabber/buddy.c:750
+#: ../src/protocols/jabber/buddy.c:278 ../src/protocols/jabber/buddy.c:858
 #: ../src/protocols/silc/silc.c:943
 msgid "Country"
 msgstr "País"
 
-#: ../src/protocols/jabber/buddy.c:260 ../src/protocols/jabber/buddy.c:761
-#: ../src/protocols/jabber/buddy.c:768
+#: ../src/protocols/jabber/buddy.c:279 ../src/protocols/jabber/buddy.c:869
+#: ../src/protocols/jabber/buddy.c:876
 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/jabber/buddy.c:1261
+#: ../src/protocols/jabber/buddy.c:280 ../src/protocols/jabber/buddy.c:887
+#: ../src/protocols/jabber/buddy.c:895 ../src/protocols/jabber/buddy.c:1524
 #: ../src/protocols/silc/ops.c:1075 ../src/protocols/silc/util.c:526
 #: ../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
+#: ../src/protocols/jabber/buddy.c:281 ../src/protocols/jabber/buddy.c:910
 msgid "Organization Name"
 msgstr "Nome da organización"
 
-#: ../src/protocols/jabber/buddy.c:263 ../src/protocols/jabber/buddy.c:806
+#: ../src/protocols/jabber/buddy.c:282 ../src/protocols/jabber/buddy.c:914
 msgid "Organization Unit"
 msgstr "Grupo de traballo"
 
-#: ../src/protocols/jabber/buddy.c:265 ../src/protocols/jabber/buddy.c:815
+#: ../src/protocols/jabber/buddy.c:284 ../src/protocols/jabber/buddy.c:923
 msgid "Role"
 msgstr "Rol"
 
-#: ../src/protocols/jabber/buddy.c:266 ../src/protocols/jabber/buddy.c:698
-#: ../src/protocols/msn/msn.c:1594 ../src/protocols/oscar/oscar.c:3657
+#: ../src/protocols/jabber/buddy.c:285 ../src/protocols/jabber/buddy.c:806
+#: ../src/protocols/msn/msn.c:1589 ../src/protocols/oscar/oscar.c:3667
 msgid "Birthday"
 msgstr "Ano de nacemento"
 
-#: ../src/protocols/jabber/buddy.c:567 ../src/protocols/jabber/buddy.c:568
+#: ../src/protocols/jabber/buddy.c:588 ../src/protocols/jabber/buddy.c:589
 msgid "Edit Jabber vCard"
 msgstr "Editar vCard de Jabber"
 
-#: ../src/protocols/jabber/buddy.c:569
+#: ../src/protocols/jabber/buddy.c:590
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -6608,145 +6641,153 @@
 "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:1908
+#: ../src/protocols/jabber/buddy.c:646 ../src/protocols/jabber/buddy.c:677
+msgid "Client:"
+msgstr "Cliente:"
+
+#: ../src/protocols/jabber/buddy.c:650 ../src/protocols/jabber/buddy.c:681
+msgid "Operating System"
+msgstr "Sistema operativo"
+
+#: ../src/protocols/jabber/buddy.c:660 ../src/protocols/jabber/jabber.c:1906
 msgid "Resource"
 msgstr "Recurso"
 
-#: ../src/protocols/jabber/buddy.c:685 ../src/protocols/silc/ops.c:1028
+#: ../src/protocols/jabber/buddy.c:793 ../src/protocols/silc/ops.c:1028
 msgid "Middle Name"
 msgstr "Nome medio"
 
-#: ../src/protocols/jabber/buddy.c:718 ../src/protocols/jabber/jabber.c:780
-#: ../src/protocols/oscar/oscar.c:3676 ../src/protocols/oscar/oscar.c:3684
+#: ../src/protocols/jabber/buddy.c:826 ../src/protocols/jabber/jabber.c:779
+#: ../src/protocols/oscar/oscar.c:3686 ../src/protocols/oscar/oscar.c:3694
 #: ../src/protocols/silc/ops.c:1064
 msgid "Address"
 msgstr "Enderezo"
 
-#: ../src/protocols/jabber/buddy.c:725
+#: ../src/protocols/jabber/buddy.c:833
 msgid "P.O. Box"
 msgstr "Código postal"
 
-#: ../src/protocols/jabber/buddy.c:839
+#: ../src/protocols/jabber/buddy.c:947
 msgid "Photo"
 msgstr "Foto"
 
-#: ../src/protocols/jabber/buddy.c:839
+#: ../src/protocols/jabber/buddy.c:947
 msgid "Logo"
 msgstr "Logotipo"
 
-#: ../src/protocols/jabber/buddy.c:1042
+#: ../src/protocols/jabber/buddy.c:1304
 msgid "Un-hide From"
 msgstr "Non agocharse de"
 
-#: ../src/protocols/jabber/buddy.c:1046
+#: ../src/protocols/jabber/buddy.c:1308
 msgid "Temporarily Hide From"
 msgstr "Agocharse temporalmente de"
 
 #. && NOT ME
-#: ../src/protocols/jabber/buddy.c:1054
+#: ../src/protocols/jabber/buddy.c:1316
 msgid "Cancel Presence Notification"
 msgstr "Cancelar notificación de presencia"
 
-#: ../src/protocols/jabber/buddy.c:1061
+#: ../src/protocols/jabber/buddy.c:1323
 msgid "(Re-)Request authorization"
 msgstr "Volver a pedir autorización"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../src/protocols/jabber/buddy.c:1070
+#: ../src/protocols/jabber/buddy.c:1332
 msgid "Unsubscribe"
 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:1165
+#: ../src/protocols/jabber/buddy.c:1359 ../src/protocols/jabber/chat.c:675
+#: ../src/protocols/jabber/chat.c:686 ../src/protocols/jabber/jabber.c:1163
 #: ../src/protocols/silc/ops.c:1449
 msgid "Error"
 msgstr "Erro"
 
-#: ../src/protocols/jabber/buddy.c:1103 ../src/protocols/jabber/jabber.c:1190
+#: ../src/protocols/jabber/buddy.c:1365 ../src/protocols/jabber/jabber.c:1188
 msgid "Chatty"
 msgstr "Falador"
 
-#: ../src/protocols/jabber/buddy.c:1107 ../src/status.c:159
+#: ../src/protocols/jabber/buddy.c:1369 ../src/status.c:159
 msgid "Extended Away"
 msgstr "Ausencia extendida"
 
-#: ../src/protocols/jabber/buddy.c:1109 ../src/protocols/jabber/jabber.c:1220
-#: ../src/protocols/oscar/oscar.c:713 ../src/protocols/oscar/oscar.c:5609
-#: ../src/protocols/sametime/sametime.c:3284
+#: ../src/protocols/jabber/buddy.c:1371 ../src/protocols/jabber/jabber.c:1218
+#: ../src/protocols/oscar/oscar.c:713 ../src/protocols/oscar/oscar.c:5623
+#: ../src/protocols/sametime/sametime.c:3277
 msgid "Do Not Disturb"
 msgstr "Non molestar"
 
-#: ../src/protocols/jabber/buddy.c:1253
+#: ../src/protocols/jabber/buddy.c:1516
 msgid "JID"
 msgstr "JID"
 
-#: ../src/protocols/jabber/buddy.c:1257 ../src/protocols/jabber/buddy.c:1436
+#: ../src/protocols/jabber/buddy.c:1520 ../src/protocols/jabber/buddy.c:1699
 #: ../src/protocols/oscar/oscar.c:3635
 msgid "Last Name"
 msgstr "Apelidos"
 
-#: ../src/protocols/jabber/buddy.c:1289
+#: ../src/protocols/jabber/buddy.c:1552
 msgid "The following are the results of your search"
 msgstr "O seguinte son os resultados da súa busca"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../src/protocols/jabber/buddy.c:1364
+#: ../src/protocols/jabber/buddy.c:1627
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
 msgstr ""
 
-#: ../src/protocols/jabber/buddy.c:1384
+#: ../src/protocols/jabber/buddy.c:1647
 #, fuzzy
 msgid "Directory Query Failed"
 msgstr "Fallou a conexión directa"
 
-#: ../src/protocols/jabber/buddy.c:1385
+#: ../src/protocols/jabber/buddy.c:1648
 #, fuzzy
 msgid "Could not query the directory server."
 msgstr "Non se puido comezar a transferencia de ficheiros."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../src/protocols/jabber/buddy.c:1419
+#: ../src/protocols/jabber/buddy.c:1682
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Instruccións do servidor: %s"
 
-#: ../src/protocols/jabber/buddy.c:1426
+#: ../src/protocols/jabber/buddy.c:1689
 msgid "Fill in one or more fields to search for any matching Jabber users."
 msgstr ""
 "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:1446 ../src/protocols/novell/novell.c:1490
+#: ../src/protocols/jabber/buddy.c:1709 ../src/protocols/novell/novell.c:1488
 #: ../src/protocols/oscar/oscar.c:3637 ../src/protocols/oscar/oscar.c:3644
 msgid "E-Mail Address"
 msgstr "Enderezo de correo electrónico"
 
-#: ../src/protocols/jabber/buddy.c:1455 ../src/protocols/jabber/buddy.c:1456
+#: ../src/protocols/jabber/buddy.c:1718 ../src/protocols/jabber/buddy.c:1719
 msgid "Search for Jabber users"
 msgstr "Procurar usuarios de Jabber"
 
-#: ../src/protocols/jabber/buddy.c:1470
+#: ../src/protocols/jabber/buddy.c:1733
 msgid "Invalid Directory"
 msgstr "Directorio inválido"
 
-#: ../src/protocols/jabber/buddy.c:1487
+#: ../src/protocols/jabber/buddy.c:1750
 msgid "Enter a User Directory"
 msgstr "Introducir un directorio de usuario"
 
-#: ../src/protocols/jabber/buddy.c:1488
+#: ../src/protocols/jabber/buddy.c:1751
 msgid "Select a user directory to search"
 msgstr "Seleccione un directorio de usuario para procurar"
 
-#: ../src/protocols/jabber/buddy.c:1491
+#: ../src/protocols/jabber/buddy.c:1754
 msgid "Search Directory"
 msgstr "Procurar directorio"
 
-#: ../src/protocols/jabber/chat.c:41 ../src/protocols/oscar/oscar.c:5098
+#: ../src/protocols/jabber/chat.c:41 ../src/protocols/oscar/oscar.c:5108
 #: ../src/protocols/yahoo/yahoochat.c:998
 msgid "_Room:"
 msgstr "Sa_la:"
@@ -6790,44 +6831,44 @@
 msgid "Configuration error"
 msgstr "Erro de configuración"
 
-#: ../src/protocols/jabber/chat.c:404 ../src/protocols/jabber/chat.c:549
+#: ../src/protocols/jabber/chat.c:404 ../src/protocols/jabber/chat.c:547
 msgid "Unable to configure"
 msgstr "Non se puido configurar"
 
+#: ../src/protocols/jabber/chat.c:419
+msgid "Room Configuration Error"
+msgstr "Erro de configuración de sala"
+
 #: ../src/protocols/jabber/chat.c:420
-msgid "Room Configuration Error"
-msgstr "Erro de configuración de sala"
-
-#: ../src/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
 msgstr "Esta sala non é capaz de ser configurada"
 
-#: ../src/protocols/jabber/chat.c:471 ../src/protocols/jabber/chat.c:540
+#: ../src/protocols/jabber/chat.c:469 ../src/protocols/jabber/chat.c:538
 msgid "Registration error"
 msgstr "Erro de rexistro"
 
-#: ../src/protocols/jabber/chat.c:628
+#: ../src/protocols/jabber/chat.c:626
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "O cambio de alcume non está soportado en salas de chat non-MUC"
 
-#: ../src/protocols/jabber/chat.c:678 ../src/protocols/jabber/chat.c:689
+#: ../src/protocols/jabber/chat.c:676 ../src/protocols/jabber/chat.c:687
 #: ../src/protocols/silc/ops.c:1449
 msgid "Error retrieving room list"
 msgstr "Erro ao obter a lista de salas"
 
-#: ../src/protocols/jabber/chat.c:737
+#: ../src/protocols/jabber/chat.c:735
 msgid "Invalid Server"
 msgstr "Servidor inválido"
 
-#: ../src/protocols/jabber/chat.c:775
+#: ../src/protocols/jabber/chat.c:773
 msgid "Enter a Conference Server"
 msgstr "Introduza un servidor de conferencias"
 
-#: ../src/protocols/jabber/chat.c:776
+#: ../src/protocols/jabber/chat.c:774
 msgid "Select a conference server to query"
 msgstr "Seleccione un servidor de conferencias ao que consultar"
 
-#: ../src/protocols/jabber/chat.c:779
+#: ../src/protocols/jabber/chat.c:777
 msgid "Find Rooms"
 msgstr "Buscar salas"
 
@@ -6844,396 +6885,396 @@
 msgid "Read Error"
 msgstr "Erro de lectura"
 
-#: ../src/protocols/jabber/jabber.c:474 ../src/protocols/jabber/jabber.c:900
+#: ../src/protocols/jabber/jabber.c:474 ../src/protocols/jabber/jabber.c:898
 msgid "Unable to create socket"
 msgstr "Non se puido crear o socket"
 
-#: ../src/protocols/jabber/jabber.c:520 ../src/protocols/jabber/jabber.c:857
+#: ../src/protocols/jabber/jabber.c:519 ../src/protocols/jabber/jabber.c:856
 msgid "Invalid Jabber ID"
 msgstr "ID de Jabber non válido"
 
-#: ../src/protocols/jabber/jabber.c:590
+#: ../src/protocols/jabber/jabber.c:589
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Rexistro de %s@%s con éxito"
 
-#: ../src/protocols/jabber/jabber.c:592 ../src/protocols/jabber/jabber.c:593
+#: ../src/protocols/jabber/jabber.c:591 ../src/protocols/jabber/jabber.c:592
 msgid "Registration Successful"
 msgstr "Éxito no rexistro"
 
-#: ../src/protocols/jabber/jabber.c:599 ../src/protocols/jabber/jabber.c:1456
+#: ../src/protocols/jabber/jabber.c:598 ../src/protocols/jabber/jabber.c:1454
 msgid "Unknown Error"
 msgstr "Erro descoñecido"
 
-#: ../src/protocols/jabber/jabber.c:601 ../src/protocols/jabber/jabber.c:602
+#: ../src/protocols/jabber/jabber.c:600 ../src/protocols/jabber/jabber.c:601
 msgid "Registration Failed"
 msgstr "Fallou o rexistro"
 
-#: ../src/protocols/jabber/jabber.c:713 ../src/protocols/jabber/jabber.c:714
+#: ../src/protocols/jabber/jabber.c:712 ../src/protocols/jabber/jabber.c:713
 msgid "Already Registered"
 msgstr "Xa está rexistrado"
 
-#: ../src/protocols/jabber/jabber.c:790 ../src/protocols/oscar/oscar.c:3678
-#: ../src/protocols/oscar/oscar.c:3686
+#: ../src/protocols/jabber/jabber.c:789 ../src/protocols/oscar/oscar.c:3688
+#: ../src/protocols/oscar/oscar.c:3696
 msgid "State"
 msgstr "Estado"
 
-#: ../src/protocols/jabber/jabber.c:795
+#: ../src/protocols/jabber/jabber.c:794
 msgid "Postal code"
 msgstr "Código postal"
 
-#: ../src/protocols/jabber/jabber.c:800 ../src/protocols/silc/ops.c:1069
+#: ../src/protocols/jabber/jabber.c:799 ../src/protocols/silc/ops.c:1069
 #: ../src/protocols/silc/silc.c:701 ../src/protocols/silc/util.c:528
 msgid "Phone"
 msgstr "Teléfono"
 
-#: ../src/protocols/jabber/jabber.c:810
+#: ../src/protocols/jabber/jabber.c:809
 msgid "Date"
 msgstr "Data"
 
-#: ../src/protocols/jabber/jabber.c:818
+#: ../src/protocols/jabber/jabber.c:817
 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."
 
-#: ../src/protocols/jabber/jabber.c:821 ../src/protocols/jabber/jabber.c:822
+#: ../src/protocols/jabber/jabber.c:820 ../src/protocols/jabber/jabber.c:821
 msgid "Register New Jabber Account"
 msgstr "Rexistrando conta nova de Jabber"
 
-#: ../src/protocols/jabber/jabber.c:983
+#: ../src/protocols/jabber/jabber.c:981
 msgid "Initializing Stream"
 msgstr "Inicializando fluxo"
 
-#: ../src/protocols/jabber/jabber.c:989 ../src/protocols/msn/session.c:357
+#: ../src/protocols/jabber/jabber.c:987 ../src/protocols/msn/session.c:350
 msgid "Authenticating"
 msgstr "Autenticando"
 
-#: ../src/protocols/jabber/jabber.c:998
+#: ../src/protocols/jabber/jabber.c:996
 msgid "Re-initializing Stream"
 msgstr "Reinicializando fluxo"
 
-#: ../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:782 ../src/protocols/oscar/oscar.c:5400
+#: ../src/protocols/jabber/jabber.c:1067 ../src/protocols/jabber/jabber.c:1432
+#: ../src/protocols/jabber/jabber.c:1473 ../src/protocols/jabber/jabber.c:1507
+#: ../src/protocols/oscar/oscar.c:782 ../src/protocols/oscar/oscar.c:5414
 msgid "Not Authorized"
 msgstr "Non autorizado"
 
-#: ../src/protocols/jabber/jabber.c:1111
+#: ../src/protocols/jabber/jabber.c:1109
 msgid "Both"
 msgstr "Ambos"
 
-#: ../src/protocols/jabber/jabber.c:1113
+#: ../src/protocols/jabber/jabber.c:1111
 msgid "From (To pending)"
 msgstr "Desde (Destino pendente)"
 
-#: ../src/protocols/jabber/jabber.c:1118
+#: ../src/protocols/jabber/jabber.c:1116
 msgid "To"
 msgstr "A"
 
-#: ../src/protocols/jabber/jabber.c:1120
+#: ../src/protocols/jabber/jabber.c:1118
 msgid "None (To pending)"
 msgstr "Ninguén (Destino pendente)"
 
-#: ../src/protocols/jabber/jabber.c:1124
+#: ../src/protocols/jabber/jabber.c:1122
 msgid "Subscription"
 msgstr "Subscrición"
 
-#: ../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:1179 ../src/protocols/jabber/jabber.c:1189
+#: ../src/protocols/jabber/jabber.c:1199 ../src/protocols/jabber/jabber.c:1209
+#: ../src/protocols/jabber/jabber.c:1219
 msgid "Priority"
 msgstr "Prioridade"
 
-#: ../src/protocols/jabber/jabber.c:1250
+#: ../src/protocols/jabber/jabber.c:1248
 msgid "Password Changed"
 msgstr "Contrasinal modificado"
 
-#: ../src/protocols/jabber/jabber.c:1251
+#: ../src/protocols/jabber/jabber.c:1249
 msgid "Your password has been changed."
 msgstr "Seu contrasinal foi modificado."
 
-#: ../src/protocols/jabber/jabber.c:1255 ../src/protocols/jabber/jabber.c:1256
+#: ../src/protocols/jabber/jabber.c:1253 ../src/protocols/jabber/jabber.c:1254
 msgid "Error changing password"
 msgstr "Erro ao cambiar o contrasinal"
 
-#: ../src/protocols/jabber/jabber.c:1312
+#: ../src/protocols/jabber/jabber.c:1310
 msgid "Password (again)"
 msgstr "Contrasinal (de novo)"
 
-#: ../src/protocols/jabber/jabber.c:1317 ../src/protocols/jabber/jabber.c:1318
+#: ../src/protocols/jabber/jabber.c:1315 ../src/protocols/jabber/jabber.c:1316
 msgid "Change Jabber Password"
 msgstr "Cambiar contrasinal de Jabber"
 
-#: ../src/protocols/jabber/jabber.c:1318
+#: ../src/protocols/jabber/jabber.c:1316
 msgid "Please enter your new password"
 msgstr "Por favor, introduza o seu novo contrasinal"
 
-#: ../src/protocols/jabber/jabber.c:1328 ../src/protocols/oscar/oscar.c:6170
+#: ../src/protocols/jabber/jabber.c:1326 ../src/protocols/oscar/oscar.c:6184
 #: ../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:1333 ../src/protocols/oscar/oscar.c:6181
+#: ../src/protocols/jabber/jabber.c:1331 ../src/protocols/oscar/oscar.c:6195
 #: ../src/protocols/silc/silc.c:1019
 msgid "Change Password..."
 msgstr "Trocar contrasinal..."
 
 #. }
-#: ../src/protocols/jabber/jabber.c:1338
+#: ../src/protocols/jabber/jabber.c:1336
 msgid "Search for Users..."
 msgstr "Procurar usuarios..."
 
+#: ../src/protocols/jabber/jabber.c:1412
+msgid "Bad Request"
+msgstr "Solicitude errónea"
+
 #: ../src/protocols/jabber/jabber.c:1414
-msgid "Bad Request"
-msgstr "Solicitude errónea"
-
-#: ../src/protocols/jabber/jabber.c:1416
 msgid "Conflict"
 msgstr "Conflicto"
 
-#: ../src/protocols/jabber/jabber.c:1418
+#: ../src/protocols/jabber/jabber.c:1416
 msgid "Feature Not Implemented"
 msgstr "Funcionalidade non implementada"
 
+#: ../src/protocols/jabber/jabber.c:1418
+msgid "Forbidden"
+msgstr "Prohibido"
+
 #: ../src/protocols/jabber/jabber.c:1420
-msgid "Forbidden"
-msgstr "Prohibido"
-
-#: ../src/protocols/jabber/jabber.c:1422
 msgid "Gone"
 msgstr "Foise"
 
-#: ../src/protocols/jabber/jabber.c:1424 ../src/protocols/jabber/jabber.c:1499
+#: ../src/protocols/jabber/jabber.c:1422 ../src/protocols/jabber/jabber.c:1497
 msgid "Internal Server Error"
 msgstr "Erro interno do servidor"
 
+#: ../src/protocols/jabber/jabber.c:1424
+msgid "Item Not Found"
+msgstr "Elemento non atopado"
+
 #: ../src/protocols/jabber/jabber.c:1426
-msgid "Item Not Found"
-msgstr "Elemento non atopado"
-
-#: ../src/protocols/jabber/jabber.c:1428
 msgid "Malformed Jabber ID"
 msgstr "ID de Jabber non válido"
 
-#: ../src/protocols/jabber/jabber.c:1430
+#: ../src/protocols/jabber/jabber.c:1428
 msgid "Not Acceptable"
 msgstr "Non aceptable"
 
-#: ../src/protocols/jabber/jabber.c:1432
+#: ../src/protocols/jabber/jabber.c:1430
 msgid "Not Allowed"
 msgstr "Non permitido"
 
-#: ../src/protocols/jabber/jabber.c:1436
+#: ../src/protocols/jabber/jabber.c:1434
 msgid "Payment Required"
 msgstr "Pago necesario"
 
-#: ../src/protocols/jabber/jabber.c:1438
+#: ../src/protocols/jabber/jabber.c:1436
 msgid "Recipient Unavailable"
 msgstr "Destinatario non dispoñible"
 
+#: ../src/protocols/jabber/jabber.c:1440
+msgid "Registration Required"
+msgstr "Rexistro necesario"
+
 #: ../src/protocols/jabber/jabber.c:1442
-msgid "Registration Required"
-msgstr "Rexistro necesario"
-
-#: ../src/protocols/jabber/jabber.c:1444
 msgid "Remote Server Not Found"
 msgstr "Non se atopou o servidor remoto"
 
-#: ../src/protocols/jabber/jabber.c:1446
+#: ../src/protocols/jabber/jabber.c:1444
 msgid "Remote Server Timeout"
 msgstr "Expirou o tempo do servidor remoto"
 
+#: ../src/protocols/jabber/jabber.c:1446
+msgid "Server Overloaded"
+msgstr "Servidor sobrecargado"
+
 #: ../src/protocols/jabber/jabber.c:1448
-msgid "Server Overloaded"
-msgstr "Servidor sobrecargado"
+msgid "Service Unavailable"
+msgstr "Servizo non dispoñible"
 
 #: ../src/protocols/jabber/jabber.c:1450
-msgid "Service Unavailable"
-msgstr "Servizo non dispoñible"
+msgid "Subscription Required"
+msgstr "Subscrición necesaria"
 
 #: ../src/protocols/jabber/jabber.c:1452
-msgid "Subscription Required"
-msgstr "Subscrición necesaria"
-
-#: ../src/protocols/jabber/jabber.c:1454
 msgid "Unexpected Request"
 msgstr "Solicitude non esperada"
 
-#: ../src/protocols/jabber/jabber.c:1461
+#: ../src/protocols/jabber/jabber.c:1459
 msgid "Authorization Aborted"
 msgstr "Autorización interrumpida"
 
-#: ../src/protocols/jabber/jabber.c:1463
+#: ../src/protocols/jabber/jabber.c:1461
 msgid "Incorrect encoding in authorization"
 msgstr "Codificación incorrecta na autorización"
 
-#: ../src/protocols/jabber/jabber.c:1466
+#: ../src/protocols/jabber/jabber.c:1464
 msgid "Invalid authzid"
 msgstr "Authzid inválido"
 
-#: ../src/protocols/jabber/jabber.c:1469
+#: ../src/protocols/jabber/jabber.c:1467
 msgid "Invalid Authorization Mechanism"
 msgstr "Mecanismo de autorización inválido"
 
-#: ../src/protocols/jabber/jabber.c:1472
+#: ../src/protocols/jabber/jabber.c:1470
 msgid "Authorization mechanism too weak"
 msgstr "Mecanismo de autorización demasiado débil"
 
-#: ../src/protocols/jabber/jabber.c:1477
+#: ../src/protocols/jabber/jabber.c:1475
 msgid "Temporary Authentication Failure"
 msgstr "Fallo temporal da autenticación"
 
-#: ../src/protocols/jabber/jabber.c:1480
+#: ../src/protocols/jabber/jabber.c:1478
 msgid "Authentication Failure"
 msgstr "Fallo de autenticación"
 
-#: ../src/protocols/jabber/jabber.c:1484
+#: ../src/protocols/jabber/jabber.c:1482
 msgid "Bad Format"
 msgstr "Formato erróneo"
 
-#: ../src/protocols/jabber/jabber.c:1486
+#: ../src/protocols/jabber/jabber.c:1484
 msgid "Bad Namespace Prefix"
 msgstr "Prefixo do espacio de nomes erróneo"
 
-#: ../src/protocols/jabber/jabber.c:1489
+#: ../src/protocols/jabber/jabber.c:1487
 msgid "Resource Conflict"
 msgstr "Conflicto de recursos"
 
-#: ../src/protocols/jabber/jabber.c:1491 ../src/protocols/silc/ops.c:1728
+#: ../src/protocols/jabber/jabber.c:1489 ../src/protocols/silc/ops.c:1728
 msgid "Connection Timeout"
 msgstr "Expirou a conexión"
 
+#: ../src/protocols/jabber/jabber.c:1491
+msgid "Host Gone"
+msgstr "Servidor desaparecido"
+
 #: ../src/protocols/jabber/jabber.c:1493
-msgid "Host Gone"
-msgstr "Servidor desaparecido"
+msgid "Host Unknown"
+msgstr "Servidor descoñecido"
 
 #: ../src/protocols/jabber/jabber.c:1495
-msgid "Host Unknown"
-msgstr "Servidor descoñecido"
-
-#: ../src/protocols/jabber/jabber.c:1497
 msgid "Improper Addressing"
 msgstr "Direccionamento incorrecto"
 
+#: ../src/protocols/jabber/jabber.c:1499
+msgid "Invalid ID"
+msgstr "ID non válido"
+
 #: ../src/protocols/jabber/jabber.c:1501
-msgid "Invalid ID"
-msgstr "ID non válido"
-
-#: ../src/protocols/jabber/jabber.c:1503
 msgid "Invalid Namespace"
 msgstr "Espacio de nomes non válido"
 
-#: ../src/protocols/jabber/jabber.c:1505
+#: ../src/protocols/jabber/jabber.c:1503
 msgid "Invalid XML"
 msgstr "XML inválido"
 
-#: ../src/protocols/jabber/jabber.c:1507
+#: ../src/protocols/jabber/jabber.c:1505
 msgid "Non-matching Hosts"
 msgstr "Non existen servidores coincidintes"
 
-#: ../src/protocols/jabber/jabber.c:1511
+#: ../src/protocols/jabber/jabber.c:1509
 msgid "Policy Violation"
 msgstr "Violación da política"
 
+#: ../src/protocols/jabber/jabber.c:1511
+msgid "Remote Connection Failed"
+msgstr "Fallou a conexión remota"
+
 #: ../src/protocols/jabber/jabber.c:1513
-msgid "Remote Connection Failed"
-msgstr "Fallou a conexión remota"
-
-#: ../src/protocols/jabber/jabber.c:1515
 msgid "Resource Constraint"
 msgstr "Restricción de recursos"
 
-#: ../src/protocols/jabber/jabber.c:1517
+#: ../src/protocols/jabber/jabber.c:1515
 msgid "Restricted XML"
 msgstr "XML restrinxido"
 
+#: ../src/protocols/jabber/jabber.c:1517
+msgid "See Other Host"
+msgstr "Ver outros servidores"
+
 #: ../src/protocols/jabber/jabber.c:1519
-msgid "See Other Host"
-msgstr "Ver outros servidores"
+msgid "System Shutdown"
+msgstr "Parada do sistema"
 
 #: ../src/protocols/jabber/jabber.c:1521
-msgid "System Shutdown"
-msgstr "Parada do sistema"
+msgid "Undefined Condition"
+msgstr "Condición non definida"
 
 #: ../src/protocols/jabber/jabber.c:1523
-msgid "Undefined Condition"
-msgstr "Condición non definida"
+msgid "Unsupported Encoding"
+msgstr "Codificación non soportada"
 
 #: ../src/protocols/jabber/jabber.c:1525
-msgid "Unsupported Encoding"
-msgstr "Codificación non soportada"
+msgid "Unsupported Stanza Type"
+msgstr "Tipo de Stanza non soportado"
 
 #: ../src/protocols/jabber/jabber.c:1527
-msgid "Unsupported Stanza Type"
-msgstr "Tipo de Stanza non soportado"
+msgid "Unsupported Version"
+msgstr "Versión non soportada"
 
 #: ../src/protocols/jabber/jabber.c:1529
-msgid "Unsupported Version"
-msgstr "Versión non soportada"
-
-#: ../src/protocols/jabber/jabber.c:1531
 msgid "XML Not Well Formed"
 msgstr "XML mal formado"
 
-#: ../src/protocols/jabber/jabber.c:1533
+#: ../src/protocols/jabber/jabber.c:1531
 msgid "Stream Error"
 msgstr "Erro de fluxo"
 
-#: ../src/protocols/jabber/jabber.c:1600
+#: ../src/protocols/jabber/jabber.c:1598
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Non puido vetar ao usuario %s"
 
-#: ../src/protocols/jabber/jabber.c:1620
+#: ../src/protocols/jabber/jabber.c:1618
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Afiliación descoñecida: \"%s\""
 
-#: ../src/protocols/jabber/jabber.c:1625
+#: ../src/protocols/jabber/jabber.c:1623
 #, 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:1644
+#: ../src/protocols/jabber/jabber.c:1642
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Rol descoñecido: \"%s\""
 
-#: ../src/protocols/jabber/jabber.c:1651
+#: ../src/protocols/jabber/jabber.c:1649
 #, 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:1704
+#: ../src/protocols/jabber/jabber.c:1702
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Non puido expulsar ao usuario %s"
 
-#: ../src/protocols/jabber/jabber.c:1735
+#: ../src/protocols/jabber/jabber.c:1733
 msgid "config:  Configure a chat room."
 msgstr "config:  Configurar unha sala de chat."
 
-#: ../src/protocols/jabber/jabber.c:1739
+#: ../src/protocols/jabber/jabber.c:1737
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Configurar unha sala de chat."
 
-#: ../src/protocols/jabber/jabber.c:1748
+#: ../src/protocols/jabber/jabber.c:1746
 msgid "part [room]:  Leave the room."
 msgstr "part [sala]:  Abandonar a sala."
 
-#: ../src/protocols/jabber/jabber.c:1753
+#: ../src/protocols/jabber/jabber.c:1751
 msgid "register:  Register with a chat room."
 msgstr "register: Rexistrarse nunha sala de chat."
 
-#: ../src/protocols/jabber/jabber.c:1759
+#: ../src/protocols/jabber/jabber.c:1757
 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:1765
+#: ../src/protocols/jabber/jabber.c:1763
 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:1771
+#: ../src/protocols/jabber/jabber.c:1769
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -7241,7 +7282,7 @@
 "affiliate &lt;usuario&gt; &lt;owner|admin|member|outcast|none&gt;: "
 "Establecer a afiliación dun usuario á sala."
 
-#: ../src/protocols/jabber/jabber.c:1777
+#: ../src/protocols/jabber/jabber.c:1775
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -7249,19 +7290,19 @@
 "role &lt;usuario&gt; &lt;moderator|participant|visitor|none&gt;: Establecer "
 "o rol dun usuario na sala."
 
-#: ../src/protocols/jabber/jabber.c:1783
+#: ../src/protocols/jabber/jabber.c:1781
 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:1789
+#: ../src/protocols/jabber/jabber.c:1787
 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:1795
+#: ../src/protocols/jabber/jabber.c:1793
 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:1800
+#: ../src/protocols/jabber/jabber.c:1798
 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 "
@@ -7277,60 +7318,60 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/jabber/jabber.c:1883 ../src/protocols/jabber/jabber.c:1885
+#: ../src/protocols/jabber/jabber.c:1881 ../src/protocols/jabber/jabber.c:1883
 msgid "Jabber Protocol Plugin"
 msgstr "Complemento de protocolo Jabber"
 
-#: ../src/protocols/jabber/jabber.c:1911
+#: ../src/protocols/jabber/jabber.c:1909
 msgid "Use TLS if available"
 msgstr "Usar TLS se está dispoñible"
 
-#: ../src/protocols/jabber/jabber.c:1916
+#: ../src/protocols/jabber/jabber.c:1914
 msgid "Require TLS"
 msgstr "Require TLS"
 
-#: ../src/protocols/jabber/jabber.c:1919
+#: ../src/protocols/jabber/jabber.c:1917
 msgid "Force old (port 5223) SSL"
 msgstr "Forzar SSL antigo (porto 5223)"
 
-#: ../src/protocols/jabber/jabber.c:1924
+#: ../src/protocols/jabber/jabber.c:1922
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Permitir autenticación en claro sobre canles non cifrados"
 
-#: ../src/protocols/jabber/jabber.c:1929 ../src/protocols/simple/simple.c:1774
+#: ../src/protocols/jabber/jabber.c:1927 ../src/protocols/simple/simple.c:1775
 msgid "Connect port"
 msgstr "Conectar co porto"
 
 #. Account options
-#: ../src/protocols/jabber/jabber.c:1933 ../src/protocols/silc/silc.c:1854
+#: ../src/protocols/jabber/jabber.c:1931 ../src/protocols/silc/silc.c:1854
 msgid "Connect server"
 msgstr "Conectar co servidor"
 
-#: ../src/protocols/jabber/message.c:108
+#: ../src/protocols/jabber/message.c:117
 #, c-format
 msgid "Message from %s"
 msgstr "Mensaxe de %s"
 
-#: ../src/protocols/jabber/message.c:172
+#: ../src/protocols/jabber/message.c:181
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s cambiou o tópico a: %s"
 
-#: ../src/protocols/jabber/message.c:174
+#: ../src/protocols/jabber/message.c:183
 #, c-format
 msgid "The topic is: %s"
 msgstr "O tópico é: %s"
 
-#: ../src/protocols/jabber/message.c:224
+#: ../src/protocols/jabber/message.c:233
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Fallou o envío da mensaxe a %s: %s"
 
-#: ../src/protocols/jabber/message.c:227
+#: ../src/protocols/jabber/message.c:236
 msgid "Jabber Message Error"
 msgstr "Mensaxe de erro de Jabber"
 
-#: ../src/protocols/jabber/message.c:295
+#: ../src/protocols/jabber/message.c:319
 #, c-format
 msgid " (Code %s)"
 msgstr " (Código %s)"
@@ -7349,12 +7390,12 @@
 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:2381
-#: ../src/protocols/oscar/oscar.c:5029
+#: ../src/protocols/oscar/oscar.c:5039
 msgid "_Authorize"
 msgstr "_Autorizar"
 
 #: ../src/protocols/jabber/presence.c:324 ../src/protocols/oscar/oscar.c:2383
-#: ../src/protocols/oscar/oscar.c:5030
+#: ../src/protocols/oscar/oscar.c:5040
 msgid "_Deny"
 msgstr "_Denegar"
 
@@ -7707,9 +7748,9 @@
 msgid "Page"
 msgstr "Páxina"
 
-#: ../src/protocols/msn/msn.c:550 ../src/protocols/msn/msn.c:557
-#: ../src/protocols/msn/msn.c:566 ../src/protocols/sametime/sametime.c:3246
-#: ../src/protocols/yahoo/yahoo.c:2882 ../src/protocols/yahoo/yahoo.c:2888
+#: ../src/protocols/msn/msn.c:548 ../src/protocols/msn/msn.c:555
+#: ../src/protocols/msn/msn.c:564 ../src/protocols/sametime/sametime.c:3239
+#: ../src/protocols/yahoo/yahoo.c:2878 ../src/protocols/yahoo/yahoo.c:2884
 #, c-format
 msgid ""
 "\n"
@@ -7718,69 +7759,69 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: ../src/protocols/msn/msn.c:557
+#: ../src/protocols/msn/msn.c:555
 msgid "Has you"
 msgstr "Tenlle"
 
-#: ../src/protocols/msn/msn.c:587 ../src/protocols/msn/state.c:33
-#: ../src/protocols/yahoo/yahoo.c:2711 ../src/protocols/yahoo/yahoo.c:3296
+#: ../src/protocols/msn/msn.c:585 ../src/protocols/msn/state.c:33
+#: ../src/protocols/yahoo/yahoo.c:2707 ../src/protocols/yahoo/yahoo.c:3292
 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/msn/msn.c:589 ../src/protocols/msn/state.c:31
+#: ../src/protocols/novell/novell.c:2849 ../src/protocols/novell/novell.c:2983
 #: ../src/protocols/silc/buddy.c:1473 ../src/protocols/silc/silc.c:53
-#: ../src/protocols/yahoo/yahoo.c:2713 ../src/protocols/yahoo/yahoo.c:3299
+#: ../src/protocols/yahoo/yahoo.c:2709 ../src/protocols/yahoo/yahoo.c:3295
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../src/protocols/msn/msn.c:595 ../src/protocols/yahoo/yahoo.c:2721
-#: ../src/protocols/yahoo/yahoo.c:3311
+#: ../src/protocols/msn/msn.c:593 ../src/protocols/yahoo/yahoo.c:2717
+#: ../src/protocols/yahoo/yahoo.c:3307
 msgid "On the Phone"
 msgstr "Ao teléfono"
 
-#: ../src/protocols/msn/msn.c:599 ../src/protocols/yahoo/yahoo.c:2725
-#: ../src/protocols/yahoo/yahoo.c:3317
+#: ../src/protocols/msn/msn.c:597 ../src/protocols/yahoo/yahoo.c:2721
+#: ../src/protocols/yahoo/yahoo.c:3313
 msgid "Out to Lunch"
 msgstr "Saín a xantar"
 
-#: ../src/protocols/msn/msn.c:623
+#: ../src/protocols/msn/msn.c:621
 msgid "Set Friendly Name..."
 msgstr "Establecer nome de amigo..."
 
-#: ../src/protocols/msn/msn.c:628
+#: ../src/protocols/msn/msn.c:626
 msgid "Set Home Phone Number..."
 msgstr "Establecer o número de teléfono do seu domicilio..."
 
-#: ../src/protocols/msn/msn.c:632
+#: ../src/protocols/msn/msn.c:630
 msgid "Set Work Phone Number..."
 msgstr "Establecer o número de teléfono do seu traballo..."
 
-#: ../src/protocols/msn/msn.c:636
+#: ../src/protocols/msn/msn.c:634
 msgid "Set Mobile Phone Number..."
 msgstr "Establecer o número do teléfono móvil..."
 
-#: ../src/protocols/msn/msn.c:642
+#: ../src/protocols/msn/msn.c:640
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Activar/Desactivar dispositivos móviles..."
 
-#: ../src/protocols/msn/msn.c:647
+#: ../src/protocols/msn/msn.c:645
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Permitir/Rexeitar páxinas de móviles..."
 
-#: ../src/protocols/msn/msn.c:657
+#: ../src/protocols/msn/msn.c:655
 msgid "Open Hotmail Inbox"
 msgstr "Abrir correo de entrada de Hotmail"
 
-#: ../src/protocols/msn/msn.c:681
+#: ../src/protocols/msn/msn.c:679
 msgid "Send to Mobile"
 msgstr "Enviar a un móvil"
 
-#: ../src/protocols/msn/msn.c:691 ../src/protocols/novell/novell.c:3441
+#: ../src/protocols/msn/msn.c:689 ../src/protocols/novell/novell.c:3439
 msgid "Initiate _Chat"
 msgstr "Iniciar _Chat"
 
-#: ../src/protocols/msn/msn.c:729
+#: ../src/protocols/msn/msn.c:727
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -7788,230 +7829,230 @@
 "O soporte SSL é necesario para MSN. Por favor, instale unha biblioteca SSL. "
 "Para máis información, vexa http://gaim.sf.net/faq-ssl.php."
 
-#: ../src/protocols/msn/msn.c:757
+#: ../src/protocols/msn/msn.c:755
 msgid "Failed to connect to server."
 msgstr "Non se puido conectar ao servidor."
 
-#: ../src/protocols/msn/msn.c:1366 ../src/protocols/yahoo/yahoo_profile.c:685
+#: ../src/protocols/msn/msn.c:1361 ../src/protocols/yahoo/yahoo_profile.c:685
 #: ../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/yahoo/yahoo_profile.c:1208
+#: ../src/protocols/msn/msn.c:1368 ../src/protocols/yahoo/yahoo_profile.c:1208
 #: ../src/util.c:1061
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b> "
 
-#: ../src/protocols/msn/msn.c:1463
+#: ../src/protocols/msn/msn.c:1458
 msgid "MSN Profile"
 msgstr "Perfil MSN"
 
-#: ../src/protocols/msn/msn.c:1468 ../src/protocols/msn/msn.c:1794
+#: ../src/protocols/msn/msn.c:1463 ../src/protocols/msn/msn.c:1789
 #: ../src/protocols/yahoo/yahoo_profile.c:795
 msgid "Error retrieving profile"
 msgstr "Erro ao obter o perfil"
 
-#: ../src/protocols/msn/msn.c:1536 ../src/protocols/oscar/oscar.c:3663
+#: ../src/protocols/msn/msn.c:1531 ../src/protocols/oscar/oscar.c:3673
 #: ../src/protocols/yahoo/yahoo_profile.c:1056
 msgid "Age"
 msgstr "Edade"
 
-#: ../src/protocols/msn/msn.c:1538 ../src/protocols/yahoo/yahoo_profile.c:1071
+#: ../src/protocols/msn/msn.c:1533 ../src/protocols/yahoo/yahoo_profile.c:1071
 msgid "Occupation"
 msgstr "Ocupación"
 
-#: ../src/protocols/msn/msn.c:1539 ../src/protocols/novell/novell.c:1480
+#: ../src/protocols/msn/msn.c:1534 ../src/protocols/novell/novell.c:1478
 #: ../src/protocols/yahoo/yahoo_profile.c:1051
 msgid "Location"
 msgstr "Ubicación"
 
-#: ../src/protocols/msn/msn.c:1544 ../src/protocols/msn/msn.c:1723
-#: ../src/protocols/msn/msn.c:1729 ../src/protocols/msn/msn.c:1736
+#: ../src/protocols/msn/msn.c:1539 ../src/protocols/msn/msn.c:1718
+#: ../src/protocols/msn/msn.c:1724 ../src/protocols/msn/msn.c:1731
 msgid "Hobbies and Interests"
 msgstr "Aficións e intereses"
 
-#: ../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:1545 ../src/protocols/msn/msn.c:1652
+#: ../src/protocols/msn/msn.c:1658 ../src/protocols/msn/msn.c:1665
+#: ../src/protocols/msn/msn.c:1673 ../src/protocols/msn/msn.c:1680
 msgid "A Little About Me"
 msgstr "Un pouco sobre min"
 
-#: ../src/protocols/msn/msn.c:1556
+#: ../src/protocols/msn/msn.c:1551
 #, c-format
 msgid "%s<b>General</b><br>%s"
 msgstr "%s<b>Xeral</b><br>%s"
 
 #. Social
-#: ../src/protocols/msn/msn.c:1565 ../src/protocols/yahoo/yahoo_profile.c:1061
+#: ../src/protocols/msn/msn.c:1560 ../src/protocols/yahoo/yahoo_profile.c:1061
 msgid "Marital Status"
 msgstr "Estado civil"
 
-#: ../src/protocols/msn/msn.c:1566
+#: ../src/protocols/msn/msn.c:1561
 msgid "Interests"
 msgstr "Interés"
 
-#: ../src/protocols/msn/msn.c:1567
+#: ../src/protocols/msn/msn.c:1562
 msgid "Pets"
 msgstr "Mascotas"
 
-#: ../src/protocols/msn/msn.c:1568
+#: ../src/protocols/msn/msn.c:1563
 msgid "Hometown"
 msgstr "Cidade"
 
-#: ../src/protocols/msn/msn.c:1569
+#: ../src/protocols/msn/msn.c:1564
 msgid "Places Lived"
 msgstr "Lugares nos que viviu"
 
-#: ../src/protocols/msn/msn.c:1570
+#: ../src/protocols/msn/msn.c:1565
 msgid "Fashion"
 msgstr "Moderno"
 
-#: ../src/protocols/msn/msn.c:1571
+#: ../src/protocols/msn/msn.c:1566
 msgid "Humor"
 msgstr "Humor"
 
+#: ../src/protocols/msn/msn.c:1567
+msgid "Music"
+msgstr "Música"
+
+#: ../src/protocols/msn/msn.c:1568 ../src/protocols/msn/msn.c:1740
+#: ../src/protocols/msn/msn.c:1746 ../src/protocols/yahoo/yahoo_profile.c:1113
+msgid "Favorite Quote"
+msgstr "Cita preferida"
+
 #: ../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:1577
 #, c-format
 msgid "%s<b>Social</b><br>%s"
 msgstr "%s<b>Social</b><br>%s"
 
-#: ../src/protocols/msn/msn.c:1586
+#: ../src/protocols/msn/msn.c:1581
 msgid "Significant Other"
 msgstr "Outro significativo"
 
-#: ../src/protocols/msn/msn.c:1587
+#: ../src/protocols/msn/msn.c:1582
 msgid "Home Phone"
 msgstr "Teléfono de casa"
 
-#: ../src/protocols/msn/msn.c:1588
+#: ../src/protocols/msn/msn.c:1583
 msgid "Home Phone 2"
 msgstr "Teléfono de casa 2"
 
-#: ../src/protocols/msn/msn.c:1589 ../src/protocols/oscar/oscar.c:3675
+#: ../src/protocols/msn/msn.c:1584 ../src/protocols/oscar/oscar.c:3685
 msgid "Home Address"
 msgstr "Domicilio"
 
-#: ../src/protocols/msn/msn.c:1590
+#: ../src/protocols/msn/msn.c:1585
 msgid "Personal Mobile"
 msgstr "Móbil persoal"
 
-#: ../src/protocols/msn/msn.c:1591
+#: ../src/protocols/msn/msn.c:1586
 msgid "Home Fax"
 msgstr "Fax de casa"
 
-#: ../src/protocols/msn/msn.c:1592
+#: ../src/protocols/msn/msn.c:1587
 msgid "Personal E-Mail"
 msgstr "Correo-e persoal"
 
-#: ../src/protocols/msn/msn.c:1593
+#: ../src/protocols/msn/msn.c:1588
 msgid "Personal IM"
 msgstr "MI persoal"
 
-#: ../src/protocols/msn/msn.c:1595
+#: ../src/protocols/msn/msn.c:1590
 msgid "Anniversary"
 msgstr "Aniversario"
 
-#: ../src/protocols/msn/msn.c:1596 ../src/protocols/msn/msn.c:1620
+#: ../src/protocols/msn/msn.c:1591 ../src/protocols/msn/msn.c:1615
 msgid "Notes"
 msgstr "Notas"
 
-#: ../src/protocols/msn/msn.c:1600
+#: ../src/protocols/msn/msn.c:1595
 #, 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
+#: ../src/protocols/msn/msn.c:1602 ../src/protocols/silc/ops.c:1044
 msgid "Job Title"
 msgstr "Traballo"
 
-#: ../src/protocols/msn/msn.c:1608 ../src/protocols/oscar/oscar.c:3692
+#: ../src/protocols/msn/msn.c:1603 ../src/protocols/oscar/oscar.c:3702
 msgid "Company"
 msgstr "Compañía"
 
-#: ../src/protocols/msn/msn.c:1609 ../src/protocols/novell/novell.c:1482
+#: ../src/protocols/msn/msn.c:1604 ../src/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "Departamento"
 
-#: ../src/protocols/msn/msn.c:1610
+#: ../src/protocols/msn/msn.c:1605
 msgid "Profession"
 msgstr "Profesión"
 
-#: ../src/protocols/msn/msn.c:1611
+#: ../src/protocols/msn/msn.c:1606
 msgid "Work Phone"
 msgstr "Teléfono do traballo"
 
-#: ../src/protocols/msn/msn.c:1612
+#: ../src/protocols/msn/msn.c:1607
 msgid "Work Phone 2"
 msgstr "Teléfono do traballo"
 
-#: ../src/protocols/msn/msn.c:1613 ../src/protocols/oscar/oscar.c:3683
+#: ../src/protocols/msn/msn.c:1608 ../src/protocols/oscar/oscar.c:3693
 msgid "Work Address"
 msgstr "Enderezo do traballo"
 
-#: ../src/protocols/msn/msn.c:1614
+#: ../src/protocols/msn/msn.c:1609
 msgid "Work Mobile"
 msgstr "Móbil do traballo"
 
-#: ../src/protocols/msn/msn.c:1615
+#: ../src/protocols/msn/msn.c:1610
 msgid "Work Pager"
 msgstr "Paxinador do traballo"
 
-#: ../src/protocols/msn/msn.c:1616
+#: ../src/protocols/msn/msn.c:1611
 msgid "Work Fax"
 msgstr "Fax do traballo"
 
-#: ../src/protocols/msn/msn.c:1617
+#: ../src/protocols/msn/msn.c:1612
 msgid "Work E-Mail"
 msgstr "Correo-e do traballo"
 
-#: ../src/protocols/msn/msn.c:1618
+#: ../src/protocols/msn/msn.c:1613
 msgid "Work IM"
 msgstr "MI do traballo"
 
-#: ../src/protocols/msn/msn.c:1619
+#: ../src/protocols/msn/msn.c:1614
 msgid "Start Date"
 msgstr "Data de inicio"
 
-#: ../src/protocols/msn/msn.c:1624
+#: ../src/protocols/msn/msn.c:1619
 #, c-format
 msgid "<br><b>Business</b><br>%s"
 msgstr "<br><b>Ocupacións</b><br>%s"
 
-#: ../src/protocols/msn/msn.c:1635
+#: ../src/protocols/msn/msn.c:1630
 #, 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
+#: ../src/protocols/msn/msn.c:1689 ../src/protocols/msn/msn.c:1695
+#: ../src/protocols/msn/msn.c:1702 ../src/protocols/msn/msn.c:1709
 msgid "Favorite Things"
 msgstr "Cousas preferidas"
 
-#: ../src/protocols/msn/msn.c:1759
+#: ../src/protocols/msn/msn.c:1754
 msgid "Last Updated"
 msgstr "Última actualización"
 
-#: ../src/protocols/msn/msn.c:1771 ../src/protocols/silc/ops.c:1060
+#: ../src/protocols/msn/msn.c:1766 ../src/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "Páxina persoal"
 
-#: ../src/protocols/msn/msn.c:1796
+#: ../src/protocols/msn/msn.c:1791
 msgid "The user has not created a public profile."
 msgstr "O usuario non creou un perfil público."
 
-#: ../src/protocols/msn/msn.c:1797
+#: ../src/protocols/msn/msn.c:1792
 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 "
@@ -8021,7 +8062,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:1801
+#: ../src/protocols/msn/msn.c:1796
 msgid ""
 "Gaim could not find any information in the user's profile. The user most "
 "likely does not exist."
@@ -8030,12 +8071,12 @@
 "usuario non exista."
 
 #. put a link to the actual profile URL
-#: ../src/protocols/msn/msn.c:1806
+#: ../src/protocols/msn/msn.c:1801
 #, 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
+#: ../src/protocols/msn/msn.c:1801 ../src/protocols/yahoo/yahoo_profile.c:1208
 msgid "Profile URL"
 msgstr "URL do perfil"
 
@@ -8049,23 +8090,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/msn/msn.c:2028 ../src/protocols/msn/msn.c:2030
+#: ../src/protocols/msn/msn.c:2023 ../src/protocols/msn/msn.c:2025
 msgid "MSN Protocol Plugin"
 msgstr "Complemento de protocolo MSN"
 
-#: ../src/protocols/msn/msn.c:2049
-msgid "Login server"
-msgstr "Servidor de conexión"
+#: ../src/protocols/msn/msn.c:2053
+msgid "Use HTTP Method"
+msgstr "Usar método HTTP"
 
 #: ../src/protocols/msn/msn.c:2058
-msgid "Use HTTP Method"
-msgstr "Usar método HTTP"
-
-#: ../src/protocols/msn/msn.c:2063
 msgid "Show custom smileys"
 msgstr "Amosar emoticóns personalizados"
 
-#: ../src/protocols/msn/msn.c:2071
+#: ../src/protocols/msn/msn.c:2066
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: Avisar a un contacto para chamar a súa atención"
 
@@ -8081,7 +8118,7 @@
 msgstr "%s non é un nome de grupo válido."
 
 #: ../src/protocols/msn/notification.c:184
-#: ../src/protocols/msn/notification.c:532 ../src/protocols/msn/session.c:336
+#: ../src/protocols/msn/notification.c:532 ../src/protocols/msn/session.c:329
 msgid "Unknown error."
 msgstr "Erro descoñecido."
 
@@ -8119,15 +8156,15 @@
 msgid "Service Temporarily Unavailable."
 msgstr "Servizo non dispoñible temporalmente."
 
-#: ../src/protocols/msn/notification.c:821
+#: ../src/protocols/msn/notification.c:820
 msgid "Unable to rename group"
 msgstr "Non se puido cambiar o nome do grupo"
 
-#: ../src/protocols/msn/notification.c:876
+#: ../src/protocols/msn/notification.c:875
 msgid "Unable to delete group"
 msgstr "Non se puido borrar o grupo"
 
-#: ../src/protocols/msn/notification.c:1309
+#: ../src/protocols/msn/notification.c:1308
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -8175,63 +8212,63 @@
 "Erro de conexión do servidor %s :\n"
 "%s"
 
-#: ../src/protocols/msn/session.c:306
+#: ../src/protocols/msn/session.c:299
 msgid "Our protocol is not supported by the server."
 msgstr "O servidor non soporta o noso protocolo."
 
-#: ../src/protocols/msn/session.c:310
+#: ../src/protocols/msn/session.c:303
 msgid "Error parsing HTTP."
 msgstr "Erro no análise HTTP."
 
 #. MSG_SERVER_GHOST
 #. Looks like someone logged in as us! =-O
-#: ../src/protocols/msn/session.c:314 ../src/protocols/napster/napster.c:456
-#: ../src/protocols/oscar/oscar.c:3416 ../src/protocols/yahoo/yahoo.c:193
+#: ../src/protocols/msn/session.c:307 ../src/protocols/napster/napster.c:456
+#: ../src/protocols/oscar/oscar.c:3416 ../src/protocols/yahoo/yahoo.c:191
 msgid "You have signed on from another location."
 msgstr "Conectouse desde outra ubicación."
 
-#: ../src/protocols/msn/session.c:317
+#: ../src/protocols/msn/session.c:310
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "Súa lista de amigos MSN non está dispoñible temporalmente. Por favor agarde "
 "e volva a intentalo máis tarde."
 
-#: ../src/protocols/msn/session.c:322
+#: ../src/protocols/msn/session.c:315
 msgid "The MSN servers are going down temporarily."
 msgstr "Os servidores MSN van sufrir un apagado temporal."
 
-#: ../src/protocols/msn/session.c:326
+#: ../src/protocols/msn/session.c:319
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Non se puido autenticar: %s"
 
-#: ../src/protocols/msn/session.c:331
+#: ../src/protocols/msn/session.c:324
 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."
 
-#: ../src/protocols/msn/session.c:352 ../src/protocols/msn/session.c:354
+#: ../src/protocols/msn/session.c:345 ../src/protocols/msn/session.c:347
 msgid "Handshaking"
 msgstr "Negociación"
 
-#: ../src/protocols/msn/session.c:353
+#: ../src/protocols/msn/session.c:346
 msgid "Transferring"
 msgstr "Transfirindo"
 
-#: ../src/protocols/msn/session.c:355
+#: ../src/protocols/msn/session.c:348
 msgid "Starting authentication"
 msgstr "Comezando a autenticación"
 
-#: ../src/protocols/msn/session.c:356
+#: ../src/protocols/msn/session.c:349
 msgid "Getting cookie"
 msgstr "Obtendo unha cookie"
 
-#: ../src/protocols/msn/session.c:358
+#: ../src/protocols/msn/session.c:351
 msgid "Sending cookie"
 msgstr "Enviando cookie"
 
-#: ../src/protocols/msn/session.c:359
+#: ../src/protocols/msn/session.c:352
 msgid "Retrieving buddy list"
 msgstr "Recuperando lista de amigos"
 
@@ -8247,35 +8284,35 @@
 msgid "Out To Lunch"
 msgstr "Saín a comer"
 
-#: ../src/protocols/msn/switchboard.c:406
+#: ../src/protocols/msn/switchboard.c:401
 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:414
+#: ../src/protocols/msn/switchboard.c:409
 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:418
+#: ../src/protocols/msn/switchboard.c:413
 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:422
+#: ../src/protocols/msn/switchboard.c:417
 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:426
+#: ../src/protocols/msn/switchboard.c:421
 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:430
+#: ../src/protocols/msn/switchboard.c:425
 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
+#: ../src/protocols/msn/switchboard.c:433
 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:959
+#: ../src/protocols/msn/switchboard.c:953
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s acáballe de dar un cobadazo!"
@@ -8285,11 +8322,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:915
+#: ../src/protocols/msn/userlist.c:111 ../src/protocols/yahoo/yahoo.c:913
 msgid "Authorize"
 msgstr "Autorizar"
 
-#: ../src/protocols/msn/userlist.c:112 ../src/protocols/yahoo/yahoo.c:917
+#: ../src/protocols/msn/userlist.c:112 ../src/protocols/yahoo/yahoo.c:915
 msgid "Deny"
 msgstr "Denegar"
 
@@ -8303,12 +8340,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:679
+#: ../src/protocols/msn/userlist.c:667
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Imposible engadir \"%s\"."
 
-#: ../src/protocols/msn/userlist.c:681
+#: ../src/protocols/msn/userlist.c:669
 msgid "The screen name specified is invalid."
 msgstr "O nome especificado é inválido."
 
@@ -8353,8 +8390,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:2239 ../src/protocols/yahoo/yahoo.c:2266
-#: ../src/protocols/yahoo/yahoo.c:2349 ../src/protocols/yahoo/yahoo.c:2364
+#: ../src/protocols/yahoo/yahoo.c:2237 ../src/protocols/yahoo/yahoo.c:2264
+#: ../src/protocols/yahoo/yahoo.c:2347 ../src/protocols/yahoo/yahoo.c:2362
 #: ../src/protocols/yahoo/yahoo_filexfer.c:74
 #: ../src/protocols/yahoo/yahoo_filexfer.c:137
 #: ../src/protocols/yahoo/ycht.c:540
@@ -8532,7 +8569,7 @@
 msgid "Unable to send message (%s)."
 msgstr "Non se puido enviar a mensaxe (%s)."
 
-#: ../src/protocols/novell/novell.c:493 ../src/protocols/novell/novell.c:987
+#: ../src/protocols/novell/novell.c:493 ../src/protocols/novell/novell.c:985
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "Non se puido invitar ao usuario (%s)."
@@ -8590,33 +8627,33 @@
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "Non se puido eliminar %s da súa lista de privacidade (%s)."
 
-#: ../src/protocols/novell/novell.c:942 ../src/protocols/novell/novell.c:1654
+#: ../src/protocols/novell/novell.c:942 ../src/protocols/novell/novell.c:1652
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "Non se puideron cambiar as opcións de privacidade do servidor (%s)."
 
-#: ../src/protocols/novell/novell.c:1014
+#: ../src/protocols/novell/novell.c:1012
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Non se puido crear a conferencia (%s)."
 
-#: ../src/protocols/novell/novell.c:1123 ../src/protocols/novell/novell.c:1693
+#: ../src/protocols/novell/novell.c:1121 ../src/protocols/novell/novell.c:1691
 msgid "Error communicating with server. Closing connection."
 msgstr "Erro comunicándose co servidor. Pecharase a conexión."
 
-#: ../src/protocols/novell/novell.c:1478
+#: ../src/protocols/novell/novell.c:1476
 msgid "Telephone Number"
 msgstr "Número de teléfono"
 
-#: ../src/protocols/novell/novell.c:1484
+#: ../src/protocols/novell/novell.c:1482
 msgid "Personal Title"
 msgstr "Título"
 
-#: ../src/protocols/novell/novell.c:1488
+#: ../src/protocols/novell/novell.c:1486
 msgid "Mailstop"
 msgstr "Buzón de correo"
 
-#: ../src/protocols/novell/novell.c:1506
+#: ../src/protocols/novell/novell.c:1504
 msgid "User ID"
 msgstr "ID de usuario"
 
@@ -8627,41 +8664,41 @@
 #. tag, value);
 #. }
 #.
-#: ../src/protocols/novell/novell.c:1520
+#: ../src/protocols/novell/novell.c:1518
 msgid "Full name"
 msgstr "Nome completo"
 
-#: ../src/protocols/novell/novell.c:1644
+#: ../src/protocols/novell/novell.c:1642
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "Conferencia GroupWise %d"
 
-#: ../src/protocols/novell/novell.c:1669
+#: ../src/protocols/novell/novell.c:1667
 msgid "Unable to make SSL connection to server."
 msgstr "Non se puido establecer unha conexión SSL co servidor."
 
-#: ../src/protocols/novell/novell.c:1726
+#: ../src/protocols/novell/novell.c:1724
 msgid "Authenticating..."
 msgstr "Autenticando..."
 
-#: ../src/protocols/novell/novell.c:1738
+#: ../src/protocols/novell/novell.c:1736
 msgid "Unable to connect to server."
 msgstr "Non se puido conectar ao servidor."
 
-#: ../src/protocols/novell/novell.c:1741
+#: ../src/protocols/novell/novell.c:1739
 msgid "Waiting for response..."
 msgstr "Esperando resposta..."
 
-#: ../src/protocols/novell/novell.c:1876
+#: ../src/protocols/novell/novell.c:1874
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "Invitouse a %s a esta conversación."
 
-#: ../src/protocols/novell/novell.c:1904
+#: ../src/protocols/novell/novell.c:1902
 msgid "Invitation to Conversation"
 msgstr "Invitación a unha conversación"
 
-#: ../src/protocols/novell/novell.c:1905
+#: ../src/protocols/novell/novell.c:1903
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -8672,15 +8709,15 @@
 "\n"
 "Enviada: %s"
 
-#: ../src/protocols/novell/novell.c:1907
+#: ../src/protocols/novell/novell.c:1905
 msgid "Would you like to join the conversation?"
 msgstr "Desexa unirse á conversación?"
 
-#: ../src/protocols/novell/novell.c:2014
+#: ../src/protocols/novell/novell.c:2012
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "Foi desconectado porque se conectou desde outra estación de traballo."
 
-#: ../src/protocols/novell/novell.c:2070
+#: ../src/protocols/novell/novell.c:2068
 #, c-format
 msgid "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
@@ -8691,7 +8728,7 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: ../src/protocols/novell/novell.c:2168
+#: ../src/protocols/novell/novell.c:2166
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -8699,11 +8736,11 @@
 "Non se puido contactar co servidor. Por favor, indique o enderezo do "
 "servidor co que desexa conectarse."
 
-#: ../src/protocols/novell/novell.c:2190
+#: ../src/protocols/novell/novell.c:2188
 msgid "Error. SSL support is not installed."
 msgstr "Erro. O soporte SSL non está instalado."
 
-#: ../src/protocols/novell/novell.c:2499
+#: ../src/protocols/novell/novell.c:2497
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Pechouse esta conferencia. Non se poden enviar máis mensaxes."
 
@@ -8717,18 +8754,59 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/novell/novell.c:3543 ../src/protocols/novell/novell.c:3545
+#: ../src/protocols/novell/novell.c:3541 ../src/protocols/novell/novell.c:3543
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Complemento de protocolo de Mensaxería de Grupos Novell"
 
-#: ../src/protocols/novell/novell.c:3564
+#: ../src/protocols/novell/novell.c:3562
 msgid "Server address"
 msgstr "Enderezo do servidor"
 
-#: ../src/protocols/novell/novell.c:3568
+#: ../src/protocols/novell/novell.c:3566
 msgid "Server port"
 msgstr "Porto do servidor"
 
+#: ../src/protocols/oscar/flap_connection.c:222
+msgid "Server closed the connection."
+msgstr "O servidor pechou a conexión."
+
+#: ../src/protocols/oscar/flap_connection.c:224
+msgid "Lost connection with server for an unknown reason."
+msgstr "Perdeuse a conexión co servidor por unha razón descoñecida."
+
+#: ../src/protocols/oscar/flap_connection.c:226
+#, fuzzy
+msgid "Received invalid data on connection with server."
+msgstr "Non se puido establecer unha conexión SSL co servidor."
+
+#: ../src/protocols/oscar/flap_connection.c:228
+msgid "Could not establish a connection with the server."
+msgstr "Non se puido establecer unha conexión co servidor."
+
+#: ../src/protocols/oscar/odc.c:41
+msgid "The remote user has closed the connection."
+msgstr "O usuario remoto pechou a conexión."
+
+#: ../src/protocols/oscar/odc.c:45
+msgid "The remote user has declined your request."
+msgstr "O usuario remoto rexeitou a túa petición."
+
+#: ../src/protocols/oscar/odc.c:49
+msgid "Lost connection with the remote user for an unknown reason."
+msgstr "Perdeuse a conexión co usuario remoto por unha razón descoñecida."
+
+#: ../src/protocols/oscar/odc.c:53
+msgid "Received invalid data on connection with remote user."
+msgstr "Recibíronse datos inválidos na conexión co usuario remoto."
+
+#: ../src/protocols/oscar/odc.c:57
+msgid "Could not establish a connection with the remote user."
+msgstr "Non se puido establecer a conexión co usuario remoto."
+
+#: ../src/protocols/oscar/odc.c:567
+msgid "Direct IM established"
+msgstr "MI directo establecido."
+
 #: ../src/protocols/oscar/oscar.c:144
 msgid "Invalid error"
 msgstr "Erro inválido"
@@ -8854,7 +8932,7 @@
 msgid "Chat"
 msgstr "Chat"
 
-#: ../src/protocols/oscar/oscar.c:637 ../src/protocols/oscar/oscar.c:5779
+#: ../src/protocols/oscar/oscar.c:637 ../src/protocols/oscar/oscar.c:5793
 msgid "Get File"
 msgstr "Recibir ficheiro"
 
@@ -8926,15 +9004,15 @@
 msgid "Camera"
 msgstr "Cámara"
 
-#: ../src/protocols/oscar/oscar.c:711 ../src/protocols/oscar/oscar.c:5586
+#: ../src/protocols/oscar/oscar.c:711 ../src/protocols/oscar/oscar.c:5600
 msgid "Free For Chat"
 msgstr "Dispoñible para conversar"
 
-#: ../src/protocols/oscar/oscar.c:715 ../src/protocols/oscar/oscar.c:5614
+#: ../src/protocols/oscar/oscar.c:715 ../src/protocols/oscar/oscar.c:5628
 msgid "Not Available"
 msgstr "Non dispoñible"
 
-#: ../src/protocols/oscar/oscar.c:717 ../src/protocols/oscar/oscar.c:5604
+#: ../src/protocols/oscar/oscar.c:717 ../src/protocols/oscar/oscar.c:5618
 msgid "Occupied"
 msgstr "Ocupado"
 
@@ -9089,7 +9167,7 @@
 
 #: ../src/protocols/oscar/oscar.c:2251 ../src/protocols/oscar/oscar.c:2259
 #: ../src/protocols/oscar/oscar.c:2367 ../src/protocols/oscar/oscar.c:2391
-#: ../src/protocols/oscar/oscar.c:5015 ../src/protocols/oscar/oscar.c:5067
+#: ../src/protocols/oscar/oscar.c:5025 ../src/protocols/oscar/oscar.c:5077
 msgid "No reason given."
 msgstr "Non se indicou un razón."
 
@@ -9106,7 +9184,7 @@
 "O usuario %u quere engadir a %s á súa lista de amigos polo seguinte motivo:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:2379 ../src/protocols/oscar/oscar.c:5027
+#: ../src/protocols/oscar/oscar.c:2379 ../src/protocols/oscar/oscar.c:5037
 msgid "Authorization Request"
 msgstr "Solicitude de autorización"
 
@@ -9247,7 +9325,7 @@
 msgstr "Razón descoñecida."
 
 #: ../src/protocols/oscar/oscar.c:2739
-#: ../src/protocols/sametime/sametime.c:2370
+#: ../src/protocols/sametime/sametime.c:2367
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Non se puido enviar a mensaxe a %s:"
@@ -9318,68 +9396,68 @@
 msgid "Mobile Phone"
 msgstr "Teléfono móvil"
 
-#: ../src/protocols/oscar/oscar.c:3666
+#: ../src/protocols/oscar/oscar.c:3676
 msgid "Personal Web Page"
 msgstr "Páxina web persoal"
 
-#: ../src/protocols/oscar/oscar.c:3670
+#: ../src/protocols/oscar/oscar.c:3680
 msgid "Additional Information"
 msgstr "Información adicional"
 
-#: ../src/protocols/oscar/oscar.c:3679 ../src/protocols/oscar/oscar.c:3687
+#: ../src/protocols/oscar/oscar.c:3689 ../src/protocols/oscar/oscar.c:3697
 msgid "Zip Code"
 msgstr "Código postal"
 
-#: ../src/protocols/oscar/oscar.c:3691
+#: ../src/protocols/oscar/oscar.c:3701
 msgid "Work Information"
 msgstr "Información do traballo"
 
-#: ../src/protocols/oscar/oscar.c:3693
+#: ../src/protocols/oscar/oscar.c:3703
 msgid "Division"
 msgstr "Sección"
 
-#: ../src/protocols/oscar/oscar.c:3694
+#: ../src/protocols/oscar/oscar.c:3704
 msgid "Position"
 msgstr "Cargo"
 
-#: ../src/protocols/oscar/oscar.c:3696
+#: ../src/protocols/oscar/oscar.c:3706
 msgid "Web Page"
 msgstr "Páxina web"
 
-#: ../src/protocols/oscar/oscar.c:3754
+#: ../src/protocols/oscar/oscar.c:3764
 msgid "Pop-Up Message"
 msgstr "Mensaxe emerxente"
 
-#: ../src/protocols/oscar/oscar.c:3794
+#: ../src/protocols/oscar/oscar.c:3804
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "O seguinte nome de usuario está asociado a %s"
 msgstr[1] "Os seguintes nomes de usuarios están asociados a %s"
 
-#: ../src/protocols/oscar/oscar.c:3799
+#: ../src/protocols/oscar/oscar.c:3809
 msgid "Screen name"
 msgstr "Nome de usuario"
 
-#: ../src/protocols/oscar/oscar.c:3825
+#: ../src/protocols/oscar/oscar.c:3835
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Non se atoparon resultados para o enderezo de correo-e %s"
 
-#: ../src/protocols/oscar/oscar.c:3846
+#: ../src/protocols/oscar/oscar.c:3856
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Debería recibir un correo-e solicitando confirmación de %s."
 
-#: ../src/protocols/oscar/oscar.c:3848
+#: ../src/protocols/oscar/oscar.c:3858
 msgid "Account Confirmation Requested"
 msgstr "Confirmación de conta solicitada"
 
-#: ../src/protocols/oscar/oscar.c:3879
+#: ../src/protocols/oscar/oscar.c:3889
 msgid "Error Changing Account Info"
 msgstr "Erro cambiando a información da conta"
 
-#: ../src/protocols/oscar/oscar.c:3882
+#: ../src/protocols/oscar/oscar.c:3892
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -9388,12 +9466,12 @@
 "Erro 0x%04x: Non se pode dar formato ao nome de usuario porque o nome de "
 "usuario solicitado difire do orixinal."
 
-#: ../src/protocols/oscar/oscar.c:3885
+#: ../src/protocols/oscar/oscar.c:3895
 #, 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."
 
-#: ../src/protocols/oscar/oscar.c:3888
+#: ../src/protocols/oscar/oscar.c:3898
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -9402,7 +9480,7 @@
 "Erro 0x%04x: Non se pode dar formato ao nome de usuario porque o nome de "
 "usuario solicitado é demasiado longo."
 
-#: ../src/protocols/oscar/oscar.c:3891
+#: ../src/protocols/oscar/oscar.c:3901
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -9411,7 +9489,7 @@
 "Erro 0x%04x: Non se pode cambiar o enderezo de correo electrónico porque xa "
 "existe unha solicitude pendente para este nome de usuario."
 
-#: ../src/protocols/oscar/oscar.c:3894
+#: ../src/protocols/oscar/oscar.c:3904
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -9420,7 +9498,7 @@
 "Erro 0x%04x: Non se pode cambiar o enderezo de correo electrónico porque o "
 "enderezo dado xa ten demasiados nomes de usuarios asociados."
 
-#: ../src/protocols/oscar/oscar.c:3897
+#: ../src/protocols/oscar/oscar.c:3907
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -9429,12 +9507,12 @@
 "Erro 0x%04x: Non es pode cambiar o enderezo de correo electrónico porque o "
 "enderezo dado é inválido."
 
-#: ../src/protocols/oscar/oscar.c:3900
+#: ../src/protocols/oscar/oscar.c:3910
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Erro 0x%04x: Erro descoñecido."
 
-#: ../src/protocols/oscar/oscar.c:3910
+#: ../src/protocols/oscar/oscar.c:3920
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -9443,26 +9521,26 @@
 "O formato de seu nome de usuario é actualmente o seguinte:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:3911 ../src/protocols/oscar/oscar.c:3918
+#: ../src/protocols/oscar/oscar.c:3921 ../src/protocols/oscar/oscar.c:3928
 msgid "Account Info"
 msgstr "Información da conta"
 
-#: ../src/protocols/oscar/oscar.c:3916
+#: ../src/protocols/oscar/oscar.c:3926
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "O enderezo de correo electrónico de %s é %s"
 
-#: ../src/protocols/oscar/oscar.c:4091
+#: ../src/protocols/oscar/oscar.c:4101
 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."
 
-#: ../src/protocols/oscar/oscar.c:4331
+#: ../src/protocols/oscar/oscar.c:4341
 msgid "Unable to set AIM profile."
 msgstr "Non se puido establecer o perfil AIM."
 
-#: ../src/protocols/oscar/oscar.c:4332
+#: ../src/protocols/oscar/oscar.c:4342
 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 "
@@ -9472,7 +9550,7 @@
 "conexión completárase. Seu perfil quedará sen cambiar, inténteo novamente "
 "cando xa estea conectado completamente."
 
-#: ../src/protocols/oscar/oscar.c:4346
+#: ../src/protocols/oscar/oscar.c:4356
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -9487,11 +9565,11 @@
 "Excedeuse o límite de %d bytes de lonxitude na mensaxe de ausencia. Gaim "
 "truncouno."
 
-#: ../src/protocols/oscar/oscar.c:4351
+#: ../src/protocols/oscar/oscar.c:4361
 msgid "Profile too long."
 msgstr "Perfil demasiado longo."
 
-#: ../src/protocols/oscar/oscar.c:4398
+#: ../src/protocols/oscar/oscar.c:4408
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -9506,11 +9584,11 @@
 "Excedeuse o límite de %d bytes de lonxitude na mensaxe de ausencia. Gaim "
 "truncouno."
 
-#: ../src/protocols/oscar/oscar.c:4403
+#: ../src/protocols/oscar/oscar.c:4413
 msgid "Away message too long."
 msgstr "Mensaxe de ausencia demasiado longo."
 
-#: ../src/protocols/oscar/oscar.c:4472
+#: ../src/protocols/oscar/oscar.c:4482
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -9521,16 +9599,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:4474 ../src/protocols/oscar/oscar.c:4873
-#: ../src/protocols/oscar/oscar.c:4887
+#: ../src/protocols/oscar/oscar.c:4484 ../src/protocols/oscar/oscar.c:4883
+#: ../src/protocols/oscar/oscar.c:4897
 msgid "Unable To Add"
 msgstr "Non se puido engadir"
 
-#: ../src/protocols/oscar/oscar.c:4578
+#: ../src/protocols/oscar/oscar.c:4588
 msgid "Unable To Retrieve Buddy List"
 msgstr "Non se puido obter a lista de amigos"
 
-#: ../src/protocols/oscar/oscar.c:4579
+#: ../src/protocols/oscar/oscar.c:4589
 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 "
@@ -9539,13 +9617,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:4771 ../src/protocols/oscar/oscar.c:4772
-#: ../src/protocols/oscar/oscar.c:4777 ../src/protocols/oscar/oscar.c:4931
-#: ../src/protocols/oscar/oscar.c:4932 ../src/protocols/oscar/oscar.c:4937
+#: ../src/protocols/oscar/oscar.c:4781 ../src/protocols/oscar/oscar.c:4782
+#: ../src/protocols/oscar/oscar.c:4787 ../src/protocols/oscar/oscar.c:4941
+#: ../src/protocols/oscar/oscar.c:4942 ../src/protocols/oscar/oscar.c:4947
 msgid "Orphans"
 msgstr "Orfos"
 
-#: ../src/protocols/oscar/oscar.c:4871
+#: ../src/protocols/oscar/oscar.c:4881
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -9554,11 +9632,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:4871 ../src/protocols/oscar/oscar.c:4885
+#: ../src/protocols/oscar/oscar.c:4881 ../src/protocols/oscar/oscar.c:4895
 msgid "(no name)"
 msgstr "(sen nome)"
 
-#: ../src/protocols/oscar/oscar.c:4885
+#: ../src/protocols/oscar/oscar.c:4895
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -9569,7 +9647,7 @@
 "habitual é que chegou ao máximo número de amigos permitidos na súa lista de "
 "amigos."
 
-#: ../src/protocols/oscar/oscar.c:4968
+#: ../src/protocols/oscar/oscar.c:4978
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -9578,11 +9656,11 @@
 "O usuario %s deulle permiso para engadirlle a súa lista de amigos. Desexa "
 "facelo?"
 
-#: ../src/protocols/oscar/oscar.c:4974
+#: ../src/protocols/oscar/oscar.c:4984
 msgid "Authorization Given"
 msgstr "Autorización otorgada"
 
-#: ../src/protocols/oscar/oscar.c:5018
+#: ../src/protocols/oscar/oscar.c:5028
 #, c-format
 msgid ""
 "The user %s wants to add %s to their buddy list for the following reason:\n"
@@ -9592,17 +9670,17 @@
 "%s"
 
 #. Granted
-#: ../src/protocols/oscar/oscar.c:5063
+#: ../src/protocols/oscar/oscar.c:5073
 #, 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:5064
+#: ../src/protocols/oscar/oscar.c:5074
 msgid "Authorization Granted"
 msgstr "Autorización aceptada"
 
 #. Denied
-#: ../src/protocols/oscar/oscar.c:5067
+#: ../src/protocols/oscar/oscar.c:5077
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -9613,41 +9691,41 @@
 "seguinte razón:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:5068
+#: ../src/protocols/oscar/oscar.c:5078
 msgid "Authorization Denied"
 msgstr "Autorización denegada"
 
-#: ../src/protocols/oscar/oscar.c:5104 ../src/protocols/toc/toc.c:1372
+#: ../src/protocols/oscar/oscar.c:5114 ../src/protocols/toc/toc.c:1372
 msgid "_Exchange:"
 msgstr "_Troco:"
 
-#: ../src/protocols/oscar/oscar.c:5144
+#: ../src/protocols/oscar/oscar.c:5154
 msgid "Invalid chat name specified."
 msgstr "Especificouse un nome de chat inválido."
 
-#: ../src/protocols/oscar/oscar.c:5214
+#: ../src/protocols/oscar/oscar.c:5224
 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:5372
+#: ../src/protocols/oscar/oscar.c:5386
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(obtendo)</i>"
 
-#: ../src/protocols/oscar/oscar.c:5677
+#: ../src/protocols/oscar/oscar.c:5691
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Comentario de amigo para %s"
 
-#: ../src/protocols/oscar/oscar.c:5678
+#: ../src/protocols/oscar/oscar.c:5692
 msgid "Buddy Comment:"
 msgstr "Comentario de amigo:"
 
-#: ../src/protocols/oscar/oscar.c:5724
+#: ../src/protocols/oscar/oscar.c:5738
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Vostede pediu abrir unha conexión MI directa con %s."
 
-#: ../src/protocols/oscar/oscar.c:5728
+#: ../src/protocols/oscar/oscar.c:5742
 #, fuzzy
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
@@ -9656,65 +9734,65 @@
 "Como isto revela seu enderezo IP, pode ser considerado como un resgo a súa "
 "privacidade. Quere continuar?"
 
-#: ../src/protocols/oscar/oscar.c:5732
+#: ../src/protocols/oscar/oscar.c:5746 ../src/protocols/oscar/peer.c:941
 msgid "_Connect"
 msgstr "_Conectar"
 
-#: ../src/protocols/oscar/oscar.c:5750
+#: ../src/protocols/oscar/oscar.c:5764
 msgid "Edit Buddy Comment"
 msgstr "Editar comentario de amigo"
 
-#: ../src/protocols/oscar/oscar.c:5758
+#: ../src/protocols/oscar/oscar.c:5772
 msgid "Get Status Msg"
 msgstr "Obter msx de estado"
 
-#: ../src/protocols/oscar/oscar.c:5771
+#: ../src/protocols/oscar/oscar.c:5785
 msgid "Direct IM"
 msgstr "MI directo"
 
-#: ../src/protocols/oscar/oscar.c:5793
+#: ../src/protocols/oscar/oscar.c:5807
 msgid "Re-request Authorization"
 msgstr "Solicitar autorización outra vez"
 
-#: ../src/protocols/oscar/oscar.c:5850
+#: ../src/protocols/oscar/oscar.c:5864
 msgid "Require authorization"
 msgstr "Pedir autorización"
 
-#: ../src/protocols/oscar/oscar.c:5853
+#: ../src/protocols/oscar/oscar.c:5867
 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:5858
+#: ../src/protocols/oscar/oscar.c:5872
 msgid "ICQ Privacy Options"
 msgstr "Opcións de privacidade ICQ"
 
-#: ../src/protocols/oscar/oscar.c:5875
+#: ../src/protocols/oscar/oscar.c:5889
 msgid "The new formatting is invalid."
 msgstr "O novo formato é inválido."
 
-#: ../src/protocols/oscar/oscar.c:5876
+#: ../src/protocols/oscar/oscar.c:5890
 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:5883
+#: ../src/protocols/oscar/oscar.c:5897
 msgid "New screen name formatting:"
 msgstr "Novo formato do nome de usuario:"
 
-#: ../src/protocols/oscar/oscar.c:5939
+#: ../src/protocols/oscar/oscar.c:5953
 msgid "Change Address To:"
 msgstr "Cambiar enderezo a:"
 
-#: ../src/protocols/oscar/oscar.c:5984
+#: ../src/protocols/oscar/oscar.c:5998
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>vostede non está agardando autorización</i>"
 
-#: ../src/protocols/oscar/oscar.c:5987
+#: ../src/protocols/oscar/oscar.c:6001
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Agardando a autorización dos seguintes amigos"
 
-#: ../src/protocols/oscar/oscar.c:5988
+#: ../src/protocols/oscar/oscar.c:6002
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -9722,71 +9800,71 @@
 "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:6005
+#: ../src/protocols/oscar/oscar.c:6019
 msgid "Find Buddy by E-Mail"
 msgstr "Procurar un amigo polo correo electrónico"
 
-#: ../src/protocols/oscar/oscar.c:6006
+#: ../src/protocols/oscar/oscar.c:6020
 msgid "Search for a buddy by e-mail address"
 msgstr "Buscar amigo polo enderezo de correo electrónico"
 
-#: ../src/protocols/oscar/oscar.c:6007
+#: ../src/protocols/oscar/oscar.c:6021
 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:6176
+#: ../src/protocols/oscar/oscar.c:6190
 msgid "Set User Info (URL)..."
 msgstr "Establecer súa información de usuario (URL)..."
 
-#: ../src/protocols/oscar/oscar.c:6187
+#: ../src/protocols/oscar/oscar.c:6201
 msgid "Change Password (URL)"
 msgstr "Trocar contrasinal (URL)"
 
-#: ../src/protocols/oscar/oscar.c:6191
+#: ../src/protocols/oscar/oscar.c:6205
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configurar reenvío de MI (URL)"
 
 #. ICQ actions
-#: ../src/protocols/oscar/oscar.c:6201
+#: ../src/protocols/oscar/oscar.c:6215
 msgid "Set Privacy Options..."
 msgstr "Establecer opcións de privacidade..."
 
 #. AIM actions
-#: ../src/protocols/oscar/oscar.c:6208
+#: ../src/protocols/oscar/oscar.c:6222
 msgid "Format Screen Name..."
 msgstr "Formato do nome de usuario..."
 
-#: ../src/protocols/oscar/oscar.c:6212
+#: ../src/protocols/oscar/oscar.c:6226
 msgid "Confirm Account"
 msgstr "Confirmar conta"
 
-#: ../src/protocols/oscar/oscar.c:6216
+#: ../src/protocols/oscar/oscar.c:6230
 #, fuzzy
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Mostrar enderezo rexistrado actualmente"
 
-#: ../src/protocols/oscar/oscar.c:6220
+#: ../src/protocols/oscar/oscar.c:6234
 #, fuzzy
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Cambiar o enderezo rexistrado..."
 
-#: ../src/protocols/oscar/oscar.c:6227
+#: ../src/protocols/oscar/oscar.c:6241
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Amosar amigos pendentes de autorización"
 
-#: ../src/protocols/oscar/oscar.c:6233
+#: ../src/protocols/oscar/oscar.c:6247
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Procurar un amigo polo enderezo de correo electrónico..."
 
-#: ../src/protocols/oscar/oscar.c:6238
+#: ../src/protocols/oscar/oscar.c:6252
 msgid "Search for Buddy by Information"
 msgstr "Buscar un amigo a través da súa información"
 
-#: ../src/protocols/oscar/oscar.c:6304
+#: ../src/protocols/oscar/oscar.c:6318
 msgid "Use recent buddies group"
 msgstr "Usar grupo de amigos recente"
 
-#: ../src/protocols/oscar/oscar.c:6307
+#: ../src/protocols/oscar/oscar.c:6321
 msgid "Show how long you have been idle"
 msgstr "Amosar canto tempo estivo inactivo"
 
@@ -9800,23 +9878,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/oscar/oscar.c:6432 ../src/protocols/oscar/oscar.c:6434
+#: ../src/protocols/oscar/oscar.c:6446 ../src/protocols/oscar/oscar.c:6448
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "Complemento de protocolo AIM/ICQ"
 
-#: ../src/protocols/oscar/oscar.c:6453
-msgid "Auth host"
-msgstr "Servidor de autenticación"
-
-#: ../src/protocols/oscar/oscar.c:6456
-msgid "Auth port"
-msgstr "Porto de autenticación"
-
-#: ../src/protocols/oscar/oscar.c:6459 ../src/protocols/zephyr/zephyr.c:2920
+#: ../src/protocols/oscar/oscar.c:6473 ../src/protocols/zephyr/zephyr.c:2920
 msgid "Encoding"
 msgstr "Codificación"
 
-#: ../src/protocols/oscar/oscar.c:6463
+#: ../src/protocols/oscar/oscar.c:6477
 msgid ""
 "Always use AIM/ICQ proxy server\n"
 "(slower, but does not reveal your IP address)"
@@ -9824,131 +9894,158 @@
 "Empregar sempre un servidor proxy de AIM/ICQ\n"
 "(máis lento, pero non revela o teu enderezo IP)"
 
+#: ../src/protocols/oscar/peer.c:613
+#, c-format
+msgid "Asking %s to connect to us at %s:%hu for Direct IM."
+msgstr ""
+
+#: ../src/protocols/oscar/peer.c:662 ../src/protocols/oscar/peer.c:693
+#, fuzzy, c-format
+msgid "Attempting to connect to %s:%hu."
+msgstr "Non se puido conectar ao servidor."
+
+#: ../src/protocols/oscar/peer.c:753
+#, fuzzy
+msgid "Attempting to connect via proxy server."
+msgstr "Non se puido conectar ao servidor."
+
+#: ../src/protocols/oscar/peer.c:931
+#, fuzzy, c-format
+msgid "%s has just asked to directly connect to %s"
+msgstr "%s cambiou o tópico a: %s"
+
+#: ../src/protocols/oscar/peer.c:935
+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 "
+"considered a privacy risk."
+msgstr ""
+
 #: ../src/protocols/sametime/sametime.c:415
 msgid "Connection closed (writing)"
 msgstr "Conexión pechada (escribindo)"
 
-#: ../src/protocols/sametime/sametime.c:1264
+#: ../src/protocols/sametime/sametime.c:1261
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Título do grupo:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:1265
+#: ../src/protocols/sametime/sametime.c:1262
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr "<b>ID de grupo Notes:</b>%s<br>"
 
-#: ../src/protocols/sametime/sametime.c:1267
+#: ../src/protocols/sametime/sametime.c:1264
 #, c-format
 msgid "Info for Group %s"
 msgstr "Información sobre o grupo %s"
 
-#: ../src/protocols/sametime/sametime.c:1269
+#: ../src/protocols/sametime/sametime.c:1266
 msgid "Notes Address Book Information"
 msgstr "Información do libro de enderezos Notes"
 
-#: ../src/protocols/sametime/sametime.c:1301
+#: ../src/protocols/sametime/sametime.c:1298
 msgid "Invite Group to Conference..."
 msgstr "Invitar grupo á conferencia..."
 
-#: ../src/protocols/sametime/sametime.c:1311
+#: ../src/protocols/sametime/sametime.c:1308
 msgid "Get Notes Address Book Info"
 msgstr "Obter a información do libro de enderezos Notes"
 
-#: ../src/protocols/sametime/sametime.c:1464
+#: ../src/protocols/sametime/sametime.c:1461
 msgid "Sending Handshake"
 msgstr "Enviando negociación"
 
-#: ../src/protocols/sametime/sametime.c:1469
+#: ../src/protocols/sametime/sametime.c:1466
 msgid "Waiting for Handshake Acknowledgement"
 msgstr "Agardando á aceptación do saúdo inicial"
 
-#: ../src/protocols/sametime/sametime.c:1474
+#: ../src/protocols/sametime/sametime.c:1471
 msgid "Handshake Acknowledged, Sending Login"
 msgstr "Aceptouse o saúdo inicial. Enviando a identificación"
 
-#: ../src/protocols/sametime/sametime.c:1479
+#: ../src/protocols/sametime/sametime.c:1476
 msgid "Waiting for Login Acknowledgement"
 msgstr "Agardando á aceptación da identificación"
 
-#: ../src/protocols/sametime/sametime.c:1484
+#: ../src/protocols/sametime/sametime.c:1481
 msgid "Login Redirected"
 msgstr "Conexión redirixida"
 
-#: ../src/protocols/sametime/sametime.c:1490
+#: ../src/protocols/sametime/sametime.c:1487
 msgid "Forcing Login"
 msgstr "Forzando conexión"
 
-#: ../src/protocols/sametime/sametime.c:1494
+#: ../src/protocols/sametime/sametime.c:1491
 msgid "Login Acknowledged"
 msgstr "Identificación aceptada"
 
-#: ../src/protocols/sametime/sametime.c:1499
+#: ../src/protocols/sametime/sametime.c:1496
 msgid "Starting Services"
 msgstr "Iniciando servizos"
 
-#: ../src/protocols/sametime/sametime.c:1504
+#: ../src/protocols/sametime/sametime.c:1501
 msgid "Connected"
 msgstr "Conectado"
 
-#: ../src/protocols/sametime/sametime.c:1602
+#: ../src/protocols/sametime/sametime.c:1599
 #, c-format
 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:1607
+#: ../src/protocols/sametime/sametime.c:1604
 msgid "Sametime Administrator Announcement"
 msgstr "Anuncio do administrador Sametime"
 
-#: ../src/protocols/sametime/sametime.c:1659
+#: ../src/protocols/sametime/sametime.c:1656
 msgid "Connection reset"
 msgstr "Conexión reiniciada"
 
-#: ../src/protocols/sametime/sametime.c:1666
+#: ../src/protocols/sametime/sametime.c:1663
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr "Erro ao ler do socket: %s"
 
 #. this is a regular connect, error out
-#: ../src/protocols/sametime/sametime.c:1695
-#: ../src/protocols/sametime/sametime.c:3695
+#: ../src/protocols/sametime/sametime.c:1692
+#: ../src/protocols/sametime/sametime.c:3688
 msgid "Unable to connect to host"
 msgstr "Non se puido conectar ao servidor"
 
-#: ../src/protocols/sametime/sametime.c:1733
+#: ../src/protocols/sametime/sametime.c:1730
 #, c-format
 msgid "Announcement from %s"
 msgstr "Aviso de %s"
 
-#: ../src/protocols/sametime/sametime.c:1907
+#: ../src/protocols/sametime/sametime.c:1904
 msgid "Conference Closed"
 msgstr "Conferencia pechada"
 
-#: ../src/protocols/sametime/sametime.c:2364
+#: ../src/protocols/sametime/sametime.c:2361
 msgid "Unable to send message: "
 msgstr "Non se puido enviar a mensaxe: "
 
-#: ../src/protocols/sametime/sametime.c:2925
+#: ../src/protocols/sametime/sametime.c:2918
 msgid "Place Closed"
 msgstr "Lugar pechado"
 
-#: ../src/protocols/sametime/sametime.c:3216
+#: ../src/protocols/sametime/sametime.c:3209
 msgid "Microphone"
 msgstr "Micrófono"
 
-#: ../src/protocols/sametime/sametime.c:3217
+#: ../src/protocols/sametime/sametime.c:3210
 msgid "Speakers"
 msgstr "Altavoces"
 
-#: ../src/protocols/sametime/sametime.c:3218
+#: ../src/protocols/sametime/sametime.c:3211
 msgid "Video Camera"
 msgstr "Video cámara"
 
-#: ../src/protocols/sametime/sametime.c:3222
+#: ../src/protocols/sametime/sametime.c:3215
 msgid "File Transfer"
 msgstr "Transferencia de ficheiros"
 
-#: ../src/protocols/sametime/sametime.c:3256
+#: ../src/protocols/sametime/sametime.c:3249
 #, c-format
 msgid ""
 "\n"
@@ -9957,7 +10054,7 @@
 "\n"
 "<b>Soporte:</b> %s"
 
-#: ../src/protocols/sametime/sametime.c:3261
+#: ../src/protocols/sametime/sametime.c:3254
 msgid ""
 "\n"
 "<b>External User</b>"
@@ -9965,11 +10062,11 @@
 "\n"
 "<b>Usuario externo</b>"
 
-#: ../src/protocols/sametime/sametime.c:3367
+#: ../src/protocols/sametime/sametime.c:3360
 msgid "Create conference with user"
 msgstr "Crear conferencia co usuario"
 
-#: ../src/protocols/sametime/sametime.c:3368
+#: ../src/protocols/sametime/sametime.c:3361
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
@@ -9978,27 +10075,27 @@
 "Por favor introduza un tema para a nova conferencia, e unha mensaxe de "
 "invitación que se enviará a %s"
 
-#: ../src/protocols/sametime/sametime.c:3372
+#: ../src/protocols/sametime/sametime.c:3365
 msgid "New Conference"
 msgstr "Nova conferencia"
 
-#: ../src/protocols/sametime/sametime.c:3374
+#: ../src/protocols/sametime/sametime.c:3367
 msgid "Create"
 msgstr "Crear"
 
-#: ../src/protocols/sametime/sametime.c:3438
+#: ../src/protocols/sametime/sametime.c:3431
 msgid "Available Conferences"
 msgstr "Conferencias dispoñibles"
 
-#: ../src/protocols/sametime/sametime.c:3444
+#: ../src/protocols/sametime/sametime.c:3437
 msgid "Create New Conference..."
 msgstr "Crear unha nova conferencia..."
 
-#: ../src/protocols/sametime/sametime.c:3451
+#: ../src/protocols/sametime/sametime.c:3444
 msgid "Invite user to a conference"
 msgstr "Invitar ao usuario a unha conferencia"
 
-#: ../src/protocols/sametime/sametime.c:3452
+#: ../src/protocols/sametime/sametime.c:3445
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -10009,27 +10106,27 @@
 "Seleccione \"Crear nova conferencia\" se quere crear unha nova conferencia "
 "para invitar a este usuario tamén."
 
-#: ../src/protocols/sametime/sametime.c:3457
+#: ../src/protocols/sametime/sametime.c:3450
 msgid "Invite to Conference"
 msgstr "Invitar a unha conferencia"
 
-#: ../src/protocols/sametime/sametime.c:3459
+#: ../src/protocols/sametime/sametime.c:3452
 msgid "Invite"
 msgstr "Invitar"
 
-#: ../src/protocols/sametime/sametime.c:3547
+#: ../src/protocols/sametime/sametime.c:3540
 msgid "Invite to Conference..."
 msgstr "Invitar a unha conferencia.."
 
-#: ../src/protocols/sametime/sametime.c:3552
+#: ../src/protocols/sametime/sametime.c:3545
 msgid "Send TEST Announcement"
 msgstr "Enviar anuncio de PROBA"
 
-#: ../src/protocols/sametime/sametime.c:3599
+#: ../src/protocols/sametime/sametime.c:3592
 msgid "No Sametime Community Server specified"
 msgstr "Non se especificou o servidor de comunidade Sametime"
 
-#: ../src/protocols/sametime/sametime.c:3621
+#: ../src/protocols/sametime/sametime.c:3614
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -10038,62 +10135,62 @@
 "Non se configurou ningún enderezo IP ou nome de equipo para a conta "
 "Meanwhile %s. Introduza un máis abaixo para continuar o rexistro."
 
-#: ../src/protocols/sametime/sametime.c:3626
+#: ../src/protocols/sametime/sametime.c:3619
 msgid "Meanwhile Connection Setup"
 msgstr "Configuración da conexión Meanwhile"
 
-#: ../src/protocols/sametime/sametime.c:3627
+#: ../src/protocols/sametime/sametime.c:3620
 msgid "No Sametime Community Server Specified"
 msgstr "Non se especificou un servidor de comunidade Sametime"
 
-#: ../src/protocols/sametime/sametime.c:4084
+#: ../src/protocols/sametime/sametime.c:4077
 msgid "<b>External User</b><br>"
 msgstr "<b>Usuario externo</b><br>"
 
-#: ../src/protocols/sametime/sametime.c:4087
+#: ../src/protocols/sametime/sametime.c:4080
 #, c-format
 msgid "<b>User ID:</b> %s<br>"
 msgstr "<b>ID de usuario:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:4093
+#: ../src/protocols/sametime/sametime.c:4086
 #, c-format
 msgid "<b>Full Name:</b> %s<br>"
 msgstr "<b>Nome completo:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:4099
+#: ../src/protocols/sametime/sametime.c:4092
 msgid "<b>Last Known Client:</b> "
 msgstr "<b>Último cliente coñecido:</b>"
 
-#: ../src/protocols/sametime/sametime.c:4107
+#: ../src/protocols/sametime/sametime.c:4100
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Descoñecido (0x%04x)<br>"
 
-#: ../src/protocols/sametime/sametime.c:4114
+#: ../src/protocols/sametime/sametime.c:4107
 #, c-format
 msgid "<b>Supports:</b> %s<br>"
 msgstr "<b>Soporta:</b> %s<br>"
 
-#: ../src/protocols/sametime/sametime.c:4120
+#: ../src/protocols/sametime/sametime.c:4113
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>Estado:</b> %s"
 
-#: ../src/protocols/sametime/sametime.c:4263
-#: ../src/protocols/sametime/sametime.c:5426
+#: ../src/protocols/sametime/sametime.c:4256
+#: ../src/protocols/sametime/sametime.c:5419
 msgid "User Name"
 msgstr "Nome de usuario"
 
-#: ../src/protocols/sametime/sametime.c:4266
-#: ../src/protocols/sametime/sametime.c:5429
+#: ../src/protocols/sametime/sametime.c:4259
+#: ../src/protocols/sametime/sametime.c:5422
 msgid "Sametime ID"
 msgstr "ID Sametime"
 
-#: ../src/protocols/sametime/sametime.c:4290
+#: ../src/protocols/sametime/sametime.c:4283
 msgid "An ambiguous user ID was entered"
 msgstr "Introduciuse un ID de usuario ambiguo"
 
-#: ../src/protocols/sametime/sametime.c:4291
+#: ../src/protocols/sametime/sametime.c:4284
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -10103,15 +10200,15 @@
 "favor seleccione o usuario da lista amosada para engadilo a súa lista de "
 "amigos."
 
-#: ../src/protocols/sametime/sametime.c:4296
+#: ../src/protocols/sametime/sametime.c:4289
 msgid "Select User"
 msgstr "Seleccionar usuario"
 
-#: ../src/protocols/sametime/sametime.c:4366
+#: ../src/protocols/sametime/sametime.c:4359
 msgid "Unable to add user: user not found"
 msgstr "Non se puido engadir ao usuario: usuario non atopado"
 
-#: ../src/protocols/sametime/sametime.c:4368
+#: ../src/protocols/sametime/sametime.c:4361
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
@@ -10120,11 +10217,11 @@
 "O identificador '%s' non coincide con ningún usuario na comunidade Sametime. "
 "Eliminouse esta entrada da lista de amigos."
 
-#: ../src/protocols/sametime/sametime.c:4373
+#: ../src/protocols/sametime/sametime.c:4366
 msgid "Unable to add user"
 msgstr "Imposible engadir ao usuario"
 
-#: ../src/protocols/sametime/sametime.c:4945
+#: ../src/protocols/sametime/sametime.c:4938
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -10133,63 +10230,63 @@
 "Erro lendo o ficheiro %s: \n"
 "%s.\n"
 
-#: ../src/protocols/sametime/sametime.c:5076
+#: ../src/protocols/sametime/sametime.c:5069
 msgid "Remotely Stored Buddy List"
 msgstr "Lista de amigos remotamente almacenada"
 
-#: ../src/protocols/sametime/sametime.c:5081
+#: ../src/protocols/sametime/sametime.c:5074
 msgid "Buddy List Storage Mode"
 msgstr "Modo de almacenamiento da lista de amigos"
 
-#: ../src/protocols/sametime/sametime.c:5084
+#: ../src/protocols/sametime/sametime.c:5077
 msgid "Local Buddy List Only"
 msgstr "Só lista de amigos local"
 
-#: ../src/protocols/sametime/sametime.c:5086
+#: ../src/protocols/sametime/sametime.c:5079
 msgid "Merge List from Server"
 msgstr "Combinar lista desde o servidor"
 
-#: ../src/protocols/sametime/sametime.c:5088
+#: ../src/protocols/sametime/sametime.c:5081
 msgid "Merge and Save List to Server"
 msgstr "Combinar e gardar a lista no servidor"
 
-#: ../src/protocols/sametime/sametime.c:5090
+#: ../src/protocols/sametime/sametime.c:5083
 msgid "Synchronize List with Server"
 msgstr "Sincronizar a lista co servidor"
 
-#: ../src/protocols/sametime/sametime.c:5139
+#: ../src/protocols/sametime/sametime.c:5132
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Importar a lista Sametime para a conta %s"
 
-#: ../src/protocols/sametime/sametime.c:5178
+#: ../src/protocols/sametime/sametime.c:5171
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Exportar a lista Sametime para a conta %s"
 
-#: ../src/protocols/sametime/sametime.c:5231
+#: ../src/protocols/sametime/sametime.c:5224
 msgid "Unable to add group: group exists"
 msgstr "Imposible engadir o grupo: o grupo existe"
 
-#: ../src/protocols/sametime/sametime.c:5232
+#: ../src/protocols/sametime/sametime.c:5225
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "Un grupo chamado '%s' xa existe na súa lista de amigos."
 
-#: ../src/protocols/sametime/sametime.c:5235
-#: ../src/protocols/sametime/sametime.c:5364
+#: ../src/protocols/sametime/sametime.c:5228
+#: ../src/protocols/sametime/sametime.c:5357
 msgid "Unable to add group"
 msgstr "Imposible engadir o grupo"
 
-#: ../src/protocols/sametime/sametime.c:5294
+#: ../src/protocols/sametime/sametime.c:5287
 msgid "Possible Matches"
 msgstr "Coincidencias posibles"
 
-#: ../src/protocols/sametime/sametime.c:5310
+#: ../src/protocols/sametime/sametime.c:5303
 msgid "Notes Address Book group results"
 msgstr "Resultados das notas dos grupos do libro de enderezos"
 
-#: ../src/protocols/sametime/sametime.c:5311
+#: ../src/protocols/sametime/sametime.c:5304
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -10200,15 +10297,15 @@
 "de enderezos. Escolla o grupo mái apropiado da lista que se amosa abaixo "
 "para engadilo a súa lista de amigos."
 
-#: ../src/protocols/sametime/sametime.c:5316
+#: ../src/protocols/sametime/sametime.c:5309
 msgid "Select Notes Address Book"
 msgstr "Seleccionar notas do libro de enderezos"
 
-#: ../src/protocols/sametime/sametime.c:5358
+#: ../src/protocols/sametime/sametime.c:5351
 msgid "Unable to add group: group not found"
 msgstr "Imposible engadir o grupo: grupo non atopado"
 
-#: ../src/protocols/sametime/sametime.c:5360
+#: ../src/protocols/sametime/sametime.c:5353
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
@@ -10217,11 +10314,11 @@
 "O identificador '%s' non coincide con ningunha das notas dos grupos do libro "
 "de enderezos nas súa comunidade Sametime."
 
-#: ../src/protocols/sametime/sametime.c:5401
+#: ../src/protocols/sametime/sametime.c:5394
 msgid "Notes Address Book Group"
 msgstr "Notas do grupo do libro de enderezos"
 
-#: ../src/protocols/sametime/sametime.c:5402
+#: ../src/protocols/sametime/sametime.c:5395
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
@@ -10229,12 +10326,12 @@
 "Introduza o nome dun grupo do libro de enderezos Notes no campo a "
 "continuación para engadir o grupo e os seus membros na súa lista de amigos."
 
-#: ../src/protocols/sametime/sametime.c:5450
+#: ../src/protocols/sametime/sametime.c:5443
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Resultados da busca para '%s'"
 
-#: ../src/protocols/sametime/sametime.c:5451
+#: ../src/protocols/sametime/sametime.c:5444
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -10245,24 +10342,24 @@
 "continuación. Pode engadir estos usuarios a súa lista de amigos ou "
 "enviarlles mensaxes cos botóns de accións amosados abaixo."
 
-#: ../src/protocols/sametime/sametime.c:5483
+#: ../src/protocols/sametime/sametime.c:5476
 msgid "No matches"
 msgstr "Non houbo coincidencia"
 
-#: ../src/protocols/sametime/sametime.c:5484
+#: ../src/protocols/sametime/sametime.c:5477
 #, 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."
 
-#: ../src/protocols/sametime/sametime.c:5488
+#: ../src/protocols/sametime/sametime.c:5481
 msgid "No Matches"
 msgstr "Non houbo coincidencia"
 
-#: ../src/protocols/sametime/sametime.c:5525
+#: ../src/protocols/sametime/sametime.c:5518
 msgid "Search for a user"
 msgstr "Procurar un usuario"
 
-#: ../src/protocols/sametime/sametime.c:5526
+#: ../src/protocols/sametime/sametime.c:5519
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
@@ -10270,32 +10367,32 @@
 "Introduza o nome ou identificador parcial no campo amosado a continuación "
 "para procurar usuarios coincidentes na súa comunidade Sametime."
 
-#: ../src/protocols/sametime/sametime.c:5529
+#: ../src/protocols/sametime/sametime.c:5522
 msgid "User Search"
 msgstr "Busca de usuario"
 
-#: ../src/protocols/sametime/sametime.c:5541
+#: ../src/protocols/sametime/sametime.c:5534
 msgid "Import Sametime List..."
 msgstr "Importar a lista Sametime..."
 
-#: ../src/protocols/sametime/sametime.c:5545
+#: ../src/protocols/sametime/sametime.c:5538
 msgid "Export Sametime List..."
 msgstr "Exportar a lista Sametime..."
 
-#: ../src/protocols/sametime/sametime.c:5549
+#: ../src/protocols/sametime/sametime.c:5542
 msgid "Add Notes Address Book Group..."
 msgstr "Engadir notas ao grupo do libro de enderezos..."
 
-#: ../src/protocols/sametime/sametime.c:5553
+#: ../src/protocols/sametime/sametime.c:5546
 msgid "User Search..."
 msgstr "Busca de usuario..."
 
-#: ../src/protocols/sametime/sametime.c:5650
+#: ../src/protocols/sametime/sametime.c:5643
 msgid "Force login (ignore server redirects)"
 msgstr "Forzar conexión (ignorar redireccións do servidor)"
 
 #. pretend to be Sametime Connect
-#: ../src/protocols/sametime/sametime.c:5660
+#: ../src/protocols/sametime/sametime.c:5653
 msgid "Hide client identity"
 msgstr "Agochar identificación do cliente"
 
@@ -10398,7 +10495,7 @@
 msgstr "Amosar clave pública"
 
 #: ../src/protocols/silc/buddy.c:635 ../src/protocols/silc/buddy.c:1030
-#: ../src/protocols/silc/chat.c:236
+#: ../src/protocols/silc/chat.c:237
 msgid "Could not load public key"
 msgstr "Non se puido cargar a clave pública"
 
@@ -10591,7 +10688,7 @@
 msgid "Kill User"
 msgstr "Matar usuario"
 
-#: ../src/protocols/silc/buddy.c:1670 ../src/protocols/silc/chat.c:971
+#: ../src/protocols/silc/buddy.c:1670 ../src/protocols/silc/chat.c:972
 msgid "Draw On Whiteboard"
 msgstr "Escribir no encerado"
 
@@ -10604,7 +10701,7 @@
 msgid "Channel %s does not exist in the network"
 msgstr "Non existe o canle %s na rede"
 
-#: ../src/protocols/silc/chat.c:81 ../src/protocols/silc/chat.c:173
+#: ../src/protocols/silc/chat.c:81 ../src/protocols/silc/chat.c:174
 msgid "Channel Information"
 msgstr "Información do canle"
 
@@ -10632,48 +10729,49 @@
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>Cifrado do canle:</b> %s"
 
-#: ../src/protocols/silc/chat.c:141
+#. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
+#: ../src/protocols/silc/chat.c:142
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>HMAC do canle:</b> %s"
 
-#: ../src/protocols/silc/chat.c:146
+#: ../src/protocols/silc/chat.c:147
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Tópico do canle:</b><br>%s"
 
-#: ../src/protocols/silc/chat.c:151
+#: ../src/protocols/silc/chat.c:152
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Modos do canle:</b> "
 
-#: ../src/protocols/silc/chat.c:164
+#: ../src/protocols/silc/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Pegada dactilar do fundador:</b><br>%s"
 
-#: ../src/protocols/silc/chat.c:165
+#: ../src/protocols/silc/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>Pegada Babble do fundador:</b><br>%s"
 
-#: ../src/protocols/silc/chat.c:235
+#: ../src/protocols/silc/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "Engadir clave pública do canle"
 
 #. Add new public key
-#: ../src/protocols/silc/chat.c:290
+#: ../src/protocols/silc/chat.c:291
 msgid "Open Public Key..."
 msgstr "Abrir clave pública..."
 
-#: ../src/protocols/silc/chat.c:399
+#: ../src/protocols/silc/chat.c:400
 msgid "Channel Passphrase"
 msgstr "Contrasinal do canle"
 
-#: ../src/protocols/silc/chat.c:406
+#: ../src/protocols/silc/chat.c:407
 msgid "Channel Public Keys List"
 msgstr "Lista de claves públicas do canle"
 
-#: ../src/protocols/silc/chat.c:411
+#: ../src/protocols/silc/chat.c:412
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -10687,128 +10785,128 @@
 "conectarse os usuarios que están na lista de claves públicas se se utilizan "
 "claves públicas para o acceso."
 
-#: ../src/protocols/silc/chat.c:420 ../src/protocols/silc/chat.c:421
-#: ../src/protocols/silc/chat.c:458 ../src/protocols/silc/chat.c:459
-#: ../src/protocols/silc/chat.c:905
+#: ../src/protocols/silc/chat.c:421 ../src/protocols/silc/chat.c:422
+#: ../src/protocols/silc/chat.c:459 ../src/protocols/silc/chat.c:460
+#: ../src/protocols/silc/chat.c:906
 msgid "Channel Authentication"
 msgstr "Autenticación do canle"
 
-#: ../src/protocols/silc/chat.c:422 ../src/protocols/silc/chat.c:460
+#: ../src/protocols/silc/chat.c:423 ../src/protocols/silc/chat.c:461
 msgid "Add / Remove"
 msgstr "Engadir / Eliminar"
 
-#: ../src/protocols/silc/chat.c:577
+#: ../src/protocols/silc/chat.c:578
 msgid "Group Name"
 msgstr "Nome do grupo"
 
-#: ../src/protocols/silc/chat.c:581 ../src/protocols/silc/ops.c:1908
+#: ../src/protocols/silc/chat.c:582 ../src/protocols/silc/ops.c:1908
 #: ../src/protocols/silc/silc.c:948
 msgid "Passphrase"
 msgstr "Contrasinal"
 
-#: ../src/protocols/silc/chat.c:592
+#: ../src/protocols/silc/chat.c:593
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "Introduza o nome do grupo de canles privados %s e un contrasinal."
 
-#: ../src/protocols/silc/chat.c:594
+#: ../src/protocols/silc/chat.c:595
 msgid "Add Channel Private Group"
 msgstr "Engadir grupo de canles privados"
 
-#: ../src/protocols/silc/chat.c:721
+#: ../src/protocols/silc/chat.c:722
 msgid "User Limit"
 msgstr "Límite de usuarios"
 
-#: ../src/protocols/silc/chat.c:722
+#: ../src/protocols/silc/chat.c:723
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 "Fixar un límite de usuarios no canle. Poñer a cero para quitar o límite de "
 "usuarios."
 
-#: ../src/protocols/silc/chat.c:877
+#: ../src/protocols/silc/chat.c:878
 msgid "Get Info"
 msgstr "Obter información"
 
-#: ../src/protocols/silc/chat.c:885
+#: ../src/protocols/silc/chat.c:886
 msgid "Invite List"
 msgstr "Lista de invitados"
 
-#: ../src/protocols/silc/chat.c:890
+#: ../src/protocols/silc/chat.c:891
 msgid "Ban List"
 msgstr "Lista de vetados"
 
-#: ../src/protocols/silc/chat.c:898
+#: ../src/protocols/silc/chat.c:899
 msgid "Add Private Group"
 msgstr "Engadir grupo privado"
 
-#: ../src/protocols/silc/chat.c:911
+#: ../src/protocols/silc/chat.c:912
 msgid "Reset Permanent"
 msgstr "Borrado permanente"
 
-#: ../src/protocols/silc/chat.c:916
+#: ../src/protocols/silc/chat.c:917
 msgid "Set Permanent"
 msgstr "Fixado permanente"
 
-#: ../src/protocols/silc/chat.c:924
+#: ../src/protocols/silc/chat.c:925
 msgid "Set User Limit"
 msgstr "Establecer límite de usuarios"
 
-#: ../src/protocols/silc/chat.c:930
+#: ../src/protocols/silc/chat.c:931
 msgid "Reset Topic Restriction"
 msgstr "Quitar restriccións de tópicos"
 
-#: ../src/protocols/silc/chat.c:935
+#: ../src/protocols/silc/chat.c:936
 msgid "Set Topic Restriction"
 msgstr "Establecer restriccións de tópico"
 
-#: ../src/protocols/silc/chat.c:942
+#: ../src/protocols/silc/chat.c:943
 msgid "Reset Private Channel"
 msgstr "Limpar canle privado"
 
-#: ../src/protocols/silc/chat.c:947
+#: ../src/protocols/silc/chat.c:948
 msgid "Set Private Channel"
 msgstr "Establecer canle privado"
 
-#: ../src/protocols/silc/chat.c:954
+#: ../src/protocols/silc/chat.c:955
 msgid "Reset Secret Channel"
 msgstr "Limpar canle secreto"
 
-#: ../src/protocols/silc/chat.c:959
+#: ../src/protocols/silc/chat.c:960
 msgid "Set Secret Channel"
 msgstr "Establecer canle secreto"
 
-#: ../src/protocols/silc/chat.c:1033
+#: ../src/protocols/silc/chat.c:1034
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "É o fundador do canle en <I>%s</I>"
 
-#: ../src/protocols/silc/chat.c:1037
+#: ../src/protocols/silc/chat.c:1038
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "O fundador do canle en <I>%s</I> é <I>%s</I>"
 
-#: ../src/protocols/silc/chat.c:1096
+#: ../src/protocols/silc/chat.c:1097
 #, c-format
 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
+#: ../src/protocols/silc/chat.c:1099
 msgid "Join Private Group"
 msgstr "Unirse a un grupo privado"
 
-#: ../src/protocols/silc/chat.c:1099
+#: ../src/protocols/silc/chat.c:1100
 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:1156
+#: ../src/protocols/silc/chat.c:1294 ../src/protocols/silc/silc.c:1156
 msgid "Call Command"
 msgstr "Comando de chamada"
 
-#: ../src/protocols/silc/chat.c:1293 ../src/protocols/silc/silc.c:1156
+#: ../src/protocols/silc/chat.c:1294 ../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:1157
+#: ../src/protocols/silc/chat.c:1295 ../src/protocols/silc/silc.c:1157
 msgid "Unknown command"
 msgstr "Comando descoñecido"
 
@@ -11677,28 +11775,28 @@
 msgstr "Encerado"
 
 #. TODO: do we really want to disconnect on a failure to write?
-#: ../src/protocols/simple/simple.c:410
+#: ../src/protocols/simple/simple.c:411
 msgid "Could not write"
 msgstr "Non se puido escribir"
 
-#: ../src/protocols/simple/simple.c:425 ../src/protocols/simple/simple.c:1424
+#: ../src/protocols/simple/simple.c:426 ../src/protocols/simple/simple.c:1425
 msgid "Could not connect"
 msgstr "Non se puido conectar"
 
-#: ../src/protocols/simple/simple.c:996
+#: ../src/protocols/simple/simple.c:997
 msgid "Wrong Password"
 msgstr "Contrasinal erróneo"
 
-#: ../src/protocols/simple/simple.c:1455 ../src/protocols/simple/simple.c:1494
-#: ../src/protocols/simple/simple.c:1506 ../src/protocols/simple/simple.c:1564
+#: ../src/protocols/simple/simple.c:1456 ../src/protocols/simple/simple.c:1495
+#: ../src/protocols/simple/simple.c:1507 ../src/protocols/simple/simple.c:1565
 msgid "Could not create listen socket"
 msgstr "Non se puido crear o socket para escoitar"
 
-#: ../src/protocols/simple/simple.c:1476
+#: ../src/protocols/simple/simple.c:1477
 msgid "Couldn't resolve host"
 msgstr "Non se puido resolver o servidor"
 
-#: ../src/protocols/simple/simple.c:1586
+#: ../src/protocols/simple/simple.c:1587
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "Os alcumes de SIP non poden ter espazos en branco nin o símbolo @"
 
@@ -11710,36 +11808,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../src/protocols/simple/simple.c:1748
+#: ../src/protocols/simple/simple.c:1749
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "Complemento de protocolo SIP/SIMPLE"
 
 #. *  summary
-#: ../src/protocols/simple/simple.c:1749
+#: ../src/protocols/simple/simple.c:1750
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "O complemento de protocolo SIP/SIMPLE"
 
-#: ../src/protocols/simple/simple.c:1771
+#: ../src/protocols/simple/simple.c:1772
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Estado público (nota: todos poderán velo)"
 
-#: ../src/protocols/simple/simple.c:1777
+#: ../src/protocols/simple/simple.c:1778
 msgid "Use UDP"
 msgstr "Usar UDP"
 
-#: ../src/protocols/simple/simple.c:1779
+#: ../src/protocols/simple/simple.c:1780
 msgid "Use proxy"
 msgstr "Usar proxy"
 
-#: ../src/protocols/simple/simple.c:1781
+#: ../src/protocols/simple/simple.c:1782
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../src/protocols/simple/simple.c:1783
+#: ../src/protocols/simple/simple.c:1784
 msgid "Auth User"
 msgstr "Usuario de autenticación"
 
-#: ../src/protocols/simple/simple.c:1785
+#: ../src/protocols/simple/simple.c:1786
 msgid "Auth Domain"
 msgstr "Dominio de autenticación"
 
@@ -11974,23 +12072,15 @@
 msgid "TOC Protocol Plugin"
 msgstr "Complemento de protocolo TOC"
 
-#: ../src/protocols/toc/toc.c:2340
-msgid "TOC host"
-msgstr "Servidor TOC"
-
-#: ../src/protocols/toc/toc.c:2344
-msgid "TOC port"
-msgstr "Porto TOC"
-
-#: ../src/protocols/yahoo/yahoo.c:712
+#: ../src/protocols/yahoo/yahoo.c:710
 msgid "Your Yahoo! message did not get sent."
 msgstr "Súa mensaxe Yahoo! non se enviou."
 
-#: ../src/protocols/yahoo/yahoo.c:766 ../src/protocols/yahoo/yahoo.c:3569
+#: ../src/protocols/yahoo/yahoo.c:764 ../src/protocols/yahoo/yahoo.c:3564
 msgid "Buzz!!"
 msgstr "Buzz!!"
 
-#: ../src/protocols/yahoo/yahoo.c:811
+#: ../src/protocols/yahoo/yahoo.c:809
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Mensaxe do sistema Yahoo! para %s:"
@@ -11998,23 +12088,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:907
+#: ../src/protocols/yahoo/yahoo.c:905
 #, 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:913
+#: ../src/protocols/yahoo/yahoo.c:911
 msgid "Message (optional) :"
 msgstr "Mensaxe (opcional) :"
 
-#: ../src/protocols/yahoo/yahoo.c:955
+#: ../src/protocols/yahoo/yahoo.c:953
 #, 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:958
+#: ../src/protocols/yahoo/yahoo.c:956
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -12023,11 +12113,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:961
+#: ../src/protocols/yahoo/yahoo.c:959
 msgid "Add buddy rejected"
 msgstr "Rechazouse a adición do amigo"
 
-#: ../src/protocols/yahoo/yahoo.c:1704
+#: ../src/protocols/yahoo/yahoo.c:1702
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -12038,11 +12128,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:1707
+#: ../src/protocols/yahoo/yahoo.c:1705
 msgid "Failed Yahoo! Authentication"
 msgstr "Fallou a autenticación en Yahoo!"
 
-#: ../src/protocols/yahoo/yahoo.c:1773
+#: ../src/protocols/yahoo/yahoo.c:1771
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -12051,19 +12141,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:1776
+#: ../src/protocols/yahoo/yahoo.c:1774
 msgid "Ignore buddy?"
 msgstr "Ignorar amigo?"
 
-#: ../src/protocols/yahoo/yahoo.c:1810
+#: ../src/protocols/yahoo/yahoo.c:1808
 msgid "Invalid username."
 msgstr "Nome de usuario inválido."
 
-#: ../src/protocols/yahoo/yahoo.c:1821
+#: ../src/protocols/yahoo/yahoo.c:1819
 msgid "Normal authentication failed!"
 msgstr "Fallou a autenticación habitual!"
 
-#: ../src/protocols/yahoo/yahoo.c:1822
+#: ../src/protocols/yahoo/yahoo.c:1820
 msgid ""
 "The normal authentication method has failed. This means either your password "
 "is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
@@ -12075,138 +12165,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:1830
+#: ../src/protocols/yahoo/yahoo.c:1828
 msgid "Incorrect password."
 msgstr "Contrasinal incorrecto."
 
-#: ../src/protocols/yahoo/yahoo.c:1833
+#: ../src/protocols/yahoo/yahoo.c:1831
 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:1836
+#: ../src/protocols/yahoo/yahoo.c:1834
 #, 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:1890
+#: ../src/protocols/yahoo/yahoo.c:1888
 #, 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:1893
+#: ../src/protocols/yahoo/yahoo.c:1891
 msgid "Could not add buddy to server list"
 msgstr "Non se puido engadir o amigo á lista do servidor"
 
-#: ../src/protocols/yahoo/yahoo.c:2012
+#: ../src/protocols/yahoo/yahoo.c:2010
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audible %s/%s/%s.swf ] %s"
 
-#: ../src/protocols/yahoo/yahoo.c:2151 ../src/protocols/yahoo/yahoo.c:2298
-#: ../src/protocols/yahoo/yahoo.c:2313 ../src/protocols/yahoo/ycht.c:472
+#: ../src/protocols/yahoo/yahoo.c:2149 ../src/protocols/yahoo/yahoo.c:2296
+#: ../src/protocols/yahoo/yahoo.c:2311 ../src/protocols/yahoo/ycht.c:472
 msgid "Unable to read"
 msgstr "Non se puido ler"
 
-#: ../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/yahoo.c:2335 ../src/protocols/yahoo/yahoo.c:2492
+#: ../src/protocols/yahoo/yahoo.c:2594 ../src/protocols/yahoo/yahoo.c:2604
 #: ../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:2715 ../src/protocols/yahoo/yahoo.c:3302
+#: ../src/protocols/yahoo/yahoo.c:2711 ../src/protocols/yahoo/yahoo.c:3298
 msgid "Not at Home"
 msgstr "Fora da casa"
 
-#: ../src/protocols/yahoo/yahoo.c:2717 ../src/protocols/yahoo/yahoo.c:3305
+#: ../src/protocols/yahoo/yahoo.c:2713 ../src/protocols/yahoo/yahoo.c:3301
 msgid "Not at Desk"
 msgstr "Lexos do escritorio"
 
-#: ../src/protocols/yahoo/yahoo.c:2719 ../src/protocols/yahoo/yahoo.c:3308
+#: ../src/protocols/yahoo/yahoo.c:2715 ../src/protocols/yahoo/yahoo.c:3304
 msgid "Not in Office"
 msgstr "Fora da oficina"
 
-#: ../src/protocols/yahoo/yahoo.c:2723 ../src/protocols/yahoo/yahoo.c:3314
+#: ../src/protocols/yahoo/yahoo.c:2719 ../src/protocols/yahoo/yahoo.c:3310
 msgid "On Vacation"
 msgstr "De vacacións"
 
-#: ../src/protocols/yahoo/yahoo.c:2727 ../src/protocols/yahoo/yahoo.c:3320
+#: ../src/protocols/yahoo/yahoo.c:2723 ../src/protocols/yahoo/yahoo.c:3316
 msgid "Stepped Out"
 msgstr "Abandonou"
 
-#: ../src/protocols/yahoo/yahoo.c:2820 ../src/protocols/yahoo/yahoo.c:2850
+#: ../src/protocols/yahoo/yahoo.c:2816 ../src/protocols/yahoo/yahoo.c:2846
 msgid "Not on server list"
 msgstr "Non está na lista do servidor"
 
-#: ../src/protocols/yahoo/yahoo.c:2867 ../src/protocols/yahoo/yahoo.c:2926
+#: ../src/protocols/yahoo/yahoo.c:2863 ../src/protocols/yahoo/yahoo.c:2922
 msgid "Appear Online"
 msgstr "Parecer conectado"
 
-#: ../src/protocols/yahoo/yahoo.c:2870 ../src/protocols/yahoo/yahoo.c:2947
+#: ../src/protocols/yahoo/yahoo.c:2866 ../src/protocols/yahoo/yahoo.c:2943
 msgid "Appear Permanently Offline"
 msgstr "Parecer permanentemente desconectado"
 
-#: ../src/protocols/yahoo/yahoo.c:2889
+#: ../src/protocols/yahoo/yahoo.c:2885
 msgid "Presence"
 msgstr "Presencia"
 
-#: ../src/protocols/yahoo/yahoo.c:2932
+#: ../src/protocols/yahoo/yahoo.c:2928
 msgid "Appear Offline"
 msgstr "Parecer desconectado"
 
-#: ../src/protocols/yahoo/yahoo.c:2941
+#: ../src/protocols/yahoo/yahoo.c:2937
 msgid "Don't Appear Permanently Offline"
 msgstr "Non aparecer sempre desconectado"
 
-#: ../src/protocols/yahoo/yahoo.c:2989
+#: ../src/protocols/yahoo/yahoo.c:2985
 msgid "Join in Chat"
 msgstr "Unirse a un chat"
 
-#: ../src/protocols/yahoo/yahoo.c:2995
+#: ../src/protocols/yahoo/yahoo.c:2991
 msgid "Initiate Conference"
 msgstr "Iniciar conferencia"
 
-#: ../src/protocols/yahoo/yahoo.c:3023
+#: ../src/protocols/yahoo/yahoo.c:3019
 msgid "Presence Settings"
 msgstr "Configuración do entorno"
 
-#: ../src/protocols/yahoo/yahoo.c:3029
+#: ../src/protocols/yahoo/yahoo.c:3025
 msgid "Start Doodling"
 msgstr "Iniciar Doodle"
 
-#: ../src/protocols/yahoo/yahoo.c:3061
+#: ../src/protocols/yahoo/yahoo.c:3057
 msgid "Active which ID?"
 msgstr "Que ID quere activar?"
 
-#: ../src/protocols/yahoo/yahoo.c:3070
+#: ../src/protocols/yahoo/yahoo.c:3066
 msgid "Join who in chat?"
 msgstr "Xuntarse con quen nun chat?"
 
-#: ../src/protocols/yahoo/yahoo.c:3080
+#: ../src/protocols/yahoo/yahoo.c:3076
 msgid "Activate ID..."
 msgstr "Activar ID..."
 
-#: ../src/protocols/yahoo/yahoo.c:3084
+#: ../src/protocols/yahoo/yahoo.c:3080
 msgid "Join User in Chat..."
 msgstr "Xuntarse cun usuario nun chat..."
 
-#: ../src/protocols/yahoo/yahoo.c:3628
+#: ../src/protocols/yahoo/yahoo.c:3623
 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:3633
+#: ../src/protocols/yahoo/yahoo.c:3628
 msgid "list: List rooms on the Yahoo network"
 msgstr "list:  Amosar as canles da rede Yahoo"
 
-#: ../src/protocols/yahoo/yahoo.c:3637
+#: ../src/protocols/yahoo/yahoo.c:3632
 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:3641
+#: ../src/protocols/yahoo/yahoo.c:3636
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Solicitar ao usuario o comezo dunha sesión Doodle"
 
@@ -12220,57 +12310,59 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/yahoo/yahoo.c:3734 ../src/protocols/yahoo/yahoo.c:3736
+#: ../src/protocols/yahoo/yahoo.c:3729 ../src/protocols/yahoo/yahoo.c:3731
 msgid "Yahoo Protocol Plugin"
 msgstr "Complemento de protocolo Yahoo"
 
-#: ../src/protocols/yahoo/yahoo.c:3753
+#: ../src/protocols/yahoo/yahoo.c:3748
 msgid "Yahoo Japan"
 msgstr "Yahoo Xapón"
 
-#: ../src/protocols/yahoo/yahoo.c:3756
-msgid "Pager host"
-msgstr "Servidor de buscapersoas"
-
-#: ../src/protocols/yahoo/yahoo.c:3759
-msgid "Japan Pager host"
+#: ../src/protocols/yahoo/yahoo.c:3751
+#, fuzzy
+msgid "Pager server"
+msgstr "Servidor de conexión"
+
+#: ../src/protocols/yahoo/yahoo.c:3754
+#, fuzzy
+msgid "Japan Pager server"
 msgstr "Servidor de buscapersoas xaponés"
 
-#: ../src/protocols/yahoo/yahoo.c:3762
+#: ../src/protocols/yahoo/yahoo.c:3757
 msgid "Pager port"
 msgstr "Porto do buscapersoas"
 
-#: ../src/protocols/yahoo/yahoo.c:3765
-msgid "File transfer host"
+#: ../src/protocols/yahoo/yahoo.c:3760
+msgid "File transfer server"
 msgstr "Servidor de transferencia de ficheiros"
 
-#: ../src/protocols/yahoo/yahoo.c:3768
-msgid "Japan file transfer host"
+#: ../src/protocols/yahoo/yahoo.c:3763
+msgid "Japan file transfer server"
 msgstr "Servidor de transferencia de ficheiros xaponés"
 
-#: ../src/protocols/yahoo/yahoo.c:3771
+#: ../src/protocols/yahoo/yahoo.c:3766
 msgid "File transfer port"
 msgstr "Porto de transferencia de ficheiros"
 
-#: ../src/protocols/yahoo/yahoo.c:3774
+#: ../src/protocols/yahoo/yahoo.c:3769
 msgid "Chat room locale"
 msgstr "Ubicación da sala de chat"
 
-#: ../src/protocols/yahoo/yahoo.c:3777
+#: ../src/protocols/yahoo/yahoo.c:3772
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignorar as invitacións a salas de conferencias ou chat"
 
-#: ../src/protocols/yahoo/yahoo.c:3781
+#: ../src/protocols/yahoo/yahoo.c:3776
 msgid "Chat room list URL"
 msgstr "Url de lista de salas de chat"
 
-#: ../src/protocols/yahoo/yahoo.c:3784
-msgid "YCHT host"
-msgstr "Servidor YCHT"
-
-#: ../src/protocols/yahoo/yahoo.c:3787
-msgid "YCHT port"
-msgstr "Porto YCHT"
+#: ../src/protocols/yahoo/yahoo.c:3779
+msgid "Yahoo Chat server"
+msgstr "Servidor de chat de Yahoo"
+
+#: ../src/protocols/yahoo/yahoo.c:3782
+msgid "Yahoo Chat port"
+msgstr "Porto de chat de Yahoo"
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
@@ -12620,14 +12712,14 @@
 msgid "Exposure"
 msgstr "Exposición"
 
-#: ../src/proxy.c:1216 ../src/proxy.c:1272 ../src/proxy.c:1320
-#: ../src/proxy.c:1347
+#: ../src/proxy.c:1217 ../src/proxy.c:1273 ../src/proxy.c:1321
+#: ../src/proxy.c:1348
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "Erro de conexión no proxy %d"
 
 #. Forbidden
-#: ../src/proxy.c:1336
+#: ../src/proxy.c:1337
 #, c-format
 msgid "Access denied: proxy server forbids port %d tunnelling."
 msgstr "Acceso denegado: o servidor proxy non permite túneles no porto %d."
@@ -12642,11 +12734,11 @@
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
-#: ../src/savedstatuses.c:44
+#: ../src/savedstatuses.c:45
 msgid "I'm not here right now"
 msgstr "Non estou aquí agora"
 
-#: ../src/savedstatuses.c:519
+#: ../src/savedstatuses.c:524
 msgid "saved statuses"
 msgstr "estados gardados"
 
--- a/po/gu.po	Wed Aug 09 06:23:18 2006 +0000
+++ b/po/gu.po	Wed Aug 09 14:47:37 2006 +0000
@@ -1,38 +1,39 @@
+# translation of gaim_gu.po to Gujarati
 # translation of gu.po to Gujarati
 # translation of gaim.po to Gujarati
-# Ankit Patel <ankit644@yahoo.com>, 2005.
-msgid ""
-msgstr ""
-"Project-Id-Version: gu\n"
+# Ankit Patel <ankit644@yahoo.com>, 2005, 2006.
+# Kartik Mistry <kartik.mistry@gmail.com>, 2006.
+msgid ""
+msgstr ""
+"Project-Id-Version: gaim_gu\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2005-10-27 16:12-0400\n"
-"PO-Revision-Date: 2005-08-26 16:14+0530\n"
+"PO-Revision-Date: 2006-07-03 11:31+0530\n"
 "Last-Translator: Ankit Patel <ankit644@yahoo.com>\n"
 "Language-Team: Gujarati <indianoss-gujarati@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n\n"
 "\n"
 "\n"
 
 #: plugins/autorecon.c:301
 msgid "Error Message Suppression"
-msgstr "ભૂલ સંદેશા દબાણ"
+msgstr "ક્ષતિ સંદેશા દબાણ"
 
 #: plugins/autorecon.c:305
 msgid "Hide Disconnect Errors"
-msgstr "જોડાણ તોડી નાંખેલ ભૂલો છુપાવો"
+msgstr "જોડાણ તોડી નાંખેલ ક્ષતિઓ છુપાવો"
 
 #: plugins/autorecon.c:309
 msgid "Hide Login Errors"
-msgstr "પ્રવેશ ભૂલો છુપાવો"
+msgstr "પ્રવેશ ક્ષતિઓ છુપાવો"
 
 #: plugins/autorecon.c:313
-#, fuzzy
 msgid "Hide Reconnecting Dialog"
-msgstr "જોડાણ તોડી નાંખેલ ભૂલો છુપાવો"
+msgstr "જોડાણ તોડી નાંખેલ સંવાદો છુપાવો"
 
 #. *< type
 #. *< ui_requirement
@@ -66,7 +67,7 @@
 
 #: plugins/contact_priority.c:121
 msgid "Buddy is idle:"
-msgstr "વ્યક્તિ ફાજલ છે:"
+msgstr "વ્યક્તિ નિષ્ક્રિય છે:"
 
 #: plugins/contact_priority.c:135
 msgid "Use last matching buddy"
@@ -74,7 +75,6 @@
 
 #. Explanation
 #: plugins/contact_priority.c:141
-#, fuzzy
 msgid ""
 "The buddy with the lowest score is the buddy who will have priority in the "
 "contact.\n"
@@ -83,11 +83,10 @@
 "the built-in order: active, idle, away, away + idle, offline."
 msgstr ""
 "નિમ્નતમ ગુણ સાથેનો વ્યક્તિ એ એવો વ્યક્તિ છે કે જેનું સંપર્ક માટે પ્રાધાન્ય ઊંચું છે.\n"
-"મૂળભુત કિંમતો (ઓફલાઈન = ૪, દૂર = ૨, અને ફાજલ = ૧)\n"
-"આંતરિક ક્રમમાં વપરાયેલ ક્રમ સક્રિય->ફાજલ->દૂર->દૂર+ફાજલ->ઓફલાઈન વાપરશે."
+"મૂળભુત કિંમતો (ઓફલાઈન = ૪, દૂર = ૨, અને નિષ્ક્રિય = ૧)\n"
+"આંતરિક ક્રમમાં વપરાયેલ ક્રમ સક્રિય->નિષ્ક્રિય->દૂર->દૂર+નિષ્ક્રિય->ઓફલાઈન વાપરશે."
 
 #: plugins/contact_priority.c:144
-#, fuzzy
 msgid "Point values to use for account..."
 msgstr "ખાતા માટે વાપરવા માટે કિંમતોનો નિર્દેશ કરો..."
 
@@ -105,8 +104,7 @@
 #. *< version
 #. *< summary
 #: plugins/contact_priority.c:198
-msgid ""
-"Allows for controlling the values associated with different buddy states."
+msgid "Allows for controlling the values associated with different buddy states."
 msgstr "અલગ અલગ વ્યક્તિ સ્થિતિઓ સાથે સંકળાયેલ કિંમતો નિયંત્રિત કરવા માટે પરવાનગી આપે છે."
 
 #. *< description
@@ -115,8 +113,8 @@
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
 msgstr ""
-"સંપર્ક પ્રાધાન્ય ગણતરીઓમાં વ્યક્તિઓ માટે ફાજલ/દૂર/ઓફલાઈન સ્થિતિઓની નિર્દેશ કિંમતો બદલવા "
-"માટે પરવાનગી આપે છે."
+"સંપર્ક પ્રાધાન્ય ગણતરીઓમાં વ્યક્તિઓ માટે નિષ્ક્રિય/દૂર/ઓફલાઈન સ્થિતિઓની નિર્દેશ કિંમતો "
+"બદલવા માટે પરવાનગી આપે છે."
 
 #.
 #. *  DEFINES, MACROS & DATA TYPES
@@ -134,9 +132,8 @@
 msgstr "Gaim - દૂર"
 
 #: plugins/docklet/docklet.c:383
-#, fuzzy
 msgid "Show Buddy List"
-msgstr "વ્યક્તિ યાદી"
+msgstr "વ્યક્તિ યાદી બતાવો"
 
 #: plugins/docklet/docklet.c:390
 msgid "New Message..."
@@ -290,84 +287,73 @@
 
 #: plugins/gaimrc.c:40
 msgid "Cursor Color"
-msgstr ""
+msgstr "કર્સર રંગ"
 
 #: plugins/gaimrc.c:41
 msgid "Secondary Cursor Color"
-msgstr ""
+msgstr "ગૌણ કર્સર રંગ"
 
 #: plugins/gaimrc.c:42
-#, fuzzy
 msgid "Hyperlink Color"
 msgstr "હાયપરલીંક રંગ"
 
 #: plugins/gaimrc.c:53
-#, fuzzy
 msgid "GtkTreeView Expander Size"
-msgstr "વિસ્તારક માપ"
+msgstr "GtkTreeView વિસ્તારક માપ"
 
 #: plugins/gaimrc.c:72
-#, fuzzy
 msgid "Conversation Entry"
-msgstr "વાર્તાલાપો"
+msgstr "વાર્તાલાપ દાખલો"
 
 #: plugins/gaimrc.c:73
-#, fuzzy
 msgid "Conversation History"
-msgstr "વાર્તાલાપો"
+msgstr "વાર્તાલાપ ઇતિહાસ"
 
 #: plugins/gaimrc.c:74
-#, fuzzy
 msgid "Log Viewer"
-msgstr "પ્રવેશ સર્વર"
+msgstr "લૉગ દર્શક"
 
 #: plugins/gaimrc.c:75
-#, fuzzy
 msgid "Request Dialog"
-msgstr "માંગણી અણગમી છે"
+msgstr "વિનંતી સંવાદ"
 
 #: plugins/gaimrc.c:76
-#, fuzzy
 msgid "Notify Dialog"
-msgstr "આના માટે સૂચવો"
+msgstr "સૂચક સંવાદ"
 
 #: plugins/gaimrc.c:209
-#, fuzzy, c-format
+#, c-format
 msgid "Select Color for %s"
-msgstr "લખાણ રંગ પસંદ કરો"
+msgstr "%s માટે રંગ પસંદ કરો"
 
 #: plugins/gaimrc.c:211
-#, fuzzy
 msgid "Select Color"
 msgstr "લખાણ રંગ પસંદ કરો"
 
 #: plugins/gaimrc.c:246
-#, fuzzy, c-format
+#, c-format
 msgid "Select Font for %s"
-msgstr "ફોન્ટ પસંદ કરો"
+msgstr "%s માટે ફોન્ટ પસંદ કરો"
 
 #: plugins/gaimrc.c:284
-#, fuzzy
 msgid "Select Interface Font"
-msgstr "ફોન્ટ પસંદ કરો"
+msgstr "ઇન્ટરફેસ ફોન્ટ પસંદ કરો"
 
 #: plugins/gaimrc.c:343
-#, fuzzy
 msgid "GTK+ Interface Font"
-msgstr "ઈન્ટરફેસ વિકલ્પો"
+msgstr "GTK+ ઈન્ટરફેસ ફોન્ટ"
 
 #: plugins/gaimrc.c:362
 msgid "GTK+ Text Shortcut Theme"
-msgstr ""
+msgstr "GTK+ લખાણ ટુંકાણ થીમ"
 
 #: plugins/gaimrc.c:460
-#, fuzzy
 msgid "Gaim GTK+ Theme Control"
-msgstr "Gaim ફાઈલ નિયંત્રણ"
+msgstr "Gaim GTK+ થીમ નિયંત્રણ"
 
 #: plugins/gaimrc.c:462 plugins/gaimrc.c:463
 msgid "Provides access to commonly used gtkrc settings."
-msgstr ""
+msgstr "સામાન્ય રીતે વપરાતી gtkrc ગોઠવણીઓ પૂરી પાડે છે."
 
 #. Configuration frame
 #: plugins/gestures/gestures.c:243
@@ -471,9 +457,8 @@
 
 #. Add the expander
 #: plugins/gevolution/assoc-buddy.c:428
-#, fuzzy
 msgid "User _details"
-msgstr "વપરાશકર્તા વિગતો છુપાવો"
+msgstr "વપરાશકર્તા વિગતો (_d)"
 
 #. "Associate Buddy" button
 #: plugins/gevolution/assoc-buddy.c:481
@@ -487,26 +472,24 @@
 msgstr "વ્યક્તિઓ"
 
 #: plugins/gevolution/gevolution.c:262 plugins/gevolution/gevolution.c:268
-#, fuzzy
 msgid "Unable to send e-mail"
-msgstr "સંદેશો મોકલવામાં અસમર્થ."
+msgstr "ઇ-મેલ મોકલવામાં અસમર્થ."
 
 #: plugins/gevolution/gevolution.c:263
 msgid "The evolution executable was not found in the PATH."
-msgstr ""
+msgstr "PATHમાં ઇવોલ્યુશન કાર્યક્રમ મળ્યો નહી."
 
 #: plugins/gevolution/gevolution.c:269
 msgid "The specified buddy was not found in the Evolution Contacts."
-msgstr ""
+msgstr "પસંદ કરેલ વ્યક્તિ ઇવોલ્યુશન સંપર્કોમાં મળ્યો નહિ."
 
 #: plugins/gevolution/gevolution.c:286
 msgid "Add to Address Book"
 msgstr "સરનામા પુસ્તિકામાં ઉમેરો"
 
 #: plugins/gevolution/gevolution.c:290
-#, fuzzy
 msgid "Send E-Mail"
-msgstr "ઇ-મેઇલ"
+msgstr "ઇ-મેઇલ મોકલો"
 
 #. Configuration frame
 #: plugins/gevolution/gevolution.c:414
@@ -537,9 +520,8 @@
 #. *  summary
 #. *  description
 #: plugins/gevolution/gevolution.c:533 plugins/gevolution/gevolution.c:535
-#, fuzzy
 msgid "Provides integration with Evolution."
-msgstr "Ximian ઈવોલ્યુશન સાથે સંકલન પૂરું પાડે છે."
+msgstr "Evolution ઈવોલ્યુશન સાથે સંકલન પૂરું પાડે છે."
 
 #: plugins/gevolution/new_person_dialog.c:266
 msgid "Please enter the person's information below."
@@ -582,7 +564,7 @@
 
 #: plugins/history.c:146
 msgid "History Plugin Requires Logging"
-msgstr ""
+msgstr "ઇતિહાસ માટે પ્લગઇન લૉગીંગ જરૂરી છે"
 
 #: plugins/history.c:147
 msgid ""
@@ -591,6 +573,10 @@
 "Enabling logs for instant messages and/or chats will activate history for "
 "the same conversation type(s)."
 msgstr ""
+"લૉગીંગ પ્લગઇન સાધનો -> પ્રાથમિકતાઓ -> લૉગીંગ.\n"
+"\n"
+"તુરંત સંદેશાઓ અને/અથવા સંદેશાઓ માટે લૉગીંગ સક્રિય કરવાનું ઇતિહાસ સમાન વાર્તાલાપ પ્રકાર(રો) "
+"માટે સક્રિય કરશે."
 
 #: plugins/history.c:186
 msgid "History"
@@ -598,7 +584,7 @@
 
 #: plugins/history.c:188
 msgid "Shows recently logged conversations in new conversations."
-msgstr "નવા સંવાદોમાં છેલ્લા લોગવાળા સંવાદો બતાવે છે."
+msgstr "નવા સંવાદોમાં છેલ્લા લૉગવાળા સંવાદો બતાવે છે."
 
 #: plugins/history.c:189
 msgid ""
@@ -609,6 +595,12 @@
 "Tools -> Preferences -> Logging. Enabling logs for instant messages and/or "
 "chats will activate history for the same conversation type(s)."
 msgstr ""
+"When a new conversation is opened this plugin will insert the last "
+"conversation into the current conversation.\n"
+"\n"
+"The history plugin requires logging be enabled. Logging can be enabled from "
+"Tools -> Preferences -> Logging. Enabling logs for instant messages and/or "
+"chats will activate history for the same conversation type(s)."
 
 #. *< type
 #. *< ui_requirement
@@ -634,11 +626,11 @@
 
 #: plugins/idle.c:122 plugins/idle.c:149 plugins/idle.c:215
 msgid "I'dle Mak'er"
-msgstr "ફાજલ બનાવનાર"
+msgstr "નિષ્ક્રિય બનાવનાર"
 
 #: plugins/idle.c:123 plugins/idle.c:181
 msgid "Set Account Idle Time"
-msgstr "ખાતા ફાજલ સમય સુયોજિત કરો"
+msgstr "ખાતા નિષ્ક્રિય સમય સુયોજિત કરો"
 
 #: plugins/idle.c:126
 msgid "_Set"
@@ -649,23 +641,20 @@
 msgstr "નકારો (_C)"
 
 #: plugins/idle.c:150 plugins/idle.c:185
-#, fuzzy
 msgid "Unset Account Idle Time"
-msgstr "ખાતા ફાજલ સમય સુયોજિત કરો"
+msgstr "ખાતા નિષ્ક્રિય સમય સુયોજિત કરો"
 
 #: plugins/idle.c:153
-#, fuzzy
 msgid "_Unset"
-msgstr "વાપરો (_U)"
+msgstr "ગોઠવણ રદ કરો (_U)"
 
 #: plugins/idle.c:190
 msgid "Unset Idle Time For All Idled Accounts"
-msgstr ""
+msgstr "બધા નિષ્ક્રિય ખાતાઓ માટે નિષ્ક્રિય સમય ફરી ગોઠવો"
 
 #: plugins/idle.c:217 plugins/idle.c:218
-#, fuzzy
 msgid "Allows you to hand-configure how long you've been idle"
-msgstr "તમે કેટલા સમય માટે ફાજલ થશો તે જાતે-રૂપરેખાંકિત કરવા માટે તમને પરવાનગી આપે છે"
+msgstr "તમે કેટલા સમય માટે નિષ્ક્રિય થશો તેનું જાતે-રૂપરેખાંકિત કરવા દે છે"
 
 #. *< type
 #. *< ui_requirement
@@ -765,9 +754,8 @@
 
 #. Raise window method button
 #: plugins/notify.c:706
-#, fuzzy
 msgid "R_aise conversation window"
-msgstr "IM વાર્તાલાપ વિન્ડો"
+msgstr "વાર્તાલાપ વિન્ડો ઉપર લાવો (_a)"
 
 #. ---------- "Notification Removals" ----------
 #: plugins/notify.c:714
@@ -861,7 +849,7 @@
 "<b>ChangeLog:</b>\n"
 "%s<br><br>"
 msgstr ""
-"<b>ફેરફારલોગ:</b>\n"
+"<b>ફેરફારલૉગ:</b>\n"
 "%s<br><br>"
 
 #: plugins/relnot.c:74
@@ -899,7 +887,7 @@
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
-msgstr "નવા પ્રકાશનો માટે સમયસર ચકાસે છે અને વપરાશકર્તાને ફેરફારલોગ સાથે સૂચવે છે."
+msgstr "નવા પ્રકાશનો માટે સમયસર ચકાસે છે અને વપરાશકર્તાને ફેરફારલૉગ સાથે સૂચવે છે."
 
 #. *< type
 #. *< ui_requirement
@@ -939,11 +927,11 @@
 
 #: plugins/spellchk.c:1788
 msgid "Duplicate Correction"
-msgstr ""
+msgstr "નકલી ખરૂ"
 
 #: plugins/spellchk.c:1789
 msgid "The specified word already exists in the correction list."
-msgstr ""
+msgstr "સ્પષ્ટ કરેલ શબ્દ ખરી કરેલ યાદીમાં પહેલેથી હાજર છે."
 
 #: plugins/spellchk.c:1948
 msgid "Text Replacements"
@@ -959,7 +947,7 @@
 
 #: plugins/spellchk.c:1996
 msgid "Whole words only"
-msgstr ""
+msgstr "ફક્ત આખા શબ્દો"
 
 #: plugins/spellchk.c:2022
 msgid "Add a new text replacement"
@@ -975,7 +963,7 @@
 
 #: plugins/spellchk.c:2060
 msgid "Only replace _whole words"
-msgstr ""
+msgstr "ફક્ત આખા શબ્દો બદલો (_w)"
 
 #: plugins/spellchk.c:2097
 msgid "Text replacement"
@@ -1052,12 +1040,12 @@
 #: plugins/statenotify.c:56
 #, c-format
 msgid "%s has become idle."
-msgstr "%s ફાજલ થઈ ગયો છે."
+msgstr "%s નિષ્ક્રિય થઈ ગયો છે."
 
 #: plugins/statenotify.c:63
 #, c-format
 msgid "%s is no longer idle."
-msgstr "%s ફાજલ નથી."
+msgstr "%s નિષ્ક્રિય નથી."
 
 #: plugins/statenotify.c:74
 msgid "Notify When"
@@ -1069,7 +1057,7 @@
 
 #: plugins/statenotify.c:80
 msgid "Buddy Goes _Idle"
-msgstr "વ્યક્તિ ફાજલ બની જાય (_I)"
+msgstr "વ્યક્તિ નિષ્ક્રિય બની જાય (_I)"
 
 #. *< type
 #. *< ui_requirement
@@ -1089,7 +1077,7 @@
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
-msgstr "વાર્તાલાપ વિન્ડોમાં સૂચવે છે જ્યારે વ્યક્તિ દૂર જાય અથવા આવે અથવા ફાજલ બની જાય."
+msgstr "વાર્તાલાપ વિન્ડોમાં સૂચવે છે જ્યારે વ્યક્તિ દૂર જાય અથવા આવે અથવા નિષ્ક્રિય બની જાય."
 
 #: plugins/tcl/tcl.c:363
 msgid "Tcl Plugin Loader"
@@ -1167,15 +1155,13 @@
 msgstr "IM વિન્ડોમાં સરકપટ્ટી બતાવો (_S)"
 
 #: plugins/win32/transparency/win2ktrans.c:555
-#, fuzzy
 msgid "Remove IM window transparency on focus"
-msgstr "_IM વિન્ડો પારદર્શકતા"
+msgstr "પસંદ કરવા પર વિન્ડો પારદર્શકતા દૂર કરો"
 
 #: plugins/win32/transparency/win2ktrans.c:558
 #: plugins/win32/transparency/win2ktrans.c:606
-#, fuzzy
 msgid "Always on top"
-msgstr "ઉપનામ સંપર્ક"
+msgstr "હંમેશા ટોચ પર"
 
 #. Buddy List trans options
 #: plugins/win32/transparency/win2ktrans.c:590
@@ -1187,9 +1173,8 @@
 msgstr "વ્યક્તિ યાદી વિન્ડો પારદર્શકતા (_B)"
 
 #: plugins/win32/transparency/win2ktrans.c:604
-#, fuzzy
 msgid "Remove Buddy List window transparency on focus"
-msgstr "વ્યક્તિ યાદી વિન્ડો પારદર્શકતા (_B)"
+msgstr "વ્યક્તિ યાદી વિન્ડો પારદર્શકતા દૂર કરો"
 
 #. *< type
 #. *< ui_requirement
@@ -1210,7 +1195,6 @@
 
 #. *  description
 #: plugins/win32/transparency/win2ktrans.c:662
-#, fuzzy
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -1245,23 +1229,21 @@
 
 #. Blist On Top
 #: plugins/win32/winprefs/winprefs.c:410
-#, fuzzy
 msgid "_Keep Buddy List window on top:"
-msgstr "વ્યક્તિ યાદી વિન્ડોને હંમેશા ટોચ પર રાખો (_K)"
+msgstr "વ્યક્તિ યાદી વિન્ડોને હંમેશા ટોચ પર રાખો (_K):"
 
 #: plugins/win32/winprefs/winprefs.c:412 src/gtkprefs.c:1657
 msgid "Never"
 msgstr "ક્યારેય નહી"
 
 #: plugins/win32/winprefs/winprefs.c:413
-#, fuzzy
 msgid "Always"
-msgstr "દૂર"
+msgstr "હંમેશા"
 
 #. XXX: Did this ever work?
 #: plugins/win32/winprefs/winprefs.c:415
 msgid "Only when docked"
-msgstr ""
+msgstr "ફક્ત જ્યારે નીચું હોય"
 
 #. Conversations
 #: plugins/win32/winprefs/winprefs.c:419 src/gtkprefs.c:803
@@ -1270,7 +1252,6 @@
 msgstr "વાર્તાલાપો"
 
 #: plugins/win32/winprefs/winprefs.c:420
-#, fuzzy
 msgid "_Flash window when messages are received"
 msgstr "જ્યારે સંદેશાઓ મેળવાય ત્યારે વિન્ડો ફ્લેશ કરો (_F)"
 
@@ -1287,16 +1268,16 @@
 "Provides options specific to Windows Gaim, such as buddy list docking and "
 "conversation flashing."
 msgstr ""
+"Provides options specific to Windows Gaim, such as buddy list docking and "
+"conversation flashing."
 
 #: src/account.c:773
-#, fuzzy
 msgid "accounts"
 msgstr "ખાતાઓ"
 
 #: src/account.c:915
-#, fuzzy
 msgid "Password is required to sign on."
-msgstr "પાસવર્ડની સમયમર્યાદા સમાપ્ત થઈ ગઈ છે"
+msgstr "પાસવર્ડની સમયમર્યાદા સમાપ્ત થઈ ગઈ છે."
 
 #: src/account.c:940
 #, c-format
@@ -1304,14 +1285,12 @@
 msgstr "%s (%s) માટે પાસવર્ડ દાખલ કરો"
 
 #: src/account.c:947
-#, fuzzy
 msgid "Enter Password"
-msgstr "પાસવર્ડ બદલો"
+msgstr "પાસવર્ડ દાખલ કરો"
 
 #: src/account.c:952
-#, fuzzy
 msgid "Save password"
-msgstr "નવો પાસવર્ડ"
+msgstr "પાસવર્ડ સંગ્રહો"
 
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
@@ -1372,7 +1351,7 @@
 
 #: src/account.c:988 src/connection.c:99
 msgid "Connection Error"
-msgstr "જોડાણ ભૂલ"
+msgstr "જોડાણ ક્ષતિ"
 
 #: src/account.c:1052 src/protocols/gg/gg.c:470
 #: src/protocols/jabber/jabber.c:1115
@@ -1421,7 +1400,6 @@
 msgstr "અજ્ઞાત"
 
 #: src/blist.c:545
-#, fuzzy
 msgid "buddy list"
 msgstr "વ્યક્તિ યાદી"
 
@@ -1450,17 +1428,16 @@
 
 #: src/connection.c:98
 msgid "Registration Error"
-msgstr "રજીસ્ટ્રેશન ભૂલ"
+msgstr "રજીસ્ટ્રેશન ક્ષતિ"
 
 #: src/conversation.c:205
-#, fuzzy
 msgid "Unable to send message: The message is too large."
-msgstr "સંદેશો મોકલવામાં અસમર્થ. સંદેશો ખૂબ લાંબો છે."
+msgstr "સંદેશો મોકલવામાં અસમર્થઃ સંદેશો ખૂબ લાંબો છે."
 
 #: src/conversation.c:208 src/conversation.c:221
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send message to %s."
-msgstr "%s ને સંદેશો મોકલવામાં અસમર્થ:"
+msgstr "%s ને સંદેશો મોકલવામાં અસમર્થ."
 
 #: src/conversation.c:209
 msgid "The message is too large."
@@ -1516,7 +1493,7 @@
 "Error reading %s: \n"
 "%s.\n"
 msgstr ""
-"%s વાંચવામાં ભૂલ: \n"
+"%s વાંચવામાં ક્ષતિ: \n"
 "%s.\n"
 
 #: src/ft.c:192
@@ -1525,7 +1502,7 @@
 "Error writing %s: \n"
 "%s.\n"
 msgstr ""
-"%s લખવામાં ભૂલ: \n"
+"%s લખવામાં ક્ષતિ: \n"
 "%s.\n"
 
 #: src/ft.c:196
@@ -1534,7 +1511,7 @@
 "Error accessing %s: \n"
 "%s.\n"
 msgstr ""
-"%s વાપરવામાં ભૂલ: \n"
+"%s વાપરવામાં ક્ષતિ: \n"
 "%s.\n"
 
 #: src/ft.c:229
@@ -1592,9 +1569,9 @@
 msgstr "%s ને %s મોકલવાની તક આપી રહ્યું છે"
 
 #: src/ft.c:454
-#, fuzzy, c-format
+#, c-format
 msgid "Starting transfer of %s from %s"
-msgstr "શું %s માંથી ફાઈલ પરિવહન અરજી સ્વીકારવી છે?"
+msgstr "શું %s માંથી  %sની ફાઈલ પરિવહન અરજી સ્વીકારવી છે"
 
 #: src/ft.c:608
 #, c-format
@@ -1625,14 +1602,14 @@
 msgstr "%s એ ફાઈલ પરિવહન રદ કર્યું"
 
 #: src/ft.c:1119
-#, fuzzy, c-format
+#, c-format
 msgid "File transfer to %s failed."
-msgstr "%s માં ફાઈલ પરિવહન અડધેથી બંધ થઈ ગયું.\n"
+msgstr "%s માં ફાઈલ પરિવહન અડધેથી બંધ થઈ ગયું."
 
 #: src/ft.c:1121
-#, fuzzy, c-format
+#, c-format
 msgid "File transfer from %s failed."
-msgstr "%s માંથી ફાઈલ પરિવહન અડધેથી બંધ થઈ ગયું.\n"
+msgstr "%s માંથી ફાઈલ પરિવહન અડધેથી બંધ થઈ ગયું."
 
 #: src/gtkaccount.c:362
 #, c-format
@@ -1779,9 +1756,8 @@
 msgstr "સ્ક્રીન નામ"
 
 #: src/gtkaccount.c:2210
-#, fuzzy
 msgid "Enabled"
-msgstr "નિષ્ફળ"
+msgstr "સક્રિય"
 
 #: src/gtkaccount.c:2218
 msgid "Protocol"
@@ -1845,7 +1821,7 @@
 #: src/gtkblist.c:954 src/gtkblist.c:958 src/gtkblist.c:1056
 #: src/gtkblist.c:1079
 msgid "View _Log"
-msgstr "લોગ જુઓ (_L)"
+msgstr "લૉગ જુઓ (_L)"
 
 #: src/gtkblist.c:969
 msgid "_Alias Buddy..."
@@ -1907,13 +1883,11 @@
 
 #: src/gtkblist.c:1353 src/gtkblist.c:1363 src/gtkblist.c:3326
 #: src/gtkblist.c:3331
-#, fuzzy
 msgid "/Tools/Mute Sounds"
-msgstr "અવાજો બંધ કરો"
+msgstr "/સાધનો/અવાજો બંધ કરો"
 
 #: src/gtkblist.c:1822 src/gtkconv.c:3745 src/gtkpounce.c:314
-msgid ""
-"You are not currently signed on with an account that can add that buddy."
+msgid "You are not currently signed on with an account that can add that buddy."
 msgstr "તમે વર્તમાનમાં ખાતા સાથે પ્રવેશેલા છો કે જે તે વ્યક્તિને ઉમેરી શકે."
 
 #. Buddies menu
@@ -1935,7 +1909,7 @@
 
 #: src/gtkblist.c:2333
 msgid "/Buddies/View User _Log..."
-msgstr "/વ્યક્તિઓ/વપરાશકર્તા લોગ જુઓ (_L)..."
+msgstr "/વ્યક્તિઓ/વપરાશકર્તા લૉગ જુઓ (_L)..."
 
 #: src/gtkblist.c:2335
 msgid "/Buddies/Show _Offline Buddies"
@@ -1946,14 +1920,12 @@
 msgstr "/વ્યક્તિઓ/ખાલી જૂથો બતાવો (_E)"
 
 #: src/gtkblist.c:2337
-#, fuzzy
 msgid "/Buddies/Show Buddy _Details"
-msgstr "/વ્યક્તિઓ/ઓફલાઈન વ્યક્તિઓ બતાવો"
+msgstr "/વ્યક્તિઓ/ઓફલાઈન વ્યક્તિઓ બતાવો (_D)"
 
 #: src/gtkblist.c:2338 src/gtkblist.c:5158
-#, fuzzy
 msgid "/Buddies/Sort Buddies"
-msgstr "/વ્યક્તિઓ/ઓફલાઈન વ્યક્તિઓ બતાવો"
+msgstr "/વ્યક્તિઓ/ગોઠવો વ્યક્તિઓ"
 
 #: src/gtkblist.c:2340
 msgid "/Buddies/_Add Buddy..."
@@ -1993,9 +1965,8 @@
 msgstr "/સાધનો/પસંદગીઓ (_e)"
 
 #: src/gtkblist.c:2353
-#, fuzzy
 msgid "/Tools/Plu_gins"
-msgstr "/સાધનો/પ્લગઈન ક્રિયાઓ"
+msgstr "/સાધનો/પ્લગઈન (_g)"
 
 #: src/gtkblist.c:2354
 msgid "/Tools/Pr_ivacy"
@@ -2010,13 +1981,12 @@
 msgstr "/સાધનો/કક્ષ યાદી (_o)"
 
 #: src/gtkblist.c:2358
-#, fuzzy
 msgid "/Tools/Mute _Sounds"
-msgstr "અવાજો બંધ કરો"
+msgstr "/સાધનો/અવાજો બંધ કરો (_S)"
 
 #: src/gtkblist.c:2359
 msgid "/Tools/View System _Log"
-msgstr "/સાધનો/સિસ્ટમ લોગ જુઓ (_L)"
+msgstr "/સાધનો/સિસ્ટમ લૉગ જુઓ (_L)"
 
 #. Help
 #: src/gtkblist.c:2362
@@ -2045,58 +2015,58 @@
 "<b>ખાતું:</b> %s"
 
 #: src/gtkblist.c:2473
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "<b>Contact Alias:</b> %s"
 msgstr ""
 "\n"
-"<b>સંપર્ક ઉપનામ:</b>"
+"<b>સંપર્ક ઉપનામ:</b> %s"
 
 #: src/gtkblist.c:2481
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "<b>Alias:</b> %s"
 msgstr ""
 "\n"
-"<b>ઉપનામ:</b>"
+"<b>ઉપનામ:</b> %s"
 
 #: src/gtkblist.c:2489
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "<b>Nickname:</b> %s"
 msgstr ""
 "\n"
-"<b>ખોટું નામ:</b>"
+"<b>ખોટું નામ:</b> %s"
 
 #: src/gtkblist.c:2498
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "<b>Logged In:</b> %s"
 msgstr ""
 "\n"
-"<b>પ્રવેશેલ:</b>"
+"<b>પ્રવેશેલ:</b> %s"
 
 #: src/gtkblist.c:2510
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "<b>Idle:</b> %s"
 msgstr ""
 "\n"
-"<b>ફાજલ:</b>"
+"<b>નિષ્ક્રિય:</b> %s"
 
 #: src/gtkblist.c:2546
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "<b>Last Seen:</b> %s ago"
 msgstr ""
 "\n"
-"<b>%s:</b> %s"
+"<b>છેલ્લે જોયેલ:</b> %s પહેલાં"
 
 #: src/gtkblist.c:2554
 msgid ""
@@ -2115,70 +2085,62 @@
 "<b>વર્ણન:</b> ભૂતિયાળ"
 
 #: src/gtkblist.c:2579
-#, fuzzy
 msgid ""
 "\n"
 "<b>Status:</b> Awesome"
 msgstr ""
 "\n"
-"<b>સ્થિતિ</b>: ભયંકર"
+"<b>સ્થિતિ:</b> જબરજસ્ત"
 
 #: src/gtkblist.c:2581
-#, fuzzy
 msgid ""
 "\n"
 "<b>Status:</b> Rockin'"
 msgstr ""
 "\n"
-"<b>સ્થિતિ</b>: નાચી રહેલ"
+"<b>સ્થિતિ:</b> આનંદદાયક"
 
 #: src/gtkblist.c:2843
-#, fuzzy, c-format
+#, c-format
 msgid "Idle (%dh %02dm) "
-msgstr "ફાજલ (%dh%02dm) "
+msgstr "નિષ્ક્રિય (%dh%02dm) "
 
 #: src/gtkblist.c:2845
 #, c-format
 msgid "Idle (%dm) "
-msgstr "ફાજલ (%dm) "
+msgstr "નિષ્ક્રિય (%dm) "
 
 #: src/gtkblist.c:2848
-#, fuzzy
 msgid "Idle "
-msgstr "ફાજલ"
+msgstr "નિષ્ક્રિય "
 
 #: src/gtkblist.c:2852
 msgid "Offline "
 msgstr "ઓફલાઈન "
 
 #: src/gtkblist.c:2968
-#, fuzzy
 msgid "/Buddies/New Instant Message..."
-msgstr "/વ્યક્તિઓ/નવો તુરંત સંદેશો (_M)..."
+msgstr "/વ્યક્તિઓ/નવો તુરંત સંદેશો..."
 
 #: src/gtkblist.c:2969 src/gtkblist.c:3003
 msgid "/Buddies/Join a Chat..."
 msgstr "/વ્યક્તિઓ/સંવાદમાં જોડાવ..."
 
 #: src/gtkblist.c:2970
-#, fuzzy
 msgid "/Buddies/Get User Info..."
-msgstr "/વ્યક્તિઓ/વપરાશકર્તા જાણકારી મેળવો (_I)..."
+msgstr "/વ્યક્તિઓ/વપરાશકર્તા જાણકારી મેળવો..."
 
 #: src/gtkblist.c:2971
-#, fuzzy
 msgid "/Buddies/Add Buddy..."
-msgstr "/વ્યક્તિઓ/વ્યક્તિ ઉમેરો (_A)..."
+msgstr "/વ્યક્તિઓ/વ્યક્તિ ઉમેરો..."
 
 #: src/gtkblist.c:2972
-#, fuzzy
 msgid "/Buddies/Add Chat..."
-msgstr "/વ્યક્તિઓ/સંવાદ ઉમેરો (_h)..."
+msgstr "/વ્યક્તિઓ/સંવાદ ઉમેરો..."
 
 #: src/gtkblist.c:2973
-#, fuzzy
 msgid "/Buddies/Add Group..."
-msgstr "/વ્યક્તિઓ/જૂથ ઉમેરો (_G)..."
+msgstr "/વ્યક્તિઓ/જૂથ ઉમેરો..."
 
 #: src/gtkblist.c:3006
 msgid "/Tools/Room List"
@@ -2189,12 +2151,10 @@
 msgstr "/સાધનો/ખાનગીપણું"
 
 #: src/gtkblist.c:3085
-#, fuzzy
 msgid "Manually"
 msgstr "જાતે"
 
 #: src/gtkblist.c:3087
-#, fuzzy
 msgid "Alphabetically"
 msgstr "બારાક્ષરી પ્રમાણે"
 
@@ -2204,7 +2164,7 @@
 
 #: src/gtkblist.c:3089
 msgid "By log size"
-msgstr "લોગ માપ પ્રમાણે"
+msgstr "લૉગ માપ પ્રમાણે"
 
 #: src/gtkblist.c:3201
 msgid "/Tools/Buddy Pounce"
@@ -2226,7 +2186,6 @@
 msgstr "/વ્યક્તિઓ/ખાલી જૂથો બતાવો"
 
 #: src/gtkblist.c:3328
-#, fuzzy
 msgid "/Buddies/Show Buddy Details"
 msgstr "/વ્યક્તિઓ/ઓફલાઈન વ્યક્તિઓ બતાવો"
 
@@ -2286,21 +2245,20 @@
 msgstr "કોઈ ક્રિયાઓ ઉપલબ્ધ નથી"
 
 #: src/gtkblist.c:5094
-#, fuzzy
 msgid "/Tools"
-msgstr "/સાધનો (_T)"
+msgstr "/સાધનો"
 
 #: src/gtkconn.c:190
-#, fuzzy, c-format
+#, c-format
 msgid "%s disconnected"
-msgstr "જોડાણ તૂટી ગયું."
+msgstr "%s જોડાણ તૂટી ગયું."
 
 #: src/gtkconn.c:191
 #, c-format
 msgid ""
 "%s was disconnected due to an error. %s The account has been disabled. "
 "Correct the error and re-enable the account to connect."
-msgstr ""
+msgstr "%s નું ભૂલને કારણે જોડાણ તૂટી ગયું હતું. %s ખાતું નિષ્ક્રિય કરવામાં આવેલ છે. ભૂલ સુધારો અને જોડાણ કરવા માટે ખાતું પુનઃ-સક્રિય કરો."
 
 #: src/gtkconv.c:325
 #, c-format
@@ -2329,34 +2287,30 @@
 
 #: src/gtkconv.c:453
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
-msgstr "વાક્યરચના ભૂલ:  તમે તે આદેશ માટે ખોટી સંખ્યાની દલીલો લખેલી છે."
+msgstr "વાક્યરચના ક્ષતિ:  તમે તે આદેશ માટે ખોટી સંખ્યાની દલીલો લખેલી છે."
 
 #: src/gtkconv.c:458
 msgid "Your command failed for an unknown reason."
 msgstr "તમારો આદેશ અજ્ઞાત કારણોસર નિષ્ફળ ગયો."
 
 #: src/gtkconv.c:465
-#, fuzzy
 msgid "That command only works in chats, not IMs."
-msgstr "તે આદેશ માત્ર સંવાદોમાં જ કામ કરે છે, નહિં કે IM માં."
+msgstr "તે આદેશ માત્ર સંવાદોમાં જ કામ કરે છે, નહિં કે તુરંત સંદેશામાં."
 
 #: src/gtkconv.c:468
-#, fuzzy
 msgid "That command only works in IMs, not chats."
-msgstr "તે આદેશ માત્ર IM માં જ કામ કરે છે, નહિં કે સંવાદોમાં."
+msgstr "તે આદેશ માત્ર તુરંત સંદેશામાં જ કામ કરે છે, નહિં કે સંવાદોમાં."
 
 #: src/gtkconv.c:472
 msgid "That command doesn't work on this protocol."
 msgstr "તે આદેશ આ પ્રોટોકોલ પર કામ કરતો નથી."
 
 #: src/gtkconv.c:699 src/gtkconv.c:725
-#, fuzzy
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "તે વ્યક્તિ આ સંવાદમાં એ જ પ્રોટોકોલ પર નથી"
 
 #: src/gtkconv.c:719
-msgid ""
-"You are not currently signed on with an account that can invite that buddy."
+msgid "You are not currently signed on with an account that can invite that buddy."
 msgstr "તમે વર્તમાનમાં જે ખાતા સાથે પ્રવેશેલ છો તે વ્યક્તિને આમંત્રિત કરી શકે છે."
 
 #: src/gtkconv.c:772
@@ -2403,12 +2357,11 @@
 
 #: src/gtkconv.c:1227
 msgid "Logging started. Future messages in this conversation will be logged."
-msgstr ""
+msgstr "લૉગીંગ શરૂ થયેલ છે. આ વાર્તાલાપનાં ભવિષ્યનાં સંદેશાઓ લૉગ કરાશે."
 
 #: src/gtkconv.c:1235
-msgid ""
-"Logging stopped. Future messages in this conversation will not be logged."
-msgstr ""
+msgid "Logging stopped. Future messages in this conversation will not be logged."
+msgstr "લૉગીંગ બંધ થયેલ છે. આ વાર્તાલાપનાં ભવિષ્યનાં સંદેશાઓ લૉગ કરાશે નહિ."
 
 #: src/gtkconv.c:1489
 msgid "IM"
@@ -2431,9 +2384,8 @@
 msgstr "જાણ"
 
 #: src/gtkconv.c:1517
-#, fuzzy
 msgid "Get Away Message"
-msgstr "નવો દૂર જવાનો સંદેશ"
+msgstr "દૂર જવાનો સંદેશ મેળવો"
 
 #: src/gtkconv.c:1524 src/gtkrequest.c:267
 msgid "Remove"
@@ -2474,7 +2426,7 @@
 
 #: src/gtkconv.c:2376
 msgid "/Conversation/View _Log"
-msgstr "/વાર્તાલાપ/લોગ જુઓ (_L)"
+msgstr "/વાર્તાલાપ/લૉગ જુઓ (_L)"
 
 #: src/gtkconv.c:2377
 msgid "/Conversation/_Save As..."
@@ -2535,14 +2487,13 @@
 
 #: src/gtkconv.c:2416
 msgid "/Options/Enable _Logging"
-msgstr "/વિકલ્પો/લોગીંગ સક્રિય કરો (_L)"
+msgstr "/વિકલ્પો/લૉગીંગ સક્રિય કરો (_L)"
 
 #: src/gtkconv.c:2417
 msgid "/Options/Enable _Sounds"
 msgstr "/વિકલ્પો/સાઉન્ડો સક્રિય કરો (_S)"
 
 #: src/gtkconv.c:2418
-#, fuzzy
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/વિકલ્પો/બંધારણ સાધનપટ્ટી બતાવો (_T)"
 
@@ -2551,13 +2502,12 @@
 msgstr "/વિકલ્પો/સમયનોંધો બતાવો (_m)"
 
 #: src/gtkconv.c:2420
-#, fuzzy
 msgid "/Options/Show Buddy _Icon"
-msgstr "વ્યક્તિ ચિહ્નો બતાવો (_i)"
+msgstr "/વિકલ્પો/વ્યક્તિ ચિહ્નો બતાવો (_I)"
 
 #: src/gtkconv.c:2460
 msgid "/Conversation/View Log"
-msgstr "/વાર્તાલાપ/લોગ જુઓ"
+msgstr "/વાર્તાલાપ/લૉગ જુઓ"
 
 #: src/gtkconv.c:2466
 msgid "/Conversation/Send File..."
@@ -2601,14 +2551,13 @@
 
 #: src/gtkconv.c:2514
 msgid "/Options/Enable Logging"
-msgstr "/વિકલ્પો/લોગીંગ સક્રિય કરો"
+msgstr "/વિકલ્પો/લૉગીંગ સક્રિય કરો"
 
 #: src/gtkconv.c:2517
 msgid "/Options/Enable Sounds"
 msgstr "/વિકલ્પો/સાઉન્ડો સક્રિય કરો"
 
 #: src/gtkconv.c:2520
-#, fuzzy
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/વિકલ્પો/બંધારણ સાધનપટ્ટી બતાવો"
 
@@ -2617,9 +2566,8 @@
 msgstr "/વિકલ્પો/સમયનોંધ બતાવો"
 
 #: src/gtkconv.c:2526
-#, fuzzy
 msgid "/Options/Show Buddy Icon"
-msgstr "વ્યક્તિ ચિહ્નો બતાવો (_i)"
+msgstr "/વિકલ્પો/વ્યક્તિ ચિહ્નો બતાવો"
 
 #: src/gtkconv.c:2597
 msgid "User is typing..."
@@ -2631,9 +2579,8 @@
 
 #. Build the Send As menu
 #: src/gtkconv.c:2740
-#, fuzzy
 msgid "_Send To"
-msgstr "આ રીતે મોકલો (_S)"
+msgstr "આને મોકલો (_S)"
 
 #: src/gtkconv.c:3373
 msgid "Topic:"
@@ -2690,14 +2637,12 @@
 msgstr "help &lt;command&gt;:  ચોક્કસ આદેશ પર મદદ."
 
 #: src/gtkconv.c:5709
-#, fuzzy
 msgid "Confirm close"
-msgstr "ખાતાની ખાતરી"
+msgstr "બંધ કરવાની ખાતરી કરો"
 
 #: src/gtkconv.c:5741
-#, fuzzy
 msgid "You have unread messages. Are you sure you want to close the window?"
-msgstr "શું તમે ખરેખર %s કાઢી નાંખવા માંગો છો?"
+msgstr "તમારી પાસે ન વાંચેલા સંદેશાઓ છે. શું તમે ખરેખર વિન્ડો બંધ કરવા માંગો છો?"
 
 #: src/gtkconv.c:6408
 msgid "Close conversation"
@@ -2725,23 +2670,21 @@
 
 #: src/gtkdebug.c:232
 msgid "Save Debug Log"
-msgstr "ડિબગ લોગ સંગ્રહો"
+msgstr "ડિબગ લૉગ સંગ્રહો"
 
 #: src/gtkdebug.c:586
-#, fuzzy
 msgid "Invert"
-msgstr "ઉમેરો (_I)"
+msgstr "ઊંધુ"
 
 #: src/gtkdebug.c:589
 msgid "Highlight matches"
-msgstr ""
+msgstr "જોડી પ્રકાશિત"
 
 #: src/gtkdebug.c:636
 msgid "Debug Window"
 msgstr "ડિબગ વિન્ડો"
 
 #: src/gtkdebug.c:689
-#, fuzzy
 msgid "Clear"
 msgstr "બંધ કરો"
 
@@ -2754,14 +2697,12 @@
 msgstr "સમયનોંધો"
 
 #: src/gtkdebug.c:724
-#, fuzzy
 msgid "Filter"
 msgstr "નિષ્ફળ"
 
 #: src/gtkdebug.c:743
-#, fuzzy
 msgid "Right click for more options."
-msgstr "વધુ વિકલ્પો બતાવો"
+msgstr "વધુ વિકલ્પો માટે જમણું ક્લિક કરો."
 
 #: src/gtkdialogs.c:59 src/gtkdialogs.c:90
 msgid "lead developer"
@@ -2790,14 +2731,12 @@
 msgstr "જાળવનાર"
 
 #: src/gtkdialogs.c:89
-#, fuzzy
 msgid "libfaim maintainer"
-msgstr "પહેલાનો libfaim જાળવનાર"
+msgstr "libfaim જાળવનાર"
 
 #: src/gtkdialogs.c:92
-#, fuzzy
 msgid "Jabber developer"
-msgstr "પહેલાનો Jabber વિકાસકર્તા"
+msgstr "Jabber વિકાસકર્તા"
 
 #: src/gtkdialogs.c:93
 msgid "original author"
@@ -2812,9 +2751,8 @@
 msgstr "બલ્ગેરીયાઈ"
 
 #: src/gtkdialogs.c:101
-#, fuzzy
 msgid "Bosnian"
-msgstr "ઈસ્ટોનિયાઈ"
+msgstr "બોસ્નિયન"
 
 #: src/gtkdialogs.c:102 src/gtkdialogs.c:145 src/gtkdialogs.c:146
 msgid "Catalan"
@@ -2889,9 +2827,8 @@
 msgstr "કોરીયાઈ"
 
 #: src/gtkdialogs.c:120
-#, fuzzy
 msgid "Dutch, Flemish"
-msgstr "ડચ; ફ્લેમીશ"
+msgstr "ડચ, ફ્લેમીશ"
 
 #: src/gtkdialogs.c:121
 msgid "Macedonian"
@@ -2915,11 +2852,11 @@
 
 #: src/gtkdialogs.c:127
 msgid "Romanian"
-msgstr "રોમેનિયાઈ"
+msgstr "રોમેનિયન"
 
 #: src/gtkdialogs.c:128 src/gtkdialogs.c:156 src/gtkdialogs.c:157
 msgid "Russian"
-msgstr "રશિયાઈ"
+msgstr "રશિયન"
 
 #: src/gtkdialogs.c:129 src/gtkdialogs.c:130
 msgid "Serbian"
@@ -2935,7 +2872,7 @@
 
 #: src/gtkdialogs.c:133
 msgid "Telugu"
-msgstr ""
+msgstr "તેલુગુ"
 
 #: src/gtkdialogs.c:134
 msgid "Vietnamese"
@@ -2966,7 +2903,6 @@
 msgstr "Gaim વિશે"
 
 #: src/gtkdialogs.c:226
-#, fuzzy
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
@@ -3005,14 +2941,12 @@
 msgstr "જૂના અનુવાદકો"
 
 #: src/gtkdialogs.c:327
-#, fuzzy
 msgid "Debugging Information"
-msgstr "વપરાશકર્તા જાણકારી"
+msgstr "ડિબગીંગ જાણકારી"
 
 #: src/gtkdialogs.c:489 src/gtkdialogs.c:630 src/gtkdialogs.c:685
-#, fuzzy
 msgid "_Name"
-msgstr "નામ"
+msgstr "નામ (_N)"
 
 #: src/gtkdialogs.c:494 src/gtkdialogs.c:635 src/gtkdialogs.c:690
 msgid "_Account"
@@ -3023,33 +2957,32 @@
 msgstr "નવો ઝડપી સંદેશો"
 
 #: src/gtkdialogs.c:504
-#, fuzzy
-msgid ""
-"Please enter the screen name or alias of the person you would like to IM."
-msgstr "મહેરબાની કરીને તમે જે વ્યક્તિને IM કરવા માંગો તેનું સ્ક્રીન નામ દાખલ કરો."
+msgid "Please enter the screen name or alias of the person you would like to IM."
+msgstr "મહેરબાની કરીને તમે જે વ્યક્તિને તુરંત સંદેશો કરવા માંગો તેનું સ્ક્રીન નામ દાખલ કરો."
 
 #: src/gtkdialogs.c:643
 msgid "Get User Info"
 msgstr "વપરાશકર્તા જાણકારી મેળવો"
 
 #: src/gtkdialogs.c:645
-#, fuzzy
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
-msgstr "મહેરબાની કરીને વ્યક્તિનું સ્ક્રીન નામ દાખલ કરો કે જેની જાણકારી તમે જોવા માંગો છો."
+msgstr ""
+"મહેરબાની કરીને વ્યક્તિનું સ્ક્રીન નામ અથવા બીજું નામ દાખલ કરો કે જેની જાણકારી  તમે જોવા "
+"માંગો છો."
 
 #: src/gtkdialogs.c:699
-#, fuzzy
 msgid "View User Log"
-msgstr "વપરાશકર્તા લોગ મેળવો"
+msgstr "વપરાશકર્તા લૉગ મેળવો"
 
 #: src/gtkdialogs.c:701
-#, fuzzy
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
-msgstr "મહેરબાની કરીને વ્યક્તિનું સ્ક્રીન નામ દાખલ કરો કે જેનો લોગ તમે જોવા માંગો છો."
+msgstr ""
+"મહેરબાની કરીને વ્યક્તિનું સ્ક્રીન નામ અથવા બીજું નામ દાખલ કરો કે જેનો લૉગ તમે જોવા માંગો "
+"છો."
 
 #: src/gtkdialogs.c:720
 msgid "Alias Contact"
@@ -3082,7 +3015,7 @@
 msgstr "આ સંવાદ માટે ઉપનામ દાખલ કરો."
 
 #: src/gtkdialogs.c:800
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
 "your buddy list.  Do you want to continue?"
@@ -3111,10 +3044,8 @@
 
 #: src/gtkdialogs.c:909
 #, c-format
-msgid ""
-"You are about to remove %s from your buddy list.  Do you want to continue?"
-msgstr ""
-"તમે તમારી વ્યક્તિ યાદીમાંથી %s દૂર કરવા જઈ રહ્યા છો.  શું તમે ચાલુ રાખવા માંગો છો?"
+msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
+msgstr "તમે તમારી વ્યક્તિ યાદીમાંથી %s દૂર કરવા જઈ રહ્યા છો.  શું તમે ચાલુ રાખવા માંગો છો?"
 
 #: src/gtkdialogs.c:912 src/gtkdialogs.c:913
 msgid "Remove Buddy"
@@ -3125,8 +3056,7 @@
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
-msgstr ""
-"તમે તમારી વ્યક્તિ યાદીમાંથી સંવાદ %s દૂર કરવા જઈ રહ્યા છો.  શું તમે ચાલુ રાખવા માંગો છો?"
+msgstr "તમે તમારી વ્યક્તિ યાદીમાંથી સંવાદ %s દૂર કરવા જઈ રહ્યા છો.  શું તમે ચાલુ રાખવા માંગો છો?"
 
 #: src/gtkdialogs.c:954 src/gtkdialogs.c:955
 msgid "Remove Chat"
@@ -3171,22 +3101,22 @@
 
 #: src/gtkft.c:447
 msgid "An error occurred while opening the file."
-msgstr "ફાઈલ ખોલતી વખતે ભૂલ ઉદ્દભવી."
+msgstr "ફાઈલ ખોલતી વખતે ક્ષતિ ઉદ્દભવી."
 
 #: src/gtkft.c:467
-#, fuzzy, c-format
+#, c-format
 msgid "Error launching %s: %s"
-msgstr "<b>%s</b> લોન્ચ કરવામાં ભૂલ: %s"
+msgstr "%s લોન્ચ કરવામાં ક્ષતિ: %s"
 
 #: src/gtkft.c:476
-#, fuzzy, c-format
+#, c-format
 msgid "Error running %s"
-msgstr "સંવાદ %s માં જોડાવામાં ભૂલ"
+msgstr "%s ચલાવવામાં ક્ષતિ"
 
 #: src/gtkft.c:477
 #, c-format
 msgid "Process returned error code %d"
-msgstr ""
+msgstr "પ્રક્રિયાએ ક્ષતિ કોડ %d આપ્યો"
 
 #: src/gtkft.c:572
 msgid "Progress"
@@ -3233,15 +3163,13 @@
 msgstr "સંવાદ ખૂલેલો રાખો (_K)"
 
 #: src/gtkft.c:725
-#, fuzzy
 msgid "C_lear finished transfers"
 msgstr "સમાપ્ત થયેલ પરિવહનો સાફ કરો (_C)"
 
 #. "Download Details" arrow
 #: src/gtkft.c:734
-#, fuzzy
 msgid "File transfer _details"
-msgstr "પરિવહન વિગતો છુપાવો"
+msgstr "ફાઇલ પરિવહન વિગતો (_d)"
 
 #. Pause button
 #: src/gtkft.c:764 src/gtkstock.c:122
@@ -3270,14 +3198,12 @@
 msgstr "હાયપરલીંકો દોરવા માટેનો રંગ."
 
 #: src/gtkimhtml.c:1317
-#, fuzzy
 msgid "Hyperlink prelight color"
-msgstr "હાયપરલીંક રંગ"
+msgstr "હાયપરલીંક પ્રિલાઇટ રંગ"
 
 #: src/gtkimhtml.c:1318
-#, fuzzy
 msgid "Color to draw hyperlinks when mouse is over them."
-msgstr "હાયપરલીંકો દોરવા માટેનો રંગ."
+msgstr "જ્યારે માઉસ તેના પર લઇ જવાય ત્યારનો હાયપરલીંકો દોરવા માટેનો રંગ."
 
 #: src/gtkimhtml.c:1537
 msgid "_Copy E-Mail Address"
@@ -3318,7 +3244,7 @@
 "\n"
 "%s"
 msgstr ""
-"<span size='larger' weight='bold'>ચિત્ર સંગ્રહવામાં ભૂલ</span>\n"
+"<span size='larger' weight='bold'>ચિત્ર સંગ્રહવામાં ક્ષતિ</span>\n"
 "\n"
 "%s"
 
@@ -3329,7 +3255,7 @@
 "\n"
 "%s"
 msgstr ""
-"ચિત્ર સંગ્રહવામાં ભૂલ\n"
+"ચિત્ર સંગ્રહવામાં ક્ષતિ\n"
 "\n"
 "%s"
 
@@ -3365,8 +3291,7 @@
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
-msgstr ""
-"મહેરબાની કરીને કડીની URL અને વર્ણન દાખલ કરો કે જે તમે ઉમેરવા માંગો છો. વર્ણન વૈકલ્પિક છે."
+msgstr "મહેરબાની કરીને કડીની URL અને વર્ણન દાખલ કરો કે જે તમે ઉમેરવા માંગો છો. વર્ણન વૈકલ્પિક છે."
 
 #: src/gtkimhtmltoolbar.c:409
 msgid "Please enter the URL of the link that you want to insert."
@@ -3431,7 +3356,6 @@
 msgstr "પાશ્વ ભાગનો રંગ"
 
 #: src/gtkimhtmltoolbar.c:1023
-#, fuzzy
 msgid "Clear formatting"
 msgstr "બંધારણ સાફ કરો (_C)"
 
@@ -3445,48 +3369,52 @@
 
 #: src/gtkimhtmltoolbar.c:1059
 msgid "Insert smiley"
-msgstr "હસતો ચહેરો ઉમેરો"
+msgstr "સ્મિત ઉમેરો"
 
 #: src/gtklog.c:200
-#, fuzzy, c-format
+#, c-format
 msgid "Conversation in %s on %s"
-msgstr "%s સાથે વાર્તાલાપ"
+msgstr "%s માં %s પર વાર્તાલાપ"
 
 #: src/gtklog.c:202
-#, fuzzy, c-format
+#, c-format
 msgid "Conversation with %s on %s"
-msgstr "%s સાથે વાર્તાલાપ"
+msgstr "%s પર %s સાથે વાર્તાલાપ"
 
 #: src/gtklog.c:309
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
 msgstr ""
+"સિસ્ટમ ધટનાઓ ફક્ત ત્યારે જ લૉગ કરવામાં આવશે જ્યારે  \"બધા સ્થિતિ બદલાવો સિસ્ટમ લૉગમાં "
+"લૉગ કરો\" પ્રાથમિકતા સક્રિય કરવામાં આવશે."
 
 #: src/gtklog.c:313
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
 msgstr ""
+"તુરંત સંદેશાઓ ફક્ત ત્યારે જ લૉગ કરવામાં આવશે જ્યારે  \"બધા સ્થિતિ બદલાવો સિસ્ટમ લૉગમાં લૉગ "
+"કરો\" પ્રાથમિકતા સક્રિય કરવામાં આવશે."
 
 #: src/gtklog.c:316
-msgid ""
-"Chats will only be logged if the \"Log all chats preference\" is enabled."
-msgstr ""
+msgid "Chats will only be logged if the \"Log all chats preference\" is enabled."
+msgstr ""
+"વાતો ફક્ત ત્યારે જ લૉગ કરવામાં આવશે જ્યારે  \"બધા સ્થિતિ બદલાવો સિસ્ટમ લૉગમાં લૉગ કરો"
+"\" પ્રાથમિકતા સક્રિય કરવામાં આવશે."
 
 #: src/gtklog.c:320
 msgid "No logs were found"
-msgstr ""
+msgstr "કોઇ લૉગ મળ્યા નહિ"
 
 #: src/gtklog.c:396
-#, fuzzy
 msgid "Total log size:"
-msgstr "લોગ માપ પ્રમાણે"
+msgstr "કુલ લૉગ માપ:"
 
 #: src/gtklog.c:472
-#, fuzzy, c-format
+#, c-format
 msgid "Conversations in %s"
-msgstr "%s સાથે વાર્તાલાપ"
+msgstr "%sમાં વાર્તાલાપ"
 
 #: src/gtklog.c:480 src/gtklog.c:531
 #, c-format
@@ -3495,7 +3423,7 @@
 
 #: src/gtklog.c:556
 msgid "System Log"
-msgstr "સિસ્ટમ લોગ"
+msgstr "સિસ્ટમ લૉગ"
 
 #: src/gtkmain.c:326
 #, c-format
@@ -3516,15 +3444,25 @@
 "                      account(s) to use, separated by commas)\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
+"Gaim %s\n"
+"વપરાશ: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    રૂપરેખા ફાઈલો માટે DIR વાપરે છે\n"
+"  -d, --debug         stdout માં ડિબગીંગ સંદેશાઓ છાપે છે\n"
+"  -h, --help          આ મદદ દર્શાવે છે અને બહાર નીકળે છે\n"
+"  -n, --loginwin      આપોઆપ પ્રવેશ કરશો નહિં; પ્રવેશ વિન્ડો બતાવે છે\n"
+"  -l, --login[=NAME]  આપોઆપ પ્રવેશો (વૈકલ્પિક દલીલ NAME વાપરવા માટેના\n"
+"                                                                           ખાતાઓ "
+"સ્પષ્ટ કરે છે, અલ્પવિરામોથી અલગ પાડીને)\n"
+"  -v, --version       વર્તમાન આવૃત્તિ દર્શાવે છે અને બહાર નીકળે છે\n"
 
 #. TODO: Should save the previous status as a transient status?
 #. Save the newly selected status to prefs.xml and status.xml
 #: src/gtkmain.c:676 src/gtkmain.c:678 src/gtkmain.c:681
 #: src/gtkstatusbox.c:663 src/gtkstatusbox.c:665 src/gtkstatusbox.c:668
 #: src/status.c:1696
-#, fuzzy
 msgid "Default"
-msgstr "જીનોમ મૂળભુત"
+msgstr "મૂળભુત"
 
 #. Descriptive label
 #: src/gtknotify.c:275
@@ -3592,11 +3530,10 @@
 #: src/gtknotify.c:699 src/gtknotify.c:712
 #, c-format
 msgid "Error launching <b>%s</b>: %s"
-msgstr "<b>%s</b> લોન્ચ કરવામાં ભૂલ: %s"
+msgstr "<b>%s</b> લોન્ચ કરવામાં ક્ષતિ: %s"
 
 #: src/gtknotify.c:839
-msgid ""
-"The 'Manual' browser command has been chosen, but no command has been set."
+msgid "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "'Manual' બ્રાઉઝર આદેશ પસંદ થયેલ છે, પરંતુ કોઈ આદેશ સુયોજિત થયેલ નથી."
 
 #: src/gtkpounce.c:130
@@ -3610,7 +3547,7 @@
 #. "New Buddy Pounce"
 #: src/gtkpounce.c:391 src/gtkpounce.c:898
 msgid "New Buddy Pounce"
-msgstr "નવી વ્યક્તિ"
+msgstr "નવી વ્યક્તિની જાણકારી"
 
 #: src/gtkpounce.c:391
 msgid "Edit Buddy Pounce"
@@ -3648,11 +3585,11 @@
 
 #: src/gtkpounce.c:475
 msgid "_Idle"
-msgstr "ફાજલ (_I)"
+msgstr "નિષ્ક્રિય (_I)"
 
 #: src/gtkpounce.c:477
 msgid "Retur_n from idle"
-msgstr "ફાજલમાંથી પાછા આવો (_n)"
+msgstr "નિષ્ક્રિયમાંથી પાછા આવો (_n)"
 
 #: src/gtkpounce.c:479
 msgid "Buddy starts _typing"
@@ -3721,7 +3658,7 @@
 #: src/gtkpounce.c:968
 #, c-format
 msgid "%s has returned from being idle (%s)"
-msgstr "%s એ ફાજલ સ્થિતિમાંથી પાછો આવી ગયો છે (%s)"
+msgstr "%s એ નિષ્ક્રિય સ્થિતિમાંથી પાછો આવી ગયો છે (%s)"
 
 #: src/gtkpounce.c:970
 #, c-format
@@ -3741,7 +3678,7 @@
 #: src/gtkpounce.c:976
 #, c-format
 msgid "%s has become idle (%s)"
-msgstr "%s એ ફાજલ બની ગયો છે (%s)"
+msgstr "%s એ નિષ્ક્રિય બની ગયો છે (%s)"
 
 #: src/gtkpounce.c:978
 #, c-format
@@ -3774,9 +3711,8 @@
 msgstr "અજ્ઞાત \"_slash\" આદેશો સંદેશાઓ તરીકે મોકલો"
 
 #: src/gtkprefs.c:807
-#, fuzzy
 msgid "Show _formatting on incoming messages"
-msgstr "બંધારણ સાધનપટ્ટી બતાવો (_f)"
+msgstr "આવતા સંદેશા પર બંધારણ સાધનપટ્ટી બતાવો (_f)"
 
 #: src/gtkprefs.c:809
 msgid "Show buddy _icons"
@@ -3798,8 +3734,7 @@
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
-msgstr ""
-"આ કેવી રીતે જતા સંદેશા લખાણ દેખાશે જ્યારે તમે પ્રોટોકોલો વાપરો જે બંધારણને આધાર આપે. :)"
+msgstr "આ કેવી રીતે જતા સંદેશા લખાણ દેખાશે જ્યારે તમે પ્રોટોકોલો વાપરો જે બંધારણને આધાર આપે. :)"
 
 #. All the tab options!
 #: src/gtkprefs.c:856
@@ -3815,9 +3750,8 @@
 msgstr "ટેબો પર બંધ કરો બટન બતાવો (_u)"
 
 #: src/gtkprefs.c:878
-#, fuzzy
 msgid "_Placement:"
-msgstr "ExtPlacement"
+msgstr "રાખવું  (_P)"
 
 #: src/gtkprefs.c:880
 msgid "Top"
@@ -3829,7 +3763,7 @@
 
 #: src/gtkprefs.c:882
 msgid "Left"
-msgstr "ડાબે"
+msgstr "ડાબુ"
 
 #: src/gtkprefs.c:883
 msgid "Right"
@@ -3837,16 +3771,15 @@
 
 #: src/gtkprefs.c:885
 msgid "Left Vertical"
-msgstr ""
+msgstr "ડાબું ઉભું"
 
 #: src/gtkprefs.c:886
 msgid "Right Vertical"
-msgstr ""
+msgstr "જમણુ ઉભું"
 
 #: src/gtkprefs.c:891
-#, fuzzy
 msgid "N_ew conversations:"
-msgstr "વાર્તાલાપ બંધ કરો"
+msgstr "નવાં વાર્તાલાપો (_e):"
 
 #: src/gtkprefs.c:942 src/protocols/oscar/oscar.c:779
 #: src/protocols/oscar/oscar.c:5959
@@ -3854,9 +3787,8 @@
 msgstr "IP સરનામું"
 
 #: src/gtkprefs.c:944
-#, fuzzy
 msgid "STUN Server:"
-msgstr "સર્વર (_S):"
+msgstr "STUN સર્વર :"
 
 #: src/gtkprefs.c:946
 msgid "_Autodetect IP Address"
@@ -3911,7 +3843,6 @@
 msgstr "ગેલન"
 
 #: src/gtkprefs.c:1123
-#, fuzzy
 msgid "GNOME Default"
 msgstr "જીનોમ મૂળભુત"
 
@@ -3974,20 +3905,19 @@
 
 #: src/gtkprefs.c:1259
 msgid "Log _Format:"
-msgstr "લોગ બંધારણ (_F):"
+msgstr "લૉગ બંધારણ (_F):"
 
 #: src/gtkprefs.c:1264
-#, fuzzy
 msgid "Log all _instant messages"
-msgstr "બધા તુરંત સંદેશાઓ લોગ કરો (_L)"
+msgstr "બધા તુરંત સંદેશાઓ લૉગ કરો (_i)"
 
 #: src/gtkprefs.c:1266
 msgid "Log all c_hats"
-msgstr "બધા સંવાદો લોગ કરો (_h)"
+msgstr "બધા સંવાદો લૉગ કરો (_h)"
 
 #: src/gtkprefs.c:1268
 msgid "Log all _status changes to system log"
-msgstr ""
+msgstr "બધા સ્થિતિ બદલાવો સિસ્ટમ લૉગમાં લૉગ કરો"
 
 #: src/gtkprefs.c:1400
 msgid "Sound Selection"
@@ -4014,9 +3944,8 @@
 msgstr "આદેશ"
 
 #: src/gtkprefs.c:1465
-#, fuzzy
 msgid "No sounds"
-msgstr "ધ્વનિઓ"
+msgstr "કોઇ ધ્વનિ નહિ"
 
 #: src/gtkprefs.c:1473
 #, c-format
@@ -4090,33 +4019,28 @@
 msgstr "જ્યારે દૂર જાવ"
 
 #: src/gtkprefs.c:1659
-#, fuzzy
 msgid "When both away and idle"
-msgstr "જ્યારે દૂર જાવ અને ફાજલ થાવ"
+msgstr "જ્યારે દૂર જાવ અને નિષ્ક્રિય થાવ"
 
 #: src/gtkprefs.c:1662
-#, fuzzy
 msgid "_Report idle time"
-msgstr "ફાજલ સમયો બતાવો (_t)"
+msgstr "નિષ્ક્રિય સમયો બતાવો (_t)"
 
 #: src/gtkprefs.c:1665
 msgid "Auto-away"
 msgstr "આપોઆપ-દૂર"
 
 #: src/gtkprefs.c:1666
-#, fuzzy
 msgid "Change status when _idle"
-msgstr "જ્યારે ફાજલ હોય ત્યેર દૂર સુયોજિત કરો (_w)"
+msgstr "જ્યારે નિષ્ક્રિય હોય ત્યારે દૂર સુયોજિત કરો (_i)"
 
 #: src/gtkprefs.c:1670
-#, fuzzy
 msgid "_Minutes before changing status:"
-msgstr "દૂર સુયોજિત કરવા પહેલાંની મિનિટો (_M):"
+msgstr "સુયોજિત કરવા પહેલાંની મિનિટો (_M):"
 
 #: src/gtkprefs.c:1678
-#, fuzzy
 msgid "Change _status to:"
-msgstr "સરનામાને આમાં બદલો:"
+msgstr "સ્થિતિને આમાં બદલો (_s):"
 
 #: src/gtkprefs.c:1728
 msgid "Smiley Themes"
@@ -4136,7 +4060,7 @@
 
 #: src/gtkprefs.c:1739
 msgid "Away / Idle"
-msgstr "દૂર જાવ / ફાજલ"
+msgstr "દૂર જાવ / નિષ્ક્રિય"
 
 #: src/gtkprivacy.c:79
 msgid "Allow all users to contact me"
@@ -4283,7 +4207,7 @@
 
 #: src/gtksavedstatuses.c:377
 msgid "Type"
-msgstr ""
+msgstr "પ્રકાર"
 
 #: src/gtksavedstatuses.c:388 src/protocols/bonjour/bonjour.c:234
 #: src/protocols/bonjour/bonjour.c:241 src/protocols/gg/gg.c:1083
@@ -4303,25 +4227,22 @@
 msgstr "સંદેશો"
 
 #: src/gtksavedstatuses.c:451
-#, fuzzy
 msgid "Saved Statuses"
-msgstr "સર્વર પરિસ્થિતિઓ"
+msgstr "સંગ્રહાયેલ પરિસ્થિતિઓ"
 
 #. Use button
 #. TODO: It might be better if the button said "Use" or "Activate"
 #: src/gtksavedstatuses.c:477
-#, fuzzy
 msgid "_Use"
 msgstr "વાપરો (_U)"
 
 #: src/gtksavedstatuses.c:584
 msgid "Title already in use.  You must choose a unique title."
-msgstr ""
+msgstr "શિર્ષક વપરાશમાં છે. તમારે બીજાને મળતું આવતું ન હોય તેવું શિર્ષક પસંદ કરવું પડશે."
 
 #: src/gtksavedstatuses.c:675
-#, fuzzy
 msgid "Custom status"
-msgstr "સ્થિતિ પ્રમાણે"
+msgstr "પોતાની સ્થિતિ"
 
 #: src/gtksavedstatuses.c:778 src/protocols/gg/gg.c:1064
 #: src/protocols/gg/gg.c:1069 src/protocols/jabber/buddy.c:626
@@ -4334,19 +4255,17 @@
 msgstr "સ્થિતિ"
 
 #: src/gtksavedstatuses.c:797
-#, fuzzy
 msgid "_Title:"
-msgstr "શીર્ષક"
+msgstr "શીર્ષક (_T):"
 
 #: src/gtksavedstatuses.c:817
-#, fuzzy
 msgid "_Status:"
-msgstr "સ્થિતિ:"
+msgstr "સ્થિતિ (_S):"
 
 #. Custom status message expander
 #: src/gtksavedstatuses.c:852
 msgid "Use a _different status for some accounts"
-msgstr ""
+msgstr "કેટલાક ખાતાઓ માટે જુદી સ્થિતિ વાપરો"
 
 #: src/gtksound.c:61
 msgid "Buddy logs in"
@@ -4409,9 +4328,8 @@
 msgstr "ધ્વનિ વગાડવામાં અસમર્થ કારણ કે રૂપરેખાંકિત ધ્વનિ આદેશ લોન્ચ કરી શકાયો નહિં: %s"
 
 #: src/gtkstatusbox.c:197
-#, fuzzy
 msgid "Typing"
-msgstr "Ping"
+msgstr "ટાઇપિંગ"
 
 #. connect to the server
 #: src/gtkstatusbox.c:200 src/protocols/irc/irc.c:258
@@ -4459,14 +4377,12 @@
 msgstr "ઓફલાઈન"
 
 #: src/gtkstatusbox.c:299
-#, fuzzy
 msgid "Custom..."
-msgstr "વૈવિધ્યપૂર્ણ"
+msgstr "વૈવિધ્યપૂર્ણ..."
 
 #: src/gtkstatusbox.c:300
-#, fuzzy
 msgid "Saved..."
-msgstr "ફાઈલ સંગ્રહો..."
+msgstr "સંગ્રહાયેલ..."
 
 #: src/gtkstock.c:117
 msgid "_Alias"
@@ -4489,68 +4405,68 @@
 msgstr "ચેતવો (_W)"
 
 #: src/gtkutils.c:1393 src/gtkutils.c:1418
-#, fuzzy, c-format
+#, c-format
 msgid "The following error has occurred loading %s: %s"
-msgstr "એક અજ્ઞાત પ્રવેશ ભૂલ ઉદ્દભવી: %s."
+msgstr "%s લાવવામાં નીચેની ક્ષતિ ઉદ્દભવી : %s"
 
 #: src/gtkutils.c:1395 src/gtkutils.c:1420
-#, fuzzy
 msgid "Failed to load image"
-msgstr "ચિત્ર સંગ્રહવામાં નિષ્ફળ: %s\n"
+msgstr "ચિત્ર લાવવામાં નિષ્ફળ"
 
 #: src/gtkutils.c:1495
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot send folder %s."
-msgstr "ફાઈલ મોકલી શકતા નથી"
+msgstr "ફોલ્ડર %s મોકલી શકતા નથી."
 
 #: src/gtkutils.c:1497
 msgid ""
 "Gaim cannot transfer a folder. You will need to send the files within "
 "individually"
-msgstr ""
+msgstr "ગેઇમ ફોલ્ડર મોકલી શકતું નથી. તમારે ફાઇલોને જુદી જુદી મોકલવી પડશે."
 
 #: src/gtkutils.c:1525 src/gtkutils.c:1534 src/gtkutils.c:1539
-#, fuzzy
 msgid "You have dragged an image"
-msgstr "તમે અયોગ્ય વપરાશકર્તાનામ દાખલ કરેલ છે"
+msgstr "તમે ચિત્રને ખેંચેલ છે"
 
 #: src/gtkutils.c:1526
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
 msgstr ""
+"તમે આ ચિત્ર ફાઇલ પરિવહન તરીકે મોકલી શકશો, તેને આ સંદેશામાં સમાવી શકશો, અથવા આ "
+"વપરાશકર્તા માટે વ્યક્તિ ચિહ્ન તરીકે રાખી શકશો."
 
 #: src/gtkutils.c:1530 src/gtkutils.c:1545
-#, fuzzy
 msgid "Set as buddy icon"
-msgstr "વ્યક્તિ ચિહ્નો બતાવો (_i)"
+msgstr "વ્યક્તિ ચિહ્નો ગોઠવો"
 
 #: src/gtkutils.c:1531 src/gtkutils.c:1546
-#, fuzzy
 msgid "Send image file"
-msgstr "સંદેશો મોકલો"
+msgstr "ચિત્ર ફાઇલ મોકલો"
 
 #: src/gtkutils.c:1532 src/gtkutils.c:1546
-#, fuzzy
 msgid "Insert in message"
-msgstr "ચિત્ર ઉમેરો"
+msgstr "સંદેશો ઉમેરો"
 
 #: src/gtkutils.c:1535
-#, fuzzy
 msgid "Would you like to set it as the buddy icon for this user?"
-msgstr "શું તમે વાર્તાલાપમાં જોડાવા માંગો છો?"
+msgstr "શું તમે આ વપરાશકર્તા માટે વ્યક્તિ ચિહ્ન ગોઠવવા માંગો છો?"
 
 #: src/gtkutils.c:1540
 msgid ""
 "You can send this image as a file transfer or embed it into this message, or "
 "use it as the buddy icon for this user."
 msgstr ""
+"તમે આ ચિત્ર ફાઇલ પરિવહન તરીકે મોકલી શકશો, તેને આ સંદેશામાં સમાવી શકશો, અથવા આ "
+"વપરાશકર્તા માટે વ્યક્તિ ચિહ્ન તરીકે રાખી શકશો."
 
 #: src/gtkutils.c:1542
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
 msgstr ""
+"તમે આ ચિત્રને આ સંદેશામાં સમાવી શકશો, અથવા આ વપરાશકર્તા માટે વ્યક્તિ ચિહ્ન તરીકે રાખી "
+"શકશો"
 
 #. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
 #. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
@@ -4558,23 +4474,24 @@
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
 #: src/gtkutils.c:1596
-#, fuzzy
 msgid "Cannot send launcher"
-msgstr "ફાઈલ મોકલી શકતા નથી"
+msgstr "ચલાવનાર મોકલી શકતા નથી"
 
 #: src/gtkutils.c:1596
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
 msgstr ""
+"You dragged a desktop launcher. Most likely you wanted to send whatever this "
+"launcher points to instead of this launcher itself."
 
 #: src/log.c:129
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
-msgstr "<b><font color=\"red\">લોગર પાસે કોઈ વાંચવાનું વિધેય નથી</font></b>"
+msgstr "<b><font color=\"red\">લૉગર પાસે કોઈ વાંચવાનું વિધેય નથી</font></b>"
 
 #: src/log.c:577
 msgid "Logging of this conversation failed."
-msgstr ""
+msgstr "આ વાર્તાલાપ લૉગ કરવાનું નિષ્ફળ ગયું."
 
 #: src/log.c:839
 msgid "XML"
@@ -4600,7 +4517,7 @@
 
 #: src/log.c:957 src/log.c:1074
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
-msgstr "<font color=\"red\"><b>લોગ પાથ શોધવામાં અસમર્થ!</b></font>"
+msgstr "<font color=\"red\"><b>લૉગ પાથ શોધવામાં અસમર્થ!</b></font>"
 
 #: src/log.c:967 src/log.c:1086
 #, c-format
@@ -4617,8 +4534,7 @@
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
-msgstr ""
-"જરૂરી પ્લગઈન %s મળ્યું નહિં. મહેરબાની કરીને આ પ્લગઈન સ્થાપિત કરો અને ફરીથી પ્રયત્ન કરો."
+msgstr "જરૂરી પ્લગઈન %s મળ્યું નહિં. મહેરબાની કરીને આ પ્લગઈન સ્થાપિત કરો અને ફરીથી પ્રયત્ન કરો."
 
 #: src/plugin.c:336 src/plugin.c:364
 msgid "Gaim was unable to load your plugin."
@@ -4634,25 +4550,25 @@
 #: src/protocols/oscar/oscar.c:5064 src/protocols/yahoo/yahoo.c:2635
 #: src/protocols/yahoo/yahoo_profile.c:660
 msgid "Idle"
-msgstr "ફાજલ"
+msgstr "નિષ્ક્રિય"
 
 #: src/protocols/bonjour/bonjour.c:303
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "<b>Status:</b> %s"
 msgstr ""
 "\n"
-"<b>સ્થિતિ</b>: ભયંકર"
+"<b>સ્થિતિ:</b> %s"
 
 #: src/protocols/bonjour/bonjour.c:305
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "<b>Message:</b> %s"
 msgstr ""
 "\n"
-"<b>%s:</b> %s"
+"<b>સંદેશો:</b> %s"
 
 #. *< type
 #. *< ui_requirement
@@ -4665,15 +4581,13 @@
 #. *  summary
 #. *  description
 #: src/protocols/bonjour/bonjour.c:388 src/protocols/bonjour/bonjour.c:390
-#, fuzzy
 msgid "Bonjour Protocol Plugin"
-msgstr "Yahoo પ્રોટોકોલ પ્લગઈન"
+msgstr "Bonjour પ્રોટોકોલ પ્લગઈન"
 
 #. Creating the user splits
 #: src/protocols/bonjour/bonjour.c:417
-#, fuzzy
 msgid "Host name"
-msgstr "છેલ્લું નામ:"
+msgstr "યજમાન નામ"
 
 #. Creating the options for the protocol
 #: src/protocols/bonjour/bonjour.c:421 src/protocols/irc/irc.c:822
@@ -4683,14 +4597,12 @@
 msgstr "પોર્ટ"
 
 #: src/protocols/bonjour/bonjour.c:424 src/protocols/gg/gg.c:405
-#, fuzzy
 msgid "First name"
-msgstr "પ્રથમ નામ:"
+msgstr "પ્રથમ નામ"
 
 #: src/protocols/bonjour/bonjour.c:427 src/protocols/gg/gg.c:401
-#, fuzzy
 msgid "Last name"
-msgstr "છેલ્લું નામ:"
+msgstr "છેલ્લું નામ"
 
 #: src/protocols/bonjour/bonjour.c:430 src/protocols/jabber/buddy.c:261
 #: src/protocols/jabber/buddy.c:772 src/protocols/jabber/buddy.c:780
@@ -4701,70 +4613,60 @@
 
 #: src/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
-msgstr ""
+msgstr "બોનજોર"
 
 #: src/protocols/gg/gg.c:136 src/protocols/gg/gg.c:155
-#, fuzzy
 msgid "Save Buddylist..."
-msgstr "વ્યક્તિ યાદી મોકલો"
+msgstr "વ્યક્તિ યાદી સંગ્રહો..."
 
 #: src/protocols/gg/gg.c:137
 msgid "Your buddylist is empty, nothing was written to the file."
-msgstr ""
+msgstr "તમારી વ્યક્તિયાદી ખાલી છે, ફાઇલમાં કંઇ પણ લખાયું નથી."
 
 #: src/protocols/gg/gg.c:143 src/protocols/gg/gg.c:145
 #: src/protocols/gg/gg.c:176
-#, fuzzy
 msgid "Couldn't open file"
-msgstr "ફાઈલ મોકલી શકતા નથી"
+msgstr "ફાઈલ ખોલી શકતા નથી"
 
 #: src/protocols/gg/gg.c:156
-#, fuzzy
 msgid "Buddylist saved successfully!"
 msgstr "પાસવર્ડ સફળતાપૂર્વક બદલાઈ ગયો"
 
 #: src/protocols/gg/gg.c:178
-#, fuzzy
 msgid "Could't open file"
-msgstr "ફાઈલ મોકલી શકતા નથી"
+msgstr "ફાઈલ ખોલી શકતા નથી"
 
 #: src/protocols/gg/gg.c:199
-#, fuzzy
 msgid "Load Buddylist..."
-msgstr "વ્યક્તિ ઉપનામ (_A)..."
+msgstr "વ્યક્તિયાદી લાવો..."
 
 #: src/protocols/gg/gg.c:200
-#, fuzzy
 msgid "Buddylist loaded successfully!"
-msgstr "પાસવર્ડ સફળતાપૂર્વક બદલાઈ ગયો"
+msgstr "વ્યક્તિયાદી સફળતાપૂર્વક બદલાઈ ગઇ!"
 
 #: src/protocols/gg/gg.c:211
-#, fuzzy
 msgid "Save buddylist..."
-msgstr "વ્યક્તિ યાદી મોકલો"
+msgstr "વ્યક્તિયાદી સંગ્રહો..."
 
 #: src/protocols/gg/gg.c:254
 msgid "Fill in the registration fields."
-msgstr ""
+msgstr "નોંધણી ક્ષેત્રોમાં ભરો."
 
 #: src/protocols/gg/gg.c:259
-#, fuzzy
 msgid "Passwords do not match."
-msgstr "નવા પાસવર્ડો બંધબેસતા નથી."
+msgstr "પાસવર્ડો બંધબેસતા નથી."
 
 #: src/protocols/gg/gg.c:266
-#, fuzzy
 msgid "Unable to register new account. Error occurred.\n"
-msgstr "નવું જોડાણ બનાવવામાં અસમર્થ."
+msgstr "નવું જોડાણ બનાવવામાં અસમર્થ. ક્ષતિ ઉદભવી.\n"
 
 #: src/protocols/gg/gg.c:279
 msgid "New Gadu-Gadu Account Registered"
-msgstr ""
+msgstr "નવી ગડુ-ગડુ ખાતાંની નોંધણી કરાઇ"
 
 #: src/protocols/gg/gg.c:280
-#, fuzzy
 msgid "Registration completed successfully!"
-msgstr "રજીસ્ટ્રેશન સફળ"
+msgstr "રજીસ્ટ્રેશન સફળતાપૂર્વક પૂર્ણ થયું!"
 
 #: src/protocols/gg/gg.c:409 src/protocols/gg/gg.c:1665
 #: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:698
@@ -4782,61 +4684,52 @@
 
 #: src/protocols/gg/gg.c:417
 msgid "Year of birth"
-msgstr ""
+msgstr "જન્મનું વર્ષ"
 
 #: src/protocols/gg/gg.c:426
-#, fuzzy
 msgid "Only online"
-msgstr "ઓનલાઈન"
+msgstr "ફક્ત ઓનલાઈન"
 
 #: src/protocols/gg/gg.c:430 src/protocols/gg/gg.c:431
 #: src/protocols/gg/gg.c:1510
-#, fuzzy
 msgid "Find buddies"
-msgstr "ફાજલ વ્યક્તિઓ ઝાંખા કરો (_d)"
+msgstr "વ્યક્તિઓ શોધો"
 
 #: src/protocols/gg/gg.c:432
-#, fuzzy
 msgid "Please, enter your search criteria below"
-msgstr "મહેરબાની કરીને નવો પાસવર્ડ દાખલ કરો"
+msgstr "મહેરબાની કરીને તમારી શોધ પરિણામ દાખલ કરો"
 
 #: src/protocols/gg/gg.c:465
 msgid "Fill in the fields."
-msgstr ""
+msgstr "ક્ષેત્રોમાં ભરો."
 
 #: src/protocols/gg/gg.c:476
 msgid "Your current password is different from the one that you specified."
-msgstr ""
+msgstr "તમારો હાલનો પાસવર્ડ તમે પહેલાં સ્પષ્ટ કરેલ પાસવર્ડ કરતાં જુદો છે."
 
 #: src/protocols/gg/gg.c:491
-#, fuzzy
 msgid "Unable to change password. Error occured.\n"
-msgstr "Gadu-Gadu પાસવર્ડ બદલવામાં અસમર્થ"
+msgstr "પાસવર્ડ બદલવામાં અસમર્થ. ક્ષતિ ઉદભવી.\n"
 
 #: src/protocols/gg/gg.c:500
-#, fuzzy
 msgid "Change password for the Gadu-Gadu account"
-msgstr "%s માટે પાસવર્ડ બદલો"
+msgstr "ગડુ-ગડુ ખાતા માટે પાસવર્ડ બદલો"
 
 #: src/protocols/gg/gg.c:501
-#, fuzzy
 msgid "Password was changed successfully!"
-msgstr "પાસવર્ડ સફળતાપૂર્વક બદલાઈ ગયો"
+msgstr "પાસવર્ડ સફળતાપૂર્વક બદલાઈ ગયો!"
 
 #: src/protocols/gg/gg.c:535
-#, fuzzy
 msgid "Token Error"
-msgstr "અજાણી ભૂલ"
+msgstr "ટોકન ક્ષતિ"
 
 #: src/protocols/gg/gg.c:536
-#, fuzzy
 msgid "Unable to fetch the token.\n"
-msgstr "કક્ષ યાદી મેળવવામાં અસમર્થ."
+msgstr "ટોકન મેળવવામાં અસમર્થ.\n"
 
 #: src/protocols/gg/gg.c:551
-#, fuzzy
 msgid "Current password"
-msgstr "અયોગ્ય પાસવર્ડ."
+msgstr "હાલનો પાસવર્ડ"
 
 #: src/protocols/gg/gg.c:555 src/protocols/gg/gg.c:1476
 #: src/protocols/jabber/jabber.c:632 src/protocols/jabber/jabber.c:1150
@@ -4844,40 +4737,34 @@
 msgstr "પાસવર્ડ"
 
 #: src/protocols/gg/gg.c:559 src/protocols/gg/gg.c:1480
-#, fuzzy
 msgid "Password (retype)"
-msgstr "પાસવર્ડ મોકલાઈ ગયો"
+msgstr "પાસવર્ડ (ફરી લખો)"
 
 #: src/protocols/gg/gg.c:563 src/protocols/gg/gg.c:1484
-#, fuzzy
 msgid "Enter current token"
-msgstr "%s વર્તમાનમાં પ્રવેશેલ નથી."
+msgstr "હાલનું ટોકન દાખલ કરો"
 
 #. original size: 60x24
 #: src/protocols/gg/gg.c:568 src/protocols/gg/gg.c:1489
-#, fuzzy
 msgid "Current token"
-msgstr "વર્તમાનમાં આના પર"
+msgstr "હાલનું ટોકન"
 
 #: src/protocols/gg/gg.c:574
-#, fuzzy
 msgid "Please, enter your current password and your new password for UIN: "
-msgstr "મહેરબાની કરીને તમારો વર્તમાન પાસવર્ડ અને નવો પાસવર્ડ દાખલ કરો."
+msgstr "મહેરબાની કરી, UIN માટે તમારો વર્તમાન પાસવર્ડ અને નવો પાસવર્ડ દાખલ કરો: "
 
 #: src/protocols/gg/gg.c:578 src/protocols/gg/gg.c:579
-#, fuzzy
 msgid "Change Gadu-Gadu Password"
-msgstr "Gadu-Gadu પાસવર્ડ બદલવામાં અસમર્થ"
+msgstr "ગડુ-ગડુ પાસવર્ડ બદલો"
 
 #: src/protocols/gg/gg.c:649
-#, fuzzy, c-format
+#, c-format
 msgid "Select a chat for buddy: %s"
-msgstr "તમારી વ્યક્તિ યાદીમાંથી સંવાદ દૂર કરો"
+msgstr "સંવાદ માટે વ્યક્તિ પસંદ કરો: %s"
 
 #: src/protocols/gg/gg.c:651 src/protocols/gg/gg.c:652
-#, fuzzy
 msgid "Add to chat..."
-msgstr "સંવાદ ઉમેરો (_h)"
+msgstr "સંવાદમાં ઉમેરો..."
 
 #: src/protocols/gg/gg.c:812
 msgid "Unable to read socket"
@@ -4885,10 +4772,9 @@
 
 #: src/protocols/gg/gg.c:959
 msgid "Gadu-Gadu Public Directory"
-msgstr ""
+msgstr "ગડુ-ગડુ જાહેર ડિરેક્ટરી"
 
 #: src/protocols/gg/gg.c:960
-#, fuzzy
 msgid "Search results"
 msgstr "શોધ પરિણામો"
 
@@ -4928,84 +4814,70 @@
 msgstr "અટકાવાયેલ"
 
 #: src/protocols/gg/gg.c:1129
-#, fuzzy
 msgid "Add to chat"
-msgstr "સંવાદ ઉમેરો"
+msgstr "સંવાદમાં ઉમેરો"
 
 #: src/protocols/gg/gg.c:1133
-#, fuzzy
 msgid "Unblock"
-msgstr "બ્લોક કરો"
+msgstr "રોકો નહિ"
 
 #: src/protocols/gg/gg.c:1149
-#, fuzzy
 msgid "Chat _name:"
-msgstr "છેલ્લું નામ:"
+msgstr "સંવાદ નામ (_n):"
 
 #: src/protocols/gg/gg.c:1183
-#, fuzzy
 msgid "Connection failed."
-msgstr "જોડાણ નિષ્ફળ"
+msgstr "જોડાણ નિષ્ફળ."
 
 #: src/protocols/gg/gg.c:1357
-#, fuzzy
 msgid "Chat error"
-msgstr "વાંચન ભૂલ"
+msgstr "સંવાદ ક્ષતિ"
 
 #: src/protocols/gg/gg.c:1358
-#, fuzzy
 msgid "This chat name is already in use"
-msgstr "તે ફાઈલ પહેલાથી જ હાજર છે"
+msgstr "આ સંવાદ નામ પહેલાથી જ ઉપયોગમાં છે"
 
 #: src/protocols/gg/gg.c:1435
-#, fuzzy
 msgid "Not connected to the server."
-msgstr "તમારું સર્વરમાંથી જોડાણ તૂટી ગયું હતું."
+msgstr "સર્વર સાથે જોડાણથયેલ નથી."
 
 #: src/protocols/gg/gg.c:1456
 msgid "Token Error: Unable to fetch the token.\n"
-msgstr ""
+msgstr "ટોકન ક્ષતિ: ટોકન મેળવવામાં નિષ્ફળ.\n"
 
 #: src/protocols/gg/gg.c:1472
-#, fuzzy
 msgid "e-Mail"
 msgstr "ઇ-મેઇલ"
 
 #: src/protocols/gg/gg.c:1495 src/protocols/gg/gg.c:1496
-#, fuzzy
 msgid "Register New Gadu-Gadu Account"
-msgstr "નવું Jabber ખાતું રજીસ્ટર કરો"
+msgstr "નવું ગડુ-ગડુ ખાતું રજીસ્ટર કરો"
 
 #: src/protocols/gg/gg.c:1497
 msgid "Please, fill in the following fields"
-msgstr ""
+msgstr "મહેરબાની કરી, નીચેનાં ક્ષેત્રો ભરો"
 
 #: src/protocols/gg/gg.c:1515
-#, fuzzy
 msgid "Change password"
 msgstr "પાસવર્ડ બદલો"
 
 #: src/protocols/gg/gg.c:1520
-#, fuzzy
 msgid "Upload buddylist to Server"
-msgstr "સર્વરમાં વ્યક્તિ યાદીની નિકાસ કરો"
+msgstr "સર્વરમાં વ્યક્તિયાદીની નિકાસ કરો"
 
 #: src/protocols/gg/gg.c:1523
-#, fuzzy
 msgid "Download buddylist from Server"
-msgstr "સર્વરમાંથી વ્યક્તિ યાદી કાઢી નાંખો"
+msgstr "સર્વરમાંથી વ્યક્તિયાદી ડાઉનલોડ કરો"
 
 #: src/protocols/gg/gg.c:1526
-#, fuzzy
 msgid "Delete buddylist from Server"
-msgstr "સર્વરમાંથી વ્યક્તિ યાદી કાઢી નાંખો"
+msgstr "સર્વરમાંથી વ્યક્તિયાદી કાઢી નાંખો"
 
 #: src/protocols/gg/gg.c:1529
 msgid "Save buddylist to file"
-msgstr ""
+msgstr "વ્યક્તિયાદીને ફાઇલમાં સંગ્રહ કરો"
 
 #: src/protocols/gg/gg.c:1532
-#, fuzzy
 msgid "Load buddylist from file"
 msgstr "સર્વરમાંથી વ્યક્તિ યાદી આયાત કરો"
 
@@ -5027,12 +4899,11 @@
 #. summary
 #: src/protocols/gg/gg.c:1618
 msgid "Polish popular IM"
-msgstr ""
+msgstr "ચકાચક લોકપ્રિય IM"
 
 #: src/protocols/gg/gg.c:1665
-#, fuzzy
 msgid "Gadu-Gadu User"
-msgstr "Gadu-Gadu શોધ યંત્ર"
+msgstr "ગડુ-ગડુ વપરાશકર્તા"
 
 #: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1313
 #, c-format
@@ -5053,7 +4924,6 @@
 #: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:173
 #: src/protocols/yahoo/yahoo_filexfer.c:182
 #: src/protocols/yahoo/yahoo_filexfer.c:191
-#, fuzzy
 msgid "File Transfer Failed"
 msgstr "ફાઈલ પરિવહન રદ થઈ ગયું"
 
@@ -5063,7 +4933,7 @@
 
 #: src/protocols/irc/irc.c:79
 msgid "Error displaying MOTD"
-msgstr "MOTD દર્શાવવામાં ભૂલ"
+msgstr "MOTD દર્શાવવામાં ક્ષતિ"
 
 #: src/protocols/irc/irc.c:79
 msgid "No MOTD available"
@@ -5124,7 +4994,7 @@
 
 #: src/protocols/irc/irc.c:519 src/protocols/irc/irc.c:541
 msgid "Read error"
-msgstr "વાંચન ભૂલ"
+msgstr "વાંચન ક્ષતિ"
 
 #: src/protocols/irc/irc.c:690 src/protocols/silc/chat.c:1388
 #: src/protocols/yahoo/yahoochat.c:1376
@@ -5180,9 +5050,8 @@
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
 #: src/protocols/irc/irc.c:839
-#, fuzzy
 msgid "Use SSL"
-msgstr "SSL"
+msgstr "SSL વાપરો"
 
 #: src/protocols/irc/msgs.c:105
 msgid "Bad mode"
@@ -5240,7 +5109,7 @@
 #: src/protocols/irc/msgs.c:244
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
-msgstr "<b>માટે ફાજલ:</b> %s<br>"
+msgstr "<b>માટે નિષ્ક્રિય:</b> %s<br>"
 
 #: src/protocols/irc/msgs.c:246
 msgid "Online since"
@@ -5352,7 +5221,7 @@
 
 #: src/protocols/irc/msgs.c:907
 msgid "Error: invalid PONG from server"
-msgstr "ભૂલ: સર્વરમાંથી અયોગ્ય PONG"
+msgstr "ક્ષતિ: સર્વરમાંથી અયોગ્ય PONG"
 
 #: src/protocols/irc/msgs.c:909
 #, c-format
@@ -5369,9 +5238,8 @@
 msgstr "ચેનલમાં જોડાઈ શકતા નથી"
 
 #: src/protocols/irc/msgs.c:1019
-#, fuzzy
 msgid "Nick or channel is temporarily unavailable."
-msgstr "સેવા ક્ષણવાર માટે ઉપલબ્ધ નથી."
+msgstr "ખોટું નામ અથવા ચેનલ થોડી વાર માટે ઉપલબ્ધ નથી."
 
 #: src/protocols/irc/msgs.c:1031
 #, c-format
@@ -5380,7 +5248,7 @@
 
 #: src/protocols/irc/parse.c:114
 msgid "action &lt;action to perform&gt;:  Perform an action."
-msgstr "action &lt;action to perform&gt;:  ક્રિયા કરો."
+msgstr "ક્રિયા &lt;કરવા માટેની ક્રિયા &gt;:  ક્રિયા કરો."
 
 #: src/protocols/irc/parse.c:115
 msgid ""
@@ -5495,8 +5363,7 @@
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
-msgstr ""
-"part [room] [message]:  વર્તમાન ચેનલ, અથવા સ્પષ્ટ થયેલ ચેનલ, વૈકલ્પિક સંદેશા સાથે છોડો."
+msgstr "part [room] [message]:  વર્તમાન ચેનલ, અથવા સ્પષ્ટ થયેલ ચેનલ, વૈકલ્પિક સંદેશા સાથે છોડો."
 
 #: src/protocols/irc/parse.c:131
 msgid ""
@@ -5732,7 +5599,7 @@
 
 #: src/protocols/jabber/buddy.c:832
 msgid "Logo"
-msgstr "લોગો"
+msgstr "લૉગો"
 
 #: src/protocols/jabber/buddy.c:1035
 msgid "Un-hide From"
@@ -5762,7 +5629,7 @@
 #: src/protocols/jabber/chat.c:688 src/protocols/jabber/jabber.c:1018
 #: src/protocols/silc/ops.c:1235
 msgid "Error"
-msgstr "ભૂલ"
+msgstr "ક્ષતિ"
 
 #: src/protocols/jabber/buddy.c:1091 src/protocols/jabber/jabber.c:1047
 msgid "Chatty"
@@ -5781,11 +5648,11 @@
 
 #: src/protocols/jabber/buddy.c:1235
 msgid "The following are the results of your search"
-msgstr ""
+msgstr "નીચે તમારી શોધનાં પરિણામો છે"
 
 #: src/protocols/jabber/buddy.c:1327
 msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr ""
+msgstr "કોઇપણ મળતાં જબાર વપરાશકર્તાઓને શોધવા માટે એક અથવા વધુ ક્ષેત્રોમાં ભરો."
 
 #: src/protocols/jabber/buddy.c:1331 src/protocols/jabber/jabber.c:653
 #: src/protocols/oscar/oscar.c:5962 src/protocols/silc/ops.c:810
@@ -5802,29 +5669,24 @@
 msgstr "ઇ-મેઇલ સરનામું"
 
 #: src/protocols/jabber/buddy.c:1355 src/protocols/jabber/buddy.c:1356
-#, fuzzy
 msgid "Search for Jabber users"
-msgstr "ઈ-મેઈલ સરનામા દ્વારા વ્યક્તિ માટે શોધ"
+msgstr "જબાર વપરાશકર્તા માટે શોધ કરો"
 
 #: src/protocols/jabber/buddy.c:1370
-#, fuzzy
 msgid "Invalid Directory"
-msgstr "અયોગ્ય ભૂલ"
+msgstr "અયોગ્ય ડિરેક્ટરી"
 
 #: src/protocols/jabber/buddy.c:1387
-#, fuzzy
 msgid "Enter a User Directory"
-msgstr "ડિરેક્ટરી મોકલી શકતા નથી."
+msgstr "વપરાશકર્તા ડિરેક્ટરી દાખલ કરો."
 
 #: src/protocols/jabber/buddy.c:1388
-#, fuzzy
 msgid "Select a user directory to search"
-msgstr "પ્રશ્ન પૂછવા માટે કોન્ફરન્સ સર્વર પસંદ કરો"
+msgstr "શોધ કરવા માટે વપરાશકર્તા ડિરેક્ટરી પસંદ કરો"
 
 #: src/protocols/jabber/buddy.c:1391
-#, fuzzy
 msgid "Search Directory"
-msgstr "આના માટે શોધો (_S):"
+msgstr "ડિરેક્ટરી શોધો"
 
 #: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:7318
 #: src/protocols/yahoo/yahoochat.c:979
@@ -5868,7 +5730,7 @@
 
 #: src/protocols/jabber/chat.c:395
 msgid "Configuration error"
-msgstr "રૂપરેખાંકન ભૂલ"
+msgstr "રૂપરેખાંકન ક્ષતિ"
 
 #: src/protocols/jabber/chat.c:404 src/protocols/jabber/chat.c:549
 msgid "Unable to configure"
@@ -5876,7 +5738,7 @@
 
 #: src/protocols/jabber/chat.c:420
 msgid "Room Configuration Error"
-msgstr "કક્ષ રૂપરેખાંકન ભૂલ"
+msgstr "કક્ષ રૂપરેખાંકન ક્ષતિ"
 
 #: src/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
@@ -5884,7 +5746,7 @@
 
 #: src/protocols/jabber/chat.c:471 src/protocols/jabber/chat.c:540
 msgid "Registration error"
-msgstr "રજીસ્ટ્રેશન ભૂલ"
+msgstr "રજીસ્ટ્રેશન ક્ષતિ"
 
 #: src/protocols/jabber/chat.c:628
 msgid "Nick changing not supported in non-MUC chatrooms"
@@ -5892,9 +5754,8 @@
 
 #: src/protocols/jabber/chat.c:678 src/protocols/jabber/chat.c:689
 #: src/protocols/silc/ops.c:1235
-#, fuzzy
 msgid "Error retrieving room list"
-msgstr "કક્ષયાદી મેળવવામાં ભૂલ"
+msgstr "કક્ષ યાદી મેળવવામાં ક્ષતિ"
 
 #: src/protocols/jabber/chat.c:737
 msgid "Invalid Server"
@@ -5914,15 +5775,15 @@
 
 #: src/protocols/jabber/jabber.c:79
 msgid "Error initializing session"
-msgstr "સત્રનો પ્રારંભ કરવામાં ભૂલ"
+msgstr "સત્રનો પ્રારંભ કરવામાં ક્ષતિ"
 
 #: src/protocols/jabber/jabber.c:215
 msgid "Write error"
-msgstr "લખવામાં ભૂલ"
+msgstr "લખવામાં ક્ષતિ"
 
 #: src/protocols/jabber/jabber.c:253 src/protocols/jabber/jabber.c:273
 msgid "Read Error"
-msgstr "વાંચવામાં ભૂલ"
+msgstr "વાંચવામાં ક્ષતિ"
 
 #: src/protocols/jabber/jabber.c:359 src/protocols/jabber/jabber.c:780
 msgid "Unable to create socket"
@@ -5943,7 +5804,7 @@
 
 #: src/protocols/jabber/jabber.c:482 src/protocols/jabber/jabber.c:1299
 msgid "Unknown Error"
-msgstr "અજાણી ભૂલ"
+msgstr "અજાણી ક્ષતિ"
 
 #: src/protocols/jabber/jabber.c:484 src/protocols/jabber/jabber.c:485
 msgid "Registration Failed"
@@ -6028,9 +5889,8 @@
 #: src/protocols/jabber/jabber.c:1039 src/protocols/jabber/jabber.c:1047
 #: src/protocols/jabber/jabber.c:1055 src/protocols/jabber/jabber.c:1063
 #: src/protocols/jabber/jabber.c:1071
-#, fuzzy
 msgid "Priority"
-msgstr "પોર્ટ"
+msgstr "ઉચ્ચતા"
 
 #: src/protocols/jabber/jabber.c:1093
 msgid "Password Changed"
@@ -6042,7 +5902,7 @@
 
 #: src/protocols/jabber/jabber.c:1098 src/protocols/jabber/jabber.c:1099
 msgid "Error changing password"
-msgstr "પાસવર્ડ બદલવામાં ભૂલ"
+msgstr "પાસવર્ડ બદલવામાં ક્ષતિ"
 
 #: src/protocols/jabber/jabber.c:1155
 msgid "Password (again)"
@@ -6067,9 +5927,8 @@
 
 #. }
 #: src/protocols/jabber/jabber.c:1181
-#, fuzzy
 msgid "Search for users"
-msgstr "આના માટે શોધો (_S):"
+msgstr "વપરાશકર્તા માટે શોધો"
 
 #: src/protocols/jabber/jabber.c:1257
 msgid "Bad Request"
@@ -6093,7 +5952,7 @@
 
 #: src/protocols/jabber/jabber.c:1267 src/protocols/jabber/jabber.c:1341
 msgid "Internal Server Error"
-msgstr "આંતરિક સર્વર ભૂલ"
+msgstr "આંતરિક સર્વર ક્ષતિ"
 
 #: src/protocols/jabber/jabber.c:1269
 msgid "Item Not Found"
@@ -6265,7 +6124,7 @@
 
 #: src/protocols/jabber/jabber.c:1375
 msgid "Stream Error"
-msgstr "સ્ટ્રીમ ભૂલ"
+msgstr "સ્ટ્રીમ ક્ષતિ"
 
 #: src/protocols/jabber/jabber.c:1442
 #, c-format
@@ -6273,14 +6132,14 @@
 msgstr "વપરાશકર્તા %s ને બેન કરવામાં અસમર્થ"
 
 #: src/protocols/jabber/jabber.c:1464
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown affiliation: \"%s\""
-msgstr "અજ્ઞાત આદેશ: %s"
+msgstr "અજ્ઞાત આમંત્રણ: \"%s\""
 
 #: src/protocols/jabber/jabber.c:1469
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to affiliate user %s as \"%s\""
-msgstr "વપરાશકર્તા ને આમંત્રિત કરવામાં અસમર્થ (%s)."
+msgstr "વપરાશકર્તા %sને \"%s\" તરીકે આમંત્રિત કરવામાં અસમર્થ"
 
 #: src/protocols/jabber/jabber.c:1521
 #, c-format
@@ -6316,6 +6175,8 @@
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
 msgstr ""
+"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: વપરાશકર્તાનું "
+"કક્ષ સાથેનું જોડાણ દર્શાવે છે."
 
 #: src/protocols/jabber/jabber.c:1589
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
@@ -6330,8 +6191,7 @@
 msgstr "kick &lt;user&gt; [room]:  વપરાશકર્તાને કક્ષમાંથી કિક મારો."
 
 #: src/protocols/jabber/jabber.c:1606
-msgid ""
-"msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
+msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr "msg &lt;user&gt; &lt;message&gt;:  અન્ય વપરાશકર્તાને ખાનગી સંદેશો મોકલો."
 
 #. *< type
@@ -6354,21 +6214,19 @@
 
 #: src/protocols/jabber/jabber.c:1719
 msgid "Require TLS"
-msgstr ""
+msgstr "TLS જરૂરી છે"
 
 #: src/protocols/jabber/jabber.c:1722
-#, fuzzy
 msgid "Force old (port 5223) SSL"
-msgstr "જૂના SSL ને દબાણ કરો"
+msgstr "જૂના SSL (port 5223)ને દબાણ કરો"
 
 #: src/protocols/jabber/jabber.c:1727
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "એનક્રિપ્ટ નહિં થયેલ સ્ટ્રીમો ઉપર સાદા લખાણ સત્તાધિકરણને પરવાનગી આપો"
 
 #: src/protocols/jabber/jabber.c:1732
-#, fuzzy
 msgid "Connect port"
-msgstr "સાંકળો"
+msgstr "પોર્ટ સાથે જોડાઓ"
 
 #. Account options
 #: src/protocols/jabber/jabber.c:1736 src/protocols/silc/silc.c:1593
@@ -6397,7 +6255,7 @@
 
 #: src/protocols/jabber/message.c:233
 msgid "Jabber Message Error"
-msgstr "Jabber સંદેશા ભૂલ"
+msgstr "Jabber સંદેશા ક્ષતિ"
 
 #: src/protocols/jabber/message.c:297
 #, c-format
@@ -6406,11 +6264,11 @@
 
 #: src/protocols/jabber/parser.c:131
 msgid "XML Parse error"
-msgstr "XML પદચ્છેદન ભૂલ"
+msgstr "XML પદચ્છેદન ક્ષતિ"
 
 #: src/protocols/jabber/presence.c:284
 msgid "Unknown Error in presence"
-msgstr "હાજરીમાં અજ્ઞાત ભૂલ"
+msgstr "હાજરીમાં અજ્ઞાત ક્ષતિ"
 
 #: src/protocols/jabber/presence.c:289 src/protocols/msn/userlist.c:93
 #, c-format
@@ -6452,12 +6310,12 @@
 #: src/protocols/jabber/presence.c:388
 #, c-format
 msgid "Error in chat %s"
-msgstr "સંવાદ %s માં ભૂલ"
+msgstr "સંવાદ %s માં ક્ષતિ"
 
 #: src/protocols/jabber/presence.c:391
 #, c-format
 msgid "Error joining chat %s"
-msgstr "સંવાદ %s માં જોડાવામાં ભૂલ"
+msgstr "સંવાદ %s માં જોડાવામાં ક્ષતિ"
 
 #: src/protocols/jabber/si.c:591
 #, c-format
@@ -6487,8 +6345,7 @@
 msgid ""
 "%s is on the local list but not on the server list. Do you want this buddy "
 "to be added?"
-msgstr ""
-"%s એ સ્થાનિક યાદી પર છે પરંતુ સર્વર યાદી પર નથી. શું તમે આ વ્યક્તિને ઉમેરવા માંગો છો?"
+msgstr "%s એ સ્થાનિક યાદી પર છે પરંતુ સર્વર યાદી પર નથી. શું તમે આ વ્યક્તિને ઉમેરવા માંગો છો?"
 
 #: src/protocols/msn/error.c:35
 msgid "Unable to parse message"
@@ -6496,11 +6353,11 @@
 
 #: src/protocols/msn/error.c:38
 msgid "Syntax Error (probably a Gaim bug)"
-msgstr "વાક્યરચના ભૂલ (સંભવિત રીતે Gaim ત્રુટિ)"
+msgstr "વાક્યરચના ક્ષતિ (સંભવિત રીતે Gaim ત્રુટિ)"
 
 #: src/protocols/msn/error.c:42
 msgid "Invalid e-mail address"
-msgstr "અયોગ્ય ઈમેઈલ સરનામું"
+msgstr "અયોગ્ય ઈ-મેઈલ સરનામું"
 
 #: src/protocols/msn/error.c:45
 msgid "User does not exist"
@@ -6596,7 +6453,7 @@
 
 #: src/protocols/msn/error.c:119
 msgid "Database server error"
-msgstr "ડેટાબેઝ સર્વર ભૂલ"
+msgstr "ડેટાબેઝ સર્વર ક્ષતિ"
 
 #: src/protocols/msn/error.c:122
 msgid "Command disabled"
@@ -6604,11 +6461,11 @@
 
 #: src/protocols/msn/error.c:125
 msgid "File operation error"
-msgstr "ફાઈલ પ્રક્રિયા ભૂલ"
+msgstr "ફાઈલ પ્રક્રિયા ક્ષતિ"
 
 #: src/protocols/msn/error.c:128
 msgid "Memory allocation error"
-msgstr "મેમરી સોંપણી ભૂલ"
+msgstr "મેમરી સોંપણી ક્ષતિ"
 
 #: src/protocols/msn/error.c:131
 msgid "Wrong CHL value sent to server"
@@ -6629,7 +6486,7 @@
 
 #: src/protocols/msn/error.c:144
 msgid "Database connect error"
-msgstr "ડેટાબેઝ જોડાણ ભૂલ"
+msgstr "ડેટાબેઝ જોડાણ ક્ષતિ"
 
 #: src/protocols/msn/error.c:148
 msgid "Server is going down (abandon ship)"
@@ -6637,7 +6494,7 @@
 
 #: src/protocols/msn/error.c:155
 msgid "Error creating connection"
-msgstr "જોડાણ બનાવવામાં ભૂલ"
+msgstr "જોડાણ બનાવવામાં ક્ષતિ"
 
 #: src/protocols/msn/error.c:159
 msgid "CVR parameters are either unknown or not allowed"
@@ -6707,16 +6564,16 @@
 #: src/protocols/msn/error.c:224
 #, c-format
 msgid "Unknown Error Code %d"
-msgstr "અજ્ઞાત ભૂલ કોડ %d"
+msgstr "અજ્ઞાત ક્ષતિ કોડ %d"
 
 #: src/protocols/msn/error.c:236
 #, c-format
 msgid "MSN Error: %s\n"
-msgstr "MSN ભૂલ: %s\n"
+msgstr "MSN ક્ષતિ: %s\n"
 
 #: src/protocols/msn/msn.c:113
 msgid "You have just sent a Nudge!"
-msgstr ""
+msgstr "તમે હમણાં ફાઇલ મોકલી છે!"
 
 #: src/protocols/msn/msn.c:138
 msgid "Your new MSN friendly name is too long."
@@ -6764,7 +6621,7 @@
 
 #: src/protocols/msn/msn.c:328
 msgid "This Hotmail account may not be active."
-msgstr ""
+msgstr "આ હોટમેલ ખાતું કદાચ સક્રિય નથી."
 
 #: src/protocols/msn/msn.c:354
 msgid "Send a mobile message."
@@ -6835,7 +6692,7 @@
 
 #: src/protocols/msn/msn.c:647
 msgid "Open Hotmail Inbox"
-msgstr ""
+msgstr "હોટમેલ ઇનબોક્સ ખોલો"
 
 #: src/protocols/msn/msn.c:671
 msgid "Send to Mobile"
@@ -6877,7 +6734,7 @@
 #: src/protocols/msn/msn.c:1476 src/protocols/msn/msn.c:1727
 #: src/protocols/yahoo/yahoo_profile.c:760
 msgid "Error retrieving profile"
-msgstr "રૂપરેખા મેળવવામાં ભૂલ"
+msgstr "રૂપરેખા મેળવવામાં ક્ષતિ"
 
 #: src/protocols/msn/msn.c:1546 src/protocols/oscar/oscar.c:5992
 #: src/protocols/yahoo/yahoo_profile.c:1015
@@ -6980,7 +6837,6 @@
 msgstr "HTTP પદ્ધતિ વાપરો"
 
 #: src/protocols/msn/msn.c:1980
-#, fuzzy
 msgid "nudge: nudge a contact to get their attention"
 msgstr "buzz: ધ્યાન દોરવા માટે તેને જગાવો"
 
@@ -6997,7 +6853,7 @@
 #: src/protocols/msn/notification.c:184 src/protocols/msn/notification.c:528
 #: src/protocols/msn/session.c:347
 msgid "Unknown error."
-msgstr "અજ્ઞાત ભૂલ."
+msgstr "અજ્ઞાત ક્ષતિ."
 
 #: src/protocols/msn/notification.c:187
 #, c-format
@@ -7066,16 +6922,16 @@
 
 #: src/protocols/msn/servconn.c:129
 msgid "Writing error"
-msgstr "લખવામાં ભૂલ"
+msgstr "લખવામાં ક્ષતિ"
 
 #: src/protocols/msn/servconn.c:131
 msgid "Reading error"
-msgstr "વાંચવામાં ભૂલ"
+msgstr "વાંચવામાં ક્ષતિ"
 
 #: src/protocols/msn/servconn.c:133 src/protocols/msn/session.c:339
 #: src/protocols/oscar/oscar.c:4925
 msgid "Unknown error"
-msgstr "અજ્ઞાત ભૂલ"
+msgstr "અજ્ઞાત ક્ષતિ"
 
 #: src/protocols/msn/servconn.c:136
 #, c-format
@@ -7083,7 +6939,7 @@
 "Connection error from %s server (%s):\n"
 "%s"
 msgstr ""
-"%s માંથી સર્વર (%s) માં જોડાણ ભૂલ:\n"
+"%s માંથી સર્વર (%s) માં જોડાણ ક્ષતિ:\n"
 "%s"
 
 #: src/protocols/msn/session.c:317
@@ -7092,7 +6948,7 @@
 
 #: src/protocols/msn/session.c:321
 msgid "Error parsing HTTP."
-msgstr "HTTP નું પદચ્છેદન કરવામાં ભૂલ."
+msgstr "HTTP નું પદચ્છેદન કરવામાં ક્ષતિ."
 
 #. MSG_SERVER_GHOST
 #. Looks like someone logged in as us! =-O
@@ -7103,8 +6959,7 @@
 
 #: src/protocols/msn/session.c:328
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
-msgstr ""
-"MSN સર્વરો ક્ષણવાર માટે ઉપલબ્ધ નથી. મહેરબાની કરીને રાહ જુઓ અને ફરીથી પ્રયત્ન કરો."
+msgstr "MSN સર્વરો ક્ષણવાર માટે ઉપલબ્ધ નથી. મહેરબાની કરીને રાહ જુઓ અને ફરીથી પ્રયત્ન કરો."
 
 #: src/protocols/msn/session.c:333
 msgid "The MSN servers are going down temporarily."
@@ -7116,8 +6971,7 @@
 msgstr "સત્તાધિકરણ કરવામાં અસમર્થ: %s"
 
 #: src/protocols/msn/session.c:342
-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 ""
 "તમારી MSN વ્યક્તિ યાદી ક્ષણવાર માટે ઉપલબ્ધ નથી. મહેરબાની કરીને રાહ જુઓ અને ફરીથી "
 "પ્રયત્ન કરો."
@@ -7164,21 +7018,20 @@
 
 #: src/protocols/msn/switchboard.c:419
 msgid "Message could not be sent because a connection error occurred:"
-msgstr "સંદેશો મોકલાઈ શકાયો નહિં કારણ કે જોડાણ ભૂલ ઉદ્દભવી:"
+msgstr "સંદેશો મોકલાઈ શકાયો નહિં કારણ કે જોડાણ ક્ષતિ ઉદ્દભવી:"
 
 #: src/protocols/msn/switchboard.c:423
-msgid ""
-"Message could not be sent because an error with the switchboard occurred:"
-msgstr "સંદેશો મોકલી શકાયો નહિં કારણ કે સ્વીચબોર્ડ સાથે ભૂલ ઉદ્દભવી:"
+msgid "Message could not be sent because an error with the switchboard occurred:"
+msgstr "સંદેશો મોકલી શકાયો નહિં કારણ કે સ્વીચબોર્ડ સાથે ક્ષતિ ઉદ્દભવી:"
 
 #: src/protocols/msn/switchboard.c:431
 msgid "Message may have not been sent because an unknown error occurred:"
-msgstr "સંદેશો મોકલાઈ શકાશે નહિં કારણ કે એક અજ્ઞાત ભૂલ ઉદ્દભવી:"
+msgstr "સંદેશો મોકલાઈ શકાશે નહિં કારણ કે એક અજ્ઞાત ક્ષતિ ઉદ્દભવી:"
 
 #: src/protocols/msn/switchboard.c:952
-#, fuzzy, c-format
+#, c-format
 msgid "%s just sent you a Nudge!"
-msgstr "%s તમને ફાઈલ મોકલવા માંગે છે"
+msgstr "%s એ તમને ફાઈલ મોકલી!"
 
 #: src/protocols/msn/userlist.c:85
 #, c-format
@@ -7186,14 +7039,14 @@
 msgstr "વપરાશકર્તા %s (%s) એ %s ને તેની અથવા તેણીની વ્યક્તિ યાદીમાં ઉમેરવા માંગે છે."
 
 #: src/protocols/msn/userlist.c:275
-#, fuzzy, c-format
+#, c-format
 msgid "%s has added you to his or her contact list."
-msgstr "વપરાશકર્તા %s એ %s ને તેની અથવા તેણીની વ્યક્તિ યાદીમાં ઉમેરવા માંગે છે."
+msgstr "વપરાશકર્તા %s એ તમને તેની અથવા તેણીની વ્યક્તિયાદીમાં ઉમેરેલ છે."
 
 #: src/protocols/msn/userlist.c:339
 #, c-format
 msgid "%s has removed you from his or her contact list."
-msgstr ""
+msgstr "%s તમને તેની સંપર્ક યાદી માંથી નિકાળી નાખ્યા છે."
 
 #: src/protocols/msn/userlist.c:659
 #, c-format
@@ -7214,9 +7067,8 @@
 msgstr "સર્વરમાંથી સંદેશો વાંચવામાં અસમર્થ: %s. %hd આદેશ છે, %hd લંબાઈ છે."
 
 #: src/protocols/napster/napster.c:290
-#, fuzzy
 msgid "Unknown server error."
-msgstr "અજ્ઞાત ભૂલ."
+msgstr "અજ્ઞાત સર્વર ક્ષતિ."
 
 #: src/protocols/napster/napster.c:339
 #, c-format
@@ -7374,7 +7226,7 @@
 
 #: src/protocols/novell/nmuser.c:1945
 msgid "An error occurred while updating the directory"
-msgstr "જ્યારે ડિરેક્ટરી સુધારી રહ્યા હોય ત્યારે ભૂલ ઉદ્દભવી"
+msgstr "જ્યારે ડિરેક્ટરી સુધારી રહ્યા હોય ત્યારે ક્ષતિ ઉદ્દભવી"
 
 #: src/protocols/novell/nmuser.c:1948
 msgid "Incompatible protocol version"
@@ -7388,8 +7240,7 @@
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
-msgstr ""
-"આ ચકાસણી આવૃત્તિ દસ કરતાં વધુ વપરાશકર્તાઓને એક જ સમયે પ્રવેશવા માટે પરવાનગી આપતું નથી"
+msgstr "આ ચકાસણી આવૃત્તિ દસ કરતાં વધુ વપરાશકર્તાઓને એક જ સમયે પ્રવેશવા માટે પરવાનગી આપતું નથી"
 
 #: src/protocols/novell/nmuser.c:1957
 msgid "The user is either offline or you are blocked"
@@ -7398,7 +7249,7 @@
 #: src/protocols/novell/nmuser.c:1960
 #, c-format
 msgid "Unknown error: 0x%X"
-msgstr "અજ્ઞાત ભૂલ: 0x%X"
+msgstr "અજ્ઞાત ક્ષતિ: 0x%X"
 
 #: src/protocols/novell/novell.c:117
 #, c-format
@@ -7443,7 +7294,7 @@
 "creating folder (%s)."
 msgstr ""
 "વપરાશકર્તા %s ને ફોલ્ડર %s માં સર્વર બાજુની યાદીમાં ખસેડવામાં અસમર્થ. ફોલ્ડર બનાવતી વખતે "
-"ભૂલ (%s)."
+"ક્ષતિ (%s)."
 
 #: src/protocols/novell/novell.c:617
 #, c-format
@@ -7451,8 +7302,8 @@
 "Unable to add %s to your buddy list. Error creating folder in server side "
 "list (%s)."
 msgstr ""
-"%s ને તમારી વ્યક્તિ યાદીમાં ઉમેરવામાં અસમર્થ. સર્વર બાજુ યાદી માં ફોલ્ડર બનાવવામાં ભૂલ (%"
-"s)."
+"%s ને તમારી વ્યક્તિ યાદીમાં ઉમેરવામાં અસમર્થ. સર્વર બાજુ યાદી માં ફોલ્ડર બનાવવામાં ક્ષતિ "
+"(%s)."
 
 #: src/protocols/novell/novell.c:690
 #, c-format
@@ -7491,7 +7342,7 @@
 
 #: src/protocols/novell/novell.c:1110 src/protocols/novell/novell.c:1667
 msgid "Error communicating with server. Closing connection."
-msgstr "સર્વર સાથે સંપર્ક વ્યવહાર કરવામાં ભૂલ. જોડાણ બંધ કરી રહ્યા છીએ."
+msgstr "સર્વર સાથે સંપર્ક વ્યવહાર કરવામાં ક્ષતિ. જોડાણ બંધ કરી રહ્યા છીએ."
 
 #: src/protocols/novell/novell.c:1452
 msgid "Telephone Number"
@@ -7541,7 +7392,7 @@
 #: src/protocols/novell/novell.c:1673
 #, c-format
 msgid "Error processing event or response (%s)."
-msgstr "ઘટના અથવા પ્રત્યુત્તર પર પ્રક્રિયા કરવામાં ભૂલ (%s)."
+msgstr "ઘટના અથવા પ્રત્યુત્તર પર પ્રક્રિયા કરવામાં ક્ષતિ (%s)."
 
 #: src/protocols/novell/novell.c:1707
 msgid "Authenticating..."
@@ -7585,8 +7436,7 @@
 
 #: src/protocols/novell/novell.c:2051
 #, 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 "%s એ ઓફલાઈન થયેલ હોય એમ દેખાય છે અને તમે મોકલેલ સંદેશો મેળવેલ નથી."
 
 #. TODO: Would be nice to prompt if not set!
@@ -7603,7 +7453,7 @@
 
 #: src/protocols/novell/novell.c:2171
 msgid "Error. SSL support is not installed."
-msgstr "ભૂલ. SSL આધાર સ્થાપિત થયેલ નથી."
+msgstr "ક્ષતિ. SSL આધાર સ્થાપિત થયેલ નથી."
 
 #: src/protocols/novell/novell.c:2475
 msgid "This conference has been closed. No more messages can be sent."
@@ -7638,7 +7488,7 @@
 
 #: src/protocols/oscar/oscar.c:202
 msgid "Invalid error"
-msgstr "અયોગ્ય ભૂલ"
+msgstr "અયોગ્ય ક્ષતિ"
 
 #: src/protocols/oscar/oscar.c:203
 msgid "Invalid SNAC"
@@ -7737,7 +7587,8 @@
 "(There was an error receiving this message.  The buddy you are speaking to "
 "most likely has a buggy client.)"
 msgstr ""
-"(આ સંદેશો મેળવતી ભૂલ હતી.  તમે જે વ્યક્તિ સાથે બોલી રહ્યા છો તે મોટે ભાગે ભૂલભરેલ ક્લાઈન્ટ છે.)"
+"(આ સંદેશો મેળવતી ક્ષતિ હતી.  તમે જે વ્યક્તિ સાથે બોલી રહ્યા છો તે મોટે ભાગે ક્ષતિભરેલ "
+"ક્લાઈન્ટ છે.)"
 
 #: src/protocols/oscar/oscar.c:616
 msgid "Voice"
@@ -7903,7 +7754,7 @@
 msgstr "સાંકળો"
 
 #: src/protocols/oscar/oscar.c:1661
-#, fuzzy, c-format
+#, c-format
 msgid "You have lost your connection to chat room %s."
 msgstr "તમારું જોડાણ સંવાદ કક્ષ %s માંથી તૂટી ગયેલ છે."
 
@@ -7956,6 +7807,8 @@
 " Try enabling proxy servers for file transfers in Tools->Preferences->AIM/"
 "ICQ."
 msgstr ""
+"ફાઇલ %sનું પરિવહન સમય સીમા ઓળંગી ગયું.\n"
+" સાધનો->પ્રાથમિકતાઓ->AIM/ICQ માં જઇને પ્રોક્સી સર્વરને સક્રિય કરવાનો પ્રયત્ન કરો."
 
 #: src/protocols/oscar/oscar.c:2206 src/protocols/yahoo/yahoo_filexfer.c:174
 #: src/protocols/yahoo/yahoo_filexfer.c:183
@@ -7974,8 +7827,7 @@
 
 #: src/protocols/oscar/oscar.c:2532
 msgid "Unable to establish listener socket or no AOL proxy connection present."
-msgstr ""
-"સાંભળનાર સોકેટ અધિષ્ઠાપિત કરવામાં અસમર્થ અથવા કોઈપણ AOL પ્રોક્સી જોડાણ હાજર નથી."
+msgstr "સાંભળનાર સોકેટ અધિષ્ઠાપિત કરવામાં અસમર્થ અથવા કોઈપણ AOL પ્રોક્સી જોડાણ હાજર નથી."
 
 #: src/protocols/oscar/oscar.c:2733 src/protocols/toc/toc.c:543
 msgid "Incorrect nickname or password."
@@ -8005,7 +7857,7 @@
 
 #: src/protocols/oscar/oscar.c:2783
 msgid "Internal Error"
-msgstr "આંતરિક ભૂલ"
+msgstr "આંતરિક ક્ષતિ"
 
 #: src/protocols/oscar/oscar.c:2853
 msgid "Received authorization"
@@ -8095,12 +7947,12 @@
 msgstr "સત્તાધિકરણ નામંજૂરી સંદેશો:"
 
 #: src/protocols/oscar/oscar.c:4590
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The user %u wants to add %s to their buddy list for the following reason:\n"
 "%s"
 msgstr ""
-"વપરાશકર્તા %u તમને તેની વ્યક્તિ યાદીમાં ઉમેરવા માંગે છે નીચેના કારણોસર:\n"
+"વપરાશકર્તા %u %sને  તેની વ્યક્તિયાદીમાં નીચેના કારણોસર ઉમેરવા માંગે છે :\n"
 "%s"
 
 #: src/protocols/oscar/oscar.c:4600 src/protocols/oscar/oscar.c:7246
@@ -8126,8 +7978,7 @@
 #: src/protocols/oscar/oscar.c:4620
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
-msgstr ""
-"વપરાશકર્તા %u એ તેમને તમારી વ્યક્તિ યાદીમાં ઉમેરવા માટેની તમારી અરજી મંજૂર કરી દીધી."
+msgstr "વપરાશકર્તા %u એ તેમને તમારી વ્યક્તિ યાદીમાં ઉમેરવા માટેની તમારી અરજી મંજૂર કરી દીધી."
 
 #: src/protocols/oscar/oscar.c:4628
 #, c-format
@@ -8163,7 +8014,7 @@
 "Message is:\n"
 "%s"
 msgstr ""
-"તમે %s માંથી ICQ ઈમેઈલ મેળવ્યો છે [%s]\n"
+"તમે %s માંથી ICQ ઈ-મેઈલ મેળવ્યો છે [%s]\n"
 "\n"
 "સંદેશો આ છે:\n"
 "%s"
@@ -8197,10 +8048,8 @@
 
 #: src/protocols/oscar/oscar.c:4777
 #, 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] "તમે %hu સંદેશાને %s માંથી ચૂકી ગયેલ છે કારણ કે તે ક્રમ મર્યાદા ઓળંગી ગયેલ હતો."
 msgstr[1] "તમે %hu સંદેશાઓ %s માંથી ચૂકી ગયેલ છો કારણ કે તેઓ ક્રમ મર્યાદા ઓળંગી ગયેલ હતા."
 
@@ -8233,7 +8082,7 @@
 #: src/protocols/oscar/oscar.c:4924
 #, c-format
 msgid "SNAC threw error: %s\n"
-msgstr "SNAC threw ભૂલ: %s\n"
+msgstr "SNAC threw ક્ષતિ: %s\n"
 
 #. Data is assumed to be the destination sn
 #: src/protocols/oscar/oscar.c:4961
@@ -8282,7 +8131,7 @@
 
 #: src/protocols/oscar/oscar.c:5554
 msgid "Rate limiting error."
-msgstr "ક્રમ મર્યાદામાં ભૂલ."
+msgstr "ક્રમ મર્યાદામાં ક્ષતિ."
 
 #: src/protocols/oscar/oscar.c:5555
 msgid ""
@@ -8375,12 +8224,12 @@
 #: src/protocols/oscar/oscar.c:6140
 #, c-format
 msgid "No results found for e-mail address %s"
-msgstr "ઈમેઈલ સરનામા %s માટે કોઈ પરિણામો મળ્યા નથી"
+msgstr "ઈ-મેઈલ સરનામા %s માટે કોઈ પરિણામો મળ્યા નથી"
 
 #: src/protocols/oscar/oscar.c:6161
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
-msgstr "તમે %s ની ખાતરી કરવા માટે પૂછતો ઈમેઈલ મેળવવો જોઈએ."
+msgstr "તમને %s ની ખાતરી કરવા માટે પૂછતો ઈ-મેઈલ મળવો જોઈએ."
 
 #: src/protocols/oscar/oscar.c:6163
 msgid "Account Confirmation Requested"
@@ -8388,7 +8237,7 @@
 
 #: src/protocols/oscar/oscar.c:6194
 msgid "Error Changing Account Info"
-msgstr "ખાતા જાણકારી બદલવામાં ભૂલ"
+msgstr "ખાતા જાણકારી બદલવામાં ક્ષતિ"
 
 #: src/protocols/oscar/oscar.c:6197
 #, c-format
@@ -8396,14 +8245,15 @@
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 msgstr ""
-"ભૂલ 0x%04x: સ્ક્રીન નામનં બંધારણ ઘડવામાં અસમર્થ કારણ કે અરજી થયેલ સ્ક્રીન નામ મૂળથી અલગ "
-"પડે છે."
+"ક્ષતિ 0x%04x: સ્ક્રીન નામનં બંધારણ ઘડવામાં અસમર્થ કારણ કે અરજી થયેલ સ્ક્રીન નામ મૂળથી "
+"અલગ પડે છે."
 
 #: src/protocols/oscar/oscar.c:6200
-#, fuzzy, c-format
+#, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr ""
-"ભૂલ 0x%04x: સ્ક્રીન નામનું બંધારણ ઘડવામાં અસમર્થ કારણ કે અરજી થયેલ સ્ક્રીન નામ ખૂબ લાંબુ છે."
+"ક્ષતિ 0x%04x: સ્ક્રીન નામનું બંધારણ ઘડવામાં અસમર્થ કારણ કે અરજી થયેલ સ્ક્રીન નામ ખૂબ લાંબુ "
+"છે."
 
 #: src/protocols/oscar/oscar.c:6203
 #, c-format
@@ -8411,37 +8261,34 @@
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 msgstr ""
-"ભૂલ 0x%04x: સ્ક્રીન નામનું બંધારણ ઘડવામાં અસમર્થ કારણ કે અરજી થયેલ સ્ક્રીન નામ ખૂબ લાંબુ છે."
+"ક્ષતિ 0x%04x: સ્ક્રીન નામનું બંધારણ ઘડવામાં અસમર્થ કારણ કે અરજી થયેલ સ્ક્રીન નામ ખૂબ લાંબુ "
+"છે."
 
 #: src/protocols/oscar/oscar.c:6206
 #, 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: સ્ક્રીન નામનું બંધારણ ઘડવામાં અસમર્થ કારણ કે આ સ્ક્રીન નામ માટેની અરજી "
-"પહેલાથી જ બાકી રહેલ છે."
+msgstr "ક્ષતિ 0x%04x: ઈ-મેઈલ સરનામું બદલવામાં અસમર્થ કારણ કે આ સ્ક્રીન નામ માટેની અરજી પહેલાથી જ બાકી રહેલ છે."
 
 #: src/protocols/oscar/oscar.c:6209
 #, 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: સ્ક્રીન નામનું બંધારણ ઘડવામાં અસમર્થ કારણ કે આપેલ સરનામાના ઘણા સ્ક્રીન નામો "
-"તેની સાથે સંકળાયેલ છે."
+msgstr "ક્ષતિ 0x%04x: ઈ-મેઈલ સરનામું બદલવામાં અસમર્થ કારણ કે આપેલ સરનામાના ઘણા સ્ક્રીન નામો તેની સાથે સંકળાયેલ છે."
 
 #: src/protocols/oscar/oscar.c:6212
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
-msgstr "ભૂલ 0x%04x: ઈમેઈલ સરનામું બદલવામાં અસમર્થ કારણ કે આપેલ સરનામું અગોગ્ય છે."
+msgstr "ક્ષતિ 0x%04x: ઈ-મેઈલ સરનામું બદલવામાં અસમર્થ કારણ કે આપેલ સરનામું અગોગ્ય છે."
 
 #: src/protocols/oscar/oscar.c:6215
 #, c-format
 msgid "Error 0x%04x: Unknown error."
-msgstr "ભૂલ 0x%04x: અજ્ઞાત ભૂલ."
+msgstr "ક્ષતિ 0x%04x: અજ્ઞાત ક્ષતિ."
 
 #: src/protocols/oscar/oscar.c:6225
 #, c-format
@@ -8459,13 +8306,11 @@
 #: src/protocols/oscar/oscar.c:6231
 #, c-format
 msgid "The e-mail address for %s is %s"
-msgstr "%s માટેનું ઈમેઈલ સરનામું %s છે"
+msgstr "%s માટેનું ઈ-મેઈલ સરનામું %s છે"
 
 #: src/protocols/oscar/oscar.c:6298
-msgid ""
-"Your IM Image was not sent. You must be Direct Connected to send IM Images."
-msgstr ""
-"તમારી IM ઈમેજ મોકલાઈ ન હતી. IM ઈમેજો મોકલવા માટે તમે સીધા જ જોડાયેલ હોવા જ જોઈએ."
+msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images."
+msgstr "તમારી IM ઈમેજ મોકલાઈ ન હતી. IM ઈમેજો મોકલવા માટે તમે સીધા જ જોડાયેલ હોવા જ જોઈએ."
 
 #: src/protocols/oscar/oscar.c:6480
 msgid "Unable to set AIM profile."
@@ -8489,10 +8334,8 @@
 msgid_plural ""
 "The maximum profile length of %d bytes has been exceeded.  Gaim has "
 "truncated it for you."
-msgstr[0] ""
-"%d બાઈટની મહત્તમ રૂપરેખા લંબાઈ ઓળંગી ગયા.  Gaim એ તેને તમારી માટે છોડી દીધું છે."
-msgstr[1] ""
-"%d બાઈટોની મહત્તમ રૂપરેખા લંબાઈ ઓળંગી ગયા.  Gaim એ તેને તમારી માટે છોડી દીધું છે."
+msgstr[0] "%d બાઈટની મહત્તમ રૂપરેખા લંબાઈ ઓળંગી ગયા.  Gaim એ તેને તમારી માટે છોડી દીધું છે."
+msgstr[1] "%d બાઈટોની મહત્તમ રૂપરેખા લંબાઈ ઓળંગી ગયા.  Gaim એ તેને તમારી માટે છોડી દીધું છે."
 
 #: src/protocols/oscar/oscar.c:6500
 msgid "Profile too long."
@@ -8603,12 +8446,12 @@
 msgstr "સત્તાધિકરણ અપાયેલ"
 
 #: src/protocols/oscar/oscar.c:7237
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The user %s wants to add %s to their buddy list for the following reason:\n"
 "%s"
 msgstr ""
-"વપરાશકર્તા %s તમને તેમની વ્યક્તિ યાદીમાં નીચેના કારણોસર ઉમેરવા માંગે છે:\n"
+"વપરાશકર્તા %s તમને તેમની વ્યક્તિ યાદી %sમાં નીચેના કારણોસર ઉમેરવા માંગે છે:\n"
 "%s"
 
 #. Granted
@@ -8679,24 +8522,20 @@
 msgstr "પુનઃ-અરજી સત્તાધિકરણ"
 
 #: src/protocols/oscar/oscar.c:7969
-#, fuzzy
 msgid "Require authorization"
-msgstr "સત્તાધિકરણ અરજી"
+msgstr "સત્તાધિકરણ જરૂરી"
 
 #: src/protocols/oscar/oscar.c:7972
-#, fuzzy
 msgid "Hide IP address"
-msgstr "IP સરનામું"
+msgstr "IP સરનામું છુપાવો"
 
 #: src/protocols/oscar/oscar.c:7975
-#, fuzzy
 msgid "Web aware"
 msgstr "વેબ પરિચિત"
 
 #: src/protocols/oscar/oscar.c:7980
-#, fuzzy
 msgid "ICQ Privacy Options"
-msgstr "પ્રોક્સી વિકલ્પો"
+msgstr "ICQ અંગતતા વિકલ્પો"
 
 #: src/protocols/oscar/oscar.c:7997
 msgid "The new formatting is invalid."
@@ -8764,9 +8603,8 @@
 
 #. ICQ actions
 #: src/protocols/oscar/oscar.c:8243
-#, fuzzy
 msgid "Show privacy options..."
-msgstr "વધુ વિકલ્પો બતાવો"
+msgstr "અંગતતા વિકલ્પો બતાવો..."
 
 #. AIM actions
 #: src/protocols/oscar/oscar.c:8250
@@ -8791,21 +8629,19 @@
 
 #: src/protocols/oscar/oscar.c:8275
 msgid "Search for Buddy by E-Mail..."
-msgstr "ઈમેઈલ દ્વારા વ્યક્તિ માટે શોધ કરો..."
+msgstr "ઈ-મેઈલ દ્વારા વ્યક્તિ માટે શોધ કરો..."
 
 #: src/protocols/oscar/oscar.c:8280
 msgid "Search for Buddy by Information"
 msgstr "જાણકારી દ્વારા વ્યક્તિ માટે શોધ કરો"
 
 #: src/protocols/oscar/oscar.c:8350
-#, fuzzy
 msgid "Use recent buddies group"
-msgstr "વપરાશકર્તા જૂથમાં નથી"
+msgstr "હાલની મિત્ર યાદી વાપરો"
 
 #: src/protocols/oscar/oscar.c:8353
-#, fuzzy
 msgid "Show how long you have been idle"
-msgstr "તમે કેટલા સમય માટે ફાજલ થશો તે જાતે-રૂપરેખાંકિત કરવા માટે તમને પરવાનગી આપે છે"
+msgstr "તમે કેટલા સમય માટે નિષ્ક્રિય થશો તે બતાવે છે"
 
 #: src/protocols/oscar/oscar.c:8362
 msgid "Use AIM/ICQ proxy server (Slower/More Secure/Usually Works)"
@@ -8838,48 +8674,43 @@
 msgstr "સંગ્રહપદ્ધતિ"
 
 #: src/protocols/sametime/sametime.c:1134
-#, fuzzy
 msgid "Sending Handshake"
-msgstr "કુકી મોકલી રહ્યા છીએ"
+msgstr "હેન્ડશેક મોકલી રહ્યા છીએ"
 
 #: src/protocols/sametime/sametime.c:1139
-#, fuzzy
 msgid "Waiting for Handshake Acknowledgement"
-msgstr "પરિવહન શરૂ થવા માટે રાહ જોઈ રહ્યા છીએ"
+msgstr "હેન્ડશેક  જવાબ માટે રાહ જોઈ રહ્યા છીએ"
 
 #: src/protocols/sametime/sametime.c:1144
 msgid "Handshake Acknowledged, Sending Login"
-msgstr ""
+msgstr "હેન્ડશેક ઓળખાયો, લૉગીન મોકલે છે"
 
 #: src/protocols/sametime/sametime.c:1149
 msgid "Waiting for Login Acknowledgement"
-msgstr ""
+msgstr "લૉગીન ઓળખાણ માટે રાહ જુએ છે"
 
 #: src/protocols/sametime/sametime.c:1154
-#, fuzzy
 msgid "Login Redirected"
-msgstr "પ્રવેશ સર્વર"
+msgstr "પ્રવેશ બદલવામાં આવ્યો"
 
 #: src/protocols/sametime/sametime.c:1159
-#, fuzzy
 msgid "Forcing Login"
-msgstr "માં પ્રવેશી રહ્યા છીએ"
+msgstr "બળજબરી પ્રવેશ"
 
 #: src/protocols/sametime/sametime.c:1163
 msgid "Login Acknowledged"
-msgstr ""
+msgstr "લૉગીન ઓળખવામાં આવ્યું"
 
 #: src/protocols/sametime/sametime.c:1168
-#, fuzzy
 msgid "Connected to Sametime Community Server"
-msgstr "SILC સર્વર સાથે જોડાઈ રહ્યા છીએ"
+msgstr "સેમટાઇમ કોમ્યુનિટી સર્વર સાથે જોડાઈ રહ્યા છીએ"
 
 #. * @todo Admin alerts should probably be in a conversation window
 #. rather than a gaim_notify_message. Or in some sort of updating
 #. dialog, or something.
 #: src/protocols/sametime/sametime.c:1263
 msgid "Admin Alert"
-msgstr ""
+msgstr "સંચાલક ચેતવણી"
 
 #: src/protocols/sametime/sametime.c:2758
 msgid "Active"
@@ -8890,17 +8721,15 @@
 msgid ""
 "Could not add the buddy %s because every simple user has to start with "
 "'sip:'."
-msgstr ""
+msgstr "વ્યક્તિ %s ને ઉમેરી શકતાં નથી કારણકે દરેક સામાન્ય વપરાશકર્તાને 'sip:' સાથે શરૂ થવું  જરૂરી છે"
 
 #: src/protocols/simple/simple.c:1209
-#, fuzzy
 msgid "Could not create listen socket"
-msgstr "સોકેટ બનાવી શક્યા નહિં"
+msgstr "લિસન સોકેટ બનાવી શક્યા નહિં"
 
 #: src/protocols/simple/simple.c:1263
-#, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
-msgstr "IRC ખોટા નામો ખાલી જગ્યાઓ સમાવી શકે નહિં"
+msgstr "SIP વપરાશકર્તાનામ ખાલી જગ્યાઓ અથવા @ ચિહ્નો ધરાવી શકે નહિં"
 
 #. *< type
 #. *< ui_requirement
@@ -8911,39 +8740,34 @@
 #. *< name
 #. *< version
 #: src/protocols/simple/simple.c:1408
-#, fuzzy
 msgid "SIP/SIMPLE Protocol Plugin"
-msgstr "SILC પ્રોટોકોલ પ્લગઈન"
+msgstr "SIP/SIMPLE પ્રોટોકોલ પ્લગઈન"
 
 #. *  summary
 #: src/protocols/simple/simple.c:1409
-#, fuzzy
 msgid "The SIP/SIMPLE Protocol Plugin"
-msgstr "SILC પ્રોટોકોલ પ્લગઈન"
+msgstr "The SIP/SIMPLE પ્રોટોકોલ પ્લગઈન"
 
 #. *  description
 #: src/protocols/simple/simple.c:1410
 msgid "Thomas Butter <butter@uni-mannheim.de>"
-msgstr ""
+msgstr "થોમસ બટર <butter@uni-mannheim.de>"
 
 #: src/protocols/simple/simple.c:1431
 msgid "Publish Status (note: everyone may watch you)"
-msgstr ""
+msgstr "જાહેર સ્થિતિ (નોંધઃ બધાં તમને જોઇ શકશે)"
 
 #: src/protocols/simple/simple.c:1434
-#, fuzzy
 msgid "Use UDP"
-msgstr "વપરાશકર્તા ID"
+msgstr "UDP વાપરો"
 
 #: src/protocols/simple/simple.c:1436
-#, fuzzy
 msgid "Use Proxy"
-msgstr "કોઈ પ્રોક્સી નથી"
+msgstr "પ્રોક્સી વાપરો"
 
 #: src/protocols/simple/simple.c:1438
-#, fuzzy
 msgid "Proxy"
-msgstr "કોઈ પ્રોક્સી નથી"
+msgstr "પ્રોક્સી"
 
 #: src/protocols/silc/buddy.c:51 src/protocols/silc/buddy.c:419
 #: src/protocols/silc/buddy.c:544 src/protocols/silc/buddy.c:711
@@ -8965,7 +8789,7 @@
 
 #: src/protocols/silc/buddy.c:115
 msgid "Error occurred during key agreement"
-msgstr "કી મંજૂરી દરમ્યાન ભૂલ ઉદ્દભવી"
+msgstr "કી મંજૂરી દરમ્યાન ક્ષતિ ઉદ્દભવી"
 
 #: src/protocols/silc/buddy.c:119
 msgid "Key Agreement failed"
@@ -9130,7 +8954,7 @@
 
 #: src/protocols/silc/buddy.c:1427
 msgid "Robot"
-msgstr "રોબટ"
+msgstr "રોબોટ"
 
 #: src/protocols/silc/buddy.c:1434 src/protocols/silc/silc.c:634
 #: src/protocols/silc/util.c:472
@@ -9150,7 +8974,7 @@
 #: src/protocols/silc/buddy.c:1440 src/protocols/silc/silc.c:640
 #: src/protocols/silc/util.c:478
 msgid "Jealous"
-msgstr "જેલસ"
+msgstr "ઇર્ષાળુ"
 
 #: src/protocols/silc/buddy.c:1442 src/protocols/silc/silc.c:642
 #: src/protocols/silc/util.c:480
@@ -9432,8 +9256,7 @@
 
 #: src/protocols/silc/chat.c:1071
 #, 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 "તમે ખાનગી જૂથમાં જોડાવા માટે સમર્થ થાવ તે પહેલાં તમારે %s ચેનલમાં જોડાવું પડે"
 
 #: src/protocols/silc/chat.c:1073
@@ -9464,7 +9287,7 @@
 #: src/protocols/silc/ft.c:97 src/protocols/silc/ft.c:101
 #: src/protocols/silc/ft.c:105
 msgid "Error during file transfer"
-msgstr "ફાઈલ પરિવહન દરમ્યાન ભૂલ"
+msgstr "ફાઈલ પરિવહન દરમ્યાન ક્ષતિ"
 
 #: src/protocols/silc/ft.c:94
 msgid "Permission denied"
@@ -9475,7 +9298,6 @@
 msgstr "કી મંજૂરી નિષ્ફળ"
 
 #: src/protocols/silc/ft.c:102
-#, fuzzy
 msgid "File transfer session does not exist"
 msgstr "ફાઈલ પરિવહન સત્રો અસ્તિત્વમાં નથી"
 
@@ -9699,15 +9521,14 @@
 
 #: src/protocols/silc/ops.c:1494
 msgid "Error during connecting to SILC Server"
-msgstr "SILC સર્વર સાથે જોડાણ કરવામાં ભૂલ"
+msgstr "SILC સર્વર સાથે જોડાણ કરવામાં ક્ષતિ"
 
 #: src/protocols/silc/ops.c:1499
 msgid "Key Exchange failed"
 msgstr "કી ફેરબદલી નિષ્ફળ"
 
 #: src/protocols/silc/ops.c:1508
-msgid ""
-"Resuming detached session failed. Press Reconnect to create new connection."
+msgid "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr "નહિં જોડાયેલ સત્ર છોડવામાં નિષ્ફળ. નવું જોડાણ બનાવવા માટે પુનઃજોડાવ દબાવો."
 
 #: src/protocols/silc/ops.c:1543
@@ -9950,7 +9771,7 @@
 #: src/protocols/silc/silc.c:1266
 #, c-format
 msgid "Unknown command: %s, (may be a Gaim bug)"
-msgstr "અજ્ઞાત આદેશ: %s, (કદાચ Gaim ભૂલ હોઈ શકે)"
+msgstr "અજ્ઞાત આદેશ: %s, (કદાચ Gaim ક્ષતિ હોઈ શકે)"
 
 #: src/protocols/silc/silc.c:1329
 msgid "part [channel]:  Leave the chat"
@@ -10319,7 +10140,7 @@
 
 #: src/protocols/toc/toc.c:524
 msgid "E-mail lookup restricted."
-msgstr "ઈમેઈલ જોવાનું પ્રતિબંધિત છે."
+msgstr "ઈ-મેઈલ જોવાનું પ્રતિબંધિત છે."
 
 #: src/protocols/toc/toc.c:527
 msgid "Keyword ignored."
@@ -10361,17 +10182,16 @@
 #: src/protocols/toc/toc.c:554
 #, c-format
 msgid "An unknown signon error has occurred: %s."
-msgstr "એક અજ્ઞાત પ્રવેશ ભૂલ ઉદ્દભવી: %s."
+msgstr "એક અજ્ઞાત પ્રવેશ ક્ષતિ ઉદ્દભવી: %s."
 
 #: src/protocols/toc/toc.c:557
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "એક અજ્ઞાત ભૂલ, %d, ઉદ્દભવી.  જાણકારી: %s"
+msgstr "એક અજ્ઞાત ક્ષતિ, %d, ઉદ્દભવી.  જાણકારી: %s"
 
 #: src/protocols/toc/toc.c:584
-#, fuzzy
 msgid "Invalid Groupname"
-msgstr "અયોગ્ય જૂથ"
+msgstr "અયોગ્ય જૂથનામ"
 
 #: src/protocols/toc/toc.c:668
 msgid "Connection Closed"
@@ -10502,8 +10322,7 @@
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
-msgstr ""
-"%s એ (પૂછીને) તેમને તમારી યાદીમાં ઉમેરવાની અરજી નીચેના કારણોસર નામંજૂર કરી છે: %s."
+msgstr "%s એ (પૂછીને) તેમને તમારી યાદીમાં ઉમેરવાની અરજી નીચેના કારણોસર નામંજૂર કરી છે: %s."
 
 #: src/protocols/yahoo/yahoo.c:941
 msgid "Add buddy rejected"
@@ -10566,7 +10385,7 @@
 #: src/protocols/yahoo/yahoo.c:1823
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
-msgstr "અજ્ઞાત ભૂલ નંબર %d. Yahoo! વેબસાઈટમાં પ્રવેશ કરવાનું ભૂલ ચોક્કસ કરશે."
+msgstr "અજ્ઞાત ક્ષતિ નંબર %d. Yahoo! વેબસાઈટમાં પ્રવેશ કરવાનું ક્ષતિ ચોક્કસ કરશે."
 
 #: src/protocols/yahoo/yahoo.c:1877
 #, c-format
@@ -10614,24 +10433,20 @@
 msgstr "સર્વર યાદી પર નથી"
 
 #: src/protocols/yahoo/yahoo.c:2773 src/protocols/yahoo/yahoo.c:2833
-#, fuzzy
 msgid "Appear Online"
-msgstr "ઓફલાઈન દેખાય છે"
+msgstr "ઓફલાઈન દેખાઓ "
 
 #: src/protocols/yahoo/yahoo.c:2776 src/protocols/yahoo/yahoo.c:2855
-#, fuzzy
 msgid "Appear Permanently Offline"
-msgstr "ઓફલાઈન દેખાય છે"
+msgstr "હંમેશ માટે ઓફલાઈન દેખાઓ "
 
 #: src/protocols/yahoo/yahoo.c:2794
-#, fuzzy
 msgid "Stealth"
-msgstr "સ્થિતિ"
+msgstr "છુપાયેલ"
 
 #: src/protocols/yahoo/yahoo.c:2849
-#, fuzzy
 msgid "Don't Appear Permanently Offline"
-msgstr "ઓફલાઈન દેખાય છે"
+msgstr "હંમેશ માટે ઓફલાઈન દેખાઓ નહિ"
 
 #: src/protocols/yahoo/yahoo.c:2896
 msgid "Join in Chat"
@@ -10643,11 +10458,11 @@
 
 #: src/protocols/yahoo/yahoo.c:2926
 msgid "Stealth Settings"
-msgstr ""
+msgstr "છુપાવવાની ગોઠવણીઓ"
 
 #: src/protocols/yahoo/yahoo.c:2932
 msgid "Start Doodling"
-msgstr ""
+msgstr "ડુડલિંગ શરૂ કરો"
 
 #: src/protocols/yahoo/yahoo.c:2963
 msgid "Active which ID?"
@@ -10675,7 +10490,7 @@
 
 #: src/protocols/yahoo/yahoo.c:3550
 msgid "doodle: Request user to start a Doodle session"
-msgstr ""
+msgstr "doodle: વપરાશકર્તાને ડુડલ સત્ર શરૂ કરવા માટે વિનંતિ કરો"
 
 #. *< type
 #. *< ui_requirement
@@ -10752,8 +10567,7 @@
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
-msgstr ""
-"માફ કરજો, ચિહ્નિત થયેલ રૂપરેખાઓ કે જે પુખ્ત સમાવિષ્ટો સમાવે છે તેઓ આ સમયે આધારભૂત નથી."
+msgstr "માફ કરજો, ચિહ્નિત થયેલ રૂપરેખાઓ કે જે પુખ્ત સમાવિષ્ટો સમાવે છે તેઓ આ સમયે આધારભૂત નથી."
 
 #: src/protocols/yahoo/yahoo_profile.c:795
 msgid ""
@@ -10890,12 +10704,12 @@
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
-msgstr "(આ સંદેશો ફેરવવામાં ત્યાં ભૂલ હતી.\t ખાતા સંપાદકમાં 'સંગ્રહપદ્ધતિ' વિકલ્પ ચકાસો)"
+msgstr "(આ સંદેશો ફેરવવામાં ત્યાં ક્ષતિ હતી.\t ખાતા સંપાદકમાં 'સંગ્રહપદ્ધતિ' વિકલ્પ ચકાસો)"
 
 #: src/protocols/zephyr/zephyr.c:686
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send to chat %s,%s,%s"
-msgstr "%s,%s,%s ને સંવાદ મોકલવામાં અસમર્થ"
+msgstr "સંવાદ %s,%s,%s ને  મોકલવામાં અસમર્થ"
 
 #: src/protocols/zephyr/zephyr.c:719 src/protocols/zephyr/zephyr.c:1133
 #, c-format
@@ -10949,17 +10763,15 @@
 msgstr "inst &lt;instance&gt;: આ વર્ગ પર વાપરવાનો ઘટક સુયોજિત કરો"
 
 #: src/protocols/zephyr/zephyr.c:2622
-#, fuzzy
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "inst &lt;instance&gt;: આ વર્ગ પર વાપરવાનો ઘટક સુયોજિત કરો"
+msgstr "વિષય &lt;instance&gt;: આ વર્ગ પર વાપરવાનો ઘટક સુયોજિત કરો"
 
 #: src/protocols/zephyr/zephyr.c:2628
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: નવા સંવાદમાં જોડાવ"
 
 #: src/protocols/zephyr/zephyr.c:2633
-msgid ""
-"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+msgid "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr "zi &lt;instance&gt;: &lt;સંદેશો,<i>ઘટક</i>,*&gt; ને સંદેશો મોકલો"
 
 #: src/protocols/zephyr/zephyr.c:2639
@@ -11021,17 +10833,14 @@
 msgstr ".zephyr.subs માં નિકાસ કરો"
 
 #: src/protocols/zephyr/zephyr.c:2880
-#, fuzzy
 msgid "Import from .anyone"
-msgstr ".anyone માં નિકાસ કરો"
+msgstr ".anyone માંથી નિકાસ કરો"
 
 #: src/protocols/zephyr/zephyr.c:2883
-#, fuzzy
 msgid "Import from .zephyr.subs"
-msgstr ".zephyr.subs માં નિકાસ કરો"
+msgstr ".zephyr.subs માંથી નિકાસ કરો"
 
 #: src/protocols/zephyr/zephyr.c:2886
-#, fuzzy
 msgid "Realm"
 msgstr "વાસ્તવિક નામ"
 
@@ -11049,7 +10858,7 @@
 #: src/proxy.c:1040
 #, c-format
 msgid "Proxy connection error %d"
-msgstr "પ્રોક્સી જોડાણ ભૂલ %d"
+msgstr "પ્રોક્સી જોડાણ ક્ષતિ %d"
 
 #: src/proxy.c:1874
 msgid "Invalid proxy settings"
@@ -11087,11 +10896,13 @@
 msgstr "(૧ સંદેશો)"
 
 #: src/server.c:859
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
 "%s"
-msgstr "%s એ %s ને સંવાદ કક્ષ %s માં આમંત્રિત કર્યો\n"
+msgstr ""
+"%s એ %sને સંવાદ કક્ષ %sમાં આમંત્રિત કર્યોૉ:\n"
+"%s"
 
 #: src/server.c:864
 #, c-format
@@ -11103,9 +10914,8 @@
 msgstr "શું સંવાદ આમંત્રણ સ્વીકારવું છે?"
 
 #: src/status.c:153
-#, fuzzy
 msgid "Unset"
-msgstr "એકમ"
+msgstr "ન ગોઠવેલ"
 
 #: src/status.c:156
 msgid "Unavailable"
@@ -11124,33 +10934,30 @@
 #: src/status.c:1308
 #, c-format
 msgid "%s became idle"
-msgstr "%s ફાજલ બની ગયો"
+msgstr "%s નિષ્ક્રિય બની ગયો"
 
 #: src/status.c:1323
 #, c-format
 msgid "%s became unidle"
-msgstr "%s બિનફાજલ બની ગયો"
+msgstr "%s બિનનિષ્ક્રિય બની ગયો"
 
 #: src/status.c:1697
-#, fuzzy
 msgid "Default auto-away"
-msgstr "આપોઆપ-દૂર"
+msgstr "મૂળભુત આપોઆપ-દૂર"
 
 #: src/util.c:2121
-#, fuzzy, c-format
+#, c-format
 msgid "Error Reading %s"
-msgstr ""
-"%s વાંચવામાં ભૂલ: \n"
-"%s.\n"
+msgstr "%s વાંચવામાં ક્ષતિ"
 
 #: src/util.c:2122
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
 "the old file has been renamed to %s~."
 msgstr ""
-"તમારી વ્યક્તિ યાદીનું પદચ્છેદ કરવામાં ભૂલ ઉદ્દભવી હતી.  તે હજુ લોડ થયેલ નથી, અને જૂની ફાઈલ "
-"blist.xml~ માં ખસી ગયેલ છે."
+"તમારૂ  %s વાંચવામાં ક્ષતિ ઉદ્દભવી હતી.  તે હજુ લોડ થયેલ નથી, અને જૂની ફાઈલને %s તરીકે "
+"નામ આપવામાં આવ્યું છે."
 
 #: src/util.c:2567
 msgid "Calculating..."
@@ -11186,1050 +10993,1038 @@
 
 #: src/util.c:3053
 msgid "g003: Error opening connection.\n"
-msgstr "g003: જોડાણ ખોલવામાં ભૂલ.\n"
-
-#~ msgid "Buddy List Sorting"
-#~ msgstr "વ્યક્તિ યાદી ક્રમમાં ગોઠવવાનું"
-
-#~ msgid "_Sorting:"
-#~ msgstr "ક્રમમાં ગોઠવણી (_S):"
-
-#~ msgid "Buddy Display"
-#~ msgstr "વ્યક્તિ દર્શાવો"
-
-#, fuzzy
-#~ msgid "Show more buddy details"
-#~ msgstr "વપરાશકર્તા વિગતો બતાવો"
-
-#~ msgid "Gnome Default"
-#~ msgstr "જીનોમ મૂળભુત"
-
-#~ msgid "Away m_essage:"
-#~ msgstr "દૂર જવાનો સંદેશો (_e):"
-
-#~ msgid "IRC"
-#~ msgstr "IRC"
-
-#~ msgid "Quit message"
-#~ msgstr "બહાર નીકળવાનો સંદેશો"
-
-#~ msgid "Restore Away State On Reconnect"
-#~ msgstr "પાછું જોડાણ કરવા પર દૂર થયેલ સ્થિતિ પાછી ઉલટાવો"
-
-#~ msgid "Mail Server"
-#~ msgstr "મેઈલ સર્વર"
-
-#~ msgid "%s (%d new/%d total)"
-#~ msgstr "%s (%d નવા/%d કુલ)"
-
-#~ msgid "Check Mail"
-#~ msgstr "મેઈલ ચકાસો"
-
-#~ msgid "Check e-mail every X seconds.\n"
-#~ msgstr "દર X સેકન્ડે મેઈલ ચકાસો.\n"
-
-#~ msgid "Auto-login"
-#~ msgstr "આપોઆપ-પ્રવેશો"
-
-#~ msgid "New..."
-#~ msgstr "નવું..."
-
-#~ msgid "Back"
-#~ msgstr "પાછા"
-
-#~ msgid "Signoff"
-#~ msgstr "પ્રવેશ બહાર નીકળો"
-
-#~ msgid "Tray Icon Configuration"
-#~ msgstr "ટ્રે ચિહ્ન રૂપરેખાંકન"
-
-#~ msgid "_Hide new messages until tray icon is clicked"
-#~ msgstr "જ્યાં સુધી ટ્રે ચિહ્ન ક્લિક નહિં થાય ત્યાં સુધી નવા સંદેશાઓ છુપાવો (_H)"
-
-#~ msgid "Orientation"
-#~ msgstr "દિશા"
-
-#~ msgid "The orientation of the tray."
-#~ msgstr "ટ્રેની દિશા."
-
-#~ msgid "Not connected to AIM"
-#~ msgstr "AIM સાથે જોડાયેલ નથી"
-
-#~ msgid "No screenname given."
-#~ msgstr "કોઈ સ્ક્રીનનામ આપેલ નથી."
-
-#~ msgid "No roomname given."
-#~ msgstr "કોઈ ખંડનામ આપેલ નથી."
-
-#~ msgid "Invalid AIM URI"
-#~ msgstr "અયોગ્ય AIM URI"
-
-#~ msgid ""
-#~ "Failed to assign %s to a socket:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "સોકેટને %s સોંપવામાં નિષ્ફળ:\n"
-#~ "%s"
-
-#~ msgid "Unable to open socket"
-#~ msgstr "સોકેટ ખોલવામાં અસમર્થ"
-
-#~ msgid "Remote Control"
-#~ msgstr "દૂરસ્થ નિયંત્રણ"
-
-#~ msgid "Provides remote control for gaim applications."
-#~ msgstr "gaim કાર્યક્રમો માટે દૂરસ્થ નિયંત્રણ પૂરું પાડે છે."
-
-#~ msgid ""
-#~ "Gives Gaim the ability to be remote-controlled through third-party "
-#~ "applications or through the gaim-remote tool."
-#~ msgstr ""
-#~ "Gaim ને ત્રીજી-વ્યક્તિ કાર્યક્રમો મારફતે અથવા gaim-remote સાધન મારફતે દૂરસ્થ-"
-#~ "નિયંત્રણની સક્ષમતા આપે છે."
-
-#~ msgid "GTK Signals Test"
-#~ msgstr "GTK સિગ્નલોની ચકાસણી"
-
-#~ msgid "Test to see that all ui signals are working properly."
-#~ msgstr "બધા ui સંકેતો યોગ્ય રીતે કામ કરી રહ્યા છે તે જોવા માટે ચકાસો."
-
-#~ msgid ""
-#~ "When a new conversation is opened this plugin will insert the last "
-#~ "conversation into the current conversation."
-#~ msgstr "જ્યારે નવો સંવાદ આ પ્લગઈન ખોલે તો તે છેલ્લો સંવાદ વર્તમાન સંવાદમાં દાખલ કરશે."
-
-#~ msgid "_Apply"
-#~ msgstr "અમલમાં મૂકો (_A)"
-
-#~ msgid "Docked _Buddy List is always on top"
-#~ msgstr "ડોક થયેલ વ્યક્તિ યાદી હંમેશા ટોચ પર છે (_B)"
-
-#~ msgid "Away!"
-#~ msgstr "દૂર!"
-
-#~ msgid "Edit This Message"
-#~ msgstr "આ સંદેશામાં ફેરફાર કરો"
-
-#~ msgid "I'm Back!"
-#~ msgstr "હું પાછો આવી ગયો!"
-
-#~ msgid "Are you sure you want to remove the away message \"%s\"?"
-#~ msgstr "શું તમે ખરેખર દૂર જવાનો સંદેશો \"%s\" દૂર કરવા માંગો છો?"
-
-#~ msgid "Remove Away Message"
-#~ msgstr "દૂર જવાનો સંદેશો દૂર કરો"
-
-#~ msgid "Set All Away"
-#~ msgstr "બધું દૂર છે એમ સુયોજિત કરો"
-
-#~ msgid "You cannot save an away message with a blank title"
-#~ msgstr "તમે દૂર જવાના સંદેશાઓ ખાલી શીર્ષક સાથે સુયોજિત કરી શકો નહિં"
-
-#~ msgid ""
-#~ "Please give the message a title, or choose \"Use\" to use without saving."
-#~ msgstr ""
-#~ "મહેરબાની કરીને સંદેશા શીર્ષક આપો, અથવા સંગ્રહ્યા વિના વાપરવા માટે \"વાપરો\" પસંદ "
-#~ "કરો."
-
-#~ msgid "You cannot create an empty away message"
-#~ msgstr "તમે ખાલી દૂર જવાના સંદેશો બનાવી શકતા નથી"
-
-#~ msgid "New away message"
-#~ msgstr "નવો દૂર જવાનો સંદેશો"
-
-#~ msgid "Away title: "
-#~ msgstr "દૂર જવાનું શીર્ષક: "
-
-#~ msgid "_Save"
-#~ msgstr "સંગ્રહો (_S)"
-
-#~ msgid "Sa_ve & Use"
-#~ msgstr "સંગ્રહો & વાપરો (_v)"
-
-#~ msgid "Buddy List Error"
-#~ msgstr "વ્યક્તિ યાદી ભૂલ"
-
-#~ msgid "Size of the expander arrow"
-#~ msgstr "વિસ્તારક તીરનું માપ"
-
-#~ msgid ""
-#~ "Usage: %s command [OPTIONS] [URI]\n"
-#~ "\n"
-#~ "    COMMANDS:\n"
-#~ "       uri                      Handle AIM: URI\n"
-#~ "       away                     Popup the away dialog with the default "
-#~ "message\n"
-#~ "       back                     Remove the away dialog\n"
-#~ "       quit                     Close running copy of Gaim\n"
-#~ "\n"
-#~ "    OPTIONS:\n"
-#~ "       -h, --help [command]     Show help for command\n"
-#~ msgstr ""
-#~ "વપરાશ: %s આદેશ [OPTIONS] [URI]\n"
-#~ "\n"
-#~ "    COMMANDS:\n"
-#~ "       uri                      હેન્ડલ AIM: URI\n"
-#~ "       away                     મૂળભુત સંદેશા સાથે દૂર જવાનો સંદેશો પોપઅપ કરે છે\n"
-#~ "       back                     દૂર જવાનો સંદેશો દૂર કરે છે\n"
-#~ "       quit                     Gaim ની ચાલી રહેલ નકલ બંધ કરે છે\n"
-#~ "\n"
-#~ "    OPTIONS:\n"
-#~ "       -h, --help [command]     આદેશ માટે મદદ બતાવે છે\n"
-
-#~ msgid ""
-#~ "Gaim not running (on session 0)\n"
-#~ "Is the \"Remote Control\" plugin loaded?\n"
-#~ msgstr ""
-#~ "Gaim ચાલી રહ્યું નથી (સત્ર ૦ પર)\n"
-#~ "શું \"દૂરસ્થ નિયંત્રણ\" પ્લગઈન લોડ થયલે છે?\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Using AIM: URIs:\n"
-#~ "Sending an IM to a screen name:\n"
-#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
-#~ "In this case, 'Penguin' is the screen name we wish to IM, and 'hello "
-#~ "world'\n"
-#~ "is the message to be sent.  '+' must be used in place of spaces.\n"
-#~ "Please note the quoting used above - if you run this from a shell the "
-#~ "'&'\n"
-#~ "needs to be escaped, or the command will stop at that point.\n"
-#~ "Also,the following will just open a conversation window to a screen "
-#~ "name,\n"
-#~ "with no message:\n"
-#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
-#~ "\n"
-#~ "Joining a chat:\n"
-#~ "\tgaim-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
-#~ "...joins the 'PenguinLounge' chat room.\n"
-#~ "\n"
-#~ "Adding a buddy to your buddy list:\n"
-#~ "\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
-#~ "...prompts you to add 'Penguin' to your buddy list.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "AIM વાપરીને: URIs:\n"
-#~ "સ્ક્રીન નામને IM મોકલીને:\n"
-#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin&message=કેમ+છો'\n"
-#~ "આ કિસ્સામાં, 'Penguin' એ સ્ક્રીન નામ છે જે અમે IM ને કહીએ છીએ, અને 'કેમ છો'\n"
-#~ "એ મોકલવા માટેનો સંદેશો છે.  '+' એ ખાલી જગ્યાઓની જગ્યાએ વપરાવો જ જોઈએ.\n"
-#~ "મહેરબાની કરીને ઉપર વપરાયેલ અવતરણોની નોંધ કરો -જો તમે આને શેલમાંથી ચલાવો તો '&'\n"
-#~ "ને રદ કરવાની જરૂર છે, અથવા આદેશ આ બિંદુએ અટકી જશે.\n"
-#~ "અને, નીચેનું ખાલી સ્ક્રીન નામ માટે વાર્તાલાપ વિન્ડો જ ખોલશે,\n"
-#~ "કોઈપણ જાતના સંદેશા વિના:\n"
-#~ "\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
-#~ "\n"
-#~ "સંવાદમાં જોડાવા માટે:\n"
-#~ "\tgaim-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
-#~ "...'PenguinLounge' સંવાદ કક્ષમાં જોડાય છે.\n"
-#~ "\n"
-#~ "તમારી વ્યક્તિ યાદીમાં વ્યક્તિ ઉમેરીને:\n"
-#~ "\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
-#~ "...તમને 'Penguin' ને તમારી વ્યક્તિ યાદીમાં ઉમેરવા માટે પૂછે છે.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Close running copy of Gaim\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Gaim ની ચાલી રહેલ નકલ બંધ કરો\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Mark all accounts as \"away\" with the default message.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "બધા ખાતાઓને મૂળભુત સંદેશા સાથે \"દૂર\" તરીકે ચિહ્નિત કરો.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Set all accounts as not away.\n"
-#~ msgstr ""
-#~ "\n"
-#~ "બધા ખાતાઓને દૂર નથી એમ સુયોજિત કરો.\n"
-
-#~ msgid "Show fewer options"
-#~ msgstr "થોડા વિકલ્પો બતાવો"
-
-#~ msgid "Information"
-#~ msgstr "જાણકારી"
-
-#~ msgid "/Buddies/_Signoff"
-#~ msgstr "/વ્યક્તિઓ/પ્રવેશ બહાર નીકળો (_S)"
-
-#~ msgid "/Tools/_Away"
-#~ msgstr "/સાધનો/દૂર (_A)"
-
-#~ msgid "/Tools/Pl_ugin Actions"
-#~ msgstr "/સાધનો/પ્લગઈન ક્રિયાઓ (_u)"
-
-#~ msgid "Rename Group"
-#~ msgstr "જૂથનું નામ બદલો"
-
-#~ msgid "New group name"
-#~ msgstr "નવું જૂથ નામ"
-
-#~ msgid "Please enter a new name for the selected group."
-#~ msgstr "મહેરબાની કરીને પસંદિત જૂથ માટે નવું નામ દાખલ કરો."
-
-#~ msgid "%d%%"
-#~ msgstr "%d%%"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Account:</b>"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>ખાતું:</b>"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Warned:</b>"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>ચેતવાયેલ:</b>"
-
-#~ msgid "Warned (%d%%) "
-#~ msgstr "ચેતવાયેલ (%d%%) "
-
-#~ msgid "/Tools/Away"
-#~ msgstr "/સાધનો/દૂર"
-
-#~ msgid "Send a message to the selected buddy"
-#~ msgstr "પસંદ કરેલ વ્યક્તિને સંદેશો મોકલો"
-
-#~ msgid "Get information on the selected buddy"
-#~ msgstr "પસંદ કરેલ વ્યક્તિ પર જાણકારી મેળવો"
-
-#~ msgid "_Chat"
-#~ msgstr "સંવાદ (_C)"
-
-#~ msgid "Join a chat room"
-#~ msgstr "સંવાદ કક્ષમાં જોડાવ"
-
-#~ msgid "_Away"
-#~ msgstr "દૂર (_A)"
-
-#~ msgid "Set an away message"
-#~ msgstr "દૂર જવાનો સંદેશ સુયોજિત કરો"
-
-#~ msgid "Done."
-#~ msgstr "પૂર્ણ થયું."
-
-#~ msgid "Signon: "
-#~ msgstr "પ્રવેશ કરો: "
-
-#~ msgid "Signon"
-#~ msgstr "પ્રવેશ કરો"
-
-#~ msgid "Cancel All"
-#~ msgstr "બધું રદ કરો"
-
-#~ msgid "_Reconnect"
-#~ msgstr "પુનઃ જોડાવ (_R)"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
-#~ "\n"
-#~ "%s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">%s નું જોડાણ તૂટી ગયેલ છે.</span>\n"
-#~ "\n"
-#~ "%s\n"
-#~ "%s"
-
-#~ msgid "Reason Unknown."
-#~ msgstr "કારણ અજ્ઞાત."
-
-#~ msgid "Reconnect _All"
-#~ msgstr "બધું પુનઃ જોડો (_A)"
-
-#~ msgid "Time"
-#~ msgstr "સમય"
-
-#~ msgid "Get Away Msg"
-#~ msgstr "દૂર જવાનો સંદેશો"
-
-#~ msgid "/Conversation/_Warn..."
-#~ msgstr "/વાર્તાલાપ/ચેતવો (_W)..."
-
-#~ msgid "/Conversation/Warn..."
-#~ msgstr "/વાર્તાલાપ/ચેતવો..."
-
-#~ msgid "Warn"
-#~ msgstr "ચેતવો"
-
-#~ msgid "Warn the user"
-#~ msgstr "વપરાશકર્તાને ચેતવો"
-
-#~ msgid "Block the user"
-#~ msgstr "વપરાશકર્તાને બ્લોક કરો"
-
-#~ msgid "Send a file to the user"
-#~ msgstr "વપરાશકર્તાને ફાઈલ મોકલો"
-
-#~ msgid "Add the user to your buddy list"
-#~ msgstr "વપરાશકર્તાને તમારી વ્યક્તિ યાદીમાં ઉમેરો"
-
-#~ msgid "Remove the user from your buddy list"
-#~ msgstr "વપરાશકર્તાને તમારી વ્યક્તિ યાદીમાંથી દૂર કરો"
-
-#~ msgid "Send"
-#~ msgstr "મોકલો"
-
-#~ msgid "Invite"
-#~ msgstr "આમંત્રણ આપો"
-
-#~ msgid "Invite a user"
-#~ msgstr "વપરાશકર્તાને આમંત્રિત કરો"
-
-#~ msgid "Add the chat to your buddy list"
-#~ msgstr "તમારી વ્યક્તિ યાદીમાં સંવાદ ઉમેરો"
-
-#~ msgid "<main>/Conversation/Close"
-#~ msgstr "<main>/વાર્તાલાપ/બંધ કરો"
-
-#~ msgid "former lead developer"
-#~ msgstr "પહેલાનો અગ્રણી વિકાસકર્તા"
-
-#~ msgid "former maintainer"
-#~ msgstr "પહેલાનો જાળવનાર"
-
-#~ msgid "Azerbaijani"
-#~ msgstr "અઝરબૈજાની"
-
-#~ msgid "Vladimira Girginova and Vladimir (Kaladan) Petkov"
-#~ msgstr "લાદીમીરા ગીર્ગીનોવા અને લાદીમીર (કાલાડાન) પેટકોવ"
-
-#~ msgid "Galician"
-#~ msgstr "ગેલીસીયન"
-
-#~ msgid "Burmese"
-#~ msgstr "બુર્મીસ"
-
-#~ msgid "Norwegian (Nynorsk)"
-#~ msgstr "નોર્વેજીયન (નાઈનોક્સ)"
-
-#~ msgid "Punjabi"
-#~ msgstr "પંજાબી"
-
-#~ msgid "Albanian"
-#~ msgstr "અલ્બેનીયન"
-
-#~ msgid "Turkish"
-#~ msgstr "તુર્કી"
-
-#~ msgid "Ukrainian"
-#~ msgstr "યુક્રેનિયાઈ"
-
-#~ msgid "Xhosa"
-#~ msgstr "હોસા"
-
-#~ msgid "Chinese"
-#~ msgstr "ચીની"
-
-#~ msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
-#~ msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
-
-#~ msgid "_Screen name"
-#~ msgstr "સ્ક્રીન નામ (_S)"
-
-#~ msgid "Warn User"
-#~ msgstr "વપરાશકર્તાને ચેતવો"
-
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
-#~ "\n"
-#~ "This will increase %s's warning level and he or she will be subject to "
-#~ "harsher rate limiting.\n"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">શું %s ને ચેતવવો છે?</span>\n"
-#~ "\n"
-#~ "આ %s નું ચેતવણી સ્તર વધારશે અને તે અથવા તેણી મર્યાદા મૂકવા પર મત આપી શકે છે.\n"
-
-#~ msgid "Warn _anonymously?"
-#~ msgstr "શું અનામિક રીતે ચેતવવું છે? (_a)"
-
-#~ msgid "<b>Anonymous warnings are less severe.</b>"
-#~ msgstr "<b>અનામિક ચેતવણીઓ ઓછી ગંભીર હોય છે.</b>"
-
-#~ msgid "Show transfer details"
-#~ msgstr "પરિવહન વિગતો બતાવો"
-
-#~ msgid "D_isplay remote nicknames if no alias is set"
-#~ msgstr "જો કોઈ ઉપનામ સુયોજિત નહિં હોય તો દૂરસ્થ ખોટા નામો દર્શાવો (_i)"
-
-#~ msgid "Display"
-#~ msgstr "દર્શાવો"
-
-#~ msgid "Show _timestamp on messages"
-#~ msgstr "સંદેશાઓ પર સમયનોંધ બતાવો (_t)"
-
-#~ msgid "Ignore c_olors"
-#~ msgstr "રંગો અવગણો (_o)"
-
-#~ msgid "Ignore font _faces"
-#~ msgstr "ફોન્ટ ફેસ અવગણો (_f)"
-
-#~ msgid "Ignore font si_zes"
-#~ msgstr "ફોન્ટ માપો અવગણો (_z)"
-
-#~ msgid "Default Formatting"
-#~ msgstr "મૂળભુત બંધારણ"
-
-#~ msgid "_Send default formatting with outgoing messages"
-#~ msgstr "જતા સંદેશાઓને મૂળભુત બંધારણ સાથે મોકલો (_S)"
-
-#~ msgid "Send Message"
-#~ msgstr "સંદેશો મોકલો"
-
-#~ msgid "Enter _sends message"
-#~ msgstr "Enter સંદેશો મોકલે છે (_s)"
-
-#~ msgid "C_ontrol-Enter sends message"
-#~ msgstr "C_ontrol-Enter સંદેશો મોકલે છે"
-
-#~ msgid "Window Closing"
-#~ msgstr "વિન્ડો બંધ કરવાનું"
-
-#~ msgid "_Escape closes window"
-#~ msgstr "_Escape વિન્ડો બંધ કરે છે"
-
-#~ msgid "Insertions"
-#~ msgstr "ઉમેરાઓ"
-
-#~ msgid "Control-{B/I/U} changes _formatting"
-#~ msgstr "Control-{B/I/U} બંધારણ બદલે છે (_f)"
-
-#~ msgid "Control-(number) _inserts smileys"
-#~ msgstr "Control-(number) હસતા ચહેરાઓ ઉમેરે છે (_i)"
-
-#~ msgid "Show _buttons as:"
-#~ msgstr "બટનો આ રીતે બતાવો (_b):"
-
-#~ msgid "Pictures"
-#~ msgstr "ચિત્રો"
-
-#~ msgid "Text"
-#~ msgstr "લખાણ"
-
-#~ msgid "Pictures and text"
-#~ msgstr "ચિત્રો અને લખાણ"
-
-#~ msgid "_Raise window on events"
-#~ msgstr "ઘટનાઓ પર વિન્ડો બતાવો (_R)"
-
-#~ msgid "Show _warning levels"
-#~ msgstr "ચેતવણી સ્તરો બતાવો (_w)"
-
-#~ msgid "_Automatically expand contacts"
-#~ msgstr "આપોઆપ સંપર્કો ફેલાવો (_A)"
-
-#~ msgid "Enable \"_slash\" commands"
-#~ msgstr "\"_slash\" આદેશો સક્રિય કરો"
-
-#~ msgid "Show _aliases in tabs/titles"
-#~ msgstr "ઉપનામો ટેબો/શીર્ષકોમાં બતાવો (_a)"
-
-#~ msgid "_Raise IM window on events"
-#~ msgstr "ઘટનાઓ પર IM વિન્ડો વધારો (_R)"
-
-#~ msgid "Raise chat _window on events"
-#~ msgstr "ઘટનાઓ પર વિન્ડો સંવાદ વિન્ડો વધારો (_w)"
-
-#~ msgid "Use _multi-colored screen names in chats"
-#~ msgstr "સંવાદોમાં સ્ક્રીન નામો વિવિધ-રંગો વાપરો (_m)"
-
-#~ msgid "Tab p_lacement:"
-#~ msgstr "ટેબ સ્થાન (_l):"
-
-#~ msgid "New conversation _placement:"
-#~ msgstr "નવી વાર્તાલાપ જગ્યા (_p):"
-
-#~ msgid "Message Logs"
-#~ msgstr "સંદેશા લોગ"
-
-#~ msgid "System Logs"
-#~ msgstr "સિસ્ટમ લોગ"
-
-#~ msgid "_Enable system log"
-#~ msgstr "સિસ્ટમ લોગ સક્રિય કરો (_E)"
-
-#~ msgid "Log when buddies _sign on/sign off"
-#~ msgstr "જ્યારે વ્યક્તિ પ્રવેશ કરે/બહાર નીકળે ત્યારે લોગ કરો (_s)"
-
-#~ msgid "Log when buddies become _idle/un-idle"
-#~ msgstr "જ્યારે વ્યક્તિ ફાજલ થાય/ફરી આવે ત્યારે લોગ કરો (_i)"
-
-#~ msgid "Log when buddies go away/come _back"
-#~ msgstr "જ્યારે વ્યક્તિ દૂર જાય/પાછો આવે ત્યારે લોગ કરો (_b)"
-
-#~ msgid "Log your _own signons/idleness/awayness"
-#~ msgstr "તમારા પોતાના પ્રવેશો/ફાજલો/દૂર જવાના સંદેશાઓ લોગ કરો (_o)"
-
-#~ msgid "Idle _time reporting:"
-#~ msgstr "ફાજલ સમય અહેવાલીકરણ (_t):"
-
-#~ msgid "Gaim usage"
-#~ msgstr "Gaim વપરાશ"
-
-#~ msgid "X usage"
-#~ msgstr "X વપરાશ"
-
-#~ msgid "Windows usage"
-#~ msgstr "વિન્ડો વપરાશ"
-
-#~ msgid ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">Written by:</span>\t%s\n"
-#~ "<span weight=\"bold\">Web site:</span>\t\t%s\n"
-#~ "<span weight=\"bold\">File name:</span>\t%s"
-#~ msgstr ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">લેખક:</span>\t%s\n"
-#~ "<span weight=\"bold\">વેબ સાઈટ:</span>\t\t%s\n"
-#~ "<span weight=\"bold\">ફાઈલ નામ:</span>\t%s"
-
-#~ msgid ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">Written by:</span>  %s\n"
-#~ "<span weight=\"bold\">URL:</span>  %s\n"
-#~ "<span weight=\"bold\">File name:</span>  %s"
-#~ msgstr ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">લેકક:</span>  %s\n"
-#~ "<span weight=\"bold\">URL:</span>  %s\n"
-#~ "<span weight=\"bold\">ફાઈલ નામ:</span>  %s"
-
-#~ msgid "Load"
-#~ msgstr "લાવો"
-
-#~ msgid "Summary"
-#~ msgstr "સાર"
-
-#~ msgid "Details"
-#~ msgstr "વિગતો"
-
-#~ msgid "_Edit"
-#~ msgstr "ફેરફાર કરો (_E)"
-
-#~ msgid "Interface"
-#~ msgstr "ઈન્ટરફેસ"
-
-#~ msgid "Message Text"
-#~ msgstr "સંદેશા લખાણ"
-
-#~ msgid "Shortcuts"
-#~ msgstr "ટુંકાણો"
-
-#~ msgid "Away Messages"
-#~ msgstr "દૂર સંદેશાઓ"
-
-#~ msgid "Plugins"
-#~ msgstr "પ્લગઈનો"
-
-#~ msgid "HTML"
-#~ msgstr "HTML"
-
-#~ msgid "Plain text"
-#~ msgstr "સાદું લખાણ"
-
-#~ msgid "Please create an account."
-#~ msgstr "મહેરબાની કરીને ખાતું બનાવો."
-
-#~ msgid "Login"
-#~ msgstr "પ્રવેશ"
-
-#~ msgid "<b>_Account:</b>"
-#~ msgstr "<b>ખાતું (_A):</b>"
-
-#~ msgid "<b>_Password:</b>"
-#~ msgstr "<b>પાસવર્ડ (_P):</b>"
-
-#~ msgid "A_ccounts"
-#~ msgstr "ખાતાઓ (_c)"
-
-#~ msgid "P_references"
-#~ msgstr "પસંદગીઓ (_r)"
-
-#~ msgid "_Sign on"
-#~ msgstr "પ્રવેશ કરો (_S)"
-
-#~ msgid ""
-#~ "Gaim %s\n"
-#~ "Usage: %s [OPTION]...\n"
-#~ "\n"
-#~ "  -a, --acct          display account editor window\n"
-#~ "  -w, --away[=MESG]   make away on signon (optional argument MESG "
-#~ "specifies\n"
-#~ "                      name of away message to use)\n"
-#~ "  -l, --login[=NAME]  automatically login (optional argument NAME "
-#~ "specifies\n"
-#~ "                      account(s) to use, seperated by commas)\n"
-#~ "  -n, --loginwin      don't automatically login; show login window\n"
-#~ "  -u, --user=NAME     use account NAME\n"
-#~ "  -c, --config=DIR    use DIR for config files\n"
-#~ "  -d, --debug         print debugging messages to stdout\n"
-#~ "  -v, --version       display the current version and exit\n"
-#~ "  -h, --help          display this help and exit\n"
-#~ msgstr ""
-#~ "Gaim %s\n"
-#~ "વપરાશ: %s [OPTION]...\n"
-#~ "\n"
-#~ "  -a, --acct          ખાતા સંપાદક વિન્ડો દર્શાવે છે\n"
-#~ "  -w, --away[=MESG]   પ્રવેશવા પર દૂર જાય છે (વૈકલ્પિક દલીલ MESG વાપરવા માટે\n"
-#~ "                      દૂર જવાના સંદેશાનું નામ સ્પષ્ટ કરે છે)\n"
-#~ "  -l, --login[=NAME]  આપોઆપ પ્રવેશો (વૈકલ્પિક દલીલ NAME વાપરવા માટેના\n"
-#~ "                      ખાતાઓ સ્પષ્ટ કરે છે, અલ્પવિરામોથી અલગ પાડીને)\n"
-#~ "  -n, --loginwin      આપોઆપ પ્રવેશ કરશો નહિં; પ્રવેશ વિન્ડો બતાવે છે\n"
-#~ "  -u, --user=NAME     ખાતુ NAME વાપરે છે\n"
-#~ "  -c, --config=DIR    રૂપરેખા ફાઈલો માટે DIR વાપરે છે\n"
-#~ "  -d, --debug         stdout માં ડિબગીંગ સંદેશાઓ છાપે છે\n"
-#~ "  -v, --version       વર્તમાન આવૃત્તિ દર્શાવે છે અને બહાર નીકળે છે\n"
-#~ "  -h, --help          આ મદદ દર્શાવે છે અને બહાર નીકળે છે\n"
-
-#~ msgid "Unable to load preferences"
-#~ msgstr "પસંદગીઓ લાવવામાં અસમર્થ"
-
-#~ msgid ""
-#~ "Gaim was not able to load your preferences because they are stored in an "
-#~ "old format that is no longer used.  Please reconfigure your settings "
-#~ "using the Preferences window."
-#~ msgstr ""
-#~ "Gaim તમારી પસંદગીઓ લાવવામાં સમર્થ હતું નહિં કારણ કે તેઓ જૂના બંધારણમાં સંગ્રહાયેલ હતા કે "
-#~ "જેઓ લાંબા સમય સુધી વાપરવાના નથી.  મહેરબાની કરીને પસંદગીઓ વિન્ડોની મદદથી તમારા "
-#~ "સુયોજનો પુનઃરૂપરેખાંકિત કરો."
-
-#~ msgid "Slightly less boring default"
-#~ msgstr "મૂળભુત થોડું ઓછું કંટાળાજનક છે"
-
-#~ msgid "Available for friends only"
-#~ msgstr "માત્ર મિત્રો માટે ઉપલબ્ધ છે"
-
-#~ msgid "Away for friends only"
-#~ msgstr "માત્ર મિત્રો માટે દૂર જાવ"
-
-#~ msgid "Invisible for friends only"
-#~ msgstr "માત્ર મિત્રો માટે અદૃશ્ય"
-
-#~ msgid "Unable to resolve hostname."
-#~ msgstr "યજમાનનામો ઉકેલવામાં અસમર્થ."
-
-#~ msgid "Error while reading from socket."
-#~ msgstr "સોકેટમાંથી વાંચતી વખતે ભૂલ."
-
-#~ msgid "Error while writing to socket."
-#~ msgstr "સોકેટ પર લખતી વખતે ભૂલ."
-
-#~ msgid "Authentication failed."
-#~ msgstr "સત્તાધિકરણ નિષ્ફળ."
-
-#~ msgid "Unknown Error Code."
-#~ msgstr "અજ્ઞાત ભૂલ કોડ."
-
-#~ msgid "Status: %s"
-#~ msgstr "સ્થિતિ: %s"
-
-#~ msgid "Could not connect"
-#~ msgstr "જોડાઈ શક્યા નહિં"
-
-#~ msgid "Reading data"
-#~ msgstr "માહિતી વાંચી રહ્યા છીએ"
-
-#~ msgid "Balancer handshake"
-#~ msgstr "બેલેન્સર હેન્ડશેક"
-
-#~ msgid "Reading server key"
-#~ msgstr "સર્વર કી વાંચી રહ્યા છીએ"
-
-#~ msgid "Exchanging key hash"
-#~ msgstr "કી હેશ બદલી રહ્યા છીએ"
-
-#~ msgid "Critical error in GG library\n"
-#~ msgstr "GG લાઈબ્રેરીમાં જટિલ ભૂલ\n"
-
-#~ msgid "Unable to ping server"
-#~ msgstr "સર્વરને પીંગ કરવામાં અસમર્થ"
-
-#~ msgid "Send as message"
-#~ msgstr "સંદેશા તરીકે મોકલો"
-
-#~ msgid "Looking up GG server"
-#~ msgstr "GG સર્વર જોઈ રહ્યા છીએ"
-
-#~ msgid "Invalid Gadu-Gadu UIN specified"
-#~ msgstr "અયોગ્ય Gadu-Gadu UIN સ્પષ્ટ થયેલ છે"
-
-#~ msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
-#~ msgstr "તમે અયોગ્ય Gadu-Gadu UIN ને સંદેશો મોકલવાનો પ્રયત્ન કરી રહ્યા છો."
-
-#~ msgid "Couldn't get search results"
-#~ msgstr "શોધ પરિણામો મેળવી શક્યા નહિં"
-
-#~ msgid "Birth Year"
-#~ msgstr "જન્મ વર્ષ"
-
-#~ msgid "Sex"
-#~ msgstr "જાતિ"
-
-#~ msgid "There is no Buddy List stored on the Gadu-Gadu server."
-#~ msgstr "Gadu-Gadu સર્વર પર કોઈ વ્યક્તિ યાદી સંગ્રહાયેલ નથી."
-
-#~ msgid "Couldn't Import Buddy List from Server"
-#~ msgstr "સર્વરમાંથી વ્યક્તિ યાદી આયાત કરી શક્યા નહિં"
-
-#~ msgid "Buddy List successfully transferred to Gadu-Gadu server"
-#~ msgstr "Gadu-Gadu સર્વરમાં વ્યક્તિ યાદી સફળતાપૂર્વક પરિવહન થઈ"
-
-#~ msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
-#~ msgstr "Gadu-Gadu સર્વરમાં વ્યક્તિ યાદી પરિવહન કરી શક્યા નહિં"
-
-#~ msgid "Buddy List successfully deleted from Gadu-Gadu server"
-#~ msgstr "Gadu-Gadu સર્વરમાંથી વ્યક્તિ યાદી સફળતાપૂર્વક કાઢી નંખાઈ"
-
-#~ msgid "Couldn't delete Buddy List from Gadu-Gadu server"
-#~ msgstr "Gadu-Gadu સર્વરમાંથી વ્યક્તિ યાદી કાઢી શક્યા નહિં"
-
-#~ msgid "Password couldn't be changed"
-#~ msgstr "પાસવર્ડ બદલી શકાયો નહિં"
-
-#~ msgid "Error communicating with Gadu-Gadu server"
-#~ msgstr "Gadu-Gadu સર્વર સાથે સંપર્કવ્યવહાર કરવામાં ભૂલ"
-
-#~ msgid ""
-#~ "Gaim was unable to complete your request due to a problem communicating "
-#~ "with the Gadu-Gadu HTTP server.  Please try again later."
-#~ msgstr ""
-#~ "Gaim એ Gadu-Gadu HTTP સર્વર સાથેની સંપર્કવ્યવહાર સમસ્યાને કારણે તમારી અરજી પૂર્ણ "
-#~ "કરવામાં અસમર્થ હતું.  પછી મહેરબાની કરીને ફરી પ્રયત્ન કરો."
-
-#~ msgid "Unable to import Gadu-Gadu buddy list"
-#~ msgstr "Gadu-Gadu buddy યાદી આયાત કરવામાં અસમર્થ"
-
-#~ msgid ""
-#~ "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please "
-#~ "try again later."
-#~ msgstr ""
-#~ "Gaim એ Gadu-Gadu વ્યક્તિ યાદી સર્વર સાથે જોડાવા માટે અસમર્થ હતું.  મહેરબાની કરીને "
-#~ "પછી ફરીથી પ્રયત્ન કરો."
-
-#~ msgid "Couldn't export buddy list"
-#~ msgstr "વ્યક્તિ યાદીનિ નિકાસ કરી શક્યા નહિં"
-
-#~ msgid ""
-#~ "Gaim was unable to connect to the buddy list server.  Please try again "
-#~ "later."
-#~ msgstr ""
-#~ "Gaim વ્યક્તિ યાદી સર્વર સાથે જોડાવા માટે અસમર્થ હતું.  મહેરબાની કરીને પછી ફરીથી "
-#~ "પ્રયત્ન કરો."
-
-#~ msgid "Unable to delete Gadu-Gadu buddy list"
-#~ msgstr "Gadu-Gadu વ્યક્તિ યાદી કાઢી નાંખવામાં અસમર્થ"
-
-#~ msgid "Unable to access directory"
-#~ msgstr "ડિરેક્ટરી વાપરવામાં અસમર્થ"
-
-#~ msgid ""
-#~ "Gaim was unable to search the Directory because it was unable to connect "
-#~ "to the directory server.  Please try again later."
-#~ msgstr ""
-#~ "Gaim ડિરેક્ટરી શોધવા માટે અસમર્થ હતું કારણ કે તે ડિરેક્ટરી સર્વર સાથે જોડાવા માટે "
-#~ "અસમર્થ હતું.  મહેરબાની કરીને પછી ફરીથી પ્રયત્ન કરો."
-
-#~ msgid ""
-#~ "Gaim was unable to change your password due to an error connecting to the "
-#~ "Gadu-Gadu server.  Please try again later."
-#~ msgstr ""
-#~ "Gaim એ Gadu-Gadu સર્વર સાથે જોડાવામાં ભૂલને કારણે તમારો પાસવર્ડ બદલવામાં અસમર્થ "
-#~ "હતું.  મહેરબાની કરીને પછી ફરીથી પ્રયત્ન કરો."
-
-#~ msgid "Directory Search"
-#~ msgstr "ડિરેક્ટરી શોધ"
-
-#~ msgid "Unable to access user profile."
-#~ msgstr "વપરાશકર્તા રૂપરેખા વાપરવામાં અસમર્થ."
-
-#~ msgid ""
-#~ "Gaim was unable to access this user's profile due to an error connecting "
-#~ "to the directory server.  Please try again later."
-#~ msgstr ""
-#~ "Gaim ડિરેક્ટરી સર્વર સાથે જોડાવામાં ભૂલને કારણે વપરાશકર્તાની રૂપરેખા વાપરવામાં અસમર્થ "
-#~ "હતું.  મહેરબાની કરીને પછી ફરીથી પ્રયત્ન કરો."
-
-#~ msgid "Gaim encountered an error communicating with the ICQ server."
-#~ msgstr "Gaim ને ICQ સર્વર સાથે સંપર્કવ્યવહાર કરવામાં ભૂલ આવી."
-
-#~ msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
-#~ msgstr "વપરાશકર્તા %s (%s%s%s%s%s) તમને તેમને સત્તાધિકારીત કરવા માંગે છે."
-
-#~ msgid "Send message through server"
-#~ msgstr "સર્વર મારફતે સંદેશો મોકલો"
-
-#~ msgid "Connecting..."
-#~ msgstr "સંપર્ક કરી રહ્યા છીએ..."
-
-#~ msgid "Nick:"
-#~ msgstr "ખોટું નામ:"
-
-#~ msgid "Gaim User"
-#~ msgstr "Gaim વપરાશકર્તા"
-
-#~ msgid "File Transfer Aborted"
-#~ msgstr "ફાઈલ પરિવહન અડધેથી બંધ થઈ ગયું"
-
-#~ msgid "Buddy Information for %s"
-#~ msgstr "%s માટે વ્યક્તિ જાણકારી"
-
-#~ msgid "Invalid nickname '%s'"
-#~ msgstr "અયોગ્ય નામ '%s'"
-
-#~ msgid "Invalid nickname"
-#~ msgstr "અયોગ્ય નામ"
-
-#~ msgid "Jabber Profile"
-#~ msgstr "Jabber રૂપરેખા"
-
-#~ msgid "Roomlist Error"
-#~ msgstr "કક્ષયાદી ભૂલ"
-
-#~ msgid "Logged out"
-#~ msgstr "પ્રવેશ બહાર નીકળો"
-
-#~ msgid "Hide Operating System"
-#~ msgstr "ઓપરેટિંગ સિસ્ટમ છુપાવો"
-
-#~ msgid "The user %s wants to add you to their buddy list."
-#~ msgstr "વપરાશકર્તા %s તમને તેમની વ્યક્તિ યાદીમાં ઉમેરવા માંગે છે."
-
-#~ msgid ""
-#~ "You were disconnected from the server, because you logged on from a "
-#~ "different location"
-#~ msgstr ""
-#~ "તમારું સર્વરમાંથી જોડાણ તૂટી ગયું હતું, કારણ કે તમે અલગ સ્થાનમાંથી પ્રવેશ બહાર નીકળી ગયા "
-#~ "હતા"
-
-#~ msgid "User Properties"
-#~ msgstr "વપરાશકર્તા ગુણધર્મો"
-
-#~ msgid "Transfer of file %s timed out."
-#~ msgstr "ફાઈલ %s નું પરિવહનનો સમય સમાપ્ત થઈ ગયો."
-
-#~ msgid ""
-#~ "You have been disconnected because you have signed on with this screen "
-#~ "name at another location."
-#~ msgstr "તમારું જોડાણ તૂટી ગયેલ છે કારણ કે તમે આ સ્ક્રીન નામ સાથે અન્ય સાથે પ્રવેશ કરેલ છે."
-
-#~ msgid "Not specified"
-#~ msgstr "સ્પષ્ટ થયેલ નથી"
-
-#~ msgid "ICQ Info for %s"
-#~ msgstr "%s માટે ICQ જાણકારી"
-
-#~ msgid ""
-#~ "Error 0x%04x: Unable to format screen name because the requested screen "
-#~ "name ends in a space."
-#~ msgstr ""
-#~ "ભૂલ 0x%04x: સ્ક્રીન નામનું બંધારણ ઘડવામાં અસમર્થ કારણ કે અરજી થયેલ સ્ક્રીન નામ જગ્યામાં "
-#~ "અંત થાય છે."
-
-#~ msgid "Visible"
-#~ msgstr "દૃશ્યમાન"
-
-#~ msgid "Available Message:"
-#~ msgstr "ઉપલબ્ધ સંદેશો:"
-
-#~ msgid "I'm doing work and hoping for a distraction--IM me!"
-#~ msgstr "હું કામ કરી રહ્યો છું અને સંતૃપ્તિ માટે આશા રાખું છે--IM મને!"
-
-#~ msgid "Set Available Message..."
-#~ msgstr "ઉપલબ્ધ સંદેશો સુયોજિત કરો..."
-
-#~ msgid "Failed to leave channel"
-#~ msgstr "ચેનલ છોડવામાં નિષ્ફળ"
-
-#~ msgid "Basic Profile"
-#~ msgstr "આધારભૂત રૂપરેખા"
-
-#~ msgid "Profile Information"
-#~ msgstr "રૂપરેખા જાણકારી"
-
-#~ msgid "Instant Messagers"
-#~ msgstr "તુરંત સંદેશા મોકલનારાઓ"
-
-#~ msgid "AIM"
-#~ msgstr "AIM"
-
-#~ msgid "ICQ UIN"
-#~ msgstr "ICQ UIN"
-
-#~ msgid "MSN"
-#~ msgstr "MSN"
-
-#~ msgid "Yahoo"
-#~ msgstr "Yahoo"
-
-#~ msgid "I'm From"
-#~ msgstr "હું આમાંથી"
-
-#~ msgid "Set your Trepia profile data."
-#~ msgstr "તમારી Trepia રૂપરેખા માહિતી સુયોજિત કરો."
-
-#~ msgid "Profile"
-#~ msgstr "રુપરેખા"
-
-#~ msgid "Set Profile"
-#~ msgstr "રૂપરેખા સુયોજિત કરો"
-
-#~ msgid "Visit Homepage"
-#~ msgstr "ઘરપાનાંની મુલાકાત લો"
-
-#~ msgid "Local Users"
-#~ msgstr "સ્થાનિક વપરાશકર્તાઓ"
-
-#~ msgid "Trepia Protocol Plugin"
-#~ msgstr "Trepia પ્રોટોકોલ પ્લગઈન"
-
-#~ msgid ""
-#~ "You have been logged off as you have logged in on a different machine or "
-#~ "device."
-#~ msgstr "તમે પ્રવેશ બંધ કરેલ છે કારણ તમે અલગ મશીન અથવા ઉપકરણમાં પ્રવેશ કરેલ છે."
-
-#~ msgid "Please enter your password"
-#~ msgstr "મહેરબાની કરીને તમારો પાસવર્ડ દાખલ કરો"
-
-#~ msgid "%s logged in."
-#~ msgstr "%s પ્રવેશેલ છે."
-
-#~ msgid "%s signed on"
-#~ msgstr "%s પ્રવેશ કરેલ છે"
-
-#~ msgid "%s logged out."
-#~ msgstr "%s બહાર નીકળી ગયો."
-
-#~ msgid "%s signed off"
-#~ msgstr "%s પ્રવેશ બહાર નીકળી ગયો"
-
-#~ msgid ""
-#~ "%s has just been warned by %s.\n"
-#~ "Your new warning level is %d%%"
-#~ msgstr ""
-#~ "%s એ હમણાં જ %s દ્વારા ચેતવાયેલ છે.\n"
-#~ "%d%% એ તમારું નવું ચેતવણી સ્તર છે"
-
-#~ msgid "an anonymous person"
-#~ msgstr "એક અનામિક વ્યક્તિ"
-
-#~ msgid ""
-#~ "%s has invited %s to the chat room %s:\n"
-#~ "<b>%s</b>"
-#~ msgstr ""
-#~ "%s એ %s ને સંવાદ કક્ષ %s માં આમંત્રિત કર્યો છે:\n"
-#~ "<b>%s</b>"
-
-#~ msgid "Sorry, I ran out for a bit!"
-#~ msgstr "માફ કરજો, હું થોડા સમય માટે ચાલી ગયો હતો!"
+msgstr "g003: જોડાણ ખોલવામાં ક્ષતિ.\n"
+
+msgid "Buddy List Sorting"
+msgstr "વ્યક્તિ યાદી ક્રમમાં ગોઠવવાનું"
+
+msgid "_Sorting:"
+msgstr "ક્રમમાં ગોઠવણી (_S):"
+
+msgid "Buddy Display"
+msgstr "વ્યક્તિ દર્શાવો"
+
+msgid "Show more buddy details"
+msgstr "વધારે વપરાશકર્તા વિગતો બતાવો"
+
+msgid "Gnome Default"
+msgstr "જીનોમ મૂળભુત"
+
+msgid "Away m_essage:"
+msgstr "દૂર જવાનો સંદેશો (_e):"
+
+msgid "IRC"
+msgstr "IRC"
+
+msgid "Quit message"
+msgstr "બહાર નીકળવાનો સંદેશો"
+
+msgid "Restore Away State On Reconnect"
+msgstr "પાછું જોડાણ કરવા પર દૂર થયેલ સ્થિતિ પાછી ઉલટાવો"
+
+msgid "Mail Server"
+msgstr "મેઈલ સર્વર"
+
+msgid "%s (%d new/%d total)"
+msgstr "%s (%d નવા/%d કુલ)"
+
+msgid "Check Mail"
+msgstr "મેઈલ ચકાસો"
+
+msgid "Check e-mail every X seconds.\n"
+msgstr "દર X સેકન્ડે ઈ-મેઈલ ચકાસો.\n"
+
+msgid "Auto-login"
+msgstr "આપોઆપ-પ્રવેશો"
+
+msgid "New..."
+msgstr "નવું..."
+
+msgid "Back"
+msgstr "પાછા"
+
+msgid "Signoff"
+msgstr "પ્રવેશ બહાર નીકળો"
+
+msgid "Tray Icon Configuration"
+msgstr "ટ્રે ચિહ્ન રૂપરેખાંકન"
+
+msgid "_Hide new messages until tray icon is clicked"
+msgstr "જ્યાં સુધી ટ્રે ચિહ્ન ક્લિક નહિં થાય ત્યાં સુધી નવા સંદેશાઓ છુપાવો (_H)"
+
+msgid "Orientation"
+msgstr "દિશા"
+
+msgid "The orientation of the tray."
+msgstr "ટ્રેની દિશા."
+
+msgid "Not connected to AIM"
+msgstr "AIM સાથે જોડાયેલ નથી"
+
+msgid "No screenname given."
+msgstr "કોઈ સ્ક્રીનનામ આપેલ નથી."
+
+msgid "No roomname given."
+msgstr "કોઈ ખંડનામ આપેલ નથી."
+
+msgid "Invalid AIM URI"
+msgstr "અયોગ્ય AIM URI"
+
+msgid ""
+"Failed to assign %s to a socket:\n"
+"%s"
+msgstr ""
+"સોકેટને %s સોંપવામાં નિષ્ફળ:\n"
+"%s"
+
+msgid "Unable to open socket"
+msgstr "સોકેટ ખોલવામાં અસમર્થ"
+
+msgid "Remote Control"
+msgstr "દૂરસ્થ નિયંત્રણ"
+
+msgid "Provides remote control for gaim applications."
+msgstr "gaim કાર્યક્રમો માટે દૂરસ્થ નિયંત્રણ પૂરું પાડે છે."
+
+msgid ""
+"Gives Gaim the ability to be remote-controlled through third-party "
+"applications or through the gaim-remote tool."
+msgstr ""
+"Gaim ને ત્રીજી-વ્યક્તિ કાર્યક્રમો મારફતે અથવા gaim-remote સાધન મારફતે દૂરસ્થ-નિયંત્રણની "
+"સક્ષમતા આપે છે."
+
+msgid "GTK Signals Test"
+msgstr "GTK સિગ્નલોની ચકાસણી"
+
+msgid "Test to see that all ui signals are working properly."
+msgstr "બધા ui સંકેતો યોગ્ય રીતે કામ કરી રહ્યા છે તે જોવા માટે ચકાસો."
+
+msgid ""
+"When a new conversation is opened this plugin will insert the last "
+"conversation into the current conversation."
+msgstr "જ્યારે નવો સંવાદ આ પ્લગઈન ખોલે તો તે છેલ્લો સંવાદ વર્તમાન સંવાદમાં દાખલ કરશે."
+
+msgid "_Apply"
+msgstr "અમલમાં મૂકો (_A)"
+
+msgid "Docked _Buddy List is always on top"
+msgstr "ડોક થયેલ વ્યક્તિ યાદી હંમેશા ટોચ પર છે (_B)"
+
+msgid "Away!"
+msgstr "દૂર!"
+
+msgid "Edit This Message"
+msgstr "આ સંદેશામાં ફેરફાર કરો"
+
+msgid "I'm Back!"
+msgstr "હું પાછો આવી ગયો!"
+
+msgid "Are you sure you want to remove the away message \"%s\"?"
+msgstr "શું તમે ખરેખર દૂર જવાનો સંદેશો \"%s\" દૂર કરવા માંગો છો?"
+
+msgid "Remove Away Message"
+msgstr "દૂર જવાનો સંદેશો દૂર કરો"
+
+msgid "Set All Away"
+msgstr "બધું દૂર છે એમ સુયોજિત કરો"
+
+msgid "You cannot save an away message with a blank title"
+msgstr "તમે દૂર જવાના સંદેશાઓ ખાલી શીર્ષક સાથે સુયોજિત કરી શકો નહિં"
+
+msgid "Please give the message a title, or choose \"Use\" to use without saving."
+msgstr "મહેરબાની કરીને સંદેશા શીર્ષક આપો, અથવા સંગ્રહ્યા વિના વાપરવા માટે \"વાપરો\" પસંદ કરો."
+
+msgid "You cannot create an empty away message"
+msgstr "તમે ખાલી દૂર જવાના સંદેશો બનાવી શકતા નથી"
+
+msgid "New away message"
+msgstr "નવો દૂર જવાનો સંદેશો"
+
+msgid "Away title: "
+msgstr "દૂર જવાનું શીર્ષક: "
+
+msgid "_Save"
+msgstr "સંગ્રહો (_S)"
+
+msgid "Sa_ve & Use"
+msgstr "સંગ્રહો & વાપરો (_v)"
+
+msgid "Buddy List Error"
+msgstr "વ્યક્તિ યાદી ક્ષતિ"
+
+msgid "Size of the expander arrow"
+msgstr "વિસ્તારક તીરનું માપ"
+
+msgid ""
+"Usage: %s command [OPTIONS] [URI]\n"
+"\n"
+"    COMMANDS:\n"
+"       uri                      Handle AIM: URI\n"
+"       away                     Popup the away dialog with the default "
+"message\n"
+"       back                     Remove the away dialog\n"
+"       quit                     Close running copy of Gaim\n"
+"\n"
+"    OPTIONS:\n"
+"       -h, --help [command]     Show help for command\n"
+msgstr ""
+"વપરાશ: %s આદેશ [OPTIONS] [URI]\n"
+"\n"
+"    COMMANDS:\n"
+"       uri                      હેન્ડલ AIM: URI\n"
+"       away                     મૂળભુત સંદેશા સાથે દૂર જવાનો સંદેશો પોપઅપ કરે છે\n"
+"       back                     દૂર જવાનો સંદેશો દૂર કરે છે\n"
+"       quit                     Gaim ની ચાલી રહેલ નકલ બંધ કરે છે\n"
+"\n"
+"    OPTIONS:\n"
+"       -h, --help [command]     આદેશ માટે મદદ બતાવે છે\n"
+
+msgid ""
+"Gaim not running (on session 0)\n"
+"Is the \"Remote Control\" plugin loaded?\n"
+msgstr ""
+"Gaim ચાલી રહ્યું નથી (સત્ર ૦ પર)\n"
+"શું \"દૂરસ્થ નિયંત્રણ\" પ્લગઈન લોડ થયલે છે?\n"
+
+msgid ""
+"\n"
+"Using AIM: URIs:\n"
+"Sending an IM to a screen name:\n"
+"\tgaim-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
+"In this case, 'Penguin' is the screen name we wish to IM, and 'hello world'\n"
+"is the message to be sent.  '+' must be used in place of spaces.\n"
+"Please note the quoting used above - if you run this from a shell the '&'\n"
+"needs to be escaped, or the command will stop at that point.\n"
+"Also,the following will just open a conversation window to a screen name,\n"
+"with no message:\n"
+"\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
+"\n"
+"Joining a chat:\n"
+"\tgaim-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
+"...joins the 'PenguinLounge' chat room.\n"
+"\n"
+"Adding a buddy to your buddy list:\n"
+"\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
+"...prompts you to add 'Penguin' to your buddy list.\n"
+msgstr ""
+"\n"
+"AIM વાપરીને: URIs:\n"
+"સ્ક્રીન નામને IM મોકલીને:\n"
+"\tgaim-remote uri 'aim:goim?screenname=Penguin&message=કેમ+છો'\n"
+"આ કિસ્સામાં, 'Penguin' એ સ્ક્રીન નામ છે જે અમે IM ને કહીએ છીએ, અને 'કેમ છો'\n"
+"એ મોકલવા માટેનો સંદેશો છે.  '+' એ ખાલી જગ્યાઓની જગ્યાએ વપરાવો જ જોઈએ.\n"
+"મહેરબાની કરીને ઉપર વપરાયેલ અવતરણોની નોંધ કરો -જો તમે આને શેલમાંથી ચલાવો તો '&'\n"
+"ને રદ કરવાની જરૂર છે, અથવા આદેશ આ બિંદુએ અટકી જશે.\n"
+"અને, નીચેનું ખાલી સ્ક્રીન નામ માટે વાર્તાલાપ વિન્ડો જ ખોલશે,\n"
+"કોઈપણ જાતના સંદેશા વિના:\n"
+"\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
+"\n"
+"સંવાદમાં જોડાવા માટે:\n"
+"\tgaim-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
+"...'PenguinLounge' સંવાદ કક્ષમાં જોડાય છે.\n"
+"\n"
+"તમારી વ્યક્તિ યાદીમાં વ્યક્તિ ઉમેરીને:\n"
+"\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
+"...તમને 'Penguin' ને તમારી વ્યક્તિ યાદીમાં ઉમેરવા માટે પૂછે છે.\n"
+
+msgid ""
+"\n"
+"Close running copy of Gaim\n"
+msgstr ""
+"\n"
+"Gaim ની ચાલી રહેલ નકલ બંધ કરો\n"
+
+msgid ""
+"\n"
+"Mark all accounts as \"away\" with the default message.\n"
+msgstr ""
+"\n"
+"બધા ખાતાઓને મૂળભુત સંદેશા સાથે \"દૂર\" તરીકે ચિહ્નિત કરો.\n"
+
+msgid ""
+"\n"
+"Set all accounts as not away.\n"
+msgstr ""
+"\n"
+"બધા ખાતાઓને દૂર નથી એમ સુયોજિત કરો.\n"
+
+msgid "Show fewer options"
+msgstr "થોડા વિકલ્પો બતાવો"
+
+msgid "Information"
+msgstr "જાણકારી"
+
+msgid "/Buddies/_Signoff"
+msgstr "/વ્યક્તિઓ/પ્રવેશ બહાર નીકળો (_S)"
+
+msgid "/Tools/_Away"
+msgstr "/સાધનો/દૂર (_A)"
+
+msgid "/Tools/Pl_ugin Actions"
+msgstr "/સાધનો/પ્લગઈન ક્રિયાઓ (_u)"
+
+msgid "Rename Group"
+msgstr "જૂથનું નામ બદલો"
+
+msgid "New group name"
+msgstr "નવું જૂથ નામ"
+
+msgid "Please enter a new name for the selected group."
+msgstr "મહેરબાની કરીને પસંદિત જૂથ માટે નવું નામ દાખલ કરો."
+
+msgid "%d%%"
+msgstr "%d%%"
+
+msgid ""
+"\n"
+"<b>Account:</b>"
+msgstr ""
+"\n"
+"<b>ખાતું:</b>"
+
+msgid ""
+"\n"
+"<b>Warned:</b>"
+msgstr ""
+"\n"
+"<b>ચેતવાયેલ:</b>"
+
+msgid "Warned (%d%%) "
+msgstr "ચેતવાયેલ (%d%%) "
+
+msgid "/Tools/Away"
+msgstr "/સાધનો/દૂર"
+
+msgid "Send a message to the selected buddy"
+msgstr "પસંદ કરેલ વ્યક્તિને સંદેશો મોકલો"
+
+msgid "Get information on the selected buddy"
+msgstr "પસંદ કરેલ વ્યક્તિ પર જાણકારી મેળવો"
+
+msgid "_Chat"
+msgstr "સંવાદ (_C)"
+
+msgid "Join a chat room"
+msgstr "સંવાદ કક્ષમાં જોડાવ"
+
+msgid "_Away"
+msgstr "દૂર (_A)"
+
+msgid "Set an away message"
+msgstr "દૂર જવાનો સંદેશ સુયોજિત કરો"
+
+msgid "Done."
+msgstr "પૂર્ણ થયું."
+
+msgid "Signon: "
+msgstr "પ્રવેશ કરો: "
+
+msgid "Signon"
+msgstr "પ્રવેશ કરો"
+
+msgid "Cancel All"
+msgstr "બધું રદ કરો"
+
+msgid "_Reconnect"
+msgstr "પુનઃ જોડાવ (_R)"
+
+msgid ""
+"<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
+"\n"
+"%s\n"
+"%s"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">%s નું જોડાણ તૂટી ગયેલ છે.</span>\n"
+"\n"
+"%s\n"
+"%s"
+
+msgid "Reason Unknown."
+msgstr "કારણ અજ્ઞાત."
+
+msgid "Reconnect _All"
+msgstr "બધું પુનઃ જોડો (_A)"
+
+msgid "Time"
+msgstr "સમય"
+
+msgid "Get Away Msg"
+msgstr "દૂર જવાનો સંદેશો"
+
+msgid "/Conversation/_Warn..."
+msgstr "/વાર્તાલાપ/ચેતવો (_W)..."
+
+msgid "/Conversation/Warn..."
+msgstr "/વાર્તાલાપ/ચેતવો..."
+
+msgid "Warn"
+msgstr "ચેતવો"
+
+msgid "Warn the user"
+msgstr "વપરાશકર્તાને ચેતવો"
+
+msgid "Block the user"
+msgstr "વપરાશકર્તાને બ્લોક કરો"
+
+msgid "Send a file to the user"
+msgstr "વપરાશકર્તાને ફાઈલ મોકલો"
+
+msgid "Add the user to your buddy list"
+msgstr "વપરાશકર્તાને તમારી વ્યક્તિ યાદીમાં ઉમેરો"
+
+msgid "Remove the user from your buddy list"
+msgstr "વપરાશકર્તાને તમારી વ્યક્તિ યાદીમાંથી દૂર કરો"
+
+msgid "Send"
+msgstr "મોકલો"
+
+msgid "Invite"
+msgstr "આમંત્રણ આપો"
+
+msgid "Invite a user"
+msgstr "વપરાશકર્તાને આમંત્રિત કરો"
+
+msgid "Add the chat to your buddy list"
+msgstr "તમારી વ્યક્તિ યાદીમાં સંવાદ ઉમેરો"
+
+msgid "<main>/Conversation/Close"
+msgstr "<main>/વાર્તાલાપ/બંધ કરો"
+
+msgid "former lead developer"
+msgstr "પહેલાનો અગ્રણી વિકાસકર્તા"
+
+msgid "former maintainer"
+msgstr "પહેલાનો જાળવનાર"
+
+msgid "Azerbaijani"
+msgstr "અઝરબૈજાની"
+
+msgid "Vladimira Girginova and Vladimir (Kaladan) Petkov"
+msgstr "લાદીમીરા ગીર્ગીનોવા અને લાદીમીર (કાલાડાન) પેટકોવ"
+
+msgid "Galician"
+msgstr "ગેલીસીયન"
+
+msgid "Burmese"
+msgstr "બુર્મીસ"
+
+msgid "Norwegian (Nynorsk)"
+msgstr "નોર્વેજીયન (નાઈનોક્સ)"
+
+msgid "Punjabi"
+msgstr "પંજાબી"
+
+msgid "Albanian"
+msgstr "અલ્બેનીયન"
+
+msgid "Turkish"
+msgstr "તુર્કી"
+
+msgid "Ukrainian"
+msgstr "યુક્રેનિયન"
+
+msgid "Xhosa"
+msgstr "હોસા"
+
+msgid "Chinese"
+msgstr "ચીની"
+
+msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
+
+msgid "_Screen name"
+msgstr "સ્ક્રીન નામ (_S)"
+
+msgid "Warn User"
+msgstr "વપરાશકર્તાને ચેતવો"
+
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
+"\n"
+"This will increase %s's warning level and he or she will be subject to "
+"harsher rate limiting.\n"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">શું %s ને ચેતવવો છે?</span>\n"
+"\n"
+"આ %s નું ચેતવણી સ્તર વધારશે અને તે અથવા તેણી મર્યાદા મૂકવા પર મત આપી શકે છે.\n"
+
+msgid "Warn _anonymously?"
+msgstr "શું અનામિક રીતે ચેતવવું છે? (_a)"
+
+msgid "<b>Anonymous warnings are less severe.</b>"
+msgstr "<b>અનામિક ચેતવણીઓ ઓછી ગંભીર હોય છે.</b>"
+
+msgid "Show transfer details"
+msgstr "પરિવહન વિગતો બતાવો"
+
+msgid "D_isplay remote nicknames if no alias is set"
+msgstr "જો કોઈ ઉપનામ સુયોજિત નહિં હોય તો દૂરસ્થ ખોટા નામો દર્શાવો (_i)"
+
+msgid "Display"
+msgstr "દર્શાવો"
+
+msgid "Show _timestamp on messages"
+msgstr "સંદેશાઓ પર સમયનોંધ બતાવો (_t)"
+
+msgid "Ignore c_olors"
+msgstr "રંગો અવગણો (_o)"
+
+msgid "Ignore font _faces"
+msgstr "ફોન્ટ ફેસ અવગણો (_f)"
+
+msgid "Ignore font si_zes"
+msgstr "ફોન્ટ માપો અવગણો (_z)"
+
+msgid "Default Formatting"
+msgstr "મૂળભુત બંધારણ"
+
+msgid "_Send default formatting with outgoing messages"
+msgstr "જતા સંદેશાઓને મૂળભુત બંધારણ સાથે મોકલો (_S)"
+
+msgid "Send Message"
+msgstr "સંદેશો મોકલો"
+
+msgid "Enter _sends message"
+msgstr "Enter સંદેશો મોકલે છે (_s)"
+
+msgid "C_ontrol-Enter sends message"
+msgstr "C_ontrol-Enter સંદેશો મોકલે છે"
+
+msgid "Window Closing"
+msgstr "વિન્ડો બંધ કરવાનું"
+
+msgid "_Escape closes window"
+msgstr "_Escape વિન્ડો બંધ કરે છે"
+
+msgid "Insertions"
+msgstr "ઉમેરાઓ"
+
+msgid "Control-{B/I/U} changes _formatting"
+msgstr "Control-{B/I/U} બંધારણ બદલે છે (_f)"
+
+msgid "Control-(number) _inserts smileys"
+msgstr "Control-(number) હસતા ચહેરાઓ ઉમેરે છે (_i)"
+
+msgid "Show _buttons as:"
+msgstr "બટનો આ રીતે બતાવો (_b):"
+
+msgid "Pictures"
+msgstr "ચિત્રો"
+
+msgid "Text"
+msgstr "લખાણ"
+
+msgid "Pictures and text"
+msgstr "ચિત્રો અને લખાણ"
+
+msgid "_Raise window on events"
+msgstr "ઘટનાઓ પર વિન્ડો બતાવો (_R)"
+
+msgid "Show _warning levels"
+msgstr "ચેતવણી સ્તરો બતાવો (_w)"
+
+msgid "_Automatically expand contacts"
+msgstr "આપોઆપ સંપર્કો ફેલાવો (_A)"
+
+msgid "Enable \"_slash\" commands"
+msgstr "\"_slash\" આદેશો સક્રિય કરો"
+
+msgid "Show _aliases in tabs/titles"
+msgstr "ઉપનામો ટેબો/શીર્ષકોમાં બતાવો (_a)"
+
+msgid "_Raise IM window on events"
+msgstr "ઘટનાઓ પર IM વિન્ડો વધારો (_R)"
+
+msgid "Raise chat _window on events"
+msgstr "ઘટનાઓ પર વિન્ડો સંવાદ વિન્ડો વધારો (_w)"
+
+msgid "Use _multi-colored screen names in chats"
+msgstr "સંવાદોમાં સ્ક્રીન નામો વિવિધ-રંગો વાપરો (_m)"
+
+msgid "Tab p_lacement:"
+msgstr "ટેબ સ્થાન (_l):"
+
+msgid "New conversation _placement:"
+msgstr "નવી વાર્તાલાપ જગ્યા (_p):"
+
+msgid "Message Logs"
+msgstr "સંદેશા લૉગ"
+
+msgid "System Logs"
+msgstr "સિસ્ટમ લૉગ"
+
+msgid "_Enable system log"
+msgstr "સિસ્ટમ લૉગ સક્રિય કરો (_E)"
+
+msgid "Log when buddies _sign on/sign off"
+msgstr "જ્યારે વ્યક્તિ પ્રવેશ કરે/બહાર નીકળે ત્યારે લૉગ કરો (_s)"
+
+msgid "Log when buddies become _idle/un-idle"
+msgstr "જ્યારે વ્યક્તિ નિષ્ક્રિય થાય/ફરી આવે ત્યારે લૉગ કરો (_i)"
+
+msgid "Log when buddies go away/come _back"
+msgstr "જ્યારે વ્યક્તિ દૂર જાય/પાછો આવે ત્યારે લૉગ કરો (_b)"
+
+msgid "Log your _own signons/idleness/awayness"
+msgstr "તમારા પોતાના પ્રવેશો/નિષ્ક્રિયો/દૂર જવાના સંદેશાઓ લૉગ કરો (_o)"
+
+msgid "Idle _time reporting:"
+msgstr "નિષ્ક્રિય સમય અહેવાલીકરણ (_t):"
+
+msgid "Gaim usage"
+msgstr "Gaim વપરાશ"
+
+msgid "X usage"
+msgstr "X વપરાશ"
+
+msgid "Windows usage"
+msgstr "વિન્ડો વપરાશ"
+
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"<span weight=\"bold\">Written by:</span>\t%s\n"
+"<span weight=\"bold\">Web site:</span>\t\t%s\n"
+"<span weight=\"bold\">File name:</span>\t%s"
+msgstr ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"<span weight=\"bold\">લેખક:</span>\t%s\n"
+"<span weight=\"bold\">વેબ સાઈટ:</span>\t\t%s\n"
+"<span weight=\"bold\">ફાઈલ નામ:</span>\t%s"
+
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"<span weight=\"bold\">Written by:</span>  %s\n"
+"<span weight=\"bold\">URL:</span>  %s\n"
+"<span weight=\"bold\">File name:</span>  %s"
+msgstr ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"<span weight=\"bold\">લેકક:</span>  %s\n"
+"<span weight=\"bold\">URL:</span>  %s\n"
+"<span weight=\"bold\">ફાઈલ નામ:</span>  %s"
+
+msgid "Load"
+msgstr "લાવો"
+
+msgid "Summary"
+msgstr "સાર"
+
+msgid "Details"
+msgstr "વિગતો"
+
+msgid "_Edit"
+msgstr "ફેરફાર કરો (_E)"
+
+msgid "Interface"
+msgstr "ઈન્ટરફેસ"
+
+msgid "Message Text"
+msgstr "સંદેશા લખાણ"
+
+msgid "Shortcuts"
+msgstr "ટુંકાણો"
+
+msgid "Away Messages"
+msgstr "દૂર સંદેશાઓ"
+
+msgid "Plugins"
+msgstr "પ્લગઈનો"
+
+msgid "HTML"
+msgstr "HTML"
+
+msgid "Plain text"
+msgstr "સાદું લખાણ"
+
+msgid "Please create an account."
+msgstr "મહેરબાની કરીને ખાતું બનાવો."
+
+msgid "Login"
+msgstr "પ્રવેશ"
+
+msgid "<b>_Account:</b>"
+msgstr "<b>ખાતું (_A):</b>"
+
+msgid "<b>_Password:</b>"
+msgstr "<b>પાસવર્ડ (_P):</b>"
+
+msgid "A_ccounts"
+msgstr "ખાતાઓ (_c)"
+
+msgid "P_references"
+msgstr "પસંદગીઓ (_r)"
+
+msgid "_Sign on"
+msgstr "પ્રવેશ કરો (_S)"
+
+msgid ""
+"Gaim %s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -a, --acct          display account editor window\n"
+"  -w, --away[=MESG]   make away on signon (optional argument MESG specifies\n"
+"                      name of away message to use)\n"
+"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
+"                      account(s) to use, seperated by commas)\n"
+"  -n, --loginwin      don't automatically login; show login window\n"
+"  -u, --user=NAME     use account NAME\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -v, --version       display the current version and exit\n"
+"  -h, --help          display this help and exit\n"
+msgstr ""
+"Gaim %s\n"
+"વપરાશ: %s [OPTION]...\n"
+"\n"
+"  -a, --acct          ખાતા સંપાદક વિન્ડો દર્શાવે છે\n"
+"  -w, --away[=MESG]   પ્રવેશવા પર દૂર જાય છે (વૈકલ્પિક દલીલ MESG વાપરવા માટે\n"
+"                      દૂર જવાના સંદેશાનું નામ સ્પષ્ટ કરે છે)\n"
+"  -l, --login[=NAME]  આપોઆપ પ્રવેશો (વૈકલ્પિક દલીલ NAME વાપરવા માટેના\n"
+"                      ખાતાઓ સ્પષ્ટ કરે છે, અલ્પવિરામોથી અલગ પાડીને)\n"
+"  -n, --loginwin      આપોઆપ પ્રવેશ કરશો નહિં; પ્રવેશ વિન્ડો બતાવે છે\n"
+"  -u, --user=NAME     ખાતુ NAME વાપરે છે\n"
+"  -c, --config=DIR    રૂપરેખા ફાઈલો માટે DIR વાપરે છે\n"
+"  -d, --debug         stdout માં ડિબગીંગ સંદેશાઓ છાપે છે\n"
+"  -v, --version       વર્તમાન આવૃત્તિ દર્શાવે છે અને બહાર નીકળે છે\n"
+"  -h, --help          આ મદદ દર્શાવે છે અને બહાર નીકળે છે\n"
+
+msgid "Unable to load preferences"
+msgstr "પસંદગીઓ લાવવામાં અસમર્થ"
+
+msgid ""
+"Gaim was not able to load your preferences because they are stored in an old "
+"format that is no longer used.  Please reconfigure your settings using the "
+"Preferences window."
+msgstr ""
+"Gaim તમારી પસંદગીઓ લાવવામાં સમર્થ હતું નહિં કારણ કે તેઓ જૂના બંધારણમાં સંગ્રહાયેલ હતા કે જેઓ "
+"લાંબા સમય સુધી વાપરવાના નથી.  મહેરબાની કરીને પસંદગીઓ વિન્ડોની મદદથી તમારા સુયોજનો "
+"પુનઃરૂપરેખાંકિત કરો."
+
+msgid "Slightly less boring default"
+msgstr "જરા થોડો ઓછો કંટાળાજનક મૂળભુત"
+
+msgid "Available for friends only"
+msgstr "માત્ર મિત્રો માટે ઉપલબ્ધ છે"
+
+msgid "Away for friends only"
+msgstr "માત્ર મિત્રો માટે દૂર જાવ"
+
+msgid "Invisible for friends only"
+msgstr "માત્ર મિત્રો માટે અદૃશ્ય"
+
+msgid "Unable to resolve hostname."
+msgstr "યજમાનનામો ઉકેલવામાં અસમર્થ."
+
+msgid "Error while reading from socket."
+msgstr "સોકેટમાંથી વાંચતી વખતે ક્ષતિ."
+
+msgid "Error while writing to socket."
+msgstr "સોકેટ પર લખતી વખતે ક્ષતિ."
+
+msgid "Authentication failed."
+msgstr "સત્તાધિકરણ નિષ્ફળ."
+
+msgid "Unknown Error Code."
+msgstr "અજ્ઞાત ક્ષતિ કોડ."
+
+msgid "Status: %s"
+msgstr "સ્થિતિ: %s"
+
+msgid "Could not connect"
+msgstr "જોડાઈ શક્યા નહિં"
+
+msgid "Reading data"
+msgstr "માહિતી વાંચી રહ્યા છીએ"
+
+msgid "Balancer handshake"
+msgstr "બેલેન્સર હેન્ડશેક"
+
+msgid "Reading server key"
+msgstr "સર્વર કી વાંચી રહ્યા છીએ"
+
+msgid "Exchanging key hash"
+msgstr "કી હેશ બદલી રહ્યા છીએ"
+
+msgid "Critical error in GG library\n"
+msgstr "GG લાઈબ્રેરીમાં જટિલ ક્ષતિ\n"
+
+msgid "Unable to ping server"
+msgstr "સર્વરને પીંગ કરવામાં અસમર્થ"
+
+msgid "Send as message"
+msgstr "સંદેશા તરીકે મોકલો"
+
+msgid "Looking up GG server"
+msgstr "GG સર્વર જોઈ રહ્યા છીએ"
+
+msgid "Invalid Gadu-Gadu UIN specified"
+msgstr "અયોગ્ય Gadu-Gadu UIN સ્પષ્ટ થયેલ છે"
+
+msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
+msgstr "તમે અયોગ્ય Gadu-Gadu UIN ને સંદેશો મોકલવાનો પ્રયત્ન કરી રહ્યા છો."
+
+msgid "Couldn't get search results"
+msgstr "શોધ પરિણામો મેળવી શક્યા નહિં"
+
+msgid "Birth Year"
+msgstr "જન્મ વર્ષ"
+
+msgid "Sex"
+msgstr "જાતિ"
+
+msgid "There is no Buddy List stored on the Gadu-Gadu server."
+msgstr "Gadu-Gadu સર્વર પર કોઈ વ્યક્તિ યાદી સંગ્રહાયેલ નથી."
+
+msgid "Couldn't Import Buddy List from Server"
+msgstr "સર્વરમાંથી વ્યક્તિ યાદી આયાત કરી શક્યા નહિં"
+
+msgid "Buddy List successfully transferred to Gadu-Gadu server"
+msgstr "Gadu-Gadu સર્વરમાં વ્યક્તિ યાદી સફળતાપૂર્વક પરિવહન થઈ"
+
+msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
+msgstr "Gadu-Gadu સર્વરમાં વ્યક્તિ યાદી પરિવહન કરી શક્યા નહિં"
+
+msgid "Buddy List successfully deleted from Gadu-Gadu server"
+msgstr "Gadu-Gadu સર્વરમાંથી વ્યક્તિ યાદી સફળતાપૂર્વક કાઢી નંખાઈ"
+
+msgid "Couldn't delete Buddy List from Gadu-Gadu server"
+msgstr "Gadu-Gadu સર્વરમાંથી વ્યક્તિ યાદી કાઢી શક્યા નહિં"
+
+msgid "Password couldn't be changed"
+msgstr "પાસવર્ડ બદલી શકાયો નહિં"
+
+msgid "Error communicating with Gadu-Gadu server"
+msgstr "Gadu-Gadu સર્વર સાથે સંપર્કવ્યવહાર કરવામાં ક્ષતિ"
+
+msgid ""
+"Gaim was unable to complete your request due to a problem communicating with "
+"the Gadu-Gadu HTTP server.  Please try again later."
+msgstr ""
+"Gaim એ Gadu-Gadu HTTP સર્વર સાથેની સંપર્કવ્યવહાર સમસ્યાને કારણે તમારી અરજી પૂર્ણ "
+"કરવામાં અસમર્થ હતું.  પછી મહેરબાની કરીને ફરી પ્રયત્ન કરો."
+
+msgid "Unable to import Gadu-Gadu buddy list"
+msgstr "Gadu-Gadu buddy યાદી આયાત કરવામાં અસમર્થ"
+
+msgid ""
+"Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
+"again later."
+msgstr ""
+"Gaim એ Gadu-Gadu વ્યક્તિ યાદી સર્વર સાથે જોડાવા માટે અસમર્થ હતું.  મહેરબાની કરીને પછી "
+"ફરીથી પ્રયત્ન કરો."
+
+msgid "Couldn't export buddy list"
+msgstr "વ્યક્તિ યાદીનિ નિકાસ કરી શક્યા નહિં"
+
+msgid "Gaim was unable to connect to the buddy list server.  Please try again later."
+msgstr ""
+"Gaim વ્યક્તિ યાદી સર્વર સાથે જોડાવા માટે અસમર્થ હતું.  મહેરબાની કરીને પછી ફરીથી પ્રયત્ન "
+"કરો."
+
+msgid "Unable to delete Gadu-Gadu buddy list"
+msgstr "Gadu-Gadu વ્યક્તિ યાદી કાઢી નાંખવામાં અસમર્થ"
+
+msgid "Unable to access directory"
+msgstr "ડિરેક્ટરી વાપરવામાં અસમર્થ"
+
+msgid ""
+"Gaim was unable to search the Directory because it was unable to connect to "
+"the directory server.  Please try again later."
+msgstr ""
+"Gaim ડિરેક્ટરી શોધવા માટે અસમર્થ હતું કારણ કે તે ડિરેક્ટરી સર્વર સાથે જોડાવા માટે અસમર્થ "
+"હતું.  મહેરબાની કરીને પછી ફરીથી પ્રયત્ન કરો."
+
+msgid ""
+"Gaim was unable to change your password due to an error connecting to the "
+"Gadu-Gadu server.  Please try again later."
+msgstr ""
+"Gaim એ Gadu-Gadu સર્વર સાથે જોડાવામાં ક્ષતિને કારણે તમારો પાસવર્ડ બદલવામાં અસમર્થ "
+"હતું.  મહેરબાની કરીને પછી ફરીથી પ્રયત્ન કરો."
+
+msgid "Directory Search"
+msgstr "ડિરેક્ટરી શોધ"
+
+msgid "Unable to access user profile."
+msgstr "વપરાશકર્તા રૂપરેખા વાપરવામાં અસમર્થ."
+
+msgid ""
+"Gaim was unable to access this user's profile due to an error connecting to "
+"the directory server.  Please try again later."
+msgstr ""
+"Gaim ડિરેક્ટરી સર્વર સાથે જોડાવામાં ક્ષતિને કારણે વપરાશકર્તાની રૂપરેખા વાપરવામાં અસમર્થ "
+"હતું.  મહેરબાની કરીને પછી ફરીથી પ્રયત્ન કરો."
+
+msgid "Gaim encountered an error communicating with the ICQ server."
+msgstr "Gaim ને ICQ સર્વર સાથે સંપર્કવ્યવહાર કરવામાં ક્ષતિ આવી."
+
+msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
+msgstr "વપરાશકર્તા %s (%s%s%s%s%s) તમને તેમને સત્તાધિકારીત કરવા માંગે છે."
+
+msgid "Send message through server"
+msgstr "સર્વર મારફતે સંદેશો મોકલો"
+
+msgid "Connecting..."
+msgstr "સંપર્ક કરી રહ્યા છીએ..."
+
+msgid "Nick:"
+msgstr "ખોટું નામ:"
+
+msgid "Gaim User"
+msgstr "Gaim વપરાશકર્તા"
+
+msgid "File Transfer Aborted"
+msgstr "ફાઈલ પરિવહન અડધેથી બંધ થઈ ગયું"
+
+msgid "Buddy Information for %s"
+msgstr "%s માટે વ્યક્તિ જાણકારી"
+
+msgid "Invalid nickname '%s'"
+msgstr "અયોગ્ય નામ '%s'"
+
+msgid "Invalid nickname"
+msgstr "અયોગ્ય નામ"
+
+msgid "Jabber Profile"
+msgstr "Jabber રૂપરેખા"
+
+msgid "Roomlist Error"
+msgstr "કક્ષયાદી ક્ષતિ"
+
+msgid "Logged out"
+msgstr "પ્રવેશ બહાર નીકળો"
+
+msgid "Hide Operating System"
+msgstr "ઓપરેટિંગ સિસ્ટમ છુપાવો"
+
+msgid "The user %s wants to add you to their buddy list."
+msgstr "વપરાશકર્તા %s તમને તેમની વ્યક્તિ યાદીમાં ઉમેરવા માંગે છે."
+
+msgid ""
+"You were disconnected from the server, because you logged on from a "
+"different location"
+msgstr "તમારું સર્વરમાંથી જોડાણ તૂટી ગયું હતું, કારણ કે તમે અલગ સ્થાનમાંથી પ્રવેશ બહાર નીકળી ગયા હતા"
+
+msgid "User Properties"
+msgstr "વપરાશકર્તા ગુણધર્મો"
+
+msgid "Transfer of file %s timed out."
+msgstr "ફાઈલ %s નું પરિવહનનો સમય સમાપ્ત થઈ ગયો."
+
+msgid ""
+"You have been disconnected because you have signed on with this screen name "
+"at another location."
+msgstr "તમારું જોડાણ તૂટી ગયેલ છે કારણ કે તમે આ સ્ક્રીન નામ સાથે અન્ય સાથે પ્રવેશ કરેલ છે."
+
+msgid "Not specified"
+msgstr "સ્પષ્ટ થયેલ નથી"
+
+msgid "ICQ Info for %s"
+msgstr "%s માટે ICQ જાણકારી"
+
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"ends in a space."
+msgstr ""
+"ક્ષતિ 0x%04x: સ્ક્રીન નામનું બંધારણ ઘડવામાં અસમર્થ કારણ કે અરજી થયેલ સ્ક્રીન નામ જગ્યામાં "
+"અંત થાય છે."
+
+msgid "Visible"
+msgstr "દૃશ્યમાન"
+
+msgid "Available Message:"
+msgstr "ઉપલબ્ધ સંદેશો:"
+
+msgid "I'm doing work and hoping for a distraction--IM me!"
+msgstr "હું કામ કરી રહ્યો છું અને સંતૃપ્તિ માટે આશા રાખું છે--IM મને!"
+
+msgid "Set Available Message..."
+msgstr "ઉપલબ્ધ સંદેશો સુયોજિત કરો..."
+
+msgid "Failed to leave channel"
+msgstr "ચેનલ છોડવામાં નિષ્ફળ"
+
+msgid "Basic Profile"
+msgstr "આધારભૂત રૂપરેખા"
+
+msgid "Profile Information"
+msgstr "રૂપરેખા જાણકારી"
+
+msgid "Instant Messagers"
+msgstr "તુરંત સંદેશા મોકલનારાઓ"
+
+msgid "AIM"
+msgstr "AIM"
+
+msgid "ICQ UIN"
+msgstr "ICQ UIN"
+
+msgid "MSN"
+msgstr "MSN"
+
+msgid "Yahoo"
+msgstr "Yahoo"
+
+msgid "I'm From"
+msgstr "હું આમાંથી"
+
+msgid "Set your Trepia profile data."
+msgstr "તમારી Trepia રૂપરેખા માહિતી સુયોજિત કરો."
+
+msgid "Profile"
+msgstr "રુપરેખા"
+
+msgid "Set Profile"
+msgstr "રૂપરેખા સુયોજિત કરો"
+
+msgid "Visit Homepage"
+msgstr "ઘરપાનાંની મુલાકાત લો"
+
+msgid "Local Users"
+msgstr "સ્થાનિક વપરાશકર્તાઓ"
+
+msgid "Trepia Protocol Plugin"
+msgstr "Trepia પ્રોટોકોલ પ્લગઈન"
+
+msgid ""
+"You have been logged off as you have logged in on a different machine or "
+"device."
+msgstr "તમે પ્રવેશ બંધ કરેલ છે કારણ તમે અલગ મશીન અથવા ઉપકરણમાં પ્રવેશ કરેલ છે."
+
+msgid "Please enter your password"
+msgstr "મહેરબાની કરીને તમારો પાસવર્ડ દાખલ કરો"
+
+msgid "%s logged in."
+msgstr "%s પ્રવેશેલ છે."
+
+msgid "%s signed on"
+msgstr "%s પ્રવેશ કરેલ છે"
+
+msgid "%s logged out."
+msgstr "%s બહાર નીકળી ગયો."
+
+msgid "%s signed off"
+msgstr "%s પ્રવેશ બહાર નીકળી ગયો"
+
+msgid ""
+"%s has just been warned by %s.\n"
+"Your new warning level is %d%%"
+msgstr ""
+"%s એ હમણાં જ %s દ્વારા ચેતવાયેલ છે.\n"
+"%d%% એ તમારું નવું ચેતવણી સ્તર છે"
+
+msgid "an anonymous person"
+msgstr "એક અનામિક વ્યક્તિ"
+
+msgid ""
+"%s has invited %s to the chat room %s:\n"
+"<b>%s</b>"
+msgstr ""
+"%s એ %s ને સંવાદ કક્ષ %s માં આમંત્રિત કર્યો છે:\n"
+"<b>%s</b>"
+
+msgid "Sorry, I ran out for a bit!"
+msgstr "માફ કરજો, હું થોડા સમય માટે ચાલી ગયો હતો!"
+
--- a/po/it.po	Wed Aug 09 06:23:18 2006 +0000
+++ b/po/it.po	Wed Aug 09 14:47:37 2006 +0000
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: Gaim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-27 16:12-0400\n"
-"PO-Revision-Date: 2005-07-05 19:30--100\n"
+"POT-Creation-Date: 2006-06-13 17:47+0200\n"
+"PO-Revision-Date: 2006-06-08 20:06+0100\n"
 "Last-Translator: Claudio Satriano <satriano@na.infn.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "MIME-Version: 1.0\n"
@@ -29,76 +29,62 @@
 msgid "Send instant messages over multiple protocols"
 msgstr "Client multiprotocollo per messaggi immediati"
 
-#: plugins/autorecon.c:301
-msgid "Error Message Suppression"
-msgstr "Soppressione dei messaggi di errore"
-
-#: plugins/autorecon.c:305
-msgid "Hide Disconnect Errors"
-msgstr "Nascondi gli errori di disconnessione"
-
-#: plugins/autorecon.c:309
-msgid "Hide Login Errors"
-msgstr "Nascondi gli errori di login"
-
-#: plugins/autorecon.c:313
-#, fuzzy
-msgid "Hide Reconnecting Dialog"
-msgstr "Nascondi gli errori di disconnessione"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:337
-msgid "Auto-Reconnect"
-msgstr "Riconnessione automatica"
+#: ../plugins/ciphertest.c:264
+msgid "Cipher Test"
+msgstr ""
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/autorecon.c:340 plugins/autorecon.c:342
-msgid "When you are kicked offline, this reconnects you."
-msgstr "Ti riconnette automaticamente quando sei cacciato fuori."
-
-#: plugins/contact_priority.c:84
+#: ../plugins/ciphertest.c:267 ../plugins/ciphertest.c:269
+msgid "Tests the ciphers that ship with gaim."
+msgstr ""
+
+#: ../plugins/contact_priority.c:61
+msgid "Buddy is idle"
+msgstr "Il contatto  inattivo"
+
+#: ../plugins/contact_priority.c:62
+msgid "Buddy is away"
+msgstr "Il contatto  assente"
+
+#: ../plugins/contact_priority.c:63
+#, fuzzy
+msgid "Buddy is \"extended\" away"
+msgstr "Il contatto  assente:"
+
+#. Not used yet.
+#: ../plugins/contact_priority.c:66
+#, fuzzy
+msgid "Buddy is mobile"
+msgstr "Il contatto  inattivo:"
+
+#: ../plugins/contact_priority.c:68
+msgid "Buddy is offline"
+msgstr "Il contatto non  in linea"
+
+#: ../plugins/contact_priority.c:90
 msgid "Point values to use when..."
 msgstr "Punti da utilizzare quando..."
 
-#: plugins/contact_priority.c:93
-msgid "Buddy is offline:"
-msgstr "Il contatto non  connesso:"
-
-#: plugins/contact_priority.c:107
-msgid "Buddy is away:"
-msgstr "Il contatto  assente:"
-
-#: plugins/contact_priority.c:121
-msgid "Buddy is idle:"
-msgstr "Il contatto  inattivo:"
-
-#: plugins/contact_priority.c:135
-msgid "Use last matching buddy"
-msgstr "Utilizza l'ultimo contatto corrispondente"
-
-#. Explanation
-#: plugins/contact_priority.c:141
-#, fuzzy
-msgid ""
-"The buddy with the lowest score is the buddy who will have priority in the "
-"contact.\n"
-"The default values (offline = 4, away = 2, and idle = 1) will use what used "
-"to be\n"
-"the built-in order: active, idle, away, away + idle, offline."
-msgstr ""
-"Il contatto con il punteggio pi basso  quello che avr priorit nella "
-"lista.\n"
-"I valori predefiniti sono: non connesso=4, assente=2, inattivo=1."
-
-#: plugins/contact_priority.c:144
+#: ../plugins/contact_priority.c:118
+msgid ""
+"The buddy with the <i>largest score</i> is the buddy who will have priority "
+"in the contact.\n"
+msgstr ""
+
+#: ../plugins/contact_priority.c:125
+msgid "Use last buddy when scores are equal"
+msgstr ""
+
+#: ../plugins/contact_priority.c:130
 #, fuzzy
 msgid "Point values to use for account..."
 msgstr "Punti da utilizzare per l'account..."
@@ -109,21 +95,21 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/contact_priority.c:195
+#: ../plugins/contact_priority.c:182
 msgid "Contact Priority"
 msgstr "Priorit nella lista"
 
 #. *< name
 #. *< version
 #. *< summary
-#: plugins/contact_priority.c:198
+#: ../plugins/contact_priority.c:185
 msgid ""
 "Allows for controlling the values associated with different buddy states."
 msgstr ""
 "Permette di controllare i valori associati a differenti stati del contatto."
 
 #. *< description
-#: plugins/contact_priority.c:200
+#: ../plugins/contact_priority.c:187
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
@@ -132,57 +118,57 @@
 "disconnesso per i contatti nel calcolo della priorit all'interno della "
 "lista."
 
-#.
-#. *  DEFINES, MACROS & DATA TYPES
-#.
-#: plugins/docklet/docklet-win32.c:44
-msgid "Gaim"
-msgstr "Gaim"
-
-#: plugins/docklet/docklet-win32.c:45
-msgid "Gaim - Signed off"
-msgstr "Gaim - Non connesso"
-
-#: plugins/docklet/docklet-win32.c:46
-msgid "Gaim - Away"
-msgstr "Gaim - Assente"
-
-#: plugins/docklet/docklet.c:383
-#, fuzzy
-msgid "Show Buddy List"
-msgstr "Lista contatti"
-
-#: plugins/docklet/docklet.c:390
-msgid "New Message..."
-msgstr "Nuovo messaggio..."
-
-#: plugins/docklet/docklet.c:394
-msgid "Join A Chat..."
-msgstr "Entra in chat..."
-
-#: plugins/docklet/docklet.c:399
-msgid "Mute Sounds"
-msgstr "Nessun suono"
-
-#: plugins/docklet/docklet.c:406 src/gtkft.c:691
-#: src/protocols/oscar/oscar.c:8357
-msgid "File Transfers"
-msgstr "Trasferimento file"
-
-#: plugins/docklet/docklet.c:407 src/gtkaccount.c:2422
-msgid "Accounts"
-msgstr "Account"
-
-#: plugins/docklet/docklet.c:408 src/gtkprefs.c:1763
-msgid "Preferences"
-msgstr "Preferenze"
-
-#. TODO: need a submenu to change status, this needs to "link"
-#. * to the status in the buddy list gtkstatusbox
-#.
-#: plugins/docklet/docklet.c:416
-msgid "Quit"
-msgstr "Esci"
+#. *< api_version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../plugins/crazychat/cc_gaim_plugin.c:146
+#, fuzzy
+msgid "Crazychat"
+msgstr "Chat"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../plugins/crazychat/cc_gaim_plugin.c:149
+msgid "Plugin to establish a Crazychat session."
+msgstr ""
+
+#. *  description
+#: ../plugins/crazychat/cc_gaim_plugin.c:151
+msgid "Uses Gaim to obtain buddy ips to connect for a Crazychat session"
+msgstr ""
+
+#. make the network configuration frame
+#: ../plugins/crazychat/cc_gaim_plugin.c:295
+msgid "Network Configuration"
+msgstr "Configurazione della rete"
+
+#: ../plugins/crazychat/cc_gaim_plugin.c:307
+msgid "TCP port"
+msgstr "Porta TCP"
+
+#: ../plugins/crazychat/cc_gaim_plugin.c:317
+msgid "UDP port"
+msgstr "Porta UDP"
+
+#. make the feature configuration frame
+#: ../plugins/crazychat/cc_gaim_plugin.c:329
+msgid "Feature Calibration"
+msgstr ""
+
+#. add enabled / disabled
+#: ../plugins/crazychat/cc_gaim_plugin.c:345 ../src/gtkaccount.c:2262
+#: ../src/gtkplugin.c:574
+msgid "Enabled"
+msgstr "Abilitato"
+
+#: ../plugins/crazychat/cc_gaim_plugin.c:350
+msgid "Disabled"
+msgstr "Disabilitato"
 
 #. *< type
 #. *< ui_requirement
@@ -190,44 +176,197 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/docklet/docklet.c:556
+#: ../plugins/dbus-example.c:152
+msgid "DBus"
+msgstr "DBus"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../plugins/dbus-example.c:155 ../plugins/dbus-example.c:157
+msgid "DBus Plugin Example"
+msgstr ""
+
+#: ../plugins/docklet/docklet.c:154
+#, fuzzy
+msgid "Right-click for more unread messages...\n"
+msgstr "Mostra pi opzioni"
+
+#: ../plugins/docklet/docklet.c:157 ../src/gtkblist.c:3241
+#, c-format
+msgid "%d unread message from %s\n"
+msgid_plural "%d unread messages from %s\n"
+msgstr[0] "%d messaggio non letto da %s\n"
+msgstr[1] "%d messaggi non letti da %s\n"
+
+#: ../plugins/docklet/docklet.c:432
+msgid "Change Status"
+msgstr "Modifica lo stato"
+
+#: ../plugins/docklet/docklet.c:435 ../src/gtkstatusbox.c:673
+#: ../src/protocols/gg/gg.c:996 ../src/protocols/jabber/buddy.c:1363
+#: ../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:2843 ../src/protocols/yahoo/yahoo.c:2731
+#: ../src/status.c:155
+msgid "Available"
+msgstr "Presente"
+
+#. Away stuff
+#. get_yahoo_status_from_gaim_status() returns YAHOO_STATUS_CUSTOM for
+#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
+#: ../plugins/docklet/docklet.c:439 ../src/gtkprefs.c:1774
+#: ../src/gtkstatusbox.c:674 ../src/protocols/gg/gg.c:999
+#: ../src/protocols/irc/irc.c:520 ../src/protocols/irc/msgs.c:223
+#: ../src/protocols/jabber/buddy.c:1367 ../src/protocols/novell/novell.c:2846
+#: ../src/protocols/oscar/oscar.c:719 ../src/protocols/oscar/oscar.c:4397
+#: ../src/protocols/oscar/oscar.c:5440 ../src/protocols/silc/buddy.c:1469
+#: ../src/protocols/yahoo/yahoo.c:3185 ../src/protocols/yahoo/yahoo.c:3258
+#: ../src/status.c:158
+msgid "Away"
+msgstr "Assente"
+
+#: ../plugins/docklet/docklet.c:443 ../src/gtkstatusbox.c:675
+#: ../src/protocols/oscar/oscar.c:723 ../src/protocols/yahoo/yahoo.c:2725
+#: ../src/status.c:157
+msgid "Invisible"
+msgstr "Invisibile"
+
+#: ../plugins/docklet/docklet.c:447 ../src/gtkblist.c:2971
+#: ../src/gtkstatusbox.c:676 ../src/protocols/gg/gg.c:993
+#: ../src/protocols/jabber/buddy.c:1361 ../src/protocols/novell/novell.c:2855
+#: ../src/protocols/oscar/oscar.c:785 ../src/protocols/oscar/oscar.c:5412
+#: ../src/protocols/yahoo/yahoo.c:2729 ../src/status.c:154
+msgid "Offline"
+msgstr "Non connesso"
+
+#: ../plugins/docklet/docklet.c:467 ../src/gtkstatusbox.c:681
+msgid "New..."
+msgstr "Nuovo..."
+
+#: ../plugins/docklet/docklet.c:468 ../src/gtkstatusbox.c:682
+msgid "Saved..."
+msgstr "Salvato..."
+
+#: ../plugins/docklet/docklet.c:484
+msgid "Show Buddy List"
+msgstr "Mostra la lista contatti"
+
+#: ../plugins/docklet/docklet.c:489 ../src/gtkconv.c:5680
+msgid "Unread Messages"
+msgstr "Messaggi non letti"
+
+#: ../plugins/docklet/docklet.c:510
+msgid "New Message..."
+msgstr "Nuovo messaggio..."
+
+#: ../plugins/docklet/docklet.c:519 ../src/gtkaccount.c:2478
+msgid "Accounts"
+msgstr "Account"
+
+#: ../plugins/docklet/docklet.c:520 ../src/gtkplugin.c:538
+msgid "Plugins"
+msgstr "Plugin"
+
+#: ../plugins/docklet/docklet.c:521 ../src/gtkprefs.c:1915
+msgid "Preferences"
+msgstr "Preferenze"
+
+#: ../plugins/docklet/docklet.c:525
+msgid "Mute Sounds"
+msgstr "Nessun suono"
+
+#. TODO: need a submenu to change status, this needs to "link"
+#. * to the status in the buddy list gtkstatusbox
+#.
+#: ../plugins/docklet/docklet.c:538
+msgid "Quit"
+msgstr "Esci"
+
+#: ../plugins/docklet/docklet.c:679
+msgid "Blink tray icon for unread..."
+msgstr "Fai lampeggiare l'icona di notifica se ci sono messaggi non letti"
+
+#: ../plugins/docklet/docklet.c:682
+msgid "_Instant Messages:"
+msgstr "Messaggi _immediati:"
+
+#: ../plugins/docklet/docklet.c:684 ../plugins/docklet/docklet.c:692
+#: ../plugins/win32/winprefs/winprefs.c:462 ../src/gtkprefs.c:823
+#: ../src/gtkprefs.c:1764 ../src/gtkprefs.c:1778
+msgid "Never"
+msgstr "Mai"
+
+#: ../plugins/docklet/docklet.c:685
+msgid "In hidden conversations"
+msgstr "Nelle conversazioni nascoste"
+
+#: ../plugins/docklet/docklet.c:686 ../plugins/docklet/docklet.c:694
+#: ../plugins/timestamp_format.c:39 ../plugins/timestamp_format.c:48
+#: ../plugins/win32/winprefs/winprefs.c:463 ../src/gtkprefs.c:825
+msgid "Always"
+msgstr "Sempre"
+
+#: ../plugins/docklet/docklet.c:690
+msgid "C_hat Messages:"
+msgstr "Messaggi di c_hat:"
+
+#: ../plugins/docklet/docklet.c:693
+msgid "When my nick is said"
+msgstr "Quando il mio nick  pronunciato"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../plugins/docklet/docklet.c:720
 msgid "System Tray Icon"
 msgstr "Icona di notifica"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/docklet/docklet.c:559
+#: ../plugins/docklet/docklet.c:723
 msgid "Displays an icon for Gaim in the system tray."
 msgstr "Mostra un'icona per Gaim nel vassoio di sistema."
 
 #. *  description
-#: plugins/docklet/docklet.c:561
-msgid ""
-"Displays a system tray icon (in GNOME, KDE or Windows for example) to show "
+#: ../plugins/docklet/docklet.c:725
+msgid ""
+"Displays a system tray icon (in GNOME, KDE, or Windows for example) to show "
 "the current status of Gaim, allow fast access to commonly used functions, "
-"and to toggle display of the buddy list or login window. Also allows "
-"messages to be queued until the icon is clicked, similar to ICQ."
+"and to toggle display of the buddy list. Also provides options to blink for "
+"unread messages."
 msgstr ""
 "Mostra un'icona nel vassoio di sistema (in GNOME, KDE o Windows, per "
 "esempio) per visualizzare lo stato corrente di Gaim; consente un accesso "
 "veloce alle funzioni usate pi comunemente e mostra/nasconde la lista dei "
-"contatti o la finestra di login. Consente inoltre di mettere in coda i "
-"messaggi finch non si fa clic sull'icona, in maniera simile a ICQ."
-
-#: plugins/extplacement.c:79
+"contatti. Pu inoltre lampeggiare quando ci sono messaggi non letti."
+
+#: ../plugins/docklet/eggtrayicon.c:123
+msgid "Orientation"
+msgstr "Orientazione"
+
+#: ../plugins/docklet/eggtrayicon.c:124
+msgid "The orientation of the tray."
+msgstr "L'orientazione del vassoio."
+
+#: ../plugins/extplacement.c:80
 msgid "By conversation count"
 msgstr "Per numero di conversazioni"
 
-#: plugins/extplacement.c:100
+#: ../plugins/extplacement.c:101
 msgid "Conversation Placement"
 msgstr "Posizionamento delle conversazioni"
 
-#: plugins/extplacement.c:105
+#: ../plugins/extplacement.c:106
 msgid "Number of conversations per window"
 msgstr "Numero di conversazioni per finestra"
 
-#: plugins/extplacement.c:111
+#: ../plugins/extplacement.c:112
 msgid "Separate IM and Chat windows when placing by number"
 msgstr ""
 "Separa le finestre dei MI e delle chat quando sono posizionate per numero"
@@ -238,19 +377,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/extplacement.c:132
+#: ../plugins/extplacement.c:135
 msgid "ExtPlacement"
 msgstr "Posizionamento extra"
 
 #. *< name
 #. *< version
-#: plugins/extplacement.c:134
+#: ../plugins/extplacement.c:137
 msgid "Extra conversation placement options."
 msgstr "Opzioni extra per il posizionamento delle conversazioni."
 
 #. *< summary
 #. *  description
-#: plugins/extplacement.c:136
+#: ../plugins/extplacement.c:139
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
@@ -264,7 +403,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/filectl.c:245
+#: ../plugins/filectl.c:248
 msgid "Gaim File Control"
 msgstr "Controllo con file"
 
@@ -272,7 +411,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 "Consente di controllare Gaim immettendo dei comandi in un file."
 
@@ -282,19 +421,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaiminc.c:91
+#: ../plugins/gaiminc.c:91
 msgid "Gaim Demonstration Plugin"
 msgstr "Plugin dimostrativo"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaiminc.c:94
+#: ../plugins/gaiminc.c:94
 msgid "An example plugin that does stuff - see the description."
 msgstr "Un plugin di esempio che fa alcune cose - guarda la descrizione."
 
 #. *  description
-#: plugins/gaiminc.c:96
+#: ../plugins/gaiminc.c:96
 msgid ""
 "This is a really cool plugin that does a lot of stuff:\n"
 "- It tells you who wrote the program when you log in\n"
@@ -306,101 +445,130 @@
 "- Inverte il testo dei messaggi in arrivo\n"
 "- Invia un messaggio ai tuoi contatti non appena ti connetti"
 
-#: plugins/gaimrc.c:40
+#: ../plugins/gaimrc.c:41
 msgid "Cursor Color"
-msgstr ""
-
-#: plugins/gaimrc.c:41
+msgstr "Colore del cursore"
+
+#: ../plugins/gaimrc.c:42
 msgid "Secondary Cursor Color"
-msgstr ""
-
-#: plugins/gaimrc.c:42
-#, fuzzy
+msgstr "Colore secondario del cursore"
+
+#: ../plugins/gaimrc.c:43
 msgid "Hyperlink Color"
-msgstr "Colore dei collegamenti"
-
-#: plugins/gaimrc.c:53
+msgstr "Colore per i collegamenti"
+
+#: ../plugins/gaimrc.c:56
 msgid "GtkTreeView Expander Size"
 msgstr ""
 
-#: plugins/gaimrc.c:72
+#: ../plugins/gaimrc.c:57
+msgid "GtkTreeView Horizontal Separation"
+msgstr ""
+
+#: ../plugins/gaimrc.c:76
 #, fuzzy
 msgid "Conversation Entry"
 msgstr "Conversazioni"
 
-#: plugins/gaimrc.c:73
+#: ../plugins/gaimrc.c:77
 #, fuzzy
 msgid "Conversation History"
 msgstr "Conversazioni"
 
-#: plugins/gaimrc.c:74
-#, fuzzy
+#: ../plugins/gaimrc.c:78
 msgid "Log Viewer"
-msgstr "Sever di login"
-
-#: plugins/gaimrc.c:75
-#, fuzzy
+msgstr "Visualizzatore dei log"
+
+#: ../plugins/gaimrc.c:79
 msgid "Request Dialog"
-msgstr "Richiesta ambigua"
-
-#: plugins/gaimrc.c:76
-#, fuzzy
+msgstr "Finestra di richiesta"
+
+#: ../plugins/gaimrc.c:80
 msgid "Notify Dialog"
-msgstr "Notifica per"
-
-#: plugins/gaimrc.c:209
-#, fuzzy, c-format
+msgstr "Finestra di notifica"
+
+#: ../plugins/gaimrc.c:91
+msgid "GtkTreeView Indent Expanders"
+msgstr ""
+
+#: ../plugins/gaimrc.c:287
+#, c-format
 msgid "Select Color for %s"
-msgstr "Scegli il colore del testo"
-
-#: plugins/gaimrc.c:211
-#, fuzzy
+msgstr "Scegli il colore per %s"
+
+#: ../plugins/gaimrc.c:289
 msgid "Select Color"
-msgstr "Scegli il colore del testo"
-
-#: plugins/gaimrc.c:246
-#, fuzzy, c-format
+msgstr "Scegli il colore"
+
+#: ../plugins/gaimrc.c:324
+#, c-format
 msgid "Select Font for %s"
-msgstr "Scegli il carattere"
-
-#: plugins/gaimrc.c:284
-#, fuzzy
+msgstr "Scegli il carattere per %s"
+
+#: ../plugins/gaimrc.c:364
 msgid "Select Interface Font"
-msgstr "Scegli il carattere"
-
-#: plugins/gaimrc.c:343
-#, fuzzy
+msgstr "Scegli il carattere per l'interfaccia"
+
+#: ../plugins/gaimrc.c:420
+msgid "General"
+msgstr "Generale"
+
+#: ../plugins/gaimrc.c:425
 msgid "GTK+ Interface Font"
-msgstr "Opzioni dell'interfaccia"
-
-#: plugins/gaimrc.c:362
+msgstr "Carattere per l'interfaccia GTK+"
+
+#: ../plugins/gaimrc.c:445
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#: plugins/gaimrc.c:460
-#, fuzzy
+#: ../plugins/gaimrc.c:480
+msgid "Interface colors"
+msgstr "Colori dell'interfaccia"
+
+#: ../plugins/gaimrc.c:504
+msgid "Widget Sizes"
+msgstr "Dimensioni dei widget"
+
+#: ../plugins/gaimrc.c:525
+msgid "Fonts"
+msgstr "Caratteri"
+
+#: ../plugins/gaimrc.c:548
+msgid "Tools"
+msgstr "Strumenti"
+
+#: ../plugins/gaimrc.c:553
+#, c-format
+msgid "Write settings to %s%sgtkrc-2.0"
+msgstr "Salva le impostazioni in %s%sgtkrc-2.0"
+
+#: ../plugins/gaimrc.c:561
+msgid "Re-read gtkrc files"
+msgstr "Rileggi il file gtkrc"
+
+#: ../plugins/gaimrc.c:588
 msgid "Gaim GTK+ Theme Control"
-msgstr "Controllo con file"
-
-#: plugins/gaimrc.c:462 plugins/gaimrc.c:463
+msgstr "Controllo del tema GTK+"
+
+#: ../plugins/gaimrc.c:590 ../plugins/gaimrc.c:591
 msgid "Provides access to commonly used gtkrc settings."
-msgstr ""
+msgstr "Fornisce accesso alle impostazioni gtk usate comunemente."
 
 #. Configuration frame
-#: plugins/gestures/gestures.c:243
+#: ../plugins/gestures/gestures.c:235
 msgid "Mouse Gestures Configuration"
 msgstr "Configurazione dei gesti del mouse"
 
-#: plugins/gestures/gestures.c:250
+#: ../plugins/gestures/gestures.c:242
 msgid "Middle mouse button"
 msgstr "Pulsante centrale"
 
-#: plugins/gestures/gestures.c:255
+#: ../plugins/gestures/gestures.c:247
 msgid "Right mouse button"
 msgstr "Pulsante destro"
 
 #. "Visual gesture display" checkbox
-#: plugins/gestures/gestures.c:267
+#: ../plugins/gestures/gestures.c:259
 msgid "_Visual gesture display"
 msgstr "_Mostra la traccia del mouse quando si esegue un gesto"
 
@@ -410,19 +578,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gestures/gestures.c:296
+#: ../plugins/gestures/gestures.c:289
 msgid "Mouse Gestures"
 msgstr "Gesti del mouse"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gestures/gestures.c:299
+#: ../plugins/gestures/gestures.c:292
 msgid "Provides support for mouse gestures"
 msgstr "Fornisce un supporto per i gesti del mouse"
 
 #. *  description
-#: plugins/gestures/gestures.c:301
+#: ../plugins/gestures/gestures.c:294
 msgid ""
 "Allows support for mouse gestures in conversation windows.\n"
 "Drag the middle mouse button to perform certain actions:\n"
@@ -442,49 +610,64 @@
 "Trascina il mouse prima su e poi a destra per passare alla conversazione "
 "successiva."
 
-#: plugins/gevolution/add_buddy_dialog.c:131
-#: plugins/gevolution/assoc-buddy.c:119 src/gtkroomlist.c:572
-#: src/protocols/jabber/jabber.c:638 src/protocols/msn/msn.c:1539
+#. 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:759
+#: ../src/protocols/msn/msn.c:1527 ../src/protocols/msn/msn.c:1580
+#: ../src/protocols/msn/msn.c:1601
 msgid "Name"
 msgstr "Nome"
 
-#: plugins/gevolution/add_buddy_dialog.c:142
+#: ../plugins/gevolution/add_buddy_dialog.c:142
 msgid "Instant Messaging"
 msgstr "Messaggi immediati"
 
+#: ../plugins/gevolution/add_buddy_dialog.c:442 ../src/gtkblist.c:4527
+#: ../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:2974
+msgid "Add Buddy"
+msgstr "Aggiungi un contatto"
+
 #. Add the label.
-#: plugins/gevolution/add_buddy_dialog.c:458
+#: ../plugins/gevolution/add_buddy_dialog.c:455
 msgid "Select a person from your address book below, or add a new person."
 msgstr ""
 "Scegli una persona dalla tua rubrica qui sotto oppure aggiungi una nuova "
 "persona."
 
 #. "Search"
-#: plugins/gevolution/add_buddy_dialog.c:471
-#: plugins/gevolution/assoc-buddy.c:353 src/protocols/jabber/buddy.c:1357
-#: src/protocols/oscar/oscar.c:8128
+#: ../plugins/gevolution/add_buddy_dialog.c:468
+#: ../plugins/gevolution/assoc-buddy.c:353
+#: ../src/protocols/jabber/buddy.c:1720 ../src/protocols/oscar/oscar.c:6020
+#: ../src/protocols/sametime/sametime.c:5524
 msgid "Search"
 msgstr "Ricerca"
 
-#: plugins/gevolution/add_buddy_dialog.c:552
-#: plugins/gevolution/new_person_dialog.c:306 src/gtkblist.c:4082
-#: src/gtkblist.c:4459
+#: ../plugins/gevolution/add_buddy_dialog.c:549
+#: ../plugins/gevolution/new_person_dialog.c:307 ../src/gtkblist.c:4611
+#: ../src/gtkblist.c:4975
 msgid "Group:"
 msgstr "Gruppo:"
 
 #. "New Person" button
-#: plugins/gevolution/add_buddy_dialog.c:578
-#: plugins/gevolution/assoc-buddy.c:464
+#: ../plugins/gevolution/add_buddy_dialog.c:575
+#: ../plugins/gevolution/assoc-buddy.c:464
+#: ../plugins/gevolution/new_person_dialog.c:251
 msgid "New Person"
 msgstr "Nuova persona"
 
 #. "Select Buddy" button
-#: plugins/gevolution/add_buddy_dialog.c:595
+#: ../plugins/gevolution/add_buddy_dialog.c:592
 msgid "Select Buddy"
 msgstr "Seleziona il contatto"
 
 #. Add the label.
-#: plugins/gevolution/assoc-buddy.c:340
+#: ../plugins/gevolution/assoc-buddy.c:340
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
@@ -493,57 +676,62 @@
 "oppure crea una nuova persona."
 
 #. Add the expander
-#: plugins/gevolution/assoc-buddy.c:428
-#, fuzzy
+#: ../plugins/gevolution/assoc-buddy.c:428
 msgid "User _details"
-msgstr "Nascondi i dettagli dell'utente"
+msgstr "_Dettagli utente"
 
 #. "Associate Buddy" button
-#: plugins/gevolution/assoc-buddy.c:481
+#: ../plugins/gevolution/assoc-buddy.c:481
 msgid "_Associate Buddy"
 msgstr "_Associa il contatto"
 
-#: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:96
-#: src/blist.c:518 src/blist.c:1259 src/blist.c:1480 src/gtkblist.c:3897
-#: src/protocols/jabber/roster.c:66
+#: ../plugins/gevolution/eds-utils.c:73 ../plugins/gevolution/eds-utils.c:86
+#: ../src/protocols/jabber/jabber.c:1125
+msgid "None"
+msgstr "Nessuno"
+
+#: ../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:4420 ../src/protocols/jabber/roster.c:66
 msgid "Buddies"
 msgstr "Contatti"
 
-#: plugins/gevolution/gevolution.c:262 plugins/gevolution/gevolution.c:268
-#, fuzzy
+#: ../plugins/gevolution/gevolution.c:262
+#: ../plugins/gevolution/gevolution.c:268
 msgid "Unable to send e-mail"
-msgstr "Impossibile inviare il messaggio."
-
-#: plugins/gevolution/gevolution.c:263
+msgstr "Impossibile inviare l'email"
+
+#: ../plugins/gevolution/gevolution.c:263
 msgid "The evolution executable was not found in the PATH."
-msgstr ""
-
-#: plugins/gevolution/gevolution.c:269
+msgstr "L'eseguibile di evolution non  stato trovato nel PATH."
+
+#: ../plugins/gevolution/gevolution.c:269
 msgid "The specified buddy was not found in the Evolution Contacts."
 msgstr ""
-
-#: plugins/gevolution/gevolution.c:286
+"Il contatto specificato non  stato trovato tra i contatti di Evolution."
+
+#: ../plugins/gevolution/gevolution.c:286
 msgid "Add to Address Book"
 msgstr "Aggiungi alla rubrica"
 
-#: plugins/gevolution/gevolution.c:290
-#, fuzzy
+#: ../plugins/gevolution/gevolution.c:290
 msgid "Send E-Mail"
-msgstr "Email"
+msgstr "Invia email"
 
 #. Configuration frame
-#: plugins/gevolution/gevolution.c:414
+#: ../plugins/gevolution/gevolution.c:417
 msgid "Evolution Integration Configuration"
 msgstr "Configurazione dell'integrazione con Evolution"
 
 #. Label
-#: plugins/gevolution/gevolution.c:417
+#: ../plugins/gevolution/gevolution.c:420
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr ""
 "Seleziona tutti gli account ai quali i contatti dovrebbero essere aggiunti "
 "automaticamente."
 
-#: plugins/gevolution/gevolution.c:447 plugins/idle.c:111 plugins/idle.c:140
+#: ../plugins/gevolution/gevolution.c:450 ../plugins/idle.c:150
+#: ../plugins/idle.c:186 ../src/gtknotify.c:399 ../src/gtkpounce.c:1244
 msgid "Account"
 msgstr "Account"
 
@@ -553,7 +741,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gevolution/gevolution.c:530
+#: ../plugins/gevolution/gevolution.c:527
 msgid "Evolution Integration"
 msgstr "Integrazione con Evolution"
 
@@ -561,89 +749,117 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/gevolution/gevolution.c:533 plugins/gevolution/gevolution.c:535
-#, fuzzy
+#: ../plugins/gevolution/gevolution.c:530
+#: ../plugins/gevolution/gevolution.c:532
 msgid "Provides integration with Evolution."
-msgstr "Fornisce l'integrazione con Ximian Evolution."
-
-#: plugins/gevolution/new_person_dialog.c:266
+msgstr "Fornisce l'integrazione con Evolution."
+
+#: ../plugins/gevolution/new_person_dialog.c:267
 msgid "Please enter the person's information below."
 msgstr "Inserisci qui sotto le informazioni sulla persona."
 
-#: plugins/gevolution/new_person_dialog.c:270
+#: ../plugins/gevolution/new_person_dialog.c:271
 msgid "Please enter the buddy's screen name and account type below."
 msgstr "Inserisci qui sotto il nome utente del contatto e il tipo di account."
 
-#: plugins/gevolution/new_person_dialog.c:290
+#: ../plugins/gevolution/new_person_dialog.c:291
 msgid "Account type:"
 msgstr "Tipo di account:"
 
-#: plugins/gevolution/new_person_dialog.c:294
-msgid "Screenname:"
+#: ../plugins/gevolution/new_person_dialog.c:295 ../src/gtkaccount.c:784
+#: ../src/gtkblist.c:4573
+msgid "Screen name:"
 msgstr "Nome utente:"
 
 #. Optional Information section
-#: plugins/gevolution/new_person_dialog.c:314
+#: ../plugins/gevolution/new_person_dialog.c:315
 msgid "Optional information:"
 msgstr "Informazioni opzionali:"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:337 src/gtkaccount.c:412
-#: src/gtkaccount.c:434 src/protocols/oscar/oscar.c:613
+#: ../plugins/gevolution/new_person_dialog.c:338 ../src/gtkaccount.c:424
+#: ../src/gtkaccount.c:446 ../src/protocols/oscar/oscar.c:625
 msgid "Buddy Icon"
 msgstr "Icona per il contatto"
 
-#: plugins/gevolution/new_person_dialog.c:349
+#: ../plugins/gevolution/new_person_dialog.c:350
 msgid "First name:"
 msgstr "Nome:"
 
-#: plugins/gevolution/new_person_dialog.c:361
+#: ../plugins/gevolution/new_person_dialog.c:362
 msgid "Last name:"
 msgstr "Cognome:"
 
-#: plugins/gevolution/new_person_dialog.c:381
+#: ../plugins/gevolution/new_person_dialog.c:382
 msgid "E-mail:"
 msgstr "Email:"
 
-#: plugins/history.c:146
-msgid "History Plugin Requires Logging"
-msgstr ""
-
-#: plugins/history.c:147
-msgid ""
-"Logging can be enabled from Tools -> Preferences -> Logging.\n"
-"\n"
-"Enabling logs for instant messages and/or chats will activate history for "
-"the same conversation type(s)."
-msgstr ""
-
-#: plugins/history.c:186
-msgid "History"
-msgstr "Storico"
-
-#: plugins/history.c:188
-msgid "Shows recently logged conversations in new conversations."
-msgstr ""
-"Mostra le conversazioni registrate di recente nelle nuove finestre di "
-"conversazione."
-
-#: plugins/history.c:189
-msgid ""
-"When a new conversation is opened this plugin will insert the last "
-"conversation into the current conversation.\n"
-"\n"
-"The history plugin requires logging be enabled. Logging can be enabled from "
-"Tools -> Preferences -> Logging. Enabling logs for instant messages and/or "
-"chats will activate history for the same conversation type(s)."
-msgstr ""
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/iconaway.c:101
+#: ../plugins/gtk-signals-test.c:160
+msgid "GTK Signals Test"
+msgstr "Test dei segnali GTK"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../plugins/gtk-signals-test.c:163 ../plugins/gtk-signals-test.c:165
+msgid "Test to see that all ui signals are working properly."
+msgstr ""
+"Verifica se tutti i segnali dell'interfaccia utente funzionano correttamente."
+
+#: ../plugins/history.c:120
+#, c-format
+msgid "<b>Conversation with %s on %s:</b><br>"
+msgstr "<b>Conversazioni con %s su %s:</b><br>"
+
+#: ../plugins/history.c:147
+msgid "History Plugin Requires Logging"
+msgstr "Il plugin storico richiede che il log sia attivo"
+
+#: ../plugins/history.c:148
+msgid ""
+"Logging can be enabled from Tools -> Preferences -> Logging.\n"
+"\n"
+"Enabling logs for instant messages and/or chats will activate history for "
+"the same conversation type(s)."
+msgstr ""
+"Il log delle conversazioni pu essere abilitato da Strumenti -> Preferenze -"
+"> Log.\n"
+"\n"
+"L'abilitazione del log per i messaggi immediati e/o per le chat attiver lo "
+"storico per il corrispondente tipo di conversazione."
+
+#: ../plugins/history.c:188
+msgid "History"
+msgstr "Storico"
+
+#: ../plugins/history.c:190
+msgid "Shows recently logged conversations in new conversations."
+msgstr ""
+"Mostra le conversazioni registrate di recente nelle nuove finestre di "
+"conversazione."
+
+#: ../plugins/history.c:191
+msgid ""
+"When a new conversation is opened this plugin will insert the last "
+"conversation into the current conversation."
+msgstr ""
+"Quando viene aperta una nuova conversazione, questo plugin inserir l'ultima "
+"conversazione in quella corrente."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../plugins/iconaway.c:82
 msgid "Iconify on Away"
 msgstr "Riduci a icona se assente"
 
@@ -651,46 +867,56 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/iconaway.c:104 plugins/iconaway.c:106
+#: ../plugins/iconaway.c:85 ../plugins/iconaway.c:87
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "Riduce a icona la lista dei contatti quando sei assente."
 
-#: plugins/idle.c:115
+#: ../plugins/idle.c:155 ../plugins/idle.c:213
 msgid "Minutes"
 msgstr "Minuti"
 
-#: plugins/idle.c:122 plugins/idle.c:149 plugins/idle.c:215
+#. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
+#. If that doesn't translate well into your language, drop the 's before translating.
+#: ../plugins/idle.c:162 ../plugins/idle.c:195 ../plugins/idle.c:220
+#: ../plugins/idle.c:312
 msgid "I'dle Mak'er"
 msgstr "Inattivatore"
 
-#: plugins/idle.c:123 plugins/idle.c:181
+#: ../plugins/idle.c:163 ../plugins/idle.c:252
 msgid "Set Account Idle Time"
 msgstr "Imposta il tempo di inattivit per l'account"
 
-#: plugins/idle.c:126
+#: ../plugins/idle.c:166 ../plugins/idle.c:224
 msgid "_Set"
 msgstr "_Imposta"
 
-#: plugins/idle.c:127 plugins/idle.c:154
+#: ../plugins/idle.c:167 ../plugins/idle.c:200 ../plugins/idle.c:225
 msgid "_Cancel"
 msgstr "_Annulla"
 
-#: plugins/idle.c:150 plugins/idle.c:185
+#: ../plugins/idle.c:180
+msgid "None of your accounts are idle."
+msgstr "Nessuno dei tuoi account  inattivo."
+
+#: ../plugins/idle.c:196 ../plugins/idle.c:256
 #, fuzzy
 msgid "Unset Account Idle Time"
 msgstr "Imposta il tempo di inattivit per l'account"
 
-#: plugins/idle.c:153
+#: ../plugins/idle.c:199
 #, fuzzy
 msgid "_Unset"
 msgstr "_Utilizza"
 
-#: plugins/idle.c:190
-msgid "Unset Idle Time For All Idled Accounts"
-msgstr ""
-
-#: plugins/idle.c:217 plugins/idle.c:218
-#, fuzzy
+#: ../plugins/idle.c:221 ../plugins/idle.c:260
+msgid "Set Idle Time for All Accounts"
+msgstr "Imposta il tempo di inattivit per tutti gli account"
+
+#: ../plugins/idle.c:265
+msgid "Unset Idle Time for All Idled Accounts"
+msgstr ""
+
+#: ../plugins/idle.c:314 ../plugins/idle.c:315
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr ""
 "Consente di configurare manualmente per quanto tempo sei stato inattivo."
@@ -701,19 +927,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ipc-test-client.c:87
+#: ../plugins/ipc-test-client.c:87
 msgid "IPC Test Client"
 msgstr "Test client IPC"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ipc-test-client.c:90
+#: ../plugins/ipc-test-client.c:90
 msgid "Test plugin IPC support, as a client."
 msgstr "Verifica il supporto plugin IPC come client."
 
 #. *  description
-#: plugins/ipc-test-client.c:92
+#: ../plugins/ipc-test-client.c:92
 msgid ""
 "Test plugin IPC support, as a client. This locates the server plugin and "
 "calls the commands registered."
@@ -727,105 +953,301 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ipc-test-server.c:74
+#: ../plugins/ipc-test-server.c:74
 msgid "IPC Test Server"
 msgstr "Test server IPC"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ipc-test-server.c:77
+#: ../plugins/ipc-test-server.c:77
 msgid "Test plugin IPC support, as a server."
 msgstr "Verifica il supporto plugin IPC come server."
 
 #. *  description
-#: plugins/ipc-test-server.c:79
+#: ../plugins/ipc-test-server.c:79
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr "Verifica il supporto plugin IPC come server. Registra i comandi IPC."
 
-#: plugins/mailchk.c:160
+#: ../plugins/log_reader.c:1405
+msgid "User is offline."
+msgstr "L'utente non  in linea."
+
+#: ../plugins/log_reader.c:1411
+#, fuzzy
+msgid "Auto-response sent:"
+msgstr "Riconnessione automatica"
+
+#: ../plugins/log_reader.c:1421 ../plugins/log_reader.c:1424
+#: ../plugins/statenotify.c:80
+#, c-format
+msgid "%s has signed off."
+msgstr "%s si  disconnesso."
+
+#: ../plugins/log_reader.c:1438
+msgid "One or more messages may have been undeliverable."
+msgstr "Uno o pi messaggi potrebbero non essere stati inviati."
+
+#. MSG_SERVER_DISCONNECTING
+#. we have been kicked off =^(
+#: ../plugins/log_reader.c:1448 ../src/protocols/napster/napster.c:363
+msgid "You were disconnected from the server."
+msgstr "Sei stato disconnesso dal server."
+
+#: ../plugins/log_reader.c:1456
+msgid ""
+"You are currently disconnected. Messages will not be received unless you are "
+"logged in."
+msgstr ""
+"Al momento non sei connesso. Non saranno ricevuti messaggi finch non sarai "
+"nuovamente in linea."
+
+#: ../plugins/log_reader.c:1471
+msgid "Message could not be sent because the maximum length was exceeded."
+msgstr ""
+"Il messaggio non pu essere inviato poich  stata superata la lunghezza "
+"massima."
+
+#: ../plugins/log_reader.c:1476
+msgid "Message could not be sent."
+msgstr "Impossibile inviare il messaggio."
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../plugins/log_reader.c:1838 ../plugins/log_reader.c:1943
+msgid "Adium"
+msgstr "Adium"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../plugins/log_reader.c:1850 ../plugins/log_reader.c:1947
+msgid "Fire"
+msgstr "Fuoco"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../plugins/log_reader.c:1862 ../plugins/log_reader.c:1951
+msgid "Messenger Plus!"
+msgstr "Messenger Plus!"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../plugins/log_reader.c:1874 ../plugins/log_reader.c:1955
+msgid "MSN Messenger"
+msgstr "MSN Messenger"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../plugins/log_reader.c:1886 ../plugins/log_reader.c:1959
+msgid "Trillian"
+msgstr "Trillian"
+
+#. Add general preferences.
+#: ../plugins/log_reader.c:1925
+#, fuzzy
+msgid "General Log Reading Configuration"
+msgstr "Configurazione dell'icona di notifica"
+
+#: ../plugins/log_reader.c:1929
+msgid "Fast size calculations"
+msgstr ""
+
+#: ../plugins/log_reader.c:1933
+msgid "Use name heuristics"
+msgstr ""
+
+#. Add Log Directory preferences.
+#: ../plugins/log_reader.c:1939
+#, fuzzy
+msgid "Log Directory"
+msgstr "_Cerca:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../plugins/log_reader.c:1982
+msgid "Log Reader"
+msgstr "Visualizzatore log"
+
+#. *< name
+#. *< version
+#. * summary
+#: ../plugins/log_reader.c:1986
+msgid "Includes other IM clients' logs in the log viewer."
+msgstr ""
+
+#. * description
+#: ../plugins/log_reader.c:1990
+msgid ""
+"When viewing logs, this plugin will include logs from other IM clients. "
+"Currently, this includes Adium, Fire, Messenger Plus!, MSN Messenger, and "
+"Trillian."
+msgstr ""
+
+#: ../plugins/mailchk.c:160
 msgid "Mail Checker"
 msgstr "Controllo posta"
 
-#: plugins/mailchk.c:162
+#: ../plugins/mailchk.c:162
 msgid "Checks for new local mail."
 msgstr "Controlla se ci sono nuovi messaggi di posta."
 
-#: plugins/mailchk.c:163
+#: ../plugins/mailchk.c:163
 msgid "Adds a small box to the buddy list that shows if you have new mail."
 msgstr ""
 "Aggiunge una piccola casella alla lista contatti che mostra se c' posta per "
 "te."
 
+#: ../plugins/mono/loader/mono.c:213
+#, fuzzy
+msgid "Mono Plugin Loader"
+msgstr "Loader per i plugin Tcl"
+
+#: ../plugins/mono/loader/mono.c:215 ../plugins/mono/loader/mono.c:216
+msgid "Loads .NET plugins with Mono."
+msgstr "Carica i plugin .NET con Mono."
+
+#: ../plugins/musicmessaging/musicmessaging.c:44
+msgid ""
+"A music messaging session has been requested. Please click the MM icon to "
+"accept."
+msgstr ""
+
+#: ../plugins/musicmessaging/musicmessaging.c:45
+msgid "Music messaging session confirmed."
+msgstr ""
+
+#: ../plugins/musicmessaging/musicmessaging.c:414
+#, fuzzy
+msgid "Music Messaging"
+msgstr "Messaggi immediati"
+
+#: ../plugins/musicmessaging/musicmessaging.c:415
+msgid "There was a conflict in running the command:"
+msgstr ""
+
+#: ../plugins/musicmessaging/musicmessaging.c:523
+#, fuzzy
+msgid "Error Running Editor"
+msgstr "Errore nell'ingresso nella chat %s"
+
+#: ../plugins/musicmessaging/musicmessaging.c:524
+msgid "The following error has occured:"
+msgstr "Si  verificato il seguente errore:"
+
+#. Configuration frame
+#: ../plugins/musicmessaging/musicmessaging.c:623
+#, fuzzy
+msgid "Music Messaging Configuration"
+msgstr "Configurazione dei gesti del mouse"
+
+#: ../plugins/musicmessaging/musicmessaging.c:627
+msgid "Score Editor Path"
+msgstr ""
+
+#: ../plugins/musicmessaging/musicmessaging.c:628
+msgid "_Apply"
+msgstr "_Applica"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: ../plugins/musicmessaging/musicmessaging.c:663
+msgid "Music Messaging Plugin for collaborative composition."
+msgstr ""
+
+#. *  summary
+#: ../plugins/musicmessaging/musicmessaging.c:665
+msgid ""
+"The Music Messaging Plugin allows a number of users to simultaneously work "
+"on a piece of music by editting a common score in real-time."
+msgstr ""
+
 #. ---------- "Notify For" ----------
-#: plugins/notify.c:638
+#: ../plugins/notify.c:638
 msgid "Notify For"
 msgstr "Notifica per"
 
-#: plugins/notify.c:642
+#: ../plugins/notify.c:642
 msgid "_IM windows"
 msgstr "Finestre dei _messaggi immediati"
 
-#: plugins/notify.c:649
+#: ../plugins/notify.c:649
 msgid "C_hat windows"
 msgstr "Finestre delle _chat"
 
-#: plugins/notify.c:656
+#: ../plugins/notify.c:657
+msgid "\t_Only when someone says your screen name"
+msgstr "\t_Solamente quando qualcuno pronuncia il tuo nome"
+
+#: ../plugins/notify.c:667
 msgid "_Focused windows"
 msgstr "Finestre in _primo piano"
 
 #. ---------- "Notification Methods" ----------
-#: plugins/notify.c:664
+#: ../plugins/notify.c:675
 msgid "Notification Methods"
 msgstr "Metodi di notifica"
 
-#: plugins/notify.c:671
+#: ../plugins/notify.c:682
 msgid "Prepend _string into window title:"
 msgstr "Anteponi la seguente _stringa nel titolo della finestra:"
 
 #. Count method button
-#: plugins/notify.c:690
+#: ../plugins/notify.c:701
 msgid "Insert c_ount of new messages into window title"
 msgstr "Inserisci il c_onteggio dei nuovi messaggi nel titolo della finestra"
 
 #. Urgent method button
-#: plugins/notify.c:698
+#: ../plugins/notify.c:710
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Invia il messaggio \"_URGENTE\" al window manager"
 
 #. Raise window method button
-#: plugins/notify.c:706
-#, fuzzy
+#: ../plugins/notify.c:719
 msgid "R_aise conversation window"
-msgstr "Finestre dei messaggi istantanei"
+msgstr "Porta la finestra di conversazione in _primo piano"
 
 #. ---------- "Notification Removals" ----------
-#: plugins/notify.c:714
+#: ../plugins/notify.c:727
 msgid "Notification Removal"
 msgstr "Rimozione della notifica"
 
 #. Remove on focus button
-#: plugins/notify.c:719
+#: ../plugins/notify.c:732
 msgid "Remove when conversation window _gains focus"
 msgstr "Rimuovi quando la finestra di conversazione va in _primo piano"
 
 #. Remove on click button
-#: plugins/notify.c:726
+#: ../plugins/notify.c:739
 msgid "Remove when conversation window _receives click"
 msgstr "Rimuovi quando si fa c_lic sulla finestra di conversazione"
 
 #. Remove on type button
-#: plugins/notify.c:734
+#: ../plugins/notify.c:747
 msgid "Remove when _typing in conversation window"
 msgstr "Rimuovi quando si scri_ve nella finestra di conversazione"
 
 #. Remove on message send button
-#: plugins/notify.c:742
+#: ../plugins/notify.c:755
 msgid "Remove when a _message gets sent"
 msgstr "Rimuovi quando un _messaggio viene inviato"
 
 #. Remove on conversation switch button
-#: plugins/notify.c:751
+#: ../plugins/notify.c:764
 msgid "Remove on switch to conversation ta_b"
 msgstr "Rimuovi quando si _passa ad un'altra scheda"
 
@@ -835,7 +1257,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/notify.c:841
+#: ../plugins/notify.c:853
 msgid "Message Notification"
 msgstr "Notifica messaggi"
 
@@ -843,7 +1265,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/notify.c:844 plugins/notify.c:846
+#: ../plugins/notify.c:856 ../plugins/notify.c:858
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "Fornisce diversi modi per notificare i messaggi non letti."
 
@@ -853,26 +1275,64 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/perl/perl.c:587
+#: ../plugins/perl/perl.c:583
 msgid "Perl Plugin Loader"
 msgstr "Loader per i plugin in perl"
 
 #. *< name
 #. *< version
 #. *< summary
-#: plugins/perl/perl.c:589 plugins/perl/perl.c:590
+#: ../plugins/perl/perl.c:585 ../plugins/perl/perl.c:586
 msgid "Provides support for loading perl plugins."
 msgstr "Consente di caricare i plugin scritti in perl."
 
-#: plugins/raw.c:151
+#: ../plugins/psychic.c:19
+msgid "Psychic Mode"
+msgstr ""
+
+#: ../plugins/psychic.c:20
+msgid "Psychic mode for incoming conversation"
+msgstr ""
+
+#: ../plugins/psychic.c:21
+msgid ""
+"Causes conversation windows to appear as other users begin to message you.  "
+"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+msgstr ""
+"Fa s che la finestra di conversazione appaia non appena un altro utente "
+"inizia a scriverti. Funziona con AIM, ICQ, Jabber, Sametime e Yahoo!"
+
+#. This is a quote from Star Wars.  You should
+#. probably not translate it literally.  If
+#. you can't find a fitting cultural reference
+#. in your language, consider translating
+#. something like this instead:
+#. "You feel a new message coming."
+#: ../plugins/psychic.c:63
+msgid "You feel a disturbance in the force..."
+msgstr ""
+
+#: ../plugins/psychic.c:82
+msgid "Only enable for users on the buddy list"
+msgstr "Abilita solamente per gli utenti nella lista contatti"
+
+#: ../plugins/psychic.c:87
+msgid "Disable when away"
+msgstr "Disabilita se assente"
+
+#: ../plugins/psychic.c:91
+msgid "Display notification message in conversations"
+msgstr "Mostra i messaggi di notifica nelle conversazioni"
+
+#: ../plugins/raw.c:175
 msgid "Raw"
 msgstr "Raw"
 
-#: plugins/raw.c:153
+#: ../plugins/raw.c:177
 msgid "Lets you send raw input to text-based protocols."
 msgstr "Permette di inviare input raw ai protocolli text-based."
 
-#: plugins/raw.c:154
+#: ../plugins/raw.c:178
 msgid ""
 "Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
@@ -881,12 +1341,12 @@
 "TOC). Premi 'Invio' nella casella di immissione per inviare il testo. "
 "Controlla la finestra di debug."
 
-#: plugins/relnot.c:63
+#: ../plugins/relnot.c:63
 #, c-format
 msgid "You are using Gaim version %s.  The current version is %s.<hr>"
 msgstr "Stai utilizzando Gaim, versione %s. La versione corrente  la %s.<hr>"
 
-#: plugins/relnot.c:69
+#: ../plugins/relnot.c:69
 #, c-format
 msgid ""
 "<b>ChangeLog:</b>\n"
@@ -895,7 +1355,7 @@
 "<b>ChangeLog:</b>\n"
 "%s<br><br>"
 
-#: plugins/relnot.c:74
+#: ../plugins/relnot.c:74
 #, c-format
 msgid ""
 "You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
@@ -904,7 +1364,7 @@
 "Puoi ottenere la versione %s da:<br><a href=\"http://gaim.sourceforge.net/"
 "\">http://gaim.sourceforge.net</a>."
 
-#: plugins/relnot.c:78 plugins/relnot.c:79
+#: ../plugins/relnot.c:78 ../plugins/relnot.c:79
 msgid "New Version Available"
 msgstr "Nuova versione disponibile"
 
@@ -914,19 +1374,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/relnot.c:137
+#: ../plugins/relnot.c:137
 msgid "Release Notification"
 msgstr "Notifica nuove versioni"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/relnot.c:140
+#: ../plugins/relnot.c:140
 msgid "Checks periodically for new releases."
 msgstr "Controlla periodicamente l'esistenza di nuove versioni."
 
 #. *  description
-#: plugins/relnot.c:142
+#: ../plugins/relnot.c:142
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
@@ -940,7 +1400,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:730
+#: ../plugins/signals-test.c:684
 msgid "Signals Test"
 msgstr "Test dei segnali"
 
@@ -948,7 +1408,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/signals-test.c:733 plugins/signals-test.c:735
+#: ../plugins/signals-test.c:687 ../plugins/signals-test.c:689
 msgid "Test to see that all signals are working properly."
 msgstr "Verifica se tutti i segnali stanno funzionando correttamente."
 
@@ -958,7 +1418,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/simple.c:34
+#: ../plugins/simple.c:37
 msgid "Simple Plugin"
 msgstr "Plugin semplice"
 
@@ -966,55 +1426,74 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/simple.c:37 plugins/simple.c:39
+#: ../plugins/simple.c:40 ../plugins/simple.c:42
 msgid "Tests to see that most things are working."
 msgstr "Test per verificare se la maggior parte delle cose funziona."
 
-#: plugins/spellchk.c:1788
+#: ../plugins/spellchk.c:1918
 msgid "Duplicate Correction"
 msgstr ""
 
-#: plugins/spellchk.c:1789
+#: ../plugins/spellchk.c:1919
 msgid "The specified word already exists in the correction list."
-msgstr ""
-
-#: plugins/spellchk.c:1948
+msgstr "La parola specificata esiste gi nella lista delle correzioni."
+
+#: ../plugins/spellchk.c:2128
 msgid "Text Replacements"
 msgstr "Sostituzione del testo"
 
-#: plugins/spellchk.c:1972
+#: ../plugins/spellchk.c:2151
 msgid "You type"
 msgstr "Testo digitato"
 
-#: plugins/spellchk.c:1984
+#: ../plugins/spellchk.c:2165
 msgid "You send"
 msgstr "Testo inviato"
 
-#: plugins/spellchk.c:1996
+#: ../plugins/spellchk.c:2179
 msgid "Whole words only"
-msgstr ""
-
-#: plugins/spellchk.c:2022
+msgstr "Solo parole intere"
+
+#: ../plugins/spellchk.c:2191
+msgid "Case sensitive"
+msgstr "MAIUSCOLE/minuscole"
+
+#: ../plugins/spellchk.c:2217
 msgid "Add a new text replacement"
 msgstr "Aggiungi una nuova regola di sostituzione"
 
-#: plugins/spellchk.c:2032
+#: ../plugins/spellchk.c:2233
 msgid "You _type:"
 msgstr "Testo _digitato:"
 
-#: plugins/spellchk.c:2048
+#: ../plugins/spellchk.c:2250
 msgid "You _send:"
 msgstr "Testo _inviato:"
 
-#: plugins/spellchk.c:2060
+#. Created here so it can be passed to whole_words_button_toggled.
+#: ../plugins/spellchk.c:2262
+msgid "_Exact case match (uncheck for automatic case handling)"
+msgstr ""
+"Verifica in maniera _esatta MAIUSCOLE/minuscole\n"
+"(deseleziona per verificare automaticamente)"
+
+#: ../plugins/spellchk.c:2264
 msgid "Only replace _whole words"
-msgstr ""
-
-#: plugins/spellchk.c:2097
+msgstr "Sostituisci solamente parole _intere"
+
+#: ../plugins/spellchk.c:2289
+msgid "General Text Replacement Options"
+msgstr "Opzioni generali per la sostituzione del testo"
+
+#: ../plugins/spellchk.c:2290
+msgid "Enable replacement of last word on send"
+msgstr ""
+
+#: ../plugins/spellchk.c:2315
 msgid "Text replacement"
 msgstr "Sostituzione del testo"
 
-#: plugins/spellchk.c:2099 plugins/spellchk.c:2100
+#: ../plugins/spellchk.c:2317 ../plugins/spellchk.c:2318
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 "Sostituisce il testo nei messaggi in uscita secondo delle regole definite "
@@ -1026,7 +1505,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-gnutls.c:227
+#: ../plugins/ssl/ssl-gnutls.c:251
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -1034,7 +1513,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ssl/ssl-gnutls.c:230 plugins/ssl/ssl-gnutls.c:232
+#: ../plugins/ssl/ssl-gnutls.c:254 ../plugins/ssl/ssl-gnutls.c:256
 msgid "Provides SSL support through GNUTLS."
 msgstr "Fornisce il supporto SSL attraverso GNUTLS."
 
@@ -1044,7 +1523,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-nss.c:319
+#: ../plugins/ssl/ssl-nss.c:412
 msgid "NSS"
 msgstr "NSS"
 
@@ -1052,7 +1531,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ssl/ssl-nss.c:322 plugins/ssl/ssl-nss.c:324
+#: ../plugins/ssl/ssl-nss.c:415 ../plugins/ssl/ssl-nss.c:417
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Fornisce il supporto SSL attraverso NSS di Mozilla."
 
@@ -1062,7 +1541,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl.c:94
+#: ../plugins/ssl/ssl.c:94
 msgid "SSL"
 msgstr "SSL"
 
@@ -1070,49 +1549,58 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ssl/ssl.c:97 plugins/ssl/ssl.c:99
+#: ../plugins/ssl/ssl.c:97 ../plugins/ssl/ssl.c:99
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Fornisce un wrapper per le librerie di supporto SSL."
 
-#: plugins/statenotify.c:42
+#: ../plugins/statenotify.c:50
+#, c-format
+msgid "%s is no longer away."
+msgstr "%s  ritornato."
+
+#: ../plugins/statenotify.c:52
 #, c-format
 msgid "%s has gone away."
 msgstr "%s  andato via."
 
-#: plugins/statenotify.c:49
-#, c-format
-msgid "%s is no longer away."
-msgstr "%s  ritornato."
-
-#: plugins/statenotify.c:56
+#: ../plugins/statenotify.c:62
 #, c-format
 msgid "%s has become idle."
 msgstr "%s  diventato inattivo."
 
-#: plugins/statenotify.c:63
+#: ../plugins/statenotify.c:64
 #, c-format
 msgid "%s is no longer idle."
 msgstr "%s  di nuovo attivo."
 
-#: plugins/statenotify.c:74
+#: ../plugins/statenotify.c:73
+#, c-format
+msgid "%s has signed on."
+msgstr "%s si  connesso."
+
+#: ../plugins/statenotify.c:91
 msgid "Notify When"
 msgstr "Notifica quando"
 
-#: plugins/statenotify.c:77
+#: ../plugins/statenotify.c:94
 msgid "Buddy Goes _Away"
 msgstr "Il contatto  _assente"
 
-#: plugins/statenotify.c:80
+#: ../plugins/statenotify.c:97
 msgid "Buddy Goes _Idle"
 msgstr "Il contatto  _inattivo"
 
+#: ../plugins/statenotify.c:100
+msgid "Buddy _Signs On/Off"
+msgstr "Il contatto si _connette/disconnette"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/statenotify.c:120
+#: ../plugins/statenotify.c:142
 msgid "Buddy State Notification"
 msgstr "Notifica dello stato dei contatti"
 
@@ -1120,7 +1608,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/statenotify.c:123 plugins/statenotify.c:126
+#: ../plugins/statenotify.c:145 ../plugins/statenotify.c:148
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
@@ -1128,11 +1616,11 @@
 "Notifica nella finestra di conversazione quando un contatto diventa inattivo "
 "o ritorna attivo."
 
-#: plugins/tcl/tcl.c:363
+#: ../plugins/tcl/tcl.c:402
 msgid "Tcl Plugin Loader"
 msgstr "Loader per i plugin Tcl"
 
-#: plugins/tcl/tcl.c:365 plugins/tcl/tcl.c:366
+#: ../plugins/tcl/tcl.c:404 ../plugins/tcl/tcl.c:405
 msgid "Provides support for loading Tcl plugins"
 msgstr "Consente di caricare i plugin Tcl"
 
@@ -1142,7 +1630,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ticker/ticker.c:75 plugins/ticker/ticker.c:326
+#: ../plugins/ticker/ticker.c:77 ../plugins/ticker/ticker.c:355
 msgid "Buddy Ticker"
 msgstr "Ticker contatti"
 
@@ -1150,19 +1638,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ticker/ticker.c:329 plugins/ticker/ticker.c:331
+#: ../plugins/ticker/ticker.c:358 ../plugins/ticker/ticker.c:360
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Una versione a scorrimento orizzontale della lista contatti."
 
-#: plugins/timestamp.c:202
+#: ../plugins/timestamp.c:186
 msgid "iChat Timestamp"
 msgstr "iChat timestamp"
 
-#: plugins/timestamp.c:209
+#: ../plugins/timestamp.c:193
 msgid "Delay"
 msgstr "Ritardo"
 
-#: plugins/timestamp.c:216
+#: ../plugins/timestamp.c:200
 msgid "minutes."
 msgstr "minuti."
 
@@ -1172,7 +1660,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/timestamp.c:279
+#: ../plugins/timestamp.c:256
 msgid "Timestamp"
 msgstr "Timestamp"
 
@@ -1180,52 +1668,105 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/timestamp.c:282 plugins/timestamp.c:284
+#: ../plugins/timestamp.c:259 ../plugins/timestamp.c:261
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr ""
 "Aggiunge alle conversazioni informazioni sul tempo nello stile di iChat ogni "
 "N minuti."
 
-#: plugins/win32/transparency/win2ktrans.c:183
-#: plugins/win32/transparency/win2ktrans.c:569
-#: plugins/win32/transparency/win2ktrans.c:616
+#: ../plugins/timestamp_format.c:22
+msgid "Timestamp Format Options"
+msgstr "Opzioni per il formato dei timestamp"
+
+#: ../plugins/timestamp_format.c:27
+msgid "_Force (traditional Gaim) 24-hour time format"
+msgstr "_Forza il formato 24 ore (tradizionale per Gaim)"
+
+#: ../plugins/timestamp_format.c:30
+msgid "Show dates in..."
+msgstr "Mostra le date per..."
+
+#: ../plugins/timestamp_format.c:35
+msgid "Co_nversations:"
+msgstr "Co_nversazioni:"
+
+#: ../plugins/timestamp_format.c:37 ../plugins/timestamp_format.c:46
+msgid "For delayed messages"
+msgstr "Per i messaggi ritardati"
+
+#: ../plugins/timestamp_format.c:38 ../plugins/timestamp_format.c:47
+msgid "For delayed messages and in chats"
+msgstr "Per i messaggi ritardati e nelle chat"
+
+#: ../plugins/timestamp_format.c:44
+msgid "_Message Logs:"
+msgstr "Log dei _messaggi:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../plugins/timestamp_format.c:150
+msgid "Message Timestamp Formats"
+msgstr "Formato del timestamp per i messaggi"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../plugins/timestamp_format.c:153
+msgid "Customizes the message timestamp formats."
+msgstr "Personalizza il formato del timestamp dei messaggi."
+
+#. *  description
+#: ../plugins/timestamp_format.c:155
+msgid ""
+"This plugin allows the user to customize conversation and logging message "
+"timestamp formats."
+msgstr ""
+"Questo plugin consente di personalizzare i formati dei timestamp per i "
+"messaggi nelle conversazioni e nei log."
+
+#: ../plugins/win32/transparency/win2ktrans.c:183
+#: ../plugins/win32/transparency/win2ktrans.c:569
+#: ../plugins/win32/transparency/win2ktrans.c:616
 msgid "Opacity:"
 msgstr "Opacit:"
 
 #. IM Convo trans options
-#: plugins/win32/transparency/win2ktrans.c:533
+#: ../plugins/win32/transparency/win2ktrans.c:533
 msgid "IM Conversation Windows"
 msgstr "Finestre dei messaggi istantanei"
 
-#: plugins/win32/transparency/win2ktrans.c:534
+#: ../plugins/win32/transparency/win2ktrans.c:534
 msgid "_IM window transparency"
 msgstr "_Rendi trasparente la finestra"
 
-#: plugins/win32/transparency/win2ktrans.c:548
+#: ../plugins/win32/transparency/win2ktrans.c:548
 msgid "_Show slider bar in IM window"
 msgstr "_Mostra la barra di scorrimento nella finestra "
 
-#: plugins/win32/transparency/win2ktrans.c:555
+#: ../plugins/win32/transparency/win2ktrans.c:555
 #, fuzzy
 msgid "Remove IM window transparency on focus"
 msgstr "_Rendi trasparente la finestra"
 
-#: plugins/win32/transparency/win2ktrans.c:558
-#: plugins/win32/transparency/win2ktrans.c:606
-#, fuzzy
+#: ../plugins/win32/transparency/win2ktrans.c:558
+#: ../plugins/win32/transparency/win2ktrans.c:606
 msgid "Always on top"
-msgstr "Imposta un alias per la lista"
+msgstr "Sempre in primo piano"
 
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:590
+#: ../plugins/win32/transparency/win2ktrans.c:590
 msgid "Buddy List Window"
 msgstr "Finestra della lista contatti"
 
-#: plugins/win32/transparency/win2ktrans.c:591
+#: ../plugins/win32/transparency/win2ktrans.c:591
 msgid "_Buddy List window transparency"
 msgstr "Rendi _trasparente la finestra della lista contatti"
 
-#: plugins/win32/transparency/win2ktrans.c:604
+#: ../plugins/win32/transparency/win2ktrans.c:604
 #, fuzzy
 msgid "Remove Buddy List window transparency on focus"
 msgstr "Rendi _trasparente la finestra della lista contatti"
@@ -1236,20 +1777,20 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/win32/transparency/win2ktrans.c:657
+#: ../plugins/win32/transparency/win2ktrans.c:658
 msgid "Transparency"
 msgstr "Trasparenza"
 
 #. *< 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 ""
 "Trasparenza variabile per la lista contatti e le finestre di conversazione."
 
 #. *  description
-#: plugins/win32/transparency/win2ktrans.c:662
+#: ../plugins/win32/transparency/win2ktrans.c:663
 #, fuzzy
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
@@ -1262,294 +1803,296 @@
 "\n"
 "* Nota: Questo plugin richiede Windows 2000 o Windows XP."
 
-#: plugins/win32/winprefs/winprefs.c:385
+#: ../plugins/win32/winprefs/winprefs.c:434
 msgid "GTK+ Runtime Version"
 msgstr "Versione di GTK+"
 
 #. Autostart
-#: plugins/win32/winprefs/winprefs.c:393
+#: ../plugins/win32/winprefs/winprefs.c:442
 msgid "Startup"
 msgstr "Avvio"
 
-#: plugins/win32/winprefs/winprefs.c:394
+#: ../plugins/win32/winprefs/winprefs.c:443
 msgid "_Start Gaim on Windows startup"
 msgstr "_Lancia Gaim all'avvio di Windows"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:405 src/gtkblist.c:3173
+#: ../plugins/win32/winprefs/winprefs.c:455 ../src/gtkblist.c:3667
 msgid "Buddy List"
 msgstr "Lista contatti"
 
-#: plugins/win32/winprefs/winprefs.c:406
+#: ../plugins/win32/winprefs/winprefs.c:456
 msgid "_Dockable Buddy List"
 msgstr "Lista contatti _agganciabile"
 
 #. Blist On Top
-#: plugins/win32/winprefs/winprefs.c:410
-#, fuzzy
+#: ../plugins/win32/winprefs/winprefs.c:460
 msgid "_Keep Buddy List window on top:"
-msgstr "Mantieni la finestra della lista contatti in _primo piano"
-
-#: plugins/win32/winprefs/winprefs.c:412 src/gtkprefs.c:1657
-msgid "Never"
-msgstr "Mai"
-
-#: plugins/win32/winprefs/winprefs.c:413
-#, fuzzy
-msgid "Always"
-msgstr "Assente"
+msgstr "Mantieni la finestra della lista contatti in _primo piano:"
 
 #. XXX: Did this ever work?
-#: plugins/win32/winprefs/winprefs.c:415
+#: ../plugins/win32/winprefs/winprefs.c:465
 msgid "Only when docked"
 msgstr ""
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:419 src/gtkprefs.c:803
-#: src/gtkprefs.c:1727
+#: ../plugins/win32/winprefs/winprefs.c:469 ../src/gtkprefs.c:819
+#: ../src/gtkprefs.c:1879
 msgid "Conversations"
 msgstr "Conversazioni"
 
-#: plugins/win32/winprefs/winprefs.c:420
+#: ../plugins/win32/winprefs/winprefs.c:470
 #, fuzzy
 msgid "_Flash window when messages are received"
 msgstr "_Illumina la finestra quando arriva un messaggio"
 
-#: plugins/win32/winprefs/winprefs.c:443
+#: ../plugins/win32/winprefs/winprefs.c:494
 msgid "WinGaim Options"
 msgstr "Opzioni di WinGaim"
 
-#: plugins/win32/winprefs/winprefs.c:445
+#: ../plugins/win32/winprefs/winprefs.c:496
 msgid "Options specific to Windows Gaim."
 msgstr "Opzioni specifiche di Gaim per Windows."
 
-#: plugins/win32/winprefs/winprefs.c:446
+#: ../plugins/win32/winprefs/winprefs.c:497
 msgid ""
 "Provides options specific to Windows Gaim, such as buddy list docking and "
 "conversation flashing."
 msgstr ""
-
-#: src/account.c:773
-#, fuzzy
+"Fornisce opzioni specifiche per Windows Gaim, come la lista contatti "
+"agganciabile o l'illuminazione della finestra di conversazione."
+
+#: ../src/account.c:773
 msgid "accounts"
-msgstr "Account"
-
-#: src/account.c:915
-#, fuzzy
+msgstr "account"
+
+#: ../src/account.c:918
 msgid "Password is required to sign on."
-msgstr "La password  scaduta"
-
-#: src/account.c:940
+msgstr " richiesta una password per il login."
+
+#: ../src/account.c:943
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Inserisci la password per %s (%s)"
 
-#: src/account.c:947
-#, fuzzy
+#: ../src/account.c:950
 msgid "Enter Password"
-msgstr "Cambia password"
-
-#: src/account.c:952
-#, fuzzy
+msgstr "Inserisci la password"
+
+#: ../src/account.c:955
 msgid "Save password"
-msgstr "Nuova password"
+msgstr "Salva password"
 
 #. *
-#. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
+#. * A wrapper for gaim_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: src/account.c:960 src/account.c:1116 src/gtkdialogs.c:507
-#: src/gtkdialogs.c:648 src/gtkdialogs.c:704 src/gtkrequest.c:261
-#: src/protocols/gg/gg.c:434 src/protocols/gg/gg.c:581
-#: src/protocols/gg/gg.c:1498 src/protocols/jabber/jabber.c:1162
-#: 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:2894
-#: src/protocols/oscar/oscar.c:4404 src/protocols/oscar/oscar.c:4485
-#: src/protocols/oscar/oscar.c:7857 src/protocols/oscar/oscar.c:7982
-#: src/protocols/oscar/oscar.c:8007 src/protocols/oscar/oscar.c:8059
-#: src/protocols/sametime/sametime.c:4585 src/protocols/silc/buddy.c:465
-#: src/protocols/silc/buddy.c:1137 src/protocols/silc/chat.c:422
-#: src/protocols/silc/chat.c:460 src/protocols/silc/chat.c:723
-#: src/protocols/silc/ops.c:1083 src/protocols/silc/ops.c:1696
-#: src/protocols/silc/silc.c:716 src/protocols/yahoo/yahoo.c:2965
-#: src/protocols/yahoo/yahoo.c:2974 src/request.h:1331
+#: ../src/account.c:963 ../src/account.c:1134 ../src/gtkblist.c:3551
+#: ../src/gtkdialogs.c:613 ../src/gtkdialogs.c:750 ../src/gtkdialogs.c:824
+#: ../src/gtkrequest.c:269 ../src/protocols/gg/gg.c:497
+#: ../src/protocols/gg/gg.c:655 ../src/protocols/gg/gg.c:791
+#: ../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:1408 ../src/protocols/oscar/oscar.c:2167
+#: ../src/protocols/oscar/oscar.c:2260 ../src/protocols/oscar/oscar.c:5690
+#: ../src/protocols/oscar/oscar.c:5870 ../src/protocols/oscar/oscar.c:5895
+#: ../src/protocols/oscar/oscar.c:5951 ../src/protocols/silc/buddy.c:466
+#: ../src/protocols/silc/buddy.c:1182 ../src/protocols/silc/chat.c:424
+#: ../src/protocols/silc/chat.c:462 ../src/protocols/silc/chat.c:725
+#: ../src/protocols/silc/ops.c:1297 ../src/protocols/silc/ops.c:1910
+#: ../src/protocols/silc/silc.c:753 ../src/protocols/yahoo/yahoo.c:3059
+#: ../src/protocols/yahoo/yahoo.c:3068 ../src/request.h:1344
 msgid "OK"
 msgstr "OK"
 
-#: src/account.c:961 src/account.c:1117 src/account.c:1155
-#: src/gtkaccount.c:2124 src/gtkaccount.c:2575 src/gtkblist.c:4497
-#: src/gtkdialogs.c:508 src/gtkdialogs.c:649 src/gtkdialogs.c:705
-#: src/gtkdialogs.c:724 src/gtkdialogs.c:746 src/gtkdialogs.c:766
-#: src/gtkdialogs.c:810 src/gtkdialogs.c:872 src/gtkdialogs.c:914
-#: src/gtkdialogs.c:956 src/gtkimhtmltoolbar.c:419 src/gtkprivacy.c:595
-#: src/gtkprivacy.c:608 src/gtkprivacy.c:633 src/gtkprivacy.c:644
-#: src/gtkrequest.c:262 src/gtksavedstatuses.c:221 src/protocols/gg/gg.c:435
-#: src/protocols/gg/gg.c:582 src/protocols/gg/gg.c:656
-#: src/protocols/gg/gg.c:1499 src/protocols/jabber/buddy.c:573
-#: src/protocols/jabber/buddy.c:1358 src/protocols/jabber/buddy.c:1392
-#: src/protocols/jabber/chat.c:780 src/protocols/jabber/jabber.c:707
-#: src/protocols/jabber/jabber.c:1163 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:1596
-#: src/protocols/oscar/oscar.c:2895 src/protocols/oscar/oscar.c:4362
-#: src/protocols/oscar/oscar.c:4405 src/protocols/oscar/oscar.c:4442
-#: src/protocols/oscar/oscar.c:4486 src/protocols/oscar/oscar.c:7858
-#: src/protocols/oscar/oscar.c:7983 src/protocols/oscar/oscar.c:8008
-#: src/protocols/oscar/oscar.c:8060 src/protocols/oscar/oscar.c:8129
-#: src/protocols/sametime/sametime.c:4586 src/protocols/silc/buddy.c:466
-#: src/protocols/silc/buddy.c:1042 src/protocols/silc/buddy.c:1138
-#: src/protocols/silc/chat.c:595 src/protocols/silc/chat.c:724
-#: src/protocols/silc/ops.c:1697 src/protocols/silc/silc.c:717
-#: src/protocols/yahoo/yahoo.c:2966 src/protocols/yahoo/yahoo.c:2975
-#: src/request.h:1331 src/request.h:1341
+#: ../src/account.c:964 ../src/account.c:1135 ../src/account.c:1172
+#: ../src/gtkaccount.c:2182 ../src/gtkaccount.c:2649 ../src/gtkblist.c:5016
+#: ../src/gtkdialogs.c:614 ../src/gtkdialogs.c:751 ../src/gtkdialogs.c:825
+#: ../src/gtkdialogs.c:844 ../src/gtkdialogs.c:866 ../src/gtkdialogs.c:886
+#: ../src/gtkdialogs.c:930 ../src/gtkdialogs.c:985 ../src/gtkdialogs.c:1022
+#: ../src/gtkdialogs.c:1047 ../src/gtkimhtmltoolbar.c:419
+#: ../src/gtkplugin.c:296 ../src/gtkpounce.c:1077 ../src/gtkprivacy.c:568
+#: ../src/gtkprivacy.c:581 ../src/gtkprivacy.c:606 ../src/gtkprivacy.c:617
+#: ../src/gtkrequest.c:270 ../src/gtksavedstatuses.c:296
+#: ../src/protocols/gg/gg.c:498 ../src/protocols/gg/gg.c:656
+#: ../src/protocols/gg/gg.c:792 ../src/protocols/gg/gg.c:871
+#: ../src/protocols/jabber/buddy.c:594 ../src/protocols/jabber/buddy.c:1721
+#: ../src/protocols/jabber/buddy.c:1755 ../src/protocols/jabber/chat.c:778
+#: ../src/protocols/jabber/jabber.c:828 ../src/protocols/jabber/jabber.c:1323
+#: ../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:1409 ../src/protocols/oscar/oscar.c:2168
+#: ../src/protocols/oscar/oscar.c:2209 ../src/protocols/oscar/oscar.c:2261
+#: ../src/protocols/oscar/oscar.c:5691 ../src/protocols/oscar/oscar.c:5743
+#: ../src/protocols/oscar/oscar.c:5871 ../src/protocols/oscar/oscar.c:5896
+#: ../src/protocols/oscar/oscar.c:5952 ../src/protocols/oscar/oscar.c:6021
+#: ../src/protocols/oscar/peer.c:942 ../src/protocols/sametime/sametime.c:3368
+#: ../src/protocols/sametime/sametime.c:3453
+#: ../src/protocols/sametime/sametime.c:3623
+#: ../src/protocols/sametime/sametime.c:5312
+#: ../src/protocols/sametime/sametime.c:5401
+#: ../src/protocols/sametime/sametime.c:5525 ../src/protocols/silc/buddy.c:467
+#: ../src/protocols/silc/buddy.c:1078 ../src/protocols/silc/buddy.c:1183
+#: ../src/protocols/silc/chat.c:597 ../src/protocols/silc/chat.c:726
+#: ../src/protocols/silc/ops.c:1911 ../src/protocols/silc/silc.c:754
+#: ../src/protocols/silc/silc.c:959 ../src/protocols/yahoo/yahoo.c:3060
+#: ../src/protocols/yahoo/yahoo.c:3069 ../src/request.h:1344
+#: ../src/request.h:1354
 msgid "Cancel"
 msgstr "Annulla"
 
-#: src/account.c:986 src/connection.c:96
+#: ../src/account.c:989 ../src/connection.c:96
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Manca il plugin per il protocollo %s"
 
-#: src/account.c:988 src/connection.c:99
+#: ../src/account.c:991 ../src/connection.c:99 ../src/gtkblist.c:3549
 msgid "Connection Error"
 msgstr "Errore di connessione"
 
-#: src/account.c:1052 src/protocols/gg/gg.c:470
-#: src/protocols/jabber/jabber.c:1115
+#: ../src/account.c:1071 ../src/protocols/gg/gg.c:696
+#: ../src/protocols/jabber/jabber.c:1275
 msgid "New passwords do not match."
 msgstr "Le nuove password non coincidono."
 
-#: src/account.c:1061
+#: ../src/account.c:1080
 msgid "Fill out all fields completely."
 msgstr "Riempi tutti i campi in maniera completa."
 
-#: src/account.c:1085
+#: ../src/account.c:1103
 msgid "Original password"
 msgstr "Pasword originale"
 
-#: src/account.c:1092
+#: ../src/account.c:1110
 msgid "New password"
 msgstr "Nuova password"
 
-#: src/account.c:1099
+#: ../src/account.c:1117
 msgid "New password (again)"
 msgstr "Nuova password (di nuovo)"
 
-#: src/account.c:1105
+#: ../src/account.c:1123
 #, c-format
 msgid "Change password for %s"
 msgstr "Cambia la password per %s"
 
-#: src/account.c:1113
+#: ../src/account.c:1131
 msgid "Please enter your current password and your new password."
 msgstr "Inserisci la tua password attuale e la nuova password."
 
-#: src/account.c:1146
+#: ../src/account.c:1164
 #, c-format
 msgid "Change user information for %s"
 msgstr "Modifica le informazioni utente per %s"
 
-#: src/account.c:1154 src/gtkdebug.c:684 src/gtkrequest.c:268
-#: src/protocols/jabber/buddy.c:572
+#: ../src/account.c:1167 ../src/protocols/toc/toc.c:1684
+msgid "Set User Info"
+msgstr "Imposta le informazioni utente"
+
+#: ../src/account.c:1171 ../src/gtkdebug.c:684 ../src/gtkrequest.c:276
+#: ../src/protocols/jabber/buddy.c:593
 msgid "Save"
 msgstr "Salva"
 
-#: src/account.c:1641 src/gtkft.c:156 src/protocols/jabber/buddy.c:633
-#: src/protocols/jabber/buddy.c:1083 src/protocols/jabber/buddy.c:1100
-#: src/protocols/novell/novell.c:2837
+#: ../src/account.c:1681 ../src/gtkft.c:159 ../src/protocols/gg/gg.c:1002
+#: ../src/protocols/jabber/buddy.c:636 ../src/protocols/jabber/buddy.c:1357
+#: ../src/protocols/jabber/buddy.c:1374 ../src/protocols/novell/novell.c:2858
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: src/blist.c:545
-#, fuzzy
+#: ../src/blist.c:543
 msgid "buddy list"
-msgstr "Lista contatti"
-
-#: src/blist.c:1162
+msgstr "lista contatti"
+
+#: ../src/blist.c:1179
 msgid "Chats"
 msgstr "Chat"
 
-#: src/blist.c:1863
-#, c-format
-msgid ""
-"%d buddy from group %s was not removed because its account was not logged "
-"in.  This buddy and the group were not removed.\n"
+#: ../src/blist.c:1901
+#, fuzzy, c-format
+msgid ""
+"%d buddy from group %s was not removed because it belongs to an account "
+"which is disabled or offline.  This buddy and the group were not removed.\n"
 msgid_plural ""
-"%d buddies from group %s were not removed because their accounts were not "
-"logged in.  These buddies and the group were not removed.\n"
+"%d buddies from group %s were not removed because they belong to accounts "
+"which are currently disabled or offline.  These buddies and the group were "
+"not removed.\n"
 msgstr[0] ""
 "%d contatto del gruppo %s non  stato rimosso poich non era connesso.\n"
 msgstr[1] ""
 "%d contatti del gruppo %s non sono stati rimossi poich non erano connessi.\n"
 
-#: src/blist.c:1872
+#: ../src/blist.c:1911
 msgid "Group not removed"
 msgstr "Gruppo non rimosso"
 
-#: src/connection.c:98
+#: ../src/connection.c:98
 msgid "Registration Error"
 msgstr "Errore di registrazione"
 
-#: src/conversation.c:205
-#, fuzzy
+#: ../src/connection.c:280
+#, c-format
+msgid "+++ %s signed on"
+msgstr "+++ %s si  connesso"
+
+#: ../src/connection.c:313
+#, c-format
+msgid "+++ %s signed off"
+msgstr "+++ %s si  disconnesso"
+
+#: ../src/conversation.c:163
 msgid "Unable to send message: The message is too large."
-msgstr "Impossibile inviare il messaggio. Il messaggio  troppo grande."
-
-#: src/conversation.c:208 src/conversation.c:221
-#, fuzzy, c-format
+msgstr "Impossibile inviare il messaggio: il messaggio  troppo grande."
+
+#: ../src/conversation.c:166 ../src/conversation.c:179
+#, c-format
 msgid "Unable to send message to %s."
-msgstr "Impossibile inviare il messaggio %s:"
-
-#: src/conversation.c:209
+msgstr "Impossibile inviare il messaggio a %s."
+
+#: ../src/conversation.c:167
 msgid "The message is too large."
 msgstr "Il messaggio  troppo grande."
 
-#: src/conversation.c:218
+#: ../src/conversation.c:176
 msgid "Unable to send message."
 msgstr "Impossibile inviare il messaggio."
 
-#: src/conversation.c:1497
+#: ../src/conversation.c:1517
 #, c-format
 msgid "%s entered the room."
 msgstr "%s  entrato nella stanza."
 
-#: src/conversation.c:1499
+#: ../src/conversation.c:1520
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>]  entrato nella stanza."
 
-#: src/conversation.c:1598
+#: ../src/conversation.c:1627
 #, c-format
 msgid "You are now known as %s"
 msgstr "Sei ora conosciuto come %s"
 
-#: src/conversation.c:1613
+#: ../src/conversation.c:1647
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s  ora conosciuto come %s"
 
-#: src/conversation.c:1669
-#, c-format
-msgid "%s left the room (%s)."
-msgstr "%s ha abbandonato la stanza (%s)."
-
-#: src/conversation.c:1671
+#: ../src/conversation.c:1720
 #, c-format
 msgid "%s left the room."
 msgstr "%s ha abbandonato la stanza."
 
-#: src/conversation.c:1748
-#, c-format
-msgid "(+%d more)"
-msgstr "(+%d in pi)"
-
-#: src/conversation.c:1750
-#, c-format
-msgid " left the room (%s)."
-msgstr " ha abbandonato la stanza (%s)."
-
-#: src/ft.c:188 src/protocols/msn/msn.c:412
+#: ../src/conversation.c:1723
+#, c-format
+msgid "%s left the room (%s)."
+msgstr "%s ha abbandonato la stanza (%s)."
+
+#: ../src/desktopitem.c:286 ../src/desktopitem.c:877
+msgid "No name"
+msgstr "Nessun nome"
+
+#: ../src/ft.c:189 ../src/protocols/msn/msn.c:410
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1558,7 +2101,7 @@
 "Errore di lettura di %s: \n"
 "%s.\n"
 
-#: src/ft.c:192
+#: ../src/ft.c:193
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -1567,7 +2110,7 @@
 "Errore di scrittura di %s: \n"
 "%s.\n"
 
-#: src/ft.c:196
+#: ../src/ft.c:197
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -1576,36 +2119,36 @@
 "Errore di accesso a %s: \n"
 "%s.\n"
 
-#: src/ft.c:229
+#: ../src/ft.c:230
 msgid "Cannot send a file of 0 bytes."
 msgstr "Impossibile inviare un file di 0 byte."
 
-#: src/ft.c:239
+#: ../src/ft.c:240
 msgid "Cannot send a directory."
 msgstr "Impossibile inviare una directory."
 
-#: src/ft.c:248
+#: ../src/ft.c:249
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr ""
 "%s non  un file regolare. Mi rifiuto codardamente di sovrascriverlo.\n"
 
-#: src/ft.c:306
+#: ../src/ft.c:307
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s vuole inviarti %s (%s)"
 
-#: src/ft.c:313
+#: ../src/ft.c:314
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s vuole inviarti un file"
 
-#: src/ft.c:354
+#: ../src/ft.c:355
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Accettare la richiesta di trasferimento file da %s?"
 
-#: src/ft.c:358
+#: ../src/ft.c:359
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1616,65 +2159,65 @@
 "Host remoto: %s\n"
 "Porta remota: %d"
 
-#: src/ft.c:382
+#: ../src/ft.c:391
 #, fuzzy, c-format
 msgid "%s is offering to send file %s"
 msgstr "Richiesta di invio di %s a %s in corso"
 
-#: src/ft.c:422
+#: ../src/ft.c:443
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s non  un nome file valido.\n"
 
-#: src/ft.c:443
+#: ../src/ft.c:464
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Richiesta di invio di %s a %s in corso"
 
-#: src/ft.c:454
-#, fuzzy, c-format
+#: ../src/ft.c:476
+#, c-format
 msgid "Starting transfer of %s from %s"
-msgstr "Accettare la richiesta di trasferimento file da %s?"
-
-#: src/ft.c:608
+msgstr "Inizio del trasferimento di %s da %s"
+
+#: ../src/ft.c:630
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Trasferimento del file %s completato"
 
-#: src/ft.c:611
+#: ../src/ft.c:633
 msgid "File transfer complete"
 msgstr "Trasferimento file completato"
 
-#: src/ft.c:995
+#: ../src/ft.c:1030
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Hai annullato il trasferimento di %s"
 
-#: src/ft.c:1000
+#: ../src/ft.c:1035
 msgid "File transfer cancelled"
 msgstr "Trasferimento file annullato"
 
-#: src/ft.c:1057
+#: ../src/ft.c:1093
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s ha annullato il trasferimento di %s"
 
-#: src/ft.c:1062
+#: ../src/ft.c:1098
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s ha annullato il trasferimento file"
 
-#: src/ft.c:1119
-#, fuzzy, c-format
+#: ../src/ft.c:1155
+#, c-format
 msgid "File transfer to %s failed."
-msgstr "Trasferimento file per %s annullato.\n"
-
-#: src/ft.c:1121
-#, fuzzy, c-format
+msgstr "Trasferimento file per %s fallito."
+
+#: ../src/ft.c:1157
+#, c-format
 msgid "File transfer from %s failed."
-msgstr "Trasferimento file da %s annullato.\n"
-
-#: src/gtkaccount.c:362
+msgstr "Trasferimento file da %s fallito."
+
+#: ../src/gtkaccount.c:374
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -1686,273 +2229,255 @@
 "<b>Dimensione dell'immagine:</b> %dx%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:730
+#: ../src/gtkaccount.c:762
 msgid "Login Options"
 msgstr "Opzioni di login"
 
-#: src/gtkaccount.c:747 src/gtkft.c:623
+#: ../src/gtkaccount.c:779 ../src/gtkft.c:642
 msgid "Protocol:"
 msgstr "Protocollo:"
 
-#: src/gtkaccount.c:752 src/gtkblist.c:4051
-msgid "Screen Name:"
-msgstr "Nome utente:"
-
-#: src/gtkaccount.c:825
+#: ../src/gtkaccount.c:858
 msgid "Password:"
 msgstr "Password:"
 
-#: src/gtkaccount.c:830 src/gtkblist.c:4065 src/gtkblist.c:4444
+#: ../src/gtkaccount.c:863 ../src/gtkblist.c:4594 ../src/gtkblist.c:4960
 msgid "Alias:"
 msgstr "Alias:"
 
-#: src/gtkaccount.c:834
+#: ../src/gtkaccount.c:867
 msgid "Remember password"
 msgstr "Ricorda la password"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:879
+#: ../src/gtkaccount.c:919
 msgid "User Options"
 msgstr "Opzioni utente"
 
-#: src/gtkaccount.c:892
+#: ../src/gtkaccount.c:932
 msgid "New mail notifications"
 msgstr "Notifica i nuovi messaggi di posta"
 
-#: src/gtkaccount.c:901
+#: ../src/gtkaccount.c:941
 msgid "Buddy icon:"
 msgstr "Icona per il contatto:"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:990
+#: ../src/gtkaccount.c:1032
 #, c-format
 msgid "%s Options"
 msgstr "Opzioni %s"
 
-#. Use Global Proxy Settings
-#: src/gtkaccount.c:1128 src/gtkaccount.c:1175
+#: ../src/gtkaccount.c:1233
 msgid "Use Global Proxy Settings"
 msgstr "Utilizza le opzioni globali del proxy"
 
-#. No Proxy
-#: src/gtkaccount.c:1134 src/gtkaccount.c:1182
+#: ../src/gtkaccount.c:1239
 msgid "No Proxy"
 msgstr "Nessun proxy"
 
-#. HTTP
-#: src/gtkaccount.c:1140 src/gtkaccount.c:1189
+#: ../src/gtkaccount.c:1245
 msgid "HTTP"
 msgstr "HTTP"
 
-#. SOCKS 4
-#: src/gtkaccount.c:1146 src/gtkaccount.c:1196
+#: ../src/gtkaccount.c:1251
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#. SOCKS 5
-#: src/gtkaccount.c:1152 src/gtkaccount.c:1203
+#: ../src/gtkaccount.c:1257
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#. Use Environmental Settings
-#: src/gtkaccount.c:1158 src/gtkaccount.c:1210 src/gtkprefs.c:1007
+#: ../src/gtkaccount.c:1263 ../src/gtkprefs.c:1058
 msgid "Use Environmental Settings"
 msgstr "Utilizza le opzioni globali"
 
-#: src/gtkaccount.c:1249
-msgid "you can see the butterflies mating"
-msgstr "puoi vedere le farfalle accoppiarsi"
-
-#: src/gtkaccount.c:1253
+#. This is an easter egg.
+#. It means one of two things, both intended as humourus:
+#. A) your network is really slow and you have nothing better to do than
+#. look at butterflies.
+#. B)You are looking really closely at something that shouldn't matter.
+#: ../src/gtkaccount.c:1302
 msgid "If you look real closely"
 msgstr "Se guardi da vicino"
 
-#: src/gtkaccount.c:1269
+#. This is an easter egg. See the comment on the previous line in the source.
+#: ../src/gtkaccount.c:1305
+msgid "you can see the butterflies mating"
+msgstr "puoi vedere le farfalle accoppiarsi"
+
+#: ../src/gtkaccount.c:1326
 msgid "Proxy Options"
 msgstr "Opzioni del proxy"
 
-#: src/gtkaccount.c:1287 src/gtkprefs.c:1001
+#: ../src/gtkaccount.c:1340 ../src/gtkprefs.c:1052
 msgid "Proxy _type:"
 msgstr "_Tipo di proxy:"
 
-#: src/gtkaccount.c:1296 src/gtkprefs.c:1022
+#: ../src/gtkaccount.c:1349 ../src/gtkprefs.c:1073
 msgid "_Host:"
 msgstr "_Host:"
 
-#: src/gtkaccount.c:1300 src/gtkprefs.c:1040
+#: ../src/gtkaccount.c:1353 ../src/gtkprefs.c:1091
 msgid "_Port:"
 msgstr "_Porta:"
 
-#: src/gtkaccount.c:1308
+#: ../src/gtkaccount.c:1361
 msgid "_Username:"
 msgstr "Nome _utente:"
 
-#: src/gtkaccount.c:1313 src/gtkprefs.c:1077
+#: ../src/gtkaccount.c:1367 ../src/gtkprefs.c:1128
 msgid "Pa_ssword:"
 msgstr "Pa_ssword:"
 
-#: src/gtkaccount.c:1700
+#: ../src/gtkaccount.c:1747
 msgid "Add Account"
 msgstr "Aggiungi un account"
 
-#: src/gtkaccount.c:1702
+#: ../src/gtkaccount.c:1749 ../src/gtkblist.c:3552
 msgid "Modify Account"
 msgstr "Modifica l'account"
 
+#: ../src/gtkaccount.c:1771
+msgid "_Basic"
+msgstr "Di _base"
+
+#: ../src/gtkaccount.c:1782
+msgid "_Advanced"
+msgstr "_Avanzate"
+
 #. Register button
-#: src/gtkaccount.c:1750 src/protocols/jabber/jabber.c:706
+#: ../src/gtkaccount.c:1797 ../src/protocols/jabber/jabber.c:827
 msgid "Register"
 msgstr "Iscrizione"
 
-#: src/gtkaccount.c:2118 src/gtksavedstatuses.c:217
+#: ../src/gtkaccount.c:2176 ../src/gtksavedstatuses.c:293
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Sei sicuro di voler eliminare %s?"
 
-#: src/gtkaccount.c:2123 src/gtkrequest.c:265 src/gtksavedstatuses.c:220
+#: ../src/gtkaccount.c:2181 ../src/gtkpounce.c:1076 ../src/gtkrequest.c:273
+#: ../src/gtksavedstatuses.c:295
 msgid "Delete"
 msgstr "Elimina"
 
-#: src/gtkaccount.c:2187 src/gtksavedstatuses.c:686
-#: src/protocols/oscar/oscar.c:5049
+#: ../src/gtkaccount.c:2239 ../src/gtksavedstatuses.c:889
+#: ../src/protocols/oscar/oscar.c:2823
 msgid "Screen Name"
 msgstr "Nome utente"
 
-#: src/gtkaccount.c:2210
-#, fuzzy
-msgid "Enabled"
-msgstr "Fallito"
-
-#: src/gtkaccount.c:2218
+#: ../src/gtkaccount.c:2270
 msgid "Protocol"
 msgstr "Protocollo"
 
-#: src/gtkaccount.c:2550
-#, c-format
-msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
-msgstr "%s%s%s%s ha aggiunto %s alla sua lista contatti%s%s%s"
-
-#: src/gtkaccount.c:2564
-msgid ""
-"\n"
-"\n"
-"Do you wish to add him or her to your buddy list?"
-msgstr ""
-"\n"
-"\n"
-"Vuoi aggiungerlo alla tua lista dei contatti?"
-
-#: src/gtkaccount.c:2572
+#: ../src/gtkaccount.c:2597
+#, c-format
+msgid "%s%s%s%s has made %s his or her buddy%s%s"
+msgstr "%s%s%s%s ha aggiunto %s alla sua lista contatti%s%s"
+
+#: ../src/gtkaccount.c:2646
 msgid "Add buddy to your list?"
 msgstr "Vuoi aggiungere il contatto alla tua lista?"
 
-#: src/gtkaccount.c:2574 src/gtkblist.c:4496 src/gtkconv.c:1527
-#: src/gtkrequest.c:266 src/protocols/gg/gg.c:655
-#: src/protocols/oscar/oscar.c:4674 src/protocols/silc/chat.c:594
+#: ../src/gtkaccount.c:2648 ../src/gtkblist.c:5015 ../src/gtkconv.c:1625
+#: ../src/gtkrequest.c:274 ../src/protocols/gg/gg.c:870
+#: ../src/protocols/oscar/oscar.c:2453
+#: ../src/protocols/sametime/sametime.c:5400 ../src/protocols/silc/chat.c:596
 msgid "Add"
 msgstr "Aggiungi"
 
-#: src/gtkblist.c:595
+#: ../src/gtkblist.c:673
 msgid "Join a Chat"
 msgstr "Entra in chat"
 
-#: src/gtkblist.c:616
+#: ../src/gtkblist.c:694
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr ""
 "Inserisci le informazioni appropriate per la chat nella quale vuoi entrare.\n"
 
-#: src/gtkblist.c:627 src/gtkpounce.c:415 src/gtkroomlist.c:354
+#: ../src/gtkblist.c:705 ../src/gtkpounce.c:519 ../src/gtkroomlist.c:377
 msgid "_Account:"
 msgstr "_Account:"
 
-#: src/gtkblist.c:935
+#: ../src/gtkblist.c:949
 msgid "Get _Info"
 msgstr "_Info"
 
-#: src/gtkblist.c:938
+#: ../src/gtkblist.c:952 ../src/gtkstock.c:141
 msgid "I_M"
 msgstr "_MI"
 
-#: src/gtkblist.c:944
+#: ../src/gtkblist.c:958
 msgid "_Send File"
 msgstr "_Invia file"
 
-#: src/gtkblist.c:950
+#: ../src/gtkblist.c:965
 msgid "Add Buddy _Pounce"
 msgstr "Aggiungi un _allarme"
 
-#: src/gtkblist.c:954 src/gtkblist.c:958 src/gtkblist.c:1056
-#: src/gtkblist.c:1079
+#: ../src/gtkblist.c:969 ../src/gtkblist.c:973 ../src/gtkblist.c:1072
+#: ../src/gtkblist.c:1095
 msgid "View _Log"
 msgstr "Mostra il _log"
 
-#: src/gtkblist.c:969
-msgid "_Alias Buddy..."
-msgstr "_Alias per il contatto..."
-
-#: src/gtkblist.c:971
-msgid "_Remove Buddy"
-msgstr "_Rimuovi il contatto"
-
-#: src/gtkblist.c:973
-msgid "Alias Contact..."
-msgstr "Alias per la lista..."
-
-#: src/gtkblist.c:976 src/gtkdialogs.c:808 src/gtkdialogs.c:809
-msgid "Remove Contact"
-msgstr "Rimuovi lista"
-
-#: src/gtkblist.c:980 src/gtkblist.c:1064 src/gtkblist.c:1085
+#: ../src/gtkblist.c:984
+msgid "Alias..."
+msgstr "Alias..."
+
+#: ../src/gtkblist.c:987 ../src/gtkconv.c:1622 ../src/gtkrequest.c:275
+msgid "Remove"
+msgstr "Rimuovi"
+
+#: ../src/gtkblist.c:993 ../src/gtkblist.c:1080 ../src/gtkblist.c:1101
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: src/gtkblist.c:982 src/gtkblist.c:1066 src/gtkblist.c:1087
+#: ../src/gtkblist.c:995 ../src/gtkblist.c:1082 ../src/gtkblist.c:1103
 msgid "_Remove"
 msgstr "_Rimuovi"
 
-#: src/gtkblist.c:1028
+#: ../src/gtkblist.c:1043
 msgid "Add a _Buddy"
 msgstr "_Aggiungi un contatto"
 
-#: src/gtkblist.c:1030
+#: ../src/gtkblist.c:1045
 msgid "Add a C_hat"
 msgstr "Aggiungi una c_hat"
 
-#: src/gtkblist.c:1032
+#: ../src/gtkblist.c:1048
 msgid "_Delete Group"
 msgstr "_Elimina il gruppo"
 
-#: src/gtkblist.c:1034
+#: ../src/gtkblist.c:1050
 msgid "_Rename"
 msgstr "_Rinomina"
 
 #. join button
-#: src/gtkblist.c:1052 src/gtkroomlist.c:264 src/gtkroomlist.c:409
-#: src/gtkstock.c:118
+#: ../src/gtkblist.c:1068 ../src/gtkroomlist.c:285 ../src/gtkroomlist.c:441
+#: ../src/gtkstock.c:139
 msgid "_Join"
 msgstr "_Entra"
 
-#: src/gtkblist.c:1054
+#: ../src/gtkblist.c:1070
 msgid "Auto-Join"
 msgstr "Entra automaticamente"
 
-#: src/gtkblist.c:1092 src/gtkblist.c:1115
+#: ../src/gtkblist.c:1108 ../src/gtkblist.c:1131
 msgid "_Collapse"
 msgstr "_Minimizza"
 
-#: src/gtkblist.c:1120
+#: ../src/gtkblist.c:1136
 msgid "_Expand"
 msgstr "M_assimizza"
 
-#: src/gtkblist.c:1353 src/gtkblist.c:1363 src/gtkblist.c:3326
-#: src/gtkblist.c:3331
-#, fuzzy
+#: ../src/gtkblist.c:1382 ../src/gtkblist.c:1394 ../src/gtkblist.c:3812
+#: ../src/gtkblist.c:3822
 msgid "/Tools/Mute Sounds"
-msgstr "Nessun suono"
-
-#: src/gtkblist.c:1822 src/gtkconv.c:3745 src/gtkpounce.c:314
+msgstr "/Strumenti/Nessun suono"
+
+#: ../src/gtkblist.c:1854 ../src/gtkconv.c:4245 ../src/gtkpounce.c:418
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
@@ -1960,125 +2485,126 @@
 "un contatto."
 
 #. Buddies menu
-#: src/gtkblist.c:2329
+#: ../src/gtkblist.c:2428
 msgid "/_Buddies"
 msgstr "/_Contatti"
 
-#: src/gtkblist.c:2330
+#: ../src/gtkblist.c:2429
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Contatti/Nuovo _messaggio immediato..."
 
-#: src/gtkblist.c:2331
+#: ../src/gtkblist.c:2430
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Contatti/Entra in _chat..."
 
-#: src/gtkblist.c:2332
+#: ../src/gtkblist.c:2431
 msgid "/Buddies/Get User _Info..."
-msgstr "/Contatti/_Informazioni su un contatto..."
-
-#: src/gtkblist.c:2333
+msgstr "/Contatti/_Informazioni sul contatto..."
+
+#: ../src/gtkblist.c:2432
 msgid "/Buddies/View User _Log..."
-msgstr "/Contatti/Visualizza il log dell'utente..."
-
-#: src/gtkblist.c:2335
+msgstr "/Contatti/Mostra il log dell'utente..."
+
+#: ../src/gtkblist.c:2434
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Contatti/Mostra i contatti non in linea"
 
-#: src/gtkblist.c:2336
+#: ../src/gtkblist.c:2435
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Contatti/Mostra i gruppi _vuoti"
 
-#: src/gtkblist.c:2337
-#, fuzzy
+#: ../src/gtkblist.c:2436
 msgid "/Buddies/Show Buddy _Details"
-msgstr "/Contatti/Mostra i contatti non in linea"
-
-#: src/gtkblist.c:2338 src/gtkblist.c:5158
-#, fuzzy
-msgid "/Buddies/Sort Buddies"
-msgstr "/Contatti/Mostra i contatti non in linea"
-
-#: src/gtkblist.c:2340
+msgstr "/Contatti/Mostra _dettagli sui contatti"
+
+#: ../src/gtkblist.c:2437
+msgid "/Buddies/Show Idle _Times"
+msgstr "/Contatti/Mostra _tempi di inattivit"
+
+#: ../src/gtkblist.c:2438
+msgid "/Buddies/_Sort Buddies"
+msgstr "/Contatti/_Ordina contatti"
+
+#: ../src/gtkblist.c:2440
 msgid "/Buddies/_Add Buddy..."
-msgstr "/Contatti/_Aggiungi un contatto..."
-
-#: src/gtkblist.c:2341
+msgstr "/Contatti/_Aggiungi contatto..."
+
+#: ../src/gtkblist.c:2441
 msgid "/Buddies/Add C_hat..."
-msgstr "/Contatti/Aggiungi una c_hat..."
-
-#: src/gtkblist.c:2342
+msgstr "/Contatti/Aggiungi c_hat..."
+
+#: ../src/gtkblist.c:2442
 msgid "/Buddies/Add _Group..."
-msgstr "/Contatti/Aggiungi un _gruppo..."
-
-#: src/gtkblist.c:2344
+msgstr "/Contatti/Aggiungi _gruppo..."
+
+#: ../src/gtkblist.c:2444
 msgid "/Buddies/_Quit"
 msgstr "/Contatti/_Esci"
 
+#. Accounts menu
+#: ../src/gtkblist.c:2447
+msgid "/_Accounts"
+msgstr "/_Account"
+
+#: ../src/gtkblist.c:2448 ../src/gtkblist.c:5592
+msgid "/Accounts/Add\\/Edit"
+msgstr "/Account/Aggiungi\\/Modifica"
+
 #. Tools
-#: src/gtkblist.c:2347
+#: ../src/gtkblist.c:2451
 msgid "/_Tools"
 msgstr "/_Strumenti"
 
-#: src/gtkblist.c:2348
-msgid "/Tools/Buddy _Pounce"
+#: ../src/gtkblist.c:2452
+msgid "/Tools/Buddy _Pounces"
 msgstr "/Strumenti/A_llarmi"
 
-#: src/gtkblist.c:2349
-msgid "/Tools/Account Ac_tions"
-msgstr "/Strumenti/A_zioni di account"
-
-#: src/gtkblist.c:2351
-msgid "/Tools/A_ccounts"
-msgstr "/Strumenti/A_ccount"
-
-#: src/gtkblist.c:2352
+#: ../src/gtkblist.c:2453
+msgid "/Tools/Plu_gins"
+msgstr "/Strumenti/Plu_gin"
+
+#: ../src/gtkblist.c:2454
 msgid "/Tools/Pr_eferences"
 msgstr "/Strumenti/Pr_eferenze"
 
-#: src/gtkblist.c:2353
-#, fuzzy
-msgid "/Tools/Plu_gins"
-msgstr "/Strumenti/Azioni dei plugin"
-
-#: src/gtkblist.c:2354
+#: ../src/gtkblist.c:2455
 msgid "/Tools/Pr_ivacy"
 msgstr "/Strumenti/Pr_ivacy"
 
-#: src/gtkblist.c:2355
+#: ../src/gtkblist.c:2457
 msgid "/Tools/_File Transfers"
 msgstr "/Strumenti/Trasferimento _file"
 
-#: src/gtkblist.c:2356
+#: ../src/gtkblist.c:2458
 msgid "/Tools/R_oom List"
 msgstr "/Strumenti/Lista delle _stanze"
 
-#: src/gtkblist.c:2358
-#, fuzzy
+#: ../src/gtkblist.c:2459
+msgid "/Tools/System _Log"
+msgstr "/Strumenti/_Log di sistema"
+
+#: ../src/gtkblist.c:2461
 msgid "/Tools/Mute _Sounds"
-msgstr "Nessun suono"
-
-#: src/gtkblist.c:2359
-msgid "/Tools/View System _Log"
-msgstr "/Strumenti/Mostra il _log di sistema"
+msgstr "/Strumenti/Nessun _suono"
 
 #. Help
-#: src/gtkblist.c:2362
+#: ../src/gtkblist.c:2464
 msgid "/_Help"
 msgstr "/_Aiuto"
 
-#: src/gtkblist.c:2363
+#: ../src/gtkblist.c:2465
 msgid "/Help/Online _Help"
 msgstr "/Aiuto/_Aiuto online"
 
-#: src/gtkblist.c:2364
+#: ../src/gtkblist.c:2466
 msgid "/Help/_Debug Window"
 msgstr "/Aiuto/Finestra di _debug"
 
-#: src/gtkblist.c:2365
+#: ../src/gtkblist.c:2467
 msgid "/Help/_About"
 msgstr "/Aiuto/I_nformazioni"
 
-#: src/gtkblist.c:2397 src/gtkblist.c:2464
+#: ../src/gtkblist.c:2499 ../src/gtkblist.c:2568
 #, c-format
 msgid ""
 "\n"
@@ -2087,61 +2613,52 @@
 "\n"
 "<b>Account:</b> %s"
 
-#: src/gtkblist.c:2473
-#, fuzzy, c-format
-msgid ""
-"\n"
-"<b>Contact Alias:</b> %s"
-msgstr ""
-"\n"
-"<b>Alias del contatto:</b>"
-
-#: src/gtkblist.c:2481
-#, fuzzy, c-format
-msgid ""
-"\n"
-"<b>Alias:</b> %s"
-msgstr ""
-"\n"
-"<b>Alias:</b>"
-
-#: src/gtkblist.c:2489
-#, fuzzy, c-format
+#: ../src/gtkblist.c:2580
+#, c-format
+msgid ""
+"\n"
+"<b>Buddy Alias:</b> %s"
+msgstr ""
+"\n"
+"<b>Alias del contatto:</b> %s"
+
+#: ../src/gtkblist.c:2592
+#, c-format
 msgid ""
 "\n"
 "<b>Nickname:</b> %s"
 msgstr ""
 "\n"
-"<b>Nickname:</b>"
-
-#: src/gtkblist.c:2498
-#, fuzzy, c-format
+"<b>Nickname:</b> %s"
+
+#: ../src/gtkblist.c:2601
+#, c-format
 msgid ""
 "\n"
 "<b>Logged In:</b> %s"
 msgstr ""
 "\n"
-"<b>Connesso:</b>"
-
-#: src/gtkblist.c:2510
-#, fuzzy, c-format
+"<b>Connesso:</b> %s"
+
+#: ../src/gtkblist.c:2612
+#, c-format
 msgid ""
 "\n"
 "<b>Idle:</b> %s"
 msgstr ""
 "\n"
-"<b>Inattivo:</b>"
-
-#: src/gtkblist.c:2546
-#, fuzzy, c-format
+"<b>Inattivo:</b> %s"
+
+#: ../src/gtkblist.c:2647
+#, c-format
 msgid ""
 "\n"
 "<b>Last Seen:</b> %s ago"
 msgstr ""
 "\n"
-"<b>%s:</b> %s"
-
-#: src/gtkblist.c:2554
+"<b>Visto l'ultima volta:</b> %s fa"
+
+#: ../src/gtkblist.c:2656
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2149,7 +2666,7 @@
 "\n"
 "<b>Stato:</b> Non connesso"
 
-#: src/gtkblist.c:2577
+#: ../src/gtkblist.c:2667
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2157,159 +2674,167 @@
 "\n"
 "<b>Descrizione:</b> Spettrale"
 
-#: src/gtkblist.c:2579
-#, fuzzy
+#: ../src/gtkblist.c:2669
 msgid ""
 "\n"
 "<b>Status:</b> Awesome"
 msgstr ""
 "\n"
-"<b>Stato</b>: Impressionante"
-
-#: src/gtkblist.c:2581
-#, fuzzy
+"<b>Stato:</b> Impressionante"
+
+#: ../src/gtkblist.c:2671
 msgid ""
 "\n"
 "<b>Status:</b> Rockin'"
 msgstr ""
 "\n"
-"<b>Stato</b>: Rockin'"
-
-#: src/gtkblist.c:2843
-#, fuzzy, c-format
-msgid "Idle (%dh %02dm) "
-msgstr "Inattivo (%dh%02dm) "
-
-#: src/gtkblist.c:2845
-#, c-format
-msgid "Idle (%dm) "
-msgstr "Inattivo (%dm) "
-
-#: src/gtkblist.c:2848
-#, fuzzy
-msgid "Idle "
+"<b>Stato:</b> Rockin'"
+
+#: ../src/gtkblist.c:2962
+#, c-format
+msgid "Idle %dh %02dm"
+msgstr "Inattivo %dh %02dm"
+
+#: ../src/gtkblist.c:2964
+#, c-format
+msgid "Idle %dm"
+msgstr "Inattivo %dm"
+
+#. Idle stuff
+#: ../src/gtkblist.c:2967 ../src/gtkprefs.c:1760
+#: ../src/protocols/bonjour/bonjour.c:333 ../src/protocols/jabber/buddy.c:641
+#: ../src/protocols/jabber/buddy.c:672 ../src/protocols/msn/msn.c:550
+#: ../src/protocols/msn/state.c:32 ../src/protocols/novell/novell.c:2852
+#: ../src/protocols/oscar/oscar.c:2844 ../src/protocols/yahoo/yahoo.c:2727
+#: ../src/protocols/yahoo/yahoo_profile.c:691
+msgid "Idle"
 msgstr "Inattivo"
 
-#: src/gtkblist.c:2852
-msgid "Offline "
-msgstr "Non connesso "
-
-#: src/gtkblist.c:2968
-#, fuzzy
+#: ../src/gtkblist.c:3099
 msgid "/Buddies/New Instant Message..."
-msgstr "/Contatti/Nuovo _messaggio immediato..."
-
-#: src/gtkblist.c:2969 src/gtkblist.c:3003
+msgstr "/Contatti/Nuovo messaggio immediato..."
+
+#: ../src/gtkblist.c:3100 ../src/gtkblist.c:3133
 msgid "/Buddies/Join a Chat..."
 msgstr "/Contatti/Entra in chat..."
 
-#: src/gtkblist.c:2970
-#, fuzzy
+#: ../src/gtkblist.c:3101
 msgid "/Buddies/Get User Info..."
-msgstr "/Contatti/_Informazioni su un contatto..."
-
-#: src/gtkblist.c:2971
-#, fuzzy
+msgstr "/Contatti/Informazioni sul contatto..."
+
+#: ../src/gtkblist.c:3102
 msgid "/Buddies/Add Buddy..."
-msgstr "/Contatti/_Aggiungi un contatto..."
-
-#: src/gtkblist.c:2972
-#, fuzzy
+msgstr "/Contatti/Aggiungi contatto..."
+
+#: ../src/gtkblist.c:3103 ../src/gtkblist.c:3136
 msgid "/Buddies/Add Chat..."
-msgstr "/Contatti/Aggiungi una c_hat..."
-
-#: src/gtkblist.c:2973
-#, fuzzy
+msgstr "/Contatti/Aggiungi chat..."
+
+#: ../src/gtkblist.c:3104
 msgid "/Buddies/Add Group..."
-msgstr "/Contatti/Aggiungi un _gruppo..."
-
-#: src/gtkblist.c:3006
-msgid "/Tools/Room List"
-msgstr "/Strumenti/Lista delle stanze"
-
-#: src/gtkblist.c:3009
+msgstr "/Contatti/Aggiungi gruppo..."
+
+#: ../src/gtkblist.c:3139
+msgid "/Tools/Buddy Pounces"
+msgstr "/Strumenti/Allarmi"
+
+#: ../src/gtkblist.c:3142
 msgid "/Tools/Privacy"
 msgstr "/Strumenti/Privacy"
 
-#: src/gtkblist.c:3085
-#, fuzzy
+#: ../src/gtkblist.c:3145
+msgid "/Tools/Room List"
+msgstr "/Strumenti/Lista delle stanze"
+
+#: ../src/gtkblist.c:3339
 msgid "Manually"
-msgstr "Manuale"
-
-#: src/gtkblist.c:3087
-#, fuzzy
+msgstr "Manualmente"
+
+#: ../src/gtkblist.c:3341
 msgid "Alphabetically"
-msgstr "Alfabetico"
-
-#: src/gtkblist.c:3088
+msgstr "Alfabeticamente"
+
+#: ../src/gtkblist.c:3342
 msgid "By status"
 msgstr "Per stato"
 
-#: src/gtkblist.c:3089
+#: ../src/gtkblist.c:3343
 msgid "By log size"
 msgstr "Per dimensione del log"
 
-#: src/gtkblist.c:3201
-msgid "/Tools/Buddy Pounce"
-msgstr "/Strumenti/Allarmi"
-
-#: src/gtkblist.c:3202
-msgid "/Tools/Account Actions"
-msgstr "/Strumenti/Azioni di account"
+#: ../src/gtkblist.c:3544 ../src/gtkconn.c:184
+#, c-format
+msgid "%s disconnected"
+msgstr "%s si  disconnesso"
+
+#: ../src/gtkblist.c:3553 ../src/protocols/sametime/sametime.c:3622
+msgid "Connect"
+msgstr "Connetti"
+
+#: ../src/gtkblist.c:3553
+msgid "Re-enable Account"
+msgstr "Riabilita l'account"
+
+#: ../src/gtkblist.c:3574
+#, c-format
+msgid "<span color=\"red\">%s disconnected: %s</span>"
+msgstr "<span color=\"red\">%s disconnesso: %s</span>"
+
+#: ../src/gtkblist.c:3701
+msgid "/Accounts"
+msgstr "/Account"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3322
+#: ../src/gtkblist.c:3806
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Contatti/Mostra i contatti non in linea"
 
-#: src/gtkblist.c:3324
+#: ../src/gtkblist.c:3809
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Contatti/Mostra i gruppi vuoti"
 
-#: src/gtkblist.c:3328
-#, fuzzy
+#: ../src/gtkblist.c:3815
 msgid "/Buddies/Show Buddy Details"
-msgstr "/Contatti/Mostra i contatti non in linea"
-
-#: src/gtkblist.c:4005 src/protocols/silc/buddy.c:736
-#: src/protocols/silc/buddy.c:994 src/protocols/silc/buddy.c:1039
-#: src/protocols/silc/buddy.c:1129 src/protocols/yahoo/yahoo.c:2886
-msgid "Add Buddy"
-msgstr "Aggiungi un contatto"
-
-#: src/gtkblist.c:4029
+msgstr "/Contatti/Mostra dettagli sui contatti"
+
+#: ../src/gtkblist.c:3818
+msgid "/Buddies/Show Idle Times"
+msgstr "/Contatti/Mostra tempi di inattivit"
+
+#: ../src/gtkblist.c:4551
 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. "
 "The alias will be displayed in place of the screen name whenever possible.\n"
 msgstr ""
 "Inserisci il nome utente della persona che vuoi aggiungere alla tua lista "
-"contatti. Puoi aggiungere opzionalmente un alias per il contatto. Gli alias "
-"verranno mostrati al posto del nome utente, laddove  possibile.\n"
+"contatti. Puoi aggiungere opzionalmente un alias, o nickname, per il "
+"contatto. Gli alias verranno mostrati al posto del nome utente, laddove  "
+"possibile.\n"
 
 #. Set up stuff for the account box
-#: src/gtkblist.c:4092 src/gtkblist.c:4424
+#: ../src/gtkblist.c:4621 ../src/gtkblist.c:4940
 msgid "Account:"
 msgstr "Account:"
 
-#: src/gtkblist.c:4357
+#: ../src/gtkblist.c:4873
 msgid "This protocol does not support chat rooms."
 msgstr "Questo protocollo non supporta le chat room."
 
-#: src/gtkblist.c:4373
+#: ../src/gtkblist.c:4889
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr ""
 "Non sei attualmente connesso a nessun protocollo che consenta una chat."
 
-#: src/gtkblist.c:4390
+#: ../src/gtkblist.c:4906
 msgid "Add Chat"
 msgstr "Aggiungi una chat"
 
-#: src/gtkblist.c:4414
+#: ../src/gtkblist.c:4930
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -2317,49 +2842,59 @@
 "Inserisci un alias e le informazioni appropriate per la chat che vuoi "
 "aggiungere alla tua lista contatti.\n"
 
-#: src/gtkblist.c:4493
+#: ../src/gtkblist.c:5012 ../src/protocols/sametime/sametime.c:5311
+#: ../src/protocols/sametime/sametime.c:5398
 msgid "Add Group"
 msgstr "Aggiungi un gruppo"
 
-#: src/gtkblist.c:4494
+#: ../src/gtkblist.c:5013
 msgid "Please enter the name of the group to be added."
 msgstr "Inserisci il nome del gruppo da aggiungere."
 
-#: src/gtkblist.c:5025
+#: ../src/gtkblist.c:5632
+msgid "_Edit Account"
+msgstr "_Modifica account"
+
+#: ../src/gtkblist.c:5665 ../src/gtkblist.c:5671 ../src/gtkconv.c:2753
 msgid "No actions available"
 msgstr "Nessuna azione disponibile"
 
-#: src/gtkblist.c:5094
-#, fuzzy
+#: ../src/gtkblist.c:5679
+msgid "_Disable"
+msgstr "_Disabilita"
+
+#: ../src/gtkblist.c:5691
+msgid "Enable Account"
+msgstr "Abilita account"
+
+#: ../src/gtkblist.c:5744
 msgid "/Tools"
-msgstr "/_Strumenti"
-
-#: src/gtkconn.c:190
-#, fuzzy, c-format
-msgid "%s disconnected"
-msgstr "Disconnesso."
-
-#: src/gtkconn.c:191
-#, c-format
-msgid ""
-"%s was disconnected due to an error. %s The account has been disabled. "
-"Correct the error and re-enable the account to connect."
-msgstr ""
-
-#: src/gtkconv.c:325
-#, c-format
-msgid "me is using Gaim v%s."
-msgstr "sto utilizzando Gaim v%s."
-
-#: src/gtkconv.c:334
+msgstr "/Strumenti"
+
+#: ../src/gtkblist.c:5830
+msgid "/Buddies/Sort Buddies"
+msgstr "/Contatti/Ordina contatti"
+
+#: ../src/gtkconn.c:185
+#, c-format
+msgid ""
+"%s was disconnected due to an error: %s\n"
+"Gaim will not attempt to reconnect the account until you correct the error "
+"and re-enable the account."
+msgstr ""
+"%s  stato disconnesso a causa di un errore: %s\n"
+"Gaim non prover a riconnettere l'account finch l'errore non sar corretto "
+"dall'utente e l'account riabilitato."
+
+#: ../src/gtkconv.c:373
 msgid "Supported debug options are:  version"
 msgstr "Le opzioni di debug supportate sono: version"
 
-#: src/gtkconv.c:371
+#: ../src/gtkconv.c:409
 msgid "No such command (in this context)."
 msgstr "Comando inesistente (in questo contesto)."
 
-#: src/gtkconv.c:374
+#: ../src/gtkconv.c:412
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -2367,53 +2902,50 @@
 "Usa \"/help &lt;comando&gt;\" per ottenere aiuto su un comando specifico.\n"
 "I seguenti comandi sono disponibili in questo contesto:\n"
 
-#: src/gtkconv.c:446
+#: ../src/gtkconv.c:482
 msgid "No such command."
 msgstr "Comando inesistente."
 
-#: src/gtkconv.c:453
+#: ../src/gtkconv.c:489
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 "Errore di sintassi:  stato digitato un numero sbagliato di argomenti per "
 "questo comando."
 
-#: src/gtkconv.c:458
+#: ../src/gtkconv.c:494
 msgid "Your command failed for an unknown reason."
 msgstr "Il comando non ha funzionato per un motivo sconosciuto."
 
-#: src/gtkconv.c:465
-#, fuzzy
+#: ../src/gtkconv.c:501
 msgid "That command only works in chats, not IMs."
 msgstr "Il comando funziona solo per le chat, non per i MI."
 
-#: src/gtkconv.c:468
-#, fuzzy
+#: ../src/gtkconv.c:504
 msgid "That command only works in IMs, not chats."
 msgstr "Il comando funziona solo per i MI, non per le chat."
 
-#: src/gtkconv.c:472
+#: ../src/gtkconv.c:508
 msgid "That command doesn't work on this protocol."
 msgstr "Il comando non funziona con questo protocollo."
 
-#: src/gtkconv.c:699 src/gtkconv.c:725
-#, fuzzy
+#: ../src/gtkconv.c:743 ../src/gtkconv.c:769
 msgid "That buddy is not on the same protocol as this chat."
 msgstr ""
 "Il contatto appartiene a un protocollo diverso da quello di questa chat"
 
-#: src/gtkconv.c:719
+#: ../src/gtkconv.c:763
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 "Non sei attualmente connesso a nessun protocollo che consenta di invitare il "
 "contatto."
 
-#: src/gtkconv.c:772
+#: ../src/gtkconv.c:816
 msgid "Invite Buddy Into Chat Room"
 msgstr "Invita un contatto nella chat room"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:802
+#: ../src/gtkconv.c:846
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -2421,300 +2953,338 @@
 "Inserisci il nome del contatto che vuoi invitare, insieme a un messaggio di "
 "invito (opzionale)."
 
-#: src/gtkconv.c:823
+#: ../src/gtkconv.c:867
 msgid "_Buddy:"
 msgstr "_Contatto:"
 
-#: src/gtkconv.c:843 src/gtksavedstatuses.c:836
+#: ../src/gtkconv.c:887 ../src/gtksavedstatuses.c:1107
+#: ../src/gtksavedstatuses.c:1443
 msgid "_Message:"
 msgstr "_Messaggio:"
 
-#: src/gtkconv.c:900 src/gtkconv.c:2228 src/gtkdebug.c:217 src/gtkft.c:470
+#: ../src/gtkconv.c:944 ../src/gtkconv.c:2370 ../src/gtkdebug.c:217
+#: ../src/gtkft.c:490
 msgid "Unable to open file."
 msgstr "Impossibile aprire il file."
 
-#: src/gtkconv.c:906
+#: ../src/gtkconv.c:950
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Conversazioni con %s</h1>\n"
 
-#: src/gtkconv.c:930
+#: ../src/gtkconv.c:974
 msgid "Save Conversation"
 msgstr "Salva la conversazione"
 
-#: src/gtkconv.c:1030 src/gtkdebug.c:165 src/gtkdebug.c:678
+#: ../src/gtkconv.c:1095 ../src/gtkdebug.c:165 ../src/gtkdebug.c:678
 msgid "Find"
 msgstr "Trova"
 
-#: src/gtkconv.c:1056 src/gtkdebug.c:193
+#: ../src/gtkconv.c:1121 ../src/gtkdebug.c:193
 msgid "_Search for:"
 msgstr "_Cerca:"
 
-#: src/gtkconv.c:1227
+#: ../src/gtkconv.c:1292
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
-
-#: src/gtkconv.c:1235
+"Log avviato. Sar effettuato il log dei nuovi messaggi di questa "
+"conversazione."
+
+#: ../src/gtkconv.c:1300
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
-
-#: src/gtkconv.c:1489
+"Log fermato. Non sar effettuato il log dei nuovi messaggi di questa "
+"conversazione."
+
+#: ../src/gtkconv.c:1562
 msgid "IM"
 msgstr "Messaggio"
 
-#: src/gtkconv.c:1495 src/protocols/oscar/oscar.c:628
+#: ../src/gtkconv.c:1573 ../src/protocols/oscar/oscar.c:640
 msgid "Send File"
 msgstr "Invia file"
 
-#: src/gtkconv.c:1502
+#: ../src/gtkconv.c:1588
 msgid "Un-Ignore"
 msgstr "Annulla ignora"
 
-#: src/gtkconv.c:1505
+#: ../src/gtkconv.c:1591
 msgid "Ignore"
 msgstr "Ignora"
 
-#: src/gtkconv.c:1511
+#: ../src/gtkconv.c:1601
 msgid "Info"
 msgstr "Info"
 
-#: src/gtkconv.c:1517
+#: ../src/gtkconv.c:1611
 #, fuzzy
 msgid "Get Away Message"
 msgstr "Nuovo messaggio di assenza"
 
-#: src/gtkconv.c:1524 src/gtkrequest.c:267
-msgid "Remove"
-msgstr "Rimuovi"
-
-#: src/gtkconv.c:2236
+#: ../src/gtkconv.c:1634
+#, fuzzy
+msgid "Last said"
+msgstr "Cognome:"
+
+#: ../src/gtkconv.c:2378
 msgid "Unable to save icon file to disk."
 msgstr "Impossibile salvare il file dell'icona sul disco."
 
-#: src/gtkconv.c:2259
+#: ../src/gtkconv.c:2402
 msgid "Save Icon"
 msgstr "Salva l'icona"
 
-#: src/gtkconv.c:2308
+#: ../src/gtkconv.c:2451
 msgid "Animate"
 msgstr "Anima"
 
-#: src/gtkconv.c:2313
+#: ../src/gtkconv.c:2456
 msgid "Hide Icon"
 msgstr "Nascondi l'icona"
 
-#: src/gtkconv.c:2319
+#: ../src/gtkconv.c:2462
 msgid "Save Icon As..."
 msgstr "Salva l'icona con nome..."
 
 #. Conversation menu
-#: src/gtkconv.c:2367
+#: ../src/gtkconv.c:2602
 msgid "/_Conversation"
 msgstr "/_Conversazione"
 
-#: src/gtkconv.c:2369
+#: ../src/gtkconv.c:2604
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Contatti/Nuovo _messaggio immediato..."
 
-#: src/gtkconv.c:2374
+#: ../src/gtkconv.c:2609
 msgid "/Conversation/_Find..."
 msgstr "/Conversazione/_Trova..."
 
-#: src/gtkconv.c:2376
+#: ../src/gtkconv.c:2611
 msgid "/Conversation/View _Log"
 msgstr "/Conversazione/Mostra il _log"
 
-#: src/gtkconv.c:2377
+#: ../src/gtkconv.c:2612
 msgid "/Conversation/_Save As..."
 msgstr "/Conversazione/_Salva con nome..."
 
-#: src/gtkconv.c:2379
-msgid "/Conversation/Clear"
+#: ../src/gtkconv.c:2614
+#, fuzzy
+msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Conversazione/Pulisci"
 
-#: src/gtkconv.c:2383
+#: ../src/gtkconv.c:2618
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversazione/_Invia file..."
 
-#: src/gtkconv.c:2384
+#: ../src/gtkconv.c:2619
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversazione/Aggiungi un _allarme..."
 
-#: src/gtkconv.c:2386
+#: ../src/gtkconv.c:2621
 msgid "/Conversation/_Get Info"
 msgstr "/Conversazione/_Info"
 
-#: src/gtkconv.c:2388
+#: ../src/gtkconv.c:2623
 msgid "/Conversation/In_vite..."
 msgstr "/Conversazione/In_vita..."
 
-#: src/gtkconv.c:2393
-#, fuzzy
+#: ../src/gtkconv.c:2625
+#, fuzzy
+msgid "/Conversation/M_ore"
+msgstr "/Conversazione/_Chiudi"
+
+#: ../src/gtkconv.c:2629
 msgid "/Conversation/Al_ias..."
-msgstr "/Conversazione/Alias..."
-
-#: src/gtkconv.c:2395
+msgstr "/Conversazione/Al_ias..."
+
+#: ../src/gtkconv.c:2631
 msgid "/Conversation/_Block..."
 msgstr "/Conversazione/_Blocca..."
 
-#: src/gtkconv.c:2397
+#: ../src/gtkconv.c:2633
 msgid "/Conversation/_Add..."
 msgstr "/Conversazione/_Aggiungi..."
 
-#: src/gtkconv.c:2399
+#: ../src/gtkconv.c:2635
 msgid "/Conversation/_Remove..."
 msgstr "/Conversazione/_Rimuovi..."
 
-#: src/gtkconv.c:2404
+#: ../src/gtkconv.c:2640
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Conversazione/Inserisci un _collegamento..."
 
-#: src/gtkconv.c:2406
+#: ../src/gtkconv.c:2642
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Conversazione/Inserisci un'imma_gine..."
 
-#: src/gtkconv.c:2411
+#: ../src/gtkconv.c:2647
 msgid "/Conversation/_Close"
 msgstr "/Conversazione/_Chiudi"
 
 #. Options
-#: src/gtkconv.c:2415
+#: ../src/gtkconv.c:2651
 msgid "/_Options"
 msgstr "/_Opzioni"
 
-#: src/gtkconv.c:2416
+#: ../src/gtkconv.c:2652
 msgid "/Options/Enable _Logging"
 msgstr "/Opzioni/Abilita il _log"
 
-#: src/gtkconv.c:2417
+#: ../src/gtkconv.c:2653
 msgid "/Options/Enable _Sounds"
 msgstr "/Opzioni/Abilita i _suoni"
 
-#: src/gtkconv.c:2418
-#, fuzzy
+#: ../src/gtkconv.c:2654
+msgid "/Options/Show Buddy _Icon"
+msgstr "/Opzioni/Mostra l'_icona del contatto"
+
+#: ../src/gtkconv.c:2656
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Opzioni/Mostra la _barra di formattazione"
 
-#: src/gtkconv.c:2419
-#, fuzzy
+#: ../src/gtkconv.c:2657
 msgid "/Options/Show Ti_mestamps"
-msgstr "/Opzioni/Mostra i timestamp"
-
-#: src/gtkconv.c:2420
-#, fuzzy
-msgid "/Options/Show Buddy _Icon"
-msgstr "Mostra le _icone dei contatti"
-
-#: src/gtkconv.c:2460
+msgstr "/Opzioni/Mostra i ti_mestamp"
+
+#: ../src/gtkconv.c:2732
+#, fuzzy
+msgid "/Conversation/More"
+msgstr "/Conversazione/_Chiudi"
+
+#: ../src/gtkconv.c:2770 ../src/gtkconv.c:2797
+msgid "/Conversation"
+msgstr "/Conversazione"
+
+#: ../src/gtkconv.c:2807
 msgid "/Conversation/View Log"
 msgstr "/Conversazione/Mostra il log"
 
-#: src/gtkconv.c:2466
+#: ../src/gtkconv.c:2813
 msgid "/Conversation/Send File..."
 msgstr "/Conversazione/Invia file..."
 
-#: src/gtkconv.c:2470
+#: ../src/gtkconv.c:2817
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversazione/Aggiungi un allarme..."
 
-#: src/gtkconv.c:2476
+#: ../src/gtkconv.c:2823
 msgid "/Conversation/Get Info"
 msgstr "/Conversazione/Info"
 
-#: src/gtkconv.c:2480
+#: ../src/gtkconv.c:2827
 msgid "/Conversation/Invite..."
 msgstr "/Conversazione/Invita..."
 
-#: src/gtkconv.c:2486
+#: ../src/gtkconv.c:2833
 msgid "/Conversation/Alias..."
 msgstr "/Conversazione/Alias..."
 
-#: src/gtkconv.c:2490
+#: ../src/gtkconv.c:2837
 msgid "/Conversation/Block..."
 msgstr "/Conversazione/Blocca..."
 
-#: src/gtkconv.c:2494
+#: ../src/gtkconv.c:2841
 msgid "/Conversation/Add..."
 msgstr "/Conversazione/Aggiungi..."
 
-#: src/gtkconv.c:2498
+#: ../src/gtkconv.c:2845
 msgid "/Conversation/Remove..."
 msgstr "/Conversazione/Rimuovi..."
 
-#: src/gtkconv.c:2504
+#: ../src/gtkconv.c:2851
 msgid "/Conversation/Insert Link..."
 msgstr "/Conversazione/Inserisci un link..."
 
-#: src/gtkconv.c:2508
+#: ../src/gtkconv.c:2855
 msgid "/Conversation/Insert Image..."
 msgstr "/Conversazione/Inserisci un'immagine..."
 
-#: src/gtkconv.c:2514
+#: ../src/gtkconv.c:2861
 msgid "/Options/Enable Logging"
 msgstr "/Opzioni/Abilita il log"
 
-#: src/gtkconv.c:2517
+#: ../src/gtkconv.c:2864
 msgid "/Options/Enable Sounds"
 msgstr "/Opzioni/Abilita i suoni"
 
-#: src/gtkconv.c:2520
-#, fuzzy
+#: ../src/gtkconv.c:2877
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Opzioni/Mostra la barra di formattazione"
 
-#: src/gtkconv.c:2523
+#: ../src/gtkconv.c:2880
 msgid "/Options/Show Timestamps"
 msgstr "/Opzioni/Mostra i timestamp"
 
-#: src/gtkconv.c:2526
-#, fuzzy
+#: ../src/gtkconv.c:2883
 msgid "/Options/Show Buddy Icon"
-msgstr "Mostra le _icone dei contatti"
-
-#: src/gtkconv.c:2597
+msgstr "/Opzioni/Mostra l'icona del contatto"
+
+#: ../src/gtkconv.c:2963
 msgid "User is typing..."
 msgstr "L'utente sta scrivendo..."
 
-#: src/gtkconv.c:2602
-msgid "User has typed something and paused"
+#: ../src/gtkconv.c:2966
+#, fuzzy
+msgid "User has typed something and stopped"
 msgstr "L'utente ha scritto qualcosa ed ora  in pausa"
 
-#. Build the Send As menu
-#: src/gtkconv.c:2740
-#, fuzzy
+#. Build the Send To menu
+#: ../src/gtkconv.c:3149
 msgid "_Send To"
-msgstr "_Invia come"
-
-#: src/gtkconv.c:3373
+msgstr "_Invia a"
+
+#: ../src/gtkconv.c:3801
+msgid "_Send"
+msgstr "_Invia"
+
+#: ../src/gtkconv.c:3856 ../src/protocols/sametime/sametime.c:3564
 msgid "Topic:"
 msgstr "Argomento:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3421
+#: ../src/gtkconv.c:3908
 msgid "0 people in room"
 msgstr "0 persone nella stanza"
 
-#: src/gtkconv.c:3500
+#: ../src/gtkconv.c:3987
 msgid "IM the user"
 msgstr "Invia un messaggio immediato all'utente"
 
-#: src/gtkconv.c:3513
+#: ../src/gtkconv.c:4000
 msgid "Ignore the user"
 msgstr "Ignora l'utente"
 
-#: src/gtkconv.c:3525
+#: ../src/gtkconv.c:4012
 msgid "Get the user's information"
 msgstr "Informazioni sull'utente"
 
-#: src/gtkconv.c:4360 src/gtkconv.c:4462 src/gtkconv.c:4517
+#: ../src/gtkconv.c:4998 ../src/gtkconv.c:5107
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d persona nella stanza"
 msgstr[1] "%d persone nella stanza"
 
-#: src/gtkconv.c:5582
+#: ../src/gtkconv.c:5664 ../src/gtkstatusbox.c:366
+#, fuzzy
+msgid "Typing"
+msgstr "Ping"
+
+#: ../src/gtkconv.c:5670
+msgid "Stopped Typing"
+msgstr "Ha smesso di scrivere"
+
+#: ../src/gtkconv.c:5675
+#, fuzzy
+msgid "Nick Said"
+msgstr "Nickname"
+
+#: ../src/gtkconv.c:5685
+msgid "New Event"
+msgstr "Nuovo evento"
+
+#: ../src/gtkconv.c:6575
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -2722,12 +3292,12 @@
 "say &lt;message&gt;: Invia un messaggio normalmente, come se non stessi "
 "utilizzando un comando."
 
-#: src/gtkconv.c:5585
+#: ../src/gtkconv.c:6578
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;azione&gt;: Invia un'azione in stile IRC ad un contatto o ad una chat."
 
-#: src/gtkconv.c:5588
+#: ../src/gtkconv.c:6581
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -2735,411 +3305,475 @@
 "debug &lt;opzione&gt;: Invia diverse informazioni di debug alla "
 "conversazione corrente."
 
-#: src/gtkconv.c:5591
+#: ../src/gtkconv.c:6584
 #, fuzzy
 msgid "clear: Clears the conversation scrollback."
 msgstr "%s ha chiuso la finestra di conversazione."
 
-#: src/gtkconv.c:5594
+#: ../src/gtkconv.c:6587
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;comando&gt;: Aiuto su un comando specifico."
 
-#: src/gtkconv.c:5709
+#: ../src/gtkconv.c:6746
 #, fuzzy
 msgid "Confirm close"
 msgstr "Conferma account"
 
-#: src/gtkconv.c:5741
+#: ../src/gtkconv.c:6778
 #, fuzzy
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "Sei sicuro di voler eliminare %s?"
 
-#: src/gtkconv.c:6408
+#: ../src/gtkconv.c:7300
+msgid "Close other tabs"
+msgstr "Chiudi le altre schede"
+
+#: ../src/gtkconv.c:7306
+msgid "Close all tabs"
+msgstr "Chiudi tutte le schede"
+
+#: ../src/gtkconv.c:7314
+msgid "Detach this tab"
+msgstr "Stacca questa scheda"
+
+#: ../src/gtkconv.c:7320
+msgid "Close this tab"
+msgstr "Chiudi questa scheda"
+
+#: ../src/gtkconv.c:7580
 msgid "Close conversation"
 msgstr "Chiudi la conversazione"
 
-#: src/gtkconv.c:6872
+#: ../src/gtkconv.c:8044
 msgid "Last created window"
 msgstr "Ultima finestra creata"
 
-#: src/gtkconv.c:6874
+#: ../src/gtkconv.c:8046
 msgid "Separate IM and Chat windows"
 msgstr "Separa le finestre dei MI e delle chat"
 
-#: src/gtkconv.c:6876 src/gtkprefs.c:1205
+#: ../src/gtkconv.c:8048 ../src/gtkprefs.c:1258
 msgid "New window"
 msgstr "Nuova finestra"
 
-#: src/gtkconv.c:6878
+#: ../src/gtkconv.c:8050
 msgid "By group"
 msgstr "Per gruppo"
 
-#: src/gtkconv.c:6880
+#: ../src/gtkconv.c:8052
 msgid "By account"
 msgstr "Per account"
 
-#: src/gtkdebug.c:232
+#: ../src/gtkdebug.c:232
 msgid "Save Debug Log"
 msgstr "Salva il log di debug"
 
-#: src/gtkdebug.c:586
-#, fuzzy
+#: ../src/gtkdebug.c:586
 msgid "Invert"
-msgstr "_Inserisci"
-
-#: src/gtkdebug.c:589
+msgstr "Inverti"
+
+#: ../src/gtkdebug.c:589
 msgid "Highlight matches"
 msgstr ""
 
-#: src/gtkdebug.c:636
+#: ../src/gtkdebug.c:636
 msgid "Debug Window"
 msgstr "Finestra di debug"
 
-#: src/gtkdebug.c:689
-#, fuzzy
+#: ../src/gtkdebug.c:689
 msgid "Clear"
-msgstr "Chiudi"
-
-#: src/gtkdebug.c:698
+msgstr "Pulisci"
+
+#: ../src/gtkdebug.c:698
 msgid "Pause"
 msgstr "Pausa"
 
-#: src/gtkdebug.c:705 src/gtkdebug.c:706
+#: ../src/gtkdebug.c:705 ../src/gtkdebug.c:706
 msgid "Timestamps"
 msgstr "Timestamp"
 
-#: src/gtkdebug.c:724
-#, fuzzy
+#: ../src/gtkdebug.c:724
 msgid "Filter"
-msgstr "Fallito"
-
-#: src/gtkdebug.c:743
-#, fuzzy
+msgstr "Filtro"
+
+#: ../src/gtkdebug.c:743
 msgid "Right click for more options."
-msgstr "Mostra pi opzioni"
-
-#: src/gtkdialogs.c:59 src/gtkdialogs.c:90
+msgstr "Fai clic col tasto destro per altre opzioni."
+
+#: ../src/gtkdialogs.c:61 ../src/gtkdialogs.c:104
 msgid "lead developer"
 msgstr "sviluppatore principale"
 
-#: src/gtkdialogs.c:60 src/gtkdialogs.c:63 src/gtkdialogs.c:64
-#: src/gtkdialogs.c:65 src/gtkdialogs.c:66 src/gtkdialogs.c:67
-#: src/gtkdialogs.c:69 src/gtkdialogs.c:70 src/gtkdialogs.c:71
+#: ../src/gtkdialogs.c:62 ../src/gtkdialogs.c:63 ../src/gtkdialogs.c:65
+#: ../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 "sviluppatore"
 
-#: src/gtkdialogs.c:61
+#: ../src/gtkdialogs.c:64
+msgid "win32 port"
+msgstr "port su win32"
+
+#: ../src/gtkdialogs.c:67
 msgid "developer & webmaster"
 msgstr "sviluppatore e webmaster"
 
-#: src/gtkdialogs.c:62
-msgid "win32 port"
-msgstr "port su win32"
-
-#: src/gtkdialogs.c:68
+#: ../src/gtkdialogs.c:74
 msgid "support"
 msgstr "supporto"
 
-#: src/gtkdialogs.c:88 src/gtkdialogs.c:91
+#: ../src/gtkdialogs.c:97 ../src/gtkdialogs.c:98
 msgid "maintainer"
 msgstr "maintainer"
 
-#: src/gtkdialogs.c:89
-#, fuzzy
+#: ../src/gtkdialogs.c:99
 msgid "libfaim maintainer"
-msgstr "precedente maintainer della libfaim"
-
-#: src/gtkdialogs.c:92
-#, fuzzy
+msgstr "Maintainer della libfaim"
+
+#. If "lazy bum" translates literally into a serious insult, use something else or omit it.
+#: ../src/gtkdialogs.c:101
+msgid "hacker and designated driver [lazy bum]"
+msgstr "hacker e autista designato [lazy bum]"
+
+#: ../src/gtkdialogs.c:102
 msgid "Jabber developer"
-msgstr "precedente sviluppatore per Jabber"
-
-#: src/gtkdialogs.c:93
+msgstr "Sviluppatore per Jabber"
+
+#: ../src/gtkdialogs.c:103
 msgid "original author"
 msgstr "autore originale"
 
-#: src/gtkdialogs.c:94
-msgid "hacker and designated driver [lazy bum]"
-msgstr "hacker e autista designato [lazy bum]"
-
-#: src/gtkdialogs.c:99 src/gtkdialogs.c:100 src/gtkdialogs.c:144
+#: ../src/gtkdialogs.c:110 ../src/gtkdialogs.c:111 ../src/gtkdialogs.c:174
 msgid "Bulgarian"
 msgstr "Bulgaro"
 
-#: src/gtkdialogs.c:101
-#, fuzzy
+#: ../src/gtkdialogs.c:112 ../src/gtkdialogs.c:113
+msgid "Bengali"
+msgstr "Bengali"
+
+#: ../src/gtkdialogs.c:114
 msgid "Bosnian"
-msgstr "Estone"
-
-#: src/gtkdialogs.c:102 src/gtkdialogs.c:145 src/gtkdialogs.c:146
+msgstr "Bosniaco"
+
+#: ../src/gtkdialogs.c:115 ../src/gtkdialogs.c:175 ../src/gtkdialogs.c:176
 msgid "Catalan"
 msgstr "Catalano"
 
-#: src/gtkdialogs.c:103 src/gtkdialogs.c:147
+#: ../src/gtkdialogs.c:116 ../src/gtkdialogs.c:117
+msgid "Valencian-Catalan"
+msgstr ""
+
+#: ../src/gtkdialogs.c:118 ../src/gtkdialogs.c:177
 msgid "Czech"
 msgstr "Ceco"
 
-#: src/gtkdialogs.c:104
+#: ../src/gtkdialogs.c:119
 msgid "Danish"
 msgstr "Danese"
 
-#: src/gtkdialogs.c:105 src/gtkdialogs.c:148
+#: ../src/gtkdialogs.c:120 ../src/gtkdialogs.c:121 ../src/gtkdialogs.c:178
 msgid "German"
 msgstr "Tedesco"
 
-#: src/gtkdialogs.c:106
+#: ../src/gtkdialogs.c:122 ../src/gtkdialogs.c:123
+msgid "Greek"
+msgstr "Greco"
+
+#: ../src/gtkdialogs.c:124
 msgid "Australian English"
 msgstr "Inglese Australiano"
 
-#: src/gtkdialogs.c:107
+#: ../src/gtkdialogs.c:125
+msgid "Canadian English"
+msgstr "Inglese Canadese"
+
+#: ../src/gtkdialogs.c:126
 msgid "British English"
 msgstr "Inglese Britannico"
 
-#: src/gtkdialogs.c:108
-msgid "Canadian English"
-msgstr "Inglese Canadese"
-
-#: src/gtkdialogs.c:109 src/gtkdialogs.c:149
+#: ../src/gtkdialogs.c:127 ../src/gtkdialogs.c:179 ../src/gtkdialogs.c:180
+#: ../src/gtkdialogs.c:181 ../src/gtkdialogs.c:182
 msgid "Spanish"
 msgstr "Spagnolo"
 
-#: src/gtkdialogs.c:110 src/gtkdialogs.c:150
+#: ../src/gtkdialogs.c:128 ../src/gtkdialogs.c:129
+msgid "Euskera(Basque)"
+msgstr ""
+
+#: ../src/gtkdialogs.c:130 ../src/gtkdialogs.c:131
+msgid "Persian"
+msgstr "Persiano"
+
+#: ../src/gtkdialogs.c:132 ../src/gtkdialogs.c:183 ../src/gtkdialogs.c:184
 msgid "Finnish"
 msgstr "Finlandese"
 
-#: src/gtkdialogs.c:111 src/gtkdialogs.c:151
+#: ../src/gtkdialogs.c:133 ../src/gtkdialogs.c:185 ../src/gtkdialogs.c:186
+#: ../src/gtkdialogs.c:187 ../src/gtkdialogs.c:188
 msgid "French"
 msgstr "Francese"
 
-#: src/gtkdialogs.c:112
+#: ../src/gtkdialogs.c:134
+#, fuzzy
+msgid "Galician"
+msgstr "Italiano"
+
+#: ../src/gtkdialogs.c:135 ../src/gtkdialogs.c:189
 msgid "Hebrew"
 msgstr "Ebraico"
 
-#: src/gtkdialogs.c:113
+#: ../src/gtkdialogs.c:136
 msgid "Hindi"
 msgstr "Hindi"
 
-#: src/gtkdialogs.c:114
+#: ../src/gtkdialogs.c:137
 msgid "Hungarian"
 msgstr "Ungherese"
 
-#: src/gtkdialogs.c:115 src/gtkdialogs.c:152
+#: ../src/gtkdialogs.c:138 ../src/gtkdialogs.c:190
 msgid "Italian"
 msgstr "Italiano"
 
-#: src/gtkdialogs.c:116 src/gtkdialogs.c:153
+#: ../src/gtkdialogs.c:139 ../src/gtkdialogs.c:191 ../src/gtkdialogs.c:192
+#: ../src/gtkdialogs.c:193
 msgid "Japanese"
 msgstr "Giapponese"
 
-#: src/gtkdialogs.c:117
-msgid "Lithuanian"
-msgstr "Lituano"
-
-#: src/gtkdialogs.c:118
+#: ../src/gtkdialogs.c:140 ../src/gtkdialogs.c:194
 msgid "Georgian"
 msgstr "Georgiano"
 
-#: src/gtkdialogs.c:119 src/gtkdialogs.c:154
+#: ../src/gtkdialogs.c:141 ../src/gtkdialogs.c:195
 msgid "Korean"
 msgstr "Coreano"
 
-#: src/gtkdialogs.c:120
+#: ../src/gtkdialogs.c:142 ../src/gtkdialogs.c:143 ../src/gtkdialogs.c:144
+msgid "Kurdish"
+msgstr "Curdo"
+
+#: ../src/gtkdialogs.c:145 ../src/gtkdialogs.c:196 ../src/gtkdialogs.c:197
+msgid "Lithuanian"
+msgstr "Lituano"
+
+#: ../src/gtkdialogs.c:146
+msgid "Macedonian"
+msgstr "Macedone"
+
+#: ../src/gtkdialogs.c:147
 #, fuzzy
 msgid "Dutch, Flemish"
 msgstr "Olandese; Fiammingo"
 
-#: src/gtkdialogs.c:121
-msgid "Macedonian"
-msgstr "Macedone"
-
-#: src/gtkdialogs.c:122
+#: ../src/gtkdialogs.c:148
 msgid "Norwegian"
 msgstr "Norvegese"
 
-#: src/gtkdialogs.c:123 src/gtkdialogs.c:124 src/gtkdialogs.c:155
+#: ../src/gtkdialogs.c:149 ../src/gtkdialogs.c:150 ../src/gtkdialogs.c:198
 msgid "Polish"
 msgstr "Polacco"
 
-#: src/gtkdialogs.c:125
+#: ../src/gtkdialogs.c:151
 msgid "Portuguese"
 msgstr "Portoghese"
 
-#: src/gtkdialogs.c:126
+#: ../src/gtkdialogs.c:152
 msgid "Portuguese-Brazil"
 msgstr "Portoghese-Brasile"
 
-#: src/gtkdialogs.c:127
+#: ../src/gtkdialogs.c:153
 msgid "Romanian"
 msgstr "Rumeno"
 
-#: src/gtkdialogs.c:128 src/gtkdialogs.c:156 src/gtkdialogs.c:157
+#: ../src/gtkdialogs.c:154 ../src/gtkdialogs.c:199 ../src/gtkdialogs.c:200
 msgid "Russian"
 msgstr "Russo"
 
-#: src/gtkdialogs.c:129 src/gtkdialogs.c:130
+#: ../src/gtkdialogs.c:155 ../src/gtkdialogs.c:156
 msgid "Serbian"
 msgstr "Serbo"
 
-#: src/gtkdialogs.c:131
+#: ../src/gtkdialogs.c:157 ../src/gtkdialogs.c:201
+msgid "Slovak"
+msgstr "Slovacco"
+
+#: ../src/gtkdialogs.c:158
 msgid "Slovenian"
 msgstr "Sloveno"
 
-#: src/gtkdialogs.c:132 src/gtkdialogs.c:159
+#: ../src/gtkdialogs.c:159 ../src/gtkdialogs.c:202
 msgid "Swedish"
 msgstr "Svedese"
 
-#: src/gtkdialogs.c:133
+#: ../src/gtkdialogs.c:160
+#, fuzzy
+msgid "Tamil"
+msgstr "Terminale"
+
+#: ../src/gtkdialogs.c:161
 msgid "Telugu"
 msgstr ""
 
-#: src/gtkdialogs.c:134
+#: ../src/gtkdialogs.c:162
+#, fuzzy
+msgid "Thai"
+msgstr "Terminale"
+
+#: ../src/gtkdialogs.c:163
+msgid "Turkish"
+msgstr "Turco"
+
+#: ../src/gtkdialogs.c:164
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: src/gtkdialogs.c:134
+#: ../src/gtkdialogs.c:164
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh e il Team Gnome-Vi"
 
-#: src/gtkdialogs.c:135 src/gtkdialogs.c:160
+#: ../src/gtkdialogs.c:165 ../src/gtkdialogs.c:203
 msgid "Simplified Chinese"
 msgstr "Cinese semplificato"
 
-#: src/gtkdialogs.c:136 src/gtkdialogs.c:137 src/gtkdialogs.c:161
+#: ../src/gtkdialogs.c:166 ../src/gtkdialogs.c:167 ../src/gtkdialogs.c:204
 msgid "Traditional Chinese"
 msgstr "Cinese tradizionale"
 
-#: src/gtkdialogs.c:143
+#: ../src/gtkdialogs.c:173
 msgid "Amharic"
 msgstr "Amarico"
 
-#: src/gtkdialogs.c:158
-msgid "Slovak"
-msgstr "Slovacco"
-
-#: src/gtkdialogs.c:202
+#: ../src/gtkdialogs.c:245
 msgid "About Gaim"
 msgstr "Informazioni su Gaim"
 
-#: src/gtkdialogs.c:226
-#, fuzzy
+#: ../src/gtkdialogs.c:269
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
-"at once.  It is written using GTK+ and is licensed under the GNU GPL.<BR><BR>"
-msgstr ""
-"Gaim  un client modulare per messaggi immediati in grado di usare AIM, MSN, "
-"Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr e Gadu-"
-"Gadu allo stesso tempo.  scritto utilizzando Gtk+ ed  distribuito sotto "
-"licenza GPL.<BR><BR>"
-
-#: src/gtkdialogs.c:235
+"Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, "
+"and Gadu-Gadu all at once.  It is written using GTK+.<BR><BR>You may modify "
+"and redistribute the program under the terms of the GPL (version 2 or "
+"later).  A copy of the GPL is contained in the 'COPYING' file distributed "
+"with Gaim.  Gaim is copyrighted by its contributors.  See the 'COPYRIGHT' "
+"file for the complete list of contributors.  We provide no warranty for this "
+"program.<BR><BR>"
+msgstr ""
+"Gaim  un client modulare per messaggi in grado di usare allo stesso tempo i "
+"protocolli AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus "
+"Sametime, Napster, Zephyr, e Gadu-Gadu.  scritto utilizzando GTK+."
+"<BR><BR>You may modify and redistribute the program under the terms of the "
+"GPL (version 2 or later).  A copy of the GPL is contained in the 'COPYING' "
+"file distributed with Gaim.  Gaim is copyrighted by its contributors.  See "
+"the 'COPYRIGHT' file for the complete list of contributors.  We provide no "
+"warranty for this program.<BR><BR>"
+
+#: ../src/gtkdialogs.c:283
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #wingaim su irc.freenode.net<BR><BR>"
 
-#: src/gtkdialogs.c:238
+#: ../src/gtkdialogs.c:286
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #gaim su irc.freenode.net<BR><BR>"
 
-#: src/gtkdialogs.c:244
-msgid "Active Developers"
-msgstr "Sviluppatori attivi"
-
-#: src/gtkdialogs.c:259
+#: ../src/gtkdialogs.c:292
+msgid "Current Developers"
+msgstr "Sviluppatori attuali"
+
+#: ../src/gtkdialogs.c:307
 msgid "Crazy Patch Writers"
 msgstr "I pazzi scrittori di patch"
 
-#: src/gtkdialogs.c:274
+#: ../src/gtkdialogs.c:322
 msgid "Retired Developers"
 msgstr "Sviluppatori ritirati"
 
-#: src/gtkdialogs.c:289
+#: ../src/gtkdialogs.c:337
 msgid "Current Translators"
 msgstr "Traduttori attuali"
 
-#: src/gtkdialogs.c:309
+#: ../src/gtkdialogs.c:357
 msgid "Past Translators"
 msgstr "Traduttori precedenti"
 
-#: src/gtkdialogs.c:327
-#, fuzzy
+#: ../src/gtkdialogs.c:375
 msgid "Debugging Information"
-msgstr "Informazioni sull'utente"
-
-#: src/gtkdialogs.c:489 src/gtkdialogs.c:630 src/gtkdialogs.c:685
-#, fuzzy
+msgstr "Informazioni di debug"
+
+#: ../src/gtkdialogs.c:595 ../src/gtkdialogs.c:732 ../src/gtkdialogs.c:795
 msgid "_Name"
-msgstr "Nome"
-
-#: src/gtkdialogs.c:494 src/gtkdialogs.c:635 src/gtkdialogs.c:690
+msgstr "_Nome"
+
+#: ../src/gtkdialogs.c:600 ../src/gtkdialogs.c:737 ../src/gtkdialogs.c:800
 msgid "_Account"
 msgstr "_Account"
 
-#: src/gtkdialogs.c:502
+#: ../src/gtkdialogs.c:608
 msgid "New Instant Message"
 msgstr "Nuovo messaggio immediato"
 
-#: src/gtkdialogs.c:504
-#, fuzzy
+#: ../src/gtkdialogs.c:610
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr ""
-"Inserisci il nome utente della persona alla quale vuoi inviare un messaggio "
-"immediato."
-
-#: src/gtkdialogs.c:643
+"Inserisci il nome utente o l'alias della persona alla quale vuoi inviare un "
+"messaggio immediato."
+
+#: ../src/gtkdialogs.c:745
 msgid "Get User Info"
 msgstr "Informazioni sull'utente"
 
-#: src/gtkdialogs.c:645
-#, fuzzy
+#: ../src/gtkdialogs.c:747
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
-msgstr "Inserisci il nome utente della persona sulla quale vuoi informazioni."
-
-#: src/gtkdialogs.c:699
-#, fuzzy
+msgstr ""
+"Inserisci il nome utente o l'alias della persona della quale vuoi "
+"informazioni."
+
+#: ../src/gtkdialogs.c:819
 msgid "View User Log"
-msgstr "Log dell'utente"
-
-#: src/gtkdialogs.c:701
-#, fuzzy
+msgstr "Mostra il log dell'utente"
+
+#: ../src/gtkdialogs.c:821
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
-msgstr "Inserisci il nome utente della persona della quale vuoi vedere il log."
-
-#: src/gtkdialogs.c:720
+msgstr ""
+"Inserisci il nome utente o l'alias della persona della quale vuoi vedere il "
+"log."
+
+#: ../src/gtkdialogs.c:840
 msgid "Alias Contact"
 msgstr "Imposta un alias per la lista"
 
-#: src/gtkdialogs.c:721
+#: ../src/gtkdialogs.c:841
 msgid "Enter an alias for this contact."
 msgstr "Inserisci un alias per questa lista."
 
-#: src/gtkdialogs.c:723 src/gtkdialogs.c:745 src/gtkdialogs.c:765
-#: src/gtkrequest.c:269 src/protocols/silc/chat.c:585
+#: ../src/gtkdialogs.c:843 ../src/gtkdialogs.c:865 ../src/gtkdialogs.c:885
+#: ../src/gtkrequest.c:277 ../src/protocols/silc/chat.c:587
 msgid "Alias"
 msgstr "Alias"
 
-#: src/gtkdialogs.c:741
+#: ../src/gtkdialogs.c:861
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Inserisci un alias per %s."
 
-#: src/gtkdialogs.c:743
+#: ../src/gtkdialogs.c:863
 msgid "Alias Buddy"
 msgstr "Imposta un alias per il contatto"
 
-#: src/gtkdialogs.c:762
+#: ../src/gtkdialogs.c:882
 msgid "Alias Chat"
 msgstr "Imposta un alias per la chat"
 
-#: src/gtkdialogs.c:763
+#: ../src/gtkdialogs.c:883
 msgid "Enter an alias for this chat."
 msgstr "Inserisci un alias per questa chat."
 
-#: src/gtkdialogs.c:800
+#: ../src/gtkdialogs.c:920
 #, fuzzy, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -3154,7 +3788,15 @@
 "Stai per rimuovere la lista contenente %s e altri %d contatti dalla tua "
 "lista contatti. Vuoi continuare?"
 
-#: src/gtkdialogs.c:867
+#: ../src/gtkdialogs.c:928
+msgid "Remove Contact"
+msgstr "Rimuovi lista"
+
+#: ../src/gtkdialogs.c:929
+msgid "_Remove Contact"
+msgstr "_Rimuovi contatto"
+
+#: ../src/gtkdialogs.c:980
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -3163,21 +3805,29 @@
 "Stai per rimuovere il gruppo %s e tutti i suoi membri dalla tua lista "
 "contatti. Vuoi continuare?"
 
-#: src/gtkdialogs.c:870 src/gtkdialogs.c:871
+#: ../src/gtkdialogs.c:983
 msgid "Remove Group"
 msgstr "Rimuovi il gruppo"
 
-#: src/gtkdialogs.c:909
+#: ../src/gtkdialogs.c:984
+msgid "_Remove Group"
+msgstr "_Rimuovi gruppo"
+
+#: ../src/gtkdialogs.c:1017
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Stai per rimuovere %s dalla tua lista contatti. Vuoi continuare?"
 
-#: src/gtkdialogs.c:912 src/gtkdialogs.c:913
+#: ../src/gtkdialogs.c:1020
 msgid "Remove Buddy"
 msgstr "Rimuovi il contatto"
 
-#: src/gtkdialogs.c:951
+#: ../src/gtkdialogs.c:1021
+msgid "_Remove Buddy"
+msgstr "_Rimuovi il contatto"
+
+#: ../src/gtkdialogs.c:1042
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -3185,171 +3835,188 @@
 msgstr ""
 "Stai per rimuovere la chat %s dalla tua lista contatti. Vuoi continuare?"
 
-#: src/gtkdialogs.c:954 src/gtkdialogs.c:955
+#: ../src/gtkdialogs.c:1045
 msgid "Remove Chat"
 msgstr "Rimuovi la chat"
 
-#: src/gtkft.c:138
+#: ../src/gtkdialogs.c:1046
+msgid "_Remove Chat"
+msgstr "_Rimuovi chat"
+
+#: ../src/gtkft.c:133
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f KB/s"
 
-#: src/gtkft.c:159 src/gtkft.c:1035
+#: ../src/gtkft.c:153
+#, fuzzy
+msgid "Not started"
+msgstr "Non supportato"
+
+#: ../src/gtkft.c:162 ../src/gtkft.c:1063
 msgid "Finished"
 msgstr "Completato"
 
-#: src/gtkft.c:162 src/gtkft.c:986
+#: ../src/gtkft.c:165 ../src/gtkft.c:1003
 msgid "Canceled"
 msgstr "Annullato"
 
-#: src/gtkft.c:165 src/gtkft.c:905
+#: ../src/gtkft.c:168 ../src/gtkft.c:922
 msgid "Waiting for transfer to begin"
 msgstr "In attesa dell'inizio del trasferimento"
 
-#: src/gtkft.c:218
+#: ../src/gtkft.c:221
 msgid "<b>Receiving As:</b>"
 msgstr "<b>Ricezione in corso come:</b>"
 
-#: src/gtkft.c:220
+#: ../src/gtkft.c:223
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Ricezione in corso da:</b>"
 
-#: src/gtkft.c:224
+#: ../src/gtkft.c:227
 msgid "<b>Sending To:</b>"
 msgstr "<b>Invio in corso a:</b>"
 
-#: src/gtkft.c:226
+#: ../src/gtkft.c:229
 msgid "<b>Sending As:</b>"
 msgstr "<b>Invio in corso come:</b>"
 
-#: src/gtkft.c:442
+#: ../src/gtkft.c:445
 msgid "There is no application configured to open this type of file."
 msgstr ""
 "Non c' nessuna applicazione configurata per aprire questo tipo di file."
 
-#: src/gtkft.c:447
+#: ../src/gtkft.c:450
 msgid "An error occurred while opening the file."
 msgstr "C' stato un errore nell'apertura del file."
 
-#: src/gtkft.c:467
+#: ../src/gtkft.c:487
 #, fuzzy, c-format
 msgid "Error launching %s: %s"
 msgstr "Errore nell'esecuzione di <b>%s</b>: %s"
 
-#: src/gtkft.c:476
+#: ../src/gtkft.c:496
 #, fuzzy, c-format
 msgid "Error running %s"
 msgstr "Errore nell'ingresso nella chat %s"
 
-#: src/gtkft.c:477
+#: ../src/gtkft.c:497
 #, c-format
 msgid "Process returned error code %d"
-msgstr ""
-
-#: src/gtkft.c:572
+msgstr "Il processo ha restituito il codice d'errore %d"
+
+#: ../src/gtkft.c:591
 msgid "Progress"
 msgstr "Avanzamento"
 
-#: src/gtkft.c:579
+#: ../src/gtkft.c:598
 msgid "Filename"
 msgstr "Nome file"
 
-#: src/gtkft.c:586
+#: ../src/gtkft.c:605
 msgid "Size"
 msgstr "Dimensione"
 
-#: src/gtkft.c:593
+#: ../src/gtkft.c:612
 msgid "Remaining"
 msgstr "Rimanente"
 
-#: src/gtkft.c:624
+#: ../src/gtkft.c:643
 msgid "Filename:"
 msgstr "Nome file:"
 
-#: src/gtkft.c:625
+#: ../src/gtkft.c:644
 msgid "Local File:"
 msgstr "File locale:"
 
-#: src/gtkft.c:626
+#: ../src/gtkft.c:645
 msgid "Status:"
 msgstr "Stato:"
 
-#: src/gtkft.c:627
+#: ../src/gtkft.c:646
 msgid "Speed:"
 msgstr "Velocit:"
 
-#: src/gtkft.c:628
+#: ../src/gtkft.c:647
 msgid "Time Elapsed:"
 msgstr "Tempo trascorso:"
 
-#: src/gtkft.c:629
+#: ../src/gtkft.c:648
 msgid "Time Remaining:"
 msgstr "Tempo rimanente:"
 
-#: src/gtkft.c:715
-msgid "_Keep the dialog open"
-msgstr "_Mantieni la finestra aperta"
-
-#: src/gtkft.c:725
-#, fuzzy
+#: ../src/gtkft.c:710
+msgid "File Transfers"
+msgstr "Trasferimento file"
+
+#: ../src/gtkft.c:733
+msgid "Close this window when all transfers _finish"
+msgstr ""
+"Chiudi questa finestra quando tutti i trasferimenti sono stati _completati"
+
+#: ../src/gtkft.c:743
 msgid "C_lear finished transfers"
 msgstr "_Pulisci i trasferimenti ultimati"
 
 #. "Download Details" arrow
-#: src/gtkft.c:734
-#, fuzzy
+#: ../src/gtkft.c:752
 msgid "File transfer _details"
-msgstr "Nascondi i dettagli del download"
+msgstr "_Dettagli trasferimento file"
 
 #. Pause button
-#: src/gtkft.c:764 src/gtkstock.c:122
+#: ../src/gtkft.c:782 ../src/gtkstock.c:146
 msgid "_Pause"
 msgstr "_Pausa"
 
 #. Resume button
-#: src/gtkft.c:774
+#: ../src/gtkft.c:792
 msgid "_Resume"
 msgstr "_Riprendi"
 
-#: src/gtkft.c:988
+#: ../src/gtkft.c:1005
 msgid "Failed"
 msgstr "Fallito"
 
-#: src/gtkimhtml.c:816
-msgid "Pa_ste As Text"
+#: ../src/gtkimhtml.c:821
+#, fuzzy
+msgid "Paste as Plain _Text"
 msgstr "Incolla come _testo"
 
-#: src/gtkimhtml.c:1313
+#: ../src/gtkimhtml.c:833
+msgid "_Reset formatting"
+msgstr "_Rimuovi la formattazione"
+
+#: ../src/gtkimhtml.c:1327
 msgid "Hyperlink color"
 msgstr "Colore dei collegamenti"
 
-#: src/gtkimhtml.c:1314
+#: ../src/gtkimhtml.c:1328
 msgid "Color to draw hyperlinks."
 msgstr "Colore per disegnare i collegamenti."
 
-#: src/gtkimhtml.c:1317
+#: ../src/gtkimhtml.c:1331
 #, fuzzy
 msgid "Hyperlink prelight color"
 msgstr "Colore dei collegamenti"
 
-#: src/gtkimhtml.c:1318
+#: ../src/gtkimhtml.c:1332
 #, fuzzy
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Colore per disegnare i collegamenti."
 
-#: src/gtkimhtml.c:1537
+#: ../src/gtkimhtml.c:1553
 msgid "_Copy E-Mail Address"
 msgstr "_Copia l'indirizzo e-mail"
 
-#: src/gtkimhtml.c:1549
+#: ../src/gtkimhtml.c:1565
 msgid "_Open Link in Browser"
 msgstr "_Apri il collegamento nel browser"
 
-#: src/gtkimhtml.c:1559
+#: ../src/gtkimhtml.c:1575
 msgid "_Copy Link Location"
 msgstr "_Copia l'indirizzo del collegamento"
 
-#: src/gtkimhtml.c:3234
+#: ../src/gtkimhtml.c:3272
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -3359,7 +4026,7 @@
 "\n"
 "Verr utilizzato il formato predefinito PNG."
 
-#: src/gtkimhtml.c:3237
+#: ../src/gtkimhtml.c:3275
 #, fuzzy
 msgid ""
 "Unrecognized file type\n"
@@ -3370,7 +4037,7 @@
 "\n"
 "Verr utilizzato il formato predefinito PNG."
 
-#: src/gtkimhtml.c:3250
+#: ../src/gtkimhtml.c:3288
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -3382,7 +4049,7 @@
 "\n"
 "%s"
 
-#: src/gtkimhtml.c:3253
+#: ../src/gtkimhtml.c:3291
 #, fuzzy, c-format
 msgid ""
 "Error saving image\n"
@@ -3393,35 +4060,35 @@
 "\n"
 "%s"
 
-#: src/gtkimhtml.c:3333 src/gtkimhtml.c:3345
+#: ../src/gtkimhtml.c:3371 ../src/gtkimhtml.c:3383
 msgid "Save Image"
 msgstr "Salva l'immagine"
 
-#: src/gtkimhtml.c:3373
+#: ../src/gtkimhtml.c:3411
 msgid "_Save Image..."
 msgstr "_Salva l'immagine..."
 
-#: src/gtkimhtmltoolbar.c:147
+#: ../src/gtkimhtmltoolbar.c:147
 msgid "Select Font"
 msgstr "Scegli il carattere"
 
-#: src/gtkimhtmltoolbar.c:226
+#: ../src/gtkimhtmltoolbar.c:226
 msgid "Select Text Color"
 msgstr "Scegli il colore del testo"
 
-#: src/gtkimhtmltoolbar.c:305
+#: ../src/gtkimhtmltoolbar.c:305
 msgid "Select Background Color"
 msgstr "Scegli il colore dello sfondo"
 
-#: src/gtkimhtmltoolbar.c:394
+#: ../src/gtkimhtmltoolbar.c:394
 msgid "_URL"
 msgstr "_URL"
 
-#: src/gtkimhtmltoolbar.c:402
+#: ../src/gtkimhtmltoolbar.c:402
 msgid "_Description"
 msgstr "_Descrizione"
 
-#: src/gtkimhtmltoolbar.c:405
+#: ../src/gtkimhtmltoolbar.c:405
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -3429,141 +4096,158 @@
 "Inserisci l'indirizzo e la descrizione del collegamento che vuoi inserire. "
 "La descrizione  opzionale."
 
-#: src/gtkimhtmltoolbar.c:409
+#: ../src/gtkimhtmltoolbar.c:409
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Immetti l'URL del collegamento che vuoi inserire."
 
-#: src/gtkimhtmltoolbar.c:414
+#: ../src/gtkimhtmltoolbar.c:414
 msgid "Insert Link"
 msgstr "Inserisci un collegamento"
 
-#: src/gtkimhtmltoolbar.c:418
+#: ../src/gtkimhtmltoolbar.c:418
 msgid "_Insert"
 msgstr "_Inserisci"
 
-#: src/gtkimhtmltoolbar.c:487
+#: ../src/gtkimhtmltoolbar.c:487
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Impossibile salvare l'immagine: %s\n"
 
-#: src/gtkimhtmltoolbar.c:513 src/gtkimhtmltoolbar.c:523
+#: ../src/gtkimhtmltoolbar.c:513 ../src/gtkimhtmltoolbar.c:523
 msgid "Insert Image"
 msgstr "Inserisci un'immagine"
 
-#: src/gtkimhtmltoolbar.c:721
+#: ../src/gtkimhtmltoolbar.c:721
 msgid "This theme has no available smileys."
 msgstr "Questo tema non dispone di smiley."
 
 #. show everything
-#: src/gtkimhtmltoolbar.c:735
+#: ../src/gtkimhtmltoolbar.c:735
 msgid "Smile!"
 msgstr "Sorridi!"
 
-#: src/gtkimhtmltoolbar.c:916
+#: ../src/gtkimhtmltoolbar.c:923
 msgid "Bold"
 msgstr "Grassetto"
 
-#: src/gtkimhtmltoolbar.c:927
+#: ../src/gtkimhtmltoolbar.c:934
 msgid "Italic"
 msgstr "Corsivo"
 
-#: src/gtkimhtmltoolbar.c:938
+#: ../src/gtkimhtmltoolbar.c:945
 msgid "Underline"
 msgstr "Sottolineato"
 
-#: src/gtkimhtmltoolbar.c:954
+#: ../src/gtkimhtmltoolbar.c:961
 msgid "Larger font size"
 msgstr "Aumenta la dimensione del carattere"
 
-#: src/gtkimhtmltoolbar.c:966
+#: ../src/gtkimhtmltoolbar.c:973
 msgid "Smaller font size"
 msgstr "Diminuisci la dimensione del carattere"
 
-#: src/gtkimhtmltoolbar.c:983
+#: ../src/gtkimhtmltoolbar.c:990
 msgid "Font Face"
 msgstr "Tipo di carattere"
 
-#: src/gtkimhtmltoolbar.c:995
+#: ../src/gtkimhtmltoolbar.c:1002
 msgid "Foreground font color"
 msgstr "Colore del carattere"
 
-#: src/gtkimhtmltoolbar.c:1007
+#: ../src/gtkimhtmltoolbar.c:1014
 msgid "Background color"
 msgstr "Colore dello sfondo"
 
-#: src/gtkimhtmltoolbar.c:1023
-#, fuzzy
-msgid "Clear formatting"
+#: ../src/gtkimhtmltoolbar.c:1030
+#, fuzzy
+msgid "Reset formatting"
 msgstr "_Rimuovi la formattazione"
 
-#: src/gtkimhtmltoolbar.c:1038
+#: ../src/gtkimhtmltoolbar.c:1045
 msgid "Insert link"
 msgstr "Inserisci un collegamento"
 
-#: src/gtkimhtmltoolbar.c:1048
+#: ../src/gtkimhtmltoolbar.c:1055
 msgid "Insert image"
 msgstr "Inserisci un'immagine"
 
-#: src/gtkimhtmltoolbar.c:1059
+#: ../src/gtkimhtmltoolbar.c:1066
 msgid "Insert smiley"
 msgstr "Inserisci uno smiley"
 
-#: src/gtklog.c:200
+#: ../src/gtklog.c:207
+#, fuzzy, c-format
+msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
+msgstr ""
+"<span size='larger' weight='bold'>Errore nel salvataggio dell'immagine</"
+"span>\n"
+"\n"
+"%s"
+
+#: ../src/gtklog.c:212
 #, fuzzy, c-format
-msgid "Conversation in %s on %s"
-msgstr "Conversazioni con %s"
-
-#: src/gtklog.c:202
-#, fuzzy, c-format
-msgid "Conversation with %s on %s"
-msgstr "Conversazioni con %s"
-
-#: src/gtklog.c:309
+msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
+msgstr ""
+"<span size='larger' weight='bold'>Errore nel salvataggio dell'immagine</"
+"span>\n"
+"\n"
+"%s"
+
+#: ../src/gtklog.c:261
+msgid "%B %Y"
+msgstr ""
+
+#: ../src/gtklog.c:308
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
 msgstr ""
-
-#: src/gtklog.c:313
+"Il log degli eventi di sistema  effettuato soltanto se  abilitata "
+"l'opzione \"Registra nel log di sistema tutti i cambiamenti di stato\"."
+
+#: ../src/gtklog.c:312
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
 msgstr ""
-
-#: src/gtklog.c:316
-msgid ""
-"Chats will only be logged if the \"Log all chats preference\" is enabled."
-msgstr ""
-
-#: src/gtklog.c:320
+"Il log dei messaggi immediati  effettuato soltanto se  abilitata l'opzione "
+"\"Effettua il log di tutti messaggi immediati\"."
+
+#: ../src/gtklog.c:315
+msgid ""
+"Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgstr ""
+"Il log delle chat  effettuato soltanto se  abilitata l'opzione \"Effettua "
+"il log di tutte le chat\"."
+
+#: ../src/gtklog.c:319
 msgid "No logs were found"
-msgstr ""
-
-#: src/gtklog.c:396
-#, fuzzy
+msgstr "Nessun log trovato"
+
+#: ../src/gtklog.c:398
 msgid "Total log size:"
-msgstr "Per dimensione del log"
-
-#: src/gtklog.c:472
+msgstr "Dimensione totale del log:"
+
+#: ../src/gtklog.c:464
 #, fuzzy, c-format
 msgid "Conversations in %s"
 msgstr "Conversazioni con %s"
 
-#: src/gtklog.c:480 src/gtklog.c:531
+#: ../src/gtklog.c:472 ../src/gtklog.c:523
 #, c-format
 msgid "Conversations with %s"
 msgstr "Conversazioni con %s"
 
-#: src/gtklog.c:556
+#: ../src/gtklog.c:548
 msgid "System Log"
 msgstr "Log di sistema"
 
-#: src/gtkmain.c:326
+#: ../src/gtkmain.c:307
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s. Prova con `%s -h' per maggiori informazioni.\n"
 
-#: src/gtkmain.c:328
+#: ../src/gtkmain.c:309
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -3577,46 +4261,69 @@
 "                      account(s) to use, separated by commas)\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
-
-#. TODO: Should save the previous status as a transient status?
-#. Save the newly selected status to prefs.xml and status.xml
-#: src/gtkmain.c:676 src/gtkmain.c:678 src/gtkmain.c:681
-#: src/gtkstatusbox.c:663 src/gtkstatusbox.c:665 src/gtkstatusbox.c:668
-#: src/status.c:1696
-#, fuzzy
-msgid "Default"
-msgstr "Browser predefinito di Gnome"
-
-#. Descriptive label
-#: src/gtknotify.c:275
+"Gaim %s\n"
+"Uso: %s [OPZIONI]...\n"
+"\n"
+"  -c, --config=DIR    usa DIR per i file di configurazione\n"
+"  -d, --debug         stampa messaggi di debug sullo standard output\n"
+"  -h, --help          mostra questo aiuto ed esce\n"
+"  -n, --nologin       non effettuare il login\n"
+"  -l, --login[=NOME]  effettua il login automatico (l'argomento opzionale "
+"NOME\n"
+"                      specifica gli account da usare, separati da virgole)\n"
+"  -v, --version       mostra la versione attuale ed esce\n"
+
+#: ../src/gtkmain.c:492
+#, c-format
+msgid ""
+"Gaim has segfaulted and attempted to dump a core file.\n"
+"This is a bug in the software and has happened through\n"
+"no fault of your own.\n"
+"\n"
+"If you can reproduce the crash, please notify the gaim\n"
+"developers by reporting a bug at\n"
+"%sbug.php\n"
+"\n"
+"Please make sure to specify what you were doing at the time\n"
+"and post the backtrace from the core file.  If you do not know\n"
+"how to get the backtrace, please read the instructions at\n"
+"%sgdb.php\n"
+"\n"
+"If you need further assistance, please IM either SeanEgn or \n"
+"LSchiere (via AIM).  Contact information for Sean and Luke \n"
+"on other protocols is at\n"
+"%scontactinfo.php\n"
+msgstr ""
+
+#: ../src/gtknotify.c:329
+#, fuzzy
+msgid "New Mail"
+msgstr "Email"
+
+#: ../src/gtknotify.c:345
+msgid "Open All Messages"
+msgstr "Apri tutti i messaggi"
+
+#: ../src/gtknotify.c:411 ../src/protocols/jabber/jabber.c:1118
+msgid "From"
+msgstr "Da"
+
+#: ../src/gtknotify.c:420
+msgid "Subject"
+msgstr "Oggetto"
+
+#: ../src/gtknotify.c:429
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Posta in arrivo!</span>"
+
+#: ../src/gtknotify.c:495
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s ha %d nuovo messaggio"
 msgstr[1] "%s ha %d nuovi messaggi"
 
-#: src/gtknotify.c:289
-#, c-format
-msgid "<span weight=\"bold\">From:</span> %s\n"
-msgstr "<span weight=\"bold\">Da:</span> %s\n"
-
-#: src/gtknotify.c:298
-#, c-format
-msgid "<span weight=\"bold\">Subject:</span> %s\n"
-msgstr "<span weight=\"bold\">Oggetto:</span> %s\n"
-
-#: src/gtknotify.c:303
-#, c-format
-msgid ""
-"<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
-"\n"
-"%s%s%s%s"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Posta in arrivo!</span>\n"
-"\n"
-"%s%s%s%s"
-
-#: src/gtknotify.c:319
+#: ../src/gtknotify.c:500
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3627,195 +4334,269 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:504
+#: ../src/gtknotify.c:688 ../src/protocols/sametime/sametime.c:5451
 msgid "Search Results"
 msgstr "Risultati della ricerca"
 
-#: src/gtknotify.c:643 src/protocols/oscar/oscar.c:4858
+#: ../src/gtknotify.c:844 ../src/protocols/oscar/oscar.c:2634
 #, c-format
 msgid "Info for %s"
 msgstr "Informazioni per %s"
 
-#: src/gtknotify.c:644 src/protocols/toc/toc.c:470
+#: ../src/gtknotify.c:845 ../src/protocols/toc/toc.c:470
 msgid "Buddy Information"
 msgstr "Informazioni sul contatto"
 
-#: src/gtknotify.c:687
-#, c-format
-msgid "The browser command <b>%s</b> is invalid."
-msgstr "Il comando per il browser <b>%s</b> non  valido."
-
-#: src/gtknotify.c:689 src/gtknotify.c:701 src/gtknotify.c:714
-#: src/gtknotify.c:838
+#: ../src/gtknotify.c:884
+#, c-format
+msgid "The browser command \"%s\" is invalid."
+msgstr "Il comando per il browser \"%s\" non  valido."
+
+#: ../src/gtknotify.c:886 ../src/gtknotify.c:898 ../src/gtknotify.c:911
+#: ../src/gtknotify.c:1034
 msgid "Unable to open URL"
 msgstr "Impossibile aprire l'URL"
 
-#: src/gtknotify.c:699 src/gtknotify.c:712
-#, c-format
-msgid "Error launching <b>%s</b>: %s"
-msgstr "Errore nell'esecuzione di <b>%s</b>: %s"
-
-#: src/gtknotify.c:839
+#: ../src/gtknotify.c:896 ../src/gtknotify.c:909
+#, c-format
+msgid "Error launching \"%s\": %s"
+msgstr "Errore nell'esecuzione di \"%s\": %s"
+
+#: ../src/gtknotify.c:1035
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 " stato scelto di impostare il browser manualmente, ma non  stato immesso "
 "nessun comando."
 
-#: src/gtkpounce.c:130
+#: ../src/gtkplugin.c:274
+msgid "The following plugins will be unloaded."
+msgstr ""
+
+#: ../src/gtkplugin.c:293
+msgid "Multiple plugins will be unloaded."
+msgstr ""
+
+#: ../src/gtkplugin.c:295
+#, fuzzy
+msgid "Unload Plugins"
+msgstr "Plugin"
+
+#: ../src/gtkplugin.c:407
+#, c-format
+msgid ""
+"%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
+"<span weight=\"bold\">Website:</span>\t\t%s\n"
+"<span weight=\"bold\">Filename:</span>\t\t%s"
+msgstr ""
+"%s%s<span weight=\"bold\">Scritto da:</span>\t%s\n"
+"<span weight=\"bold\">Sito web:</span>\t\t%s\n"
+"<span weight=\"bold\">Nome file:</span>\t\t%s"
+
+#: ../src/gtkplugin.c:417
+#, c-format
+msgid ""
+"%s\n"
+"<span foreground=\"#ff0000\" weight=\"bold\">Error: %s\n"
+"Check the plugin website for an update.</span>"
+msgstr ""
+
+#: ../src/gtkplugin.c:543
+msgid "Configure Pl_ugin"
+msgstr "Configura il pl_ugin"
+
+#: ../src/gtkplugin.c:601
+msgid "<b>Plugin Details</b>"
+msgstr "<b>Dettagli sul plugin</b>"
+
+#: ../src/gtkpounce.c:154
 msgid "Select a file"
 msgstr "Scegli un file"
 
-#: src/gtkpounce.c:161
+#: ../src/gtkpounce.c:251
 msgid "Please enter a buddy to pounce."
 msgstr "Inserisci il nome di un utente."
 
-#. "New Buddy Pounce"
-#: src/gtkpounce.c:391 src/gtkpounce.c:898
+#: ../src/gtkpounce.c:495
 msgid "New Buddy Pounce"
 msgstr "Nuovo allarme"
 
-#: src/gtkpounce.c:391
+#: ../src/gtkpounce.c:495
 msgid "Edit Buddy Pounce"
 msgstr "Modifica l'allarme"
 
-#. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:408
-msgid "Pounce Who"
+#. Create the "Pounce on Whom" frame.
+#: ../src/gtkpounce.c:512
+msgid "Pounce on Whom"
 msgstr "Contatto da controllare"
 
-#: src/gtkpounce.c:435
+#: ../src/gtkpounce.c:539
 msgid "_Buddy name:"
 msgstr "Nome del _contatto:"
 
-#. Create the "Pounce When" frame.
-#: src/gtkpounce.c:459
-msgid "Pounce When"
-msgstr "Controlla i seguenti eventi"
-
-#: src/gtkpounce.c:467
-msgid "Si_gn on"
-msgstr "_Connessione"
-
-#: src/gtkpounce.c:469
-msgid "Sign _off"
-msgstr "_Disconnessione"
-
-#: src/gtkpounce.c:471
-msgid "A_way"
-msgstr "_Assente"
-
-#: src/gtkpounce.c:473
-msgid "_Return from away"
+#. Create the "Pounce When Buddy..." frame.
+#: ../src/gtkpounce.c:565
+msgid "Pounce When Buddy..."
+msgstr "Controlla se il contatto..."
+
+#: ../src/gtkpounce.c:573
+msgid "Si_gns on"
+msgstr "Si _connette"
+
+#: ../src/gtkpounce.c:575
+msgid "Signs o_ff"
+msgstr "Si _disconnette"
+
+#: ../src/gtkpounce.c:577
+msgid "Goes a_way"
+msgstr " _assente"
+
+#: ../src/gtkpounce.c:579
+msgid "Ret_urns from away"
 msgstr "_Ritorna dall'assenza"
 
-#: src/gtkpounce.c:475
-msgid "_Idle"
-msgstr "_Inattivo"
-
-#: src/gtkpounce.c:477
-msgid "Retur_n from idle"
-msgstr "Ri_torna dall'inattivit"
-
-#: src/gtkpounce.c:479
-msgid "Buddy starts _typing"
+#: ../src/gtkpounce.c:581
+msgid "Becomes _idle"
+msgstr "Diventa _inattivo"
+
+#: ../src/gtkpounce.c:583
+msgid "Is no longer i_dle"
+msgstr "Ritorna _attivo"
+
+#: ../src/gtkpounce.c:585
+msgid "Starts _typing"
 msgstr "Inizia a _scrivere"
 
-#: src/gtkpounce.c:481
-msgid "Buddy stops t_yping"
-msgstr "_Finisce di scrivere"
-
-#. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:510
-msgid "Pounce Action"
+#: ../src/gtkpounce.c:587
+msgid "Stops t_yping"
+msgstr "_Smette di scrivere"
+
+#: ../src/gtkpounce.c:589
+msgid "Sends a _message"
+msgstr "Invia un _messaggio"
+
+#. Create the "Action" frame.
+#: ../src/gtkpounce.c:621
+msgid "Action"
 msgstr "Azione"
 
-#: src/gtkpounce.c:518
-msgid "Op_en an IM window"
+#: ../src/gtkpounce.c:629
+msgid "Ope_n an IM window"
 msgstr "_Apri una finestra di conversazione"
 
-#: src/gtkpounce.c:520
-msgid "_Popup notification"
+#: ../src/gtkpounce.c:631
+msgid "_Pop up a notification"
 msgstr "_Notifica con un popup"
 
-#: src/gtkpounce.c:522
+#: ../src/gtkpounce.c:633
 msgid "Send a _message"
 msgstr "Invia un _messaggio"
 
-#: src/gtkpounce.c:524
+#: ../src/gtkpounce.c:635
 msgid "E_xecute a command"
 msgstr "_Esegui un comando"
 
-#: src/gtkpounce.c:526
+#: ../src/gtkpounce.c:637
 msgid "P_lay a sound"
 msgstr "_Riproduci un suono"
 
-#: src/gtkpounce.c:530
-msgid "B_rowse..."
+#: ../src/gtkpounce.c:642
+msgid "Brows_e..."
 msgstr "_Sfoglia..."
 
-#: src/gtkpounce.c:532
-msgid "Bro_wse..."
-msgstr "Sf_oglia..."
-
-#: src/gtkpounce.c:533
+#: ../src/gtkpounce.c:644
+msgid "Br_owse..."
+msgstr "_Sfoglia..."
+
+#: ../src/gtkpounce.c:645
 msgid "Pre_view"
 msgstr "_Anteprima"
 
-#: src/gtkpounce.c:616
-msgid "Sav_e this pounce after activation"
-msgstr "_Salva questo allarme dopo l'attivazione"
-
-#. "Remove Buddy Pounce"
-#: src/gtkpounce.c:906
-msgid "Remove Buddy Pounce"
-msgstr "Rimuovi un allarme"
-
-#: src/gtkpounce.c:964
+#. Create the "Options" frame.
+#: ../src/gtkpounce.c:757
+msgid "Options"
+msgstr "Opzioni"
+
+#: ../src/gtkpounce.c:765
+msgid "P_ounce only when my status is not available"
+msgstr ""
+
+#: ../src/gtkpounce.c:770
+msgid "_Recurring"
+msgstr ""
+
+#: ../src/gtkpounce.c:1074
+#, fuzzy, c-format
+msgid "Are you sure you want to delete the pounce on %s for %s?"
+msgstr "Sei sicuro di voler eliminare %s?"
+
+#: ../src/gtkpounce.c:1222
+#, fuzzy
+msgid "Pounce Target"
+msgstr "Controlla i seguenti eventi"
+
+#: ../src/gtkpounce.c:1257
+msgid "Recurring"
+msgstr ""
+
+#: ../src/gtkpounce.c:1304
+msgid "Buddy Pounces"
+msgstr "Allarmi"
+
+#: ../src/gtkpounce.c:1431
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s ha iniziato a scriverti (%s)"
 
-#: src/gtkpounce.c:966
+#: ../src/gtkpounce.c:1433
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s si  connesso (%s)"
 
-#: src/gtkpounce.c:968
+#: ../src/gtkpounce.c:1435
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s  tornato attivo (%s)"
 
-#: src/gtkpounce.c:970
+#: ../src/gtkpounce.c:1437
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s  di nuovo presente (%s)"
 
-#: src/gtkpounce.c:972
+#: ../src/gtkpounce.c:1439
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s ha smesso di scriverti (%s)"
 
-#: src/gtkpounce.c:974
+#: ../src/gtkpounce.c:1441
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s si  disconnesso (%s)"
 
-#: src/gtkpounce.c:976
+#: ../src/gtkpounce.c:1443
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s  diventato inattivo (%s)"
 
-#: src/gtkpounce.c:978
+#: ../src/gtkpounce.c:1445
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s  andato via. (%s)"
 
-#: src/gtkpounce.c:979
+#: ../src/gtkpounce.c:1447
+#, c-format
+msgid "%s has sent you a message. (%s)"
+msgstr "%s ti ha inviato un messaggio. (%s)"
+
+#: ../src/gtkpounce.c:1448
 msgid "Unknown pounce event. Please report this!"
 msgstr "Evento sconosciuto. Per piacere riporta questo errore!"
 
-#: src/gtkprefs.c:623
+#: ../src/gtkprefs.c:512
+msgid "Smiley theme failed to unpack."
+msgstr ""
+
+#: ../src/gtkprefs.c:638
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
@@ -3823,41 +4604,53 @@
 "Scegli un tema per gli smiley dalla seguente lista. Possono essere "
 "installati nuovi temi trascinandoli sulla lista dei temi."
 
-#: src/gtkprefs.c:658
+#: ../src/gtkprefs.c:673
 msgid "Icon"
 msgstr "Icona"
 
-#: src/gtkprefs.c:665 src/protocols/jabber/buddy.c:267
-#: src/protocols/jabber/buddy.c:811 src/protocols/jabber/chat.c:769
+#: ../src/gtkprefs.c:680 ../src/protocols/jabber/buddy.c:286
+#: ../src/protocols/jabber/buddy.c:926 ../src/protocols/jabber/chat.c:767
 msgid "Description"
 msgstr "Descrizione"
 
-#: src/gtkprefs.c:805
+#: ../src/gtkprefs.c:821
+msgid "_Hide new IM conversations"
+msgstr "_Nascondi le nuove conversazioni"
+
+#: ../src/gtkprefs.c:824 ../src/gtkprefs.c:1779
+msgid "When away"
+msgstr "Se assente"
+
+#: ../src/gtkprefs.c:828
 msgid "Send unknown \"_slash\" commands as messages"
-msgstr "Invia i comandi \"_slash\" sconosciuti come messaggi"
-
-#: src/gtkprefs.c:807
-#, fuzzy
+msgstr "Invia come messaggi i comandi \"_slash\" sconosciuti"
+
+#: ../src/gtkprefs.c:830
 msgid "Show _formatting on incoming messages"
-msgstr "Mostra la barra di _formattazione"
-
-#: src/gtkprefs.c:809
+msgstr "Mostra la _formattazione per i messaggi in entrata"
+
+#: ../src/gtkprefs.c:833
 msgid "Show buddy _icons"
 msgstr "Mostra le _icone dei contatti"
 
-#: src/gtkprefs.c:811
+#: ../src/gtkprefs.c:835
 msgid "Enable buddy ic_on animation"
 msgstr "Abilita l'a_nimazione delle icone dei contatti"
 
-#: src/gtkprefs.c:813
+#: ../src/gtkprefs.c:842
 msgid "_Notify buddies that you are typing to them"
 msgstr "Segnala ai contatti che stai _scrivendo"
 
-#: src/gtkprefs.c:816
-msgid "_Highlight misspelled words"
+#: ../src/gtkprefs.c:845
+#, fuzzy
+msgid "Highlight _misspelled words"
 msgstr "_Evidenzia le parole con errori di ortografia"
 
-#: src/gtkprefs.c:834
+#: ../src/gtkprefs.c:849
+msgid "Use smooth-scrolling"
+msgstr ""
+
+#: ../src/gtkprefs.c:865
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
@@ -3866,165 +4659,165 @@
 "supporta la formattazione. :)"
 
 #. All the tab options!
-#: src/gtkprefs.c:856
+#: ../src/gtkprefs.c:887
 msgid "Tab Options"
 msgstr "Opzioni schede"
 
-#: src/gtkprefs.c:858
+#: ../src/gtkprefs.c:889
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Mostra i messaggi immediati e le chat come _schede"
 
-#: src/gtkprefs.c:872
+#: ../src/gtkprefs.c:903
 msgid "Show close b_utton on tabs"
 msgstr "Mostra il pulsante di _chiusura sulle linguette"
 
-#: src/gtkprefs.c:878
-#, fuzzy
+#: ../src/gtkprefs.c:909
 msgid "_Placement:"
-msgstr "Posizionamento extra"
-
-#: src/gtkprefs.c:880
+msgstr "_Posizionamento:"
+
+#: ../src/gtkprefs.c:911
 msgid "Top"
 msgstr "In alto"
 
-#: src/gtkprefs.c:881
+#: ../src/gtkprefs.c:912
 msgid "Bottom"
 msgstr "In basso"
 
-#: src/gtkprefs.c:882
+#: ../src/gtkprefs.c:913
 msgid "Left"
 msgstr "A sinistra"
 
-#: src/gtkprefs.c:883
+#: ../src/gtkprefs.c:914
 msgid "Right"
 msgstr "A destra"
 
-#: src/gtkprefs.c:885
+#: ../src/gtkprefs.c:916
 msgid "Left Vertical"
 msgstr ""
 
-#: src/gtkprefs.c:886
+#: ../src/gtkprefs.c:917
 msgid "Right Vertical"
 msgstr ""
 
-#: src/gtkprefs.c:891
-#, fuzzy
+#: ../src/gtkprefs.c:922
 msgid "N_ew conversations:"
-msgstr "Chiudi la conversazione"
-
-#: src/gtkprefs.c:942 src/protocols/oscar/oscar.c:779
-#: src/protocols/oscar/oscar.c:5959
+msgstr "N_uove conversazioni:"
+
+#: ../src/gtkprefs.c:973 ../src/protocols/oscar/oscar.c:795
+#: ../src/protocols/oscar/oscar.c:3631
 msgid "IP Address"
 msgstr "Indirizzo IP"
 
-#: src/gtkprefs.c:944
-#, fuzzy
-msgid "STUN Server:"
-msgstr "_Server:"
-
-#: src/gtkprefs.c:946
-msgid "_Autodetect IP Address"
+#: ../src/gtkprefs.c:975
+msgid "ST_UN server:"
+msgstr "Server ST_UN:"
+
+#: ../src/gtkprefs.c:987
+msgid "<span style=\"italic\">Example: stunserver.org</span>"
+msgstr "<span style=\"italic\">Esempio: stunserver.org</span>"
+
+#: ../src/gtkprefs.c:991
+msgid "_Autodetect IP address"
 msgstr "Rileva _automaticamente l'indirizzo IP"
 
-#: src/gtkprefs.c:955
+#: ../src/gtkprefs.c:1000
 msgid "Public _IP:"
 msgstr "_IP pubblico:"
 
-#: src/gtkprefs.c:979
+#: ../src/gtkprefs.c:1029
 msgid "Ports"
 msgstr "Porte"
 
-#: src/gtkprefs.c:982
+#: ../src/gtkprefs.c:1032
 msgid "_Manually specify range of ports to listen on"
 msgstr ""
 "Specifica _manualmente l'intervallo di porte sulle quali mettersi in ascolto"
 
-#: src/gtkprefs.c:985
-msgid "_Start Port:"
+#: ../src/gtkprefs.c:1035
+msgid "_Start port:"
 msgstr "_Prima porta:"
 
-#: src/gtkprefs.c:992
-msgid "_End Port:"
+#: ../src/gtkprefs.c:1042
+msgid "_End port:"
 msgstr "_Ultima porta:"
 
-#: src/gtkprefs.c:999
+#: ../src/gtkprefs.c:1050
 msgid "Proxy Server"
 msgstr "Server proxy"
 
-#: src/gtkprefs.c:1003
+#: ../src/gtkprefs.c:1054
 msgid "No proxy"
 msgstr "Nessun proxy"
 
-#: src/gtkprefs.c:1059
+#: ../src/gtkprefs.c:1110
 msgid "_User:"
 msgstr "_Utente:"
 
-#: src/gtkprefs.c:1119
+#: ../src/gtkprefs.c:1172
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: src/gtkprefs.c:1120
+#: ../src/gtkprefs.c:1173
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1121
+#: ../src/gtkprefs.c:1174
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1122
+#: ../src/gtkprefs.c:1175
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1123
-#, fuzzy
+#: ../src/gtkprefs.c:1176
 msgid "GNOME Default"
-msgstr "Browser predefinito di Gnome"
-
-#: src/gtkprefs.c:1124
+msgstr "Predefinito di Gnome"
+
+#: ../src/gtkprefs.c:1177
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1125
+#: ../src/gtkprefs.c:1178
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1126
+#: ../src/gtkprefs.c:1179
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1127
+#: ../src/gtkprefs.c:1180
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1136
+#: ../src/gtkprefs.c:1189
 msgid "Manual"
 msgstr "Manuale"
 
-#: src/gtkprefs.c:1189
+#: ../src/gtkprefs.c:1242
 msgid "Browser Selection"
 msgstr "Scelta del browser"
 
-#: src/gtkprefs.c:1193
+#: ../src/gtkprefs.c:1246
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: src/gtkprefs.c:1201
+#: ../src/gtkprefs.c:1254
 msgid "_Open link in:"
 msgstr "_Apertura dei collegamenti:"
 
-#: src/gtkprefs.c:1203
+#: ../src/gtkprefs.c:1256
 msgid "Browser default"
 msgstr "Impostazione predefinita del browser"
 
-#: src/gtkprefs.c:1204
+#: ../src/gtkprefs.c:1257
 msgid "Existing window"
 msgstr "Finestra esistente"
 
-#: src/gtkprefs.c:1206
+#: ../src/gtkprefs.c:1259
 msgid "New tab"
 msgstr "Nuova scheda"
 
-#: src/gtkprefs.c:1220
+#: ../src/gtkprefs.c:1273
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -4033,57 +4826,83 @@
 "Scelta _manuale:\n"
 "(%s per inserire un URL)"
 
-#: src/gtkprefs.c:1256 src/gtkprefs.c:1738
+#: ../src/gtkprefs.c:1309 ../src/gtkprefs.c:1890
 msgid "Logging"
 msgstr "Log"
 
-#: src/gtkprefs.c:1259
-msgid "Log _Format:"
+#: ../src/gtkprefs.c:1312
+msgid "Log _format:"
 msgstr "_Formato del log:"
 
-#: src/gtkprefs.c:1264
-#, fuzzy
+#: ../src/gtkprefs.c:1317
 msgid "Log all _instant messages"
 msgstr "Esegui il _log di tutti i messaggi immediati"
 
-#: src/gtkprefs.c:1266
+#: ../src/gtkprefs.c:1319
 msgid "Log all c_hats"
 msgstr "Esegui il log di tutte le c_hat"
 
-#: src/gtkprefs.c:1268
+#: ../src/gtkprefs.c:1321
 msgid "Log all _status changes to system log"
-msgstr ""
-
-#: src/gtkprefs.c:1400
+msgstr "Registra nel log di sistema tutti i cambiamenti di _stato"
+
+#: ../src/gtkprefs.c:1469
 msgid "Sound Selection"
 msgstr "Selezione suoni"
 
-#: src/gtkprefs.c:1454
+#: ../src/gtkprefs.c:1477
+msgid "Quietest"
+msgstr "Bassissimo"
+
+#: ../src/gtkprefs.c:1479
+msgid "Quieter"
+msgstr "Pi basso"
+
+#: ../src/gtkprefs.c:1481
+msgid "Quiet"
+msgstr "Basso"
+
+#: ../src/gtkprefs.c:1483 ../src/protocols/silc/silc.c:670
+msgid "Normal"
+msgstr "Normale"
+
+#: ../src/gtkprefs.c:1485
+msgid "Loud"
+msgstr "Alto"
+
+#: ../src/gtkprefs.c:1487
+msgid "Louder"
+msgstr "Pi alto"
+
+#: ../src/gtkprefs.c:1489
+msgid "Loudest"
+msgstr "Altissimo"
+
+#: ../src/gtkprefs.c:1552
 msgid "Sound Method"
 msgstr "Metodo del suono"
 
-#: src/gtkprefs.c:1455
+#: ../src/gtkprefs.c:1553
 msgid "_Method:"
 msgstr "_Metodo:"
 
-#: src/gtkprefs.c:1457
+#: ../src/gtkprefs.c:1555
 msgid "Console beep"
 msgstr "Bip di console"
 
-#: src/gtkprefs.c:1459
+#: ../src/gtkprefs.c:1557
 msgid "Automatic"
 msgstr "Automatico"
 
-#: src/gtkprefs.c:1464
+#: ../src/gtkprefs.c:1562
 msgid "Command"
 msgstr "Comando"
 
-#: src/gtkprefs.c:1465
-#, fuzzy
+#: ../src/gtkprefs.c:1563
 msgid "No sounds"
-msgstr "Suoni"
-
-#: src/gtkprefs.c:1473
+msgstr "Nessun suono"
+
+#: ../src/gtkprefs.c:1571
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4092,563 +4911,552 @@
 "C_omando da eseguire:\n"
 "(%s per il nome del file)"
 
-#: src/gtkprefs.c:1499
+#: ../src/gtkprefs.c:1597
 msgid "Sound Options"
 msgstr "Opzioni suono"
 
-#: src/gtkprefs.c:1500
+#: ../src/gtkprefs.c:1598
 msgid "Sounds when conversation has _focus"
 msgstr ""
 "Riproduci i suoni quando la finestra di conversazione va in _primo piano"
 
-#: src/gtkprefs.c:1502
+#: ../src/gtkprefs.c:1600
 msgid "_Sounds while away"
 msgstr "_Riproduci i suoni quando sei assente"
 
-#: src/gtkprefs.c:1512
+#: ../src/gtkprefs.c:1607
+msgid "Volume:"
+msgstr "Volume:"
+
+#: ../src/gtkprefs.c:1635
 msgid "Sound Events"
 msgstr "Eventi sonori"
 
-#: src/gtkprefs.c:1563
+#: ../src/gtkprefs.c:1686
 msgid "Play"
 msgstr "Riproduci"
 
-#: src/gtkprefs.c:1570
+#: ../src/gtkprefs.c:1693
 msgid "Event"
 msgstr "Evento"
 
-#: src/gtkprefs.c:1589
+#: ../src/gtkprefs.c:1712
 msgid "Test"
 msgstr "Test"
 
-#: src/gtkprefs.c:1593
+#: ../src/gtkprefs.c:1716
 msgid "Reset"
 msgstr "Pulisci"
 
-#: src/gtkprefs.c:1597
+#: ../src/gtkprefs.c:1720
 msgid "Choose..."
 msgstr "Scegli..."
 
-#: src/gtkprefs.c:1651 src/gtkstatusbox.c:295
-#: src/protocols/bonjour/bonjour.c:240 src/protocols/irc/irc.c:176
-#: src/protocols/irc/msgs.c:221 src/protocols/jabber/buddy.c:1093
-#: src/protocols/jabber/jabber.c:1055 src/protocols/msn/msn.c:577
-#: src/protocols/novell/novell.c:2825 src/protocols/novell/novell.c:2959
-#: src/protocols/novell/novell.c:3041 src/protocols/oscar/oscar.c:707
-#: src/protocols/oscar/oscar.c:6516 src/protocols/oscar/oscar.c:6585
-#: src/protocols/oscar/oscar.c:7610 src/protocols/oscar/oscar.c:7764
-#: src/protocols/sametime/sametime.c:2764 src/protocols/silc/buddy.c:1417
-#: src/protocols/silc/silc.c:52 src/protocols/yahoo/yahoo.c:3225
-#: src/protocols/zephyr/zephyr.c:2259 src/status.c:158
-msgid "Away"
-msgstr "Assente"
-
-#: src/gtkprefs.c:1652
-msgid "_Queue new messages when away"
-msgstr "Metti in _coda i nuovi messaggi quando sei assente"
-
-#: src/gtkprefs.c:1655
+#: ../src/gtkprefs.c:1762
+msgid "_Report idle time:"
+msgstr "Mostra i _tempi di inattivit:"
+
+#: ../src/gtkprefs.c:1765
+msgid "From last sent message"
+msgstr "Dall'ultimo messaggio inviato"
+
+#: ../src/gtkprefs.c:1767
+msgid "Based on keyboard or mouse use"
+msgstr ""
+
+#: ../src/gtkprefs.c:1776
 msgid "_Auto-reply:"
 msgstr "Risposta _automatica:"
 
-#: src/gtkprefs.c:1658
-msgid "When away"
-msgstr "Se assente"
-
-#: src/gtkprefs.c:1659
-#, fuzzy
+#: ../src/gtkprefs.c:1780
 msgid "When both away and idle"
 msgstr "Se assente e inattivo"
 
-#: src/gtkprefs.c:1662
-#, fuzzy
-msgid "_Report idle time"
-msgstr "Mostra i _tempi di inattivit"
-
-#: src/gtkprefs.c:1665
+#. Auto-away stuff
+#: ../src/gtkprefs.c:1786
 msgid "Auto-away"
 msgstr "Assente automatico"
 
-#: src/gtkprefs.c:1666
-#, fuzzy
+#: ../src/gtkprefs.c:1788
 msgid "Change status when _idle"
-msgstr "Imposta come assente _quando sei inattivo"
-
-#: src/gtkprefs.c:1670
-#, fuzzy
+msgstr "Modifica lo stato quando sei _inattivo"
+
+#: ../src/gtkprefs.c:1792
 msgid "_Minutes before changing status:"
-msgstr "_Minuti prima di impostare come assente:"
-
-#: src/gtkprefs.c:1678
-#, fuzzy
+msgstr "_Minuti prima di modificare lo stato:"
+
+#: ../src/gtkprefs.c:1800
 msgid "Change _status to:"
-msgstr "Cambia l'indirizzo in:"
-
-#: src/gtkprefs.c:1728
+msgstr "Cambia lo _stato in:"
+
+#. Signon status stuff
+#: ../src/gtkprefs.c:1821
+msgid "Status at startup"
+msgstr "Stato all'avvio"
+
+#: ../src/gtkprefs.c:1823
+msgid "Use status from last _exit at startup"
+msgstr "Utilizza lo stato impostato l'ultima volta"
+
+#: ../src/gtkprefs.c:1829
+msgid "Status to a_pply at startup:"
+msgstr "Stato da _utilizzare all'avvio:"
+
+#: ../src/gtkprefs.c:1880
 msgid "Smiley Themes"
 msgstr "Temi degli smiley"
 
-#: src/gtkprefs.c:1729
+#: ../src/gtkprefs.c:1881
 msgid "Sounds"
 msgstr "Suoni"
 
-#: src/gtkprefs.c:1730 src/protocols/silc/silc.c:1589
+#: ../src/gtkprefs.c:1882 ../src/protocols/silc/silc.c:1850
 msgid "Network"
 msgstr "Rete"
 
-#: src/gtkprefs.c:1735
+#: ../src/gtkprefs.c:1887
 msgid "Browser"
 msgstr "Browser"
 
-#: src/gtkprefs.c:1739
+#: ../src/gtkprefs.c:1891
 msgid "Away / Idle"
 msgstr "Assente / Inattivo"
 
-#: src/gtkprivacy.c:79
+#: ../src/gtkprivacy.c:79
 msgid "Allow all users to contact me"
 msgstr "Consenti a tutti di contattarmi"
 
-#: src/gtkprivacy.c:80
+#: ../src/gtkprivacy.c:80
 msgid "Allow only the users on my buddy list"
 msgstr "Consenti di contattarmi solo agli utenti della mia lista contatti"
 
-#: src/gtkprivacy.c:81
+#: ../src/gtkprivacy.c:81
 msgid "Allow only the users below"
 msgstr "Consenti di contattarmi solo agli utenti della seguente lista"
 
-#: src/gtkprivacy.c:82
+#: ../src/gtkprivacy.c:82
 msgid "Block all users"
 msgstr "Blocca tutti gli utenti"
 
-#: src/gtkprivacy.c:83
+#: ../src/gtkprivacy.c:83
 msgid "Block only the users below"
 msgstr "Blocca solamente gli utenti nella seguente lista"
 
-#: src/gtkprivacy.c:398
+#: ../src/gtkprivacy.c:372
 msgid "Privacy"
 msgstr "Privacy"
 
-#: src/gtkprivacy.c:411
+#: ../src/gtkprivacy.c:385
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Le modifiche alle impostazioni della privacy hanno effetto immediato."
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:423
+#: ../src/gtkprivacy.c:397
 msgid "Set privacy for:"
 msgstr "Imposta la privacy per:"
 
-#: src/gtkprivacy.c:589 src/gtkprivacy.c:605
+#: ../src/gtkprivacy.c:562 ../src/gtkprivacy.c:578
 msgid "Permit User"
 msgstr "Consenti all'utente di contattarti"
 
-#: src/gtkprivacy.c:590
+#: ../src/gtkprivacy.c:563
 msgid "Type a user you permit to contact you."
 msgstr "Inserisci il nome dell'utente al quale permetti di contattarti."
 
-#: src/gtkprivacy.c:591
+#: ../src/gtkprivacy.c:564
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "Inserisci il nome dell'utente al quale permetti di contattarti."
 
-#: src/gtkprivacy.c:594 src/gtkprivacy.c:607
-msgid "Permit"
-msgstr "Consenti"
-
-#: src/gtkprivacy.c:599
+#: ../src/gtkprivacy.c:567 ../src/gtkprivacy.c:580
+msgid "_Permit"
+msgstr "_Consenti"
+
+#: ../src/gtkprivacy.c:572
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Consenti a %s di contattarti?"
 
-#: src/gtkprivacy.c:601
+#: ../src/gtkprivacy.c:574
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Sei sicuro di volere che %s ti contatti?"
 
-#: src/gtkprivacy.c:628 src/gtkprivacy.c:641
+#: ../src/gtkprivacy.c:601 ../src/gtkprivacy.c:614
 msgid "Block User"
 msgstr "Blocca l'utente"
 
-#: src/gtkprivacy.c:629
+#: ../src/gtkprivacy.c:602
 msgid "Type a user to block."
 msgstr "Inserisci il nome dell'utente da bloccare."
 
-#: src/gtkprivacy.c:630
+#: ../src/gtkprivacy.c:603
 msgid "Please enter the name of the user you wish to block."
 msgstr "Inserisci il nome dell'utente che vuoi bloccare."
 
-#: src/gtkprivacy.c:632 src/gtkprivacy.c:643 src/protocols/gg/gg.c:1135
-msgid "Block"
-msgstr "Blocca"
-
-#: src/gtkprivacy.c:637
+#: ../src/gtkprivacy.c:605 ../src/gtkprivacy.c:616
+msgid "_Block"
+msgstr "_Blocca"
+
+#: ../src/gtkprivacy.c:610
 #, c-format
 msgid "Block %s?"
 msgstr "Bloccare %s?"
 
-#: src/gtkprivacy.c:639
+#: ../src/gtkprivacy.c:612
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Sei sicuro di voler bloccare %s?"
 
 #. *
-#. * A wrapper for gaim_request_action() that uses Yes and No buttons.
+#. * A wrapper for gaim_request_action() that uses @c Yes and @c No buttons.
 #.
-#: src/gtkrequest.c:259 src/protocols/msn/dialog.c:113
-#: src/protocols/msn/msn.c:553 src/protocols/msn/msn.c:556
-#: src/protocols/novell/novell.c:1902 src/protocols/silc/buddy.c:312
-#: src/protocols/silc/pk.c:117 src/request.h:1322
+#: ../src/gtkrequest.c:267 ../src/protocols/msn/dialog.c:114
+#: ../src/protocols/msn/msn.c:557 ../src/protocols/msn/msn.c:566
+#: ../src/protocols/novell/novell.c:1919 ../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 "S"
 
-#: src/gtkrequest.c:260 src/protocols/msn/dialog.c:114
-#: src/protocols/msn/msn.c:553 src/protocols/msn/msn.c:556
-#: src/protocols/novell/novell.c:1903 src/protocols/silc/buddy.c:313
-#: src/protocols/silc/pk.c:118 src/request.h:1322
+#: ../src/gtkrequest.c:268 ../src/protocols/msn/dialog.c:115
+#: ../src/protocols/msn/msn.c:557 ../src/protocols/msn/msn.c:566
+#: ../src/protocols/novell/novell.c:1920 ../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 "No"
 
-#: src/gtkrequest.c:263
+#: ../src/gtkrequest.c:271
 msgid "Apply"
 msgstr "Applica"
 
-#: src/gtkrequest.c:264 src/protocols/msn/msn.c:357
-#: src/protocols/silc/util.c:335
+#: ../src/gtkrequest.c:272 ../src/protocols/msn/msn.c:357
+#: ../src/protocols/silc/util.c:350
 msgid "Close"
 msgstr "Chiudi"
 
-#: src/gtkrequest.c:1796
+#: ../src/gtkrequest.c:1467
 msgid "That file already exists"
 msgstr "Il file esiste gi."
 
-#: src/gtkrequest.c:1797
+#: ../src/gtkrequest.c:1468
 msgid "Would you like to overwrite it?"
 msgstr "Vuoi sovrascriverlo?"
 
-#: src/gtkrequest.c:1839 src/gtkrequest.c:1880
+#: ../src/gtkrequest.c:1469
+msgid "Overwrite"
+msgstr "Sovrascrivi"
+
+#: ../src/gtkrequest.c:1470
+msgid "Choose New Name"
+msgstr "Scegli un nuovo nome"
+
+#: ../src/gtkrequest.c:1512 ../src/gtkrequest.c:1553
 msgid "Save File..."
 msgstr "Salva il file..."
 
-#: src/gtkrequest.c:1840 src/gtkrequest.c:1881
+#: ../src/gtkrequest.c:1513 ../src/gtkrequest.c:1554
 msgid "Open File..."
 msgstr "Apri il file..."
 
-#: src/gtkroomlist.c:331
+#: ../src/gtkrequest.c:1601 ../src/gtkrequest.c:1615
+msgid "Select Folder..."
+msgstr "Scegli cartella..."
+
+#: ../src/gtkroomlist.c:287
+msgid "_Add"
+msgstr "_Aggiungi"
+
+#: ../src/gtkroomlist.c:354
 msgid "Room List"
 msgstr "Lista delle stanze"
 
 #. list button
-#: src/gtkroomlist.c:402
+#: ../src/gtkroomlist.c:424
 msgid "_Get List"
 msgstr "_Scarica la lista"
 
-#: src/gtksavedstatuses.c:362 src/protocols/jabber/buddy.c:264
-#: src/protocols/jabber/buddy.c:805 src/protocols/novell/novell.c:1460
+#. add button
+#: ../src/gtkroomlist.c:432
+msgid "_Add Chat"
+msgstr "_Aggiungi una chat"
+
+#: ../src/gtksavedstatuses.c:433 ../src/protocols/jabber/buddy.c:283
+#: ../src/protocols/jabber/buddy.c:920 ../src/protocols/novell/novell.c:1484
 msgid "Title"
 msgstr "Titolo"
 
-#: src/gtksavedstatuses.c:377
+#: ../src/gtksavedstatuses.c:448
 msgid "Type"
-msgstr ""
-
-#: src/gtksavedstatuses.c:388 src/protocols/bonjour/bonjour.c:234
-#: src/protocols/bonjour/bonjour.c:241 src/protocols/gg/gg.c:1083
-#: src/protocols/gg/gg.c:1088 src/protocols/gg/gg.c:1097
-#: src/protocols/gg/gg.c:1107 src/protocols/gg/gg.c:1112
-#: src/protocols/irc/irc.c:177 src/protocols/jabber/jabber.c:1032
-#: src/protocols/jabber/jabber.c:1040 src/protocols/jabber/jabber.c:1048
-#: src/protocols/jabber/jabber.c:1056 src/protocols/jabber/jabber.c:1064
-#: src/protocols/jabber/jabber.c:1072 src/protocols/novell/novell.c:2845
-#: src/protocols/oscar/oscar.c:7758 src/protocols/oscar/oscar.c:7765
-#: src/protocols/sametime/sametime.c:2759
-#: src/protocols/sametime/sametime.c:2765
-#: src/protocols/sametime/sametime.c:2771 src/protocols/simple/simple.c:255
-#: src/protocols/yahoo/yahoo.c:3220 src/protocols/yahoo/yahoo.c:3226
-#: src/protocols/zephyr/zephyr.c:2260
+msgstr "Tipo"
+
+#: ../src/gtksavedstatuses.c:459 ../src/gtksavedstatuses.c:919
+#: ../src/protocols/bonjour/bonjour.c:256
+#: ../src/protocols/bonjour/bonjour.c:263 ../src/protocols/gg/gg.c:1591
+#: ../src/protocols/gg/gg.c:1601 ../src/protocols/gg/gg.c:1607
+#: ../src/protocols/gg/gg.c:1616 ../src/protocols/gg/gg.c:1621
+#: ../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:2866
+#: ../src/protocols/novell/novell.c:2972 ../src/protocols/novell/novell.c:2978
+#: ../src/protocols/novell/novell.c:2984 ../src/protocols/oscar/oscar.c:5362
+#: ../src/protocols/oscar/oscar.c:5377 ../src/protocols/oscar/oscar.c:5382
+#: ../src/protocols/oscar/oscar.c:5590 ../src/protocols/oscar/oscar.c:5602
+#: ../src/protocols/sametime/sametime.c:3266
+#: ../src/protocols/sametime/sametime.c:3272
+#: ../src/protocols/sametime/sametime.c:3278
+#: ../src/protocols/sametime/sametime.c:3357
+#: ../src/protocols/silc/buddy.c:1544 ../src/protocols/simple/simple.c:242
+#: ../src/protocols/yahoo/yahoo.c:3282 ../src/protocols/yahoo/yahoo.c:3288
+#: ../src/protocols/zephyr/zephyr.c:2281
 msgid "Message"
 msgstr "Messaggio:"
 
-#: src/gtksavedstatuses.c:451
+#: ../src/gtksavedstatuses.c:526
 #, fuzzy
 msgid "Saved Statuses"
 msgstr "Statistiche del server"
 
 #. Use button
-#. TODO: It might be better if the button said "Use" or "Activate"
-#: src/gtksavedstatuses.c:477
-#, fuzzy
+#: ../src/gtksavedstatuses.c:549 ../src/gtksavedstatuses.c:1179
 msgid "_Use"
 msgstr "_Utilizza"
 
-#: src/gtksavedstatuses.c:584
+#: ../src/gtksavedstatuses.c:695
 msgid "Title already in use.  You must choose a unique title."
-msgstr ""
-
-#: src/gtksavedstatuses.c:675
-#, fuzzy
-msgid "Custom status"
-msgstr "Per stato"
-
-#: src/gtksavedstatuses.c:778 src/protocols/gg/gg.c:1064
-#: src/protocols/gg/gg.c:1069 src/protocols/jabber/buddy.c:626
-#: src/protocols/jabber/buddy.c:633 src/protocols/jabber/buddy.c:644
-#: src/protocols/jabber/jabber.c:1005 src/protocols/msn/msn.c:544
-#: src/protocols/novell/novell.c:2844 src/protocols/novell/novell.c:2848
-#: src/protocols/oscar/oscar.c:762 src/protocols/oscar/oscar.c:767
-#: src/protocols/oscar/oscar.c:769 src/protocols/yahoo/yahoo.c:2787
+msgstr "Titolo gi in uso. Devi scegliere un titolo diverso."
+
+#: ../src/gtksavedstatuses.c:879
+msgid "Different"
+msgstr "Differente"
+
+#: ../src/gtksavedstatuses.c:908 ../src/gtksavedstatuses.c:1055
+#: ../src/protocols/gg/gg.c:1024 ../src/protocols/gg/gg.c:1574
+#: ../src/protocols/gg/gg.c:1578 ../src/protocols/jabber/buddy.c:629
+#: ../src/protocols/jabber/buddy.c:636 ../src/protocols/jabber/buddy.c:662
+#: ../src/protocols/jabber/jabber.c:1156 ../src/protocols/msn/msn.c:548
+#: ../src/protocols/novell/novell.c:2865 ../src/protocols/novell/novell.c:2869
+#: ../src/protocols/oscar/oscar.c:775 ../src/protocols/oscar/oscar.c:781
+#: ../src/protocols/oscar/oscar.c:784 ../src/protocols/yahoo/yahoo.c:2878
 msgid "Status"
 msgstr "Stato"
 
-#: src/gtksavedstatuses.c:797
-#, fuzzy
+#: ../src/gtksavedstatuses.c:1072
 msgid "_Title:"
-msgstr "Titolo"
-
-#: src/gtksavedstatuses.c:817
-#, fuzzy
+msgstr "_Titolo:"
+
+#: ../src/gtksavedstatuses.c:1091 ../src/gtksavedstatuses.c:1412
 msgid "_Status:"
-msgstr "Stato:"
-
-#. Custom status message expander
-#: src/gtksavedstatuses.c:852
+msgstr "_Stato:"
+
+#. Different status message expander
+#: ../src/gtksavedstatuses.c:1123
 msgid "Use a _different status for some accounts"
-msgstr ""
-
-#: src/gtksound.c:61
+msgstr "Utilizza uno stato _differente per alcuni account"
+
+#. Save & Use button
+#: ../src/gtksavedstatuses.c:1187
+msgid "Sa_ve & Use"
+msgstr "Sa_lva e utilizza"
+
+#: ../src/gtksavedstatuses.c:1393
+#, c-format
+msgid "Status for %s"
+msgstr "Stato per %s"
+
+#: ../src/gtksound.c:59
 msgid "Buddy logs in"
 msgstr "Il contatto  connesso"
 
-#: src/gtksound.c:62
+#: ../src/gtksound.c:60
 msgid "Buddy logs out"
 msgstr "Il contatto  disconnesso"
 
-#: src/gtksound.c:63
+#: ../src/gtksound.c:61
 msgid "Message received"
 msgstr "Messaggio ricevuto"
 
-#: src/gtksound.c:64
+#: ../src/gtksound.c:62
 msgid "Message received begins conversation"
 msgstr "Il messaggio ricevuto inizia la conversazione"
 
-#: src/gtksound.c:65
+#: ../src/gtksound.c:63
 msgid "Message sent"
 msgstr "Messaggio inviato"
 
-#: src/gtksound.c:66
+#: ../src/gtksound.c:64
 msgid "Person enters chat"
 msgstr "Una persona entra in chat"
 
-#: src/gtksound.c:67
+#: ../src/gtksound.c:65
 msgid "Person leaves chat"
 msgstr "Una persona abbandona la chat"
 
-#: src/gtksound.c:68
+#: ../src/gtksound.c:66
 msgid "You talk in chat"
 msgstr "Stai parlando in chat"
 
-#: src/gtksound.c:69
+#: ../src/gtksound.c:67
 msgid "Others talk in chat"
 msgstr "Qualcun altro parla in chat"
 
-#: src/gtksound.c:72
-msgid "Someone says your name in chat"
+#: ../src/gtksound.c:70
+msgid "Someone says your screen name in chat"
 msgstr "Qualcuno pronuncia il tuo nome in chat"
 
-#: src/gtksound.c:414
-#, c-format
-msgid "Unable to play sound because the chosen file (%s) does not exist."
-msgstr "Impossibile riprodurre il suono poich il file scelto (%s) non esiste."
-
-#: src/gtksound.c:430
-msgid ""
-"Unable to play sound because the 'Command' sound method has been chosen, but "
-"no command has been set."
-msgstr ""
-"Impossibile riprodurre il suono poich  stato scelto 'Comando' come metodo "
-"del suono, ma non  stato impostato nessun comando."
-
-#: src/gtksound.c:442
-#, c-format
-msgid ""
-"Unable to play sound because the configured sound command could not be "
-"launched: %s"
-msgstr ""
-"Impossibile riprodurre il suono poich il comando per il suono scelto non "
-"pu essere eseguito: %s"
-
-#: src/gtkstatusbox.c:197
-#, fuzzy
-msgid "Typing"
-msgstr "Ping"
-
 #. connect to the server
-#: src/gtkstatusbox.c:200 src/protocols/irc/irc.c:258
-#: src/protocols/jabber/jabber.c:838 src/protocols/msn/session.c:362
-#: src/protocols/napster/napster.c:525 src/protocols/novell/novell.c:2164
-#: src/protocols/oscar/oscar.c:1816 src/protocols/simple/simple.c:1276
-#: src/protocols/yahoo/yahoo.c:2455 src/protocols/zephyr/zephyr.c:1546
+#: ../src/gtkstatusbox.c:368 ../src/protocols/irc/irc.c:313
+#: ../src/protocols/jabber/jabber.c:983 ../src/protocols/msn/session.c:344
+#: ../src/protocols/napster/napster.c:536
+#: ../src/protocols/novell/novell.c:2181 ../src/protocols/oscar/oscar.c:1250
+#: ../src/protocols/sametime/sametime.c:3685
+#: ../src/protocols/simple/simple.c:1609 ../src/protocols/yahoo/yahoo.c:2570
+#: ../src/protocols/zephyr/zephyr.c:1565
 msgid "Connecting"
 msgstr "Connessione in corso"
 
-#. hacks
-#: src/gtkstatusbox.c:294 src/protocols/bonjour/bonjour.c:233
-#: src/protocols/irc/irc.c:172 src/protocols/jabber/jabber.c:1039
-#: src/protocols/msn/msn.c:573 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:2822
-#: src/protocols/novell/novell.c:2956 src/protocols/novell/novell.c:3039
-#: src/protocols/oscar/oscar.c:808 src/protocols/oscar/oscar.c:7757
-#: src/protocols/simple/simple.c:253 src/protocols/silc/silc.c:48
-#: src/protocols/yahoo/yahoo.c:3214 src/status.c:155
-msgid "Available"
-msgstr "Presente"
-
-#.
-#. * Without this selecting Invisible as own status doesn't
-#. * work. It's not used and not needed to show status of buddies.
-#.
-#: src/gtkstatusbox.c:296 src/protocols/gg/gg.c:1096
-#: src/protocols/oscar/oscar.c:711 src/protocols/oscar/oscar.c:7771
-#: src/protocols/yahoo/yahoo.c:2633 src/protocols/yahoo/yahoo.c:3257
-msgid "Invisible"
-msgstr "Invisibile"
-
-#: src/gtkstatusbox.c:297 src/protocols/bonjour/bonjour.c:228
-#: src/protocols/gg/gg.c:1082 src/protocols/irc/irc.c:168
-#: src/protocols/jabber/buddy.c:1087 src/protocols/jabber/jabber.c:1032
-#: src/protocols/msn/msn.c:569 src/protocols/napster/napster.c:573
-#: src/protocols/novell/novell.c:2834 src/protocols/novell/novell.c:2953
-#: src/protocols/oscar/oscar.c:769 src/protocols/oscar/oscar.c:7591
-#: src/protocols/oscar/oscar.c:7752 src/protocols/sametime/sametime.c:2754
-#: src/protocols/simple/simple.c:249 src/protocols/silc/silc.c:46
-#: src/protocols/yahoo/yahoo.c:2637 src/protocols/yahoo/yahoo.c:3211
-#: src/status.c:154
-msgid "Offline"
-msgstr "Non connesso"
-
-#: src/gtkstatusbox.c:299
-#, fuzzy
-msgid "Custom..."
-msgstr "Personalizzato"
-
-#: src/gtkstatusbox.c:300
-#, fuzzy
-msgid "Saved..."
-msgstr "Salva il file..."
-
-#: src/gtkstock.c:117
+#: ../src/gtkstock.c:138
 msgid "_Alias"
 msgstr "_Alias"
 
-#: src/gtkstock.c:119
+#: ../src/gtkstock.c:140
+msgid "Close _tabs"
+msgstr "Chiudi _schede"
+
+#: ../src/gtkstock.c:142
+msgid "_Get Info"
+msgstr "_Info"
+
+#: ../src/gtkstock.c:143
 msgid "_Invite"
 msgstr "_Invita"
 
-#: src/gtkstock.c:120
+#: ../src/gtkstock.c:144
 msgid "_Modify"
 msgstr "_Modifica"
 
-#: src/gtkstock.c:121
+#: ../src/gtkstock.c:145
 msgid "_Open Mail"
 msgstr "_Leggi la Posta"
 
-#: src/gtkstock.c:123
-msgid "_Warn"
-msgstr "_Richiama"
-
-#: src/gtkutils.c:1393 src/gtkutils.c:1418
+#: ../src/gtkutils.c:1306 ../src/gtkutils.c:1331
 #, fuzzy, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "Si  verificato un errore sconosciuto di connessione: %s."
 
-#: src/gtkutils.c:1395 src/gtkutils.c:1420
-#, fuzzy
+#: ../src/gtkutils.c:1308 ../src/gtkutils.c:1333
 msgid "Failed to load image"
-msgstr "Impossibile salvare l'immagine: %s\n"
-
-#: src/gtkutils.c:1495
-#, fuzzy, c-format
+msgstr "Impossibile caricare l'immagine"
+
+#: ../src/gtkutils.c:1408
+#, c-format
 msgid "Cannot send folder %s."
-msgstr "Impossibile inviare il file"
-
-#: src/gtkutils.c:1497
+msgstr "Impossibile inviare la cartella %s."
+
+#: ../src/gtkutils.c:1410
 msgid ""
 "Gaim cannot transfer a folder. You will need to send the files within "
 "individually"
 msgstr ""
-
-#: src/gtkutils.c:1525 src/gtkutils.c:1534 src/gtkutils.c:1539
-#, fuzzy
+"Gaim non pu trasferire una cartella. Devi inviare individualmente i file "
+"contenuti"
+
+#: ../src/gtkutils.c:1438 ../src/gtkutils.c:1447 ../src/gtkutils.c:1452
 msgid "You have dragged an image"
-msgstr "Hai immesso un nome utente non valido"
-
-#: src/gtkutils.c:1526
+msgstr "Hai trascinato un'immagine"
+
+#: ../src/gtkutils.c:1439
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
 msgstr ""
-
-#: src/gtkutils.c:1530 src/gtkutils.c:1545
-#, fuzzy
+"Puoi inviare questa immagine come file, inserirla nel messaggio o "
+"utilizzarla come icona per questo contatto."
+
+#: ../src/gtkutils.c:1443 ../src/gtkutils.c:1458
 msgid "Set as buddy icon"
-msgstr "Mostra le _icone dei contatti"
-
-#: src/gtkutils.c:1531 src/gtkutils.c:1546
-#, fuzzy
+msgstr "Imposta come icona per il contatto"
+
+#: ../src/gtkutils.c:1444 ../src/gtkutils.c:1459
 msgid "Send image file"
-msgstr "Invia il messaggio"
-
-#: src/gtkutils.c:1532 src/gtkutils.c:1546
-#, fuzzy
+msgstr "Invia il file dell'immagine"
+
+#: ../src/gtkutils.c:1445 ../src/gtkutils.c:1459
 msgid "Insert in message"
-msgstr "Inserisci un'immagine"
-
-#: src/gtkutils.c:1535
-#, fuzzy
+msgstr "Inserisci nel messaggio"
+
+#: ../src/gtkutils.c:1448
 msgid "Would you like to set it as the buddy icon for this user?"
-msgstr "Vuoi entrare nella conversazione?"
-
-#: src/gtkutils.c:1540
+msgstr "Vuoi utilizzarla come icona per questo contatto?"
+
+#: ../src/gtkutils.c:1453
 msgid ""
 "You can send this image as a file transfer or embed it into this message, or "
 "use it as the buddy icon for this user."
 msgstr ""
-
-#: src/gtkutils.c:1542
+"Puoi inviare questa immagine come file, inserirla nel messaggio o "
+"utilizzarla come icona per questo contatto."
+
+#: ../src/gtkutils.c:1455
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
 msgstr ""
+"Puoi inserire questa immagine nel messaggio o utilizzarla come icona per "
+"questo contatto."
 
 #. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
 #. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: src/gtkutils.c:1596
+#: ../src/gtkutils.c:1509
 #, fuzzy
 msgid "Cannot send launcher"
 msgstr "Impossibile inviare il file"
 
-#: src/gtkutils.c:1596
+#: ../src/gtkutils.c:1509
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
 msgstr ""
 
-#: src/log.c:129
+#: ../src/gtkwhiteboard.c:756 ../src/gtkwhiteboard.c:775
+msgid "Save File"
+msgstr "Salva il file"
+
+#: ../src/gtkwhiteboard.c:863
+msgid "Select color"
+msgstr "Scegli il colore"
+
+#: ../src/log.c:180
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr ""
 "<b><font color=\"red\">Il logger non ha nessuna funzione di lettura</font></"
 "b>"
 
-#: src/log.c:577
+#: ../src/log.c:561
+msgid "HTML"
+msgstr "HTML"
+
+#: ../src/log.c:572
+msgid "Plain text"
+msgstr "Testo semplice"
+
+#: ../src/log.c:583
+msgid "Old Gaim"
+msgstr "Vecchio Gaim"
+
+#: ../src/log.c:678
 msgid "Logging of this conversation failed."
-msgstr ""
-
-#: src/log.c:839
+msgstr "Il log di questa conversazione non  riuscito."
+
+#: ../src/log.c:1028
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:904
+#: ../src/log.c:1102
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4657,7 +5465,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;RISPOSTA "
 "AUTOMATICA&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:906
+#: ../src/log.c:1104
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -4666,23 +5474,43 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;RISPOSTA "
 "AUTOMATICA&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:957 src/log.c:1074
+#: ../src/log.c:1162 ../src/log.c:1294
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr ""
 "<font color=\"red\"><b>Impossibile trovare il percorso del file di log!</b></"
 "font>"
 
-#: src/log.c:967 src/log.c:1086
+#: ../src/log.c:1174 ../src/log.c:1308
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Impossibile leggere il file: %s</b></font>"
 
-#: src/log.c:1019
+#: ../src/log.c:1236
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <RISPOSTA AUTOMATICA>: %s\n"
 
-#: src/plugin.c:331
+#: ../src/plugin.c:281 ../src/protocols/jabber/buddy.c:1645
+#: ../src/protocols/msn/servconn.c:139 ../src/protocols/msn/session.c:321
+#: ../src/protocols/oscar/oscar.c:2701
+msgid "Unknown error"
+msgstr "Errore sconosciuto"
+
+#: ../src/plugin.c:424
+#, c-format
+msgid "Plugin magic mismatch %d (need %d)"
+msgstr ""
+
+#: ../src/plugin.c:441
+#, c-format
+msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
+msgstr ""
+
+#: ../src/plugin.c:458
+msgid "Plugin does not implement all required functions"
+msgstr "Il plugin non implementa tutte le funzioni richieste"
+
+#: ../src/plugin.c:523
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -4691,39 +5519,61 @@
 "Il plugin %s richiesto non  stato trovato. Installare questo plugin e "
 "provare di nuovo."
 
-#: src/plugin.c:336 src/plugin.c:364
-msgid "Gaim was unable to load your plugin."
-msgstr "Gaim non  in grado di caricare il tuo plugin."
-
-#: src/plugin.c:360
+#: ../src/plugin.c:528
+#, fuzzy
+msgid "Gaim encountered errors loading the plugin."
+msgstr "Gaim ha incontrato un errore di comunicazione con il server ICQ."
+
+#: ../src/plugin.c:551
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "Impossibile caricare il plugin %s richiesto."
 
-#: src/protocols/bonjour/bonjour.c:298 src/protocols/msn/msn.c:546
-#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2831
-#: src/protocols/oscar/oscar.c:5064 src/protocols/yahoo/yahoo.c:2635
-#: src/protocols/yahoo/yahoo_profile.c:660
-msgid "Idle"
-msgstr "Inattivo"
-
-#: src/protocols/bonjour/bonjour.c:303
+#: ../src/plugin.c:555
+msgid "Gaim was unable to load your plugin."
+msgstr "Gaim non  in grado di caricare il tuo plugin."
+
+#: ../src/plugin.c:657
 #, fuzzy, c-format
+msgid "The dependent plugin %s failed to unload."
+msgstr "Impossibile caricare il plugin %s richiesto."
+
+#: ../src/plugin.c:662
+#, fuzzy
+msgid "Gaim encountered errors unloading the plugin."
+msgstr "Gaim ha incontrato un errore di comunicazione con il server ICQ."
+
+#. Send a message about the connection error
+#: ../src/protocols/bonjour/bonjour.c:111
+#, fuzzy
+msgid "Unable to listen for incoming IM connections\n"
+msgstr "Impossibile creare una nuova connessione."
+
+#: ../src/protocols/bonjour/bonjour.c:146
+msgid ""
+"Unable to establish connection with the local mDNS server.  Is it running?"
+msgstr ""
+"Impossibile stabilire una connessione con il server mDNS locale.  in "
+"funzione?"
+
+#: ../src/protocols/bonjour/bonjour.c:337
+#: ../src/protocols/sametime/sametime.c:3243
+#, c-format
 msgid ""
 "\n"
 "<b>Status:</b> %s"
 msgstr ""
 "\n"
-"<b>Stato</b>: Impressionante"
-
-#: src/protocols/bonjour/bonjour.c:305
-#, fuzzy, c-format
+"<b>Stato:</b> %s"
+
+#: ../src/protocols/bonjour/bonjour.c:339
+#, c-format
 msgid ""
 "\n"
 "<b>Message:</b> %s"
 msgstr ""
 "\n"
-"<b>%s:</b> %s"
+"<b>Messaggio:</b> %s"
 
 #. *< type
 #. *< ui_requirement
@@ -4735,349 +5585,407 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/bonjour/bonjour.c:388 src/protocols/bonjour/bonjour.c:390
-#, fuzzy
+#: ../src/protocols/bonjour/bonjour.c:433
+#: ../src/protocols/bonjour/bonjour.c:435
 msgid "Bonjour Protocol Plugin"
-msgstr "Plugin per il protocollo Yahoo"
+msgstr "Plugin per il protocollo Bonjour"
+
+#: ../src/protocols/bonjour/bonjour.c:471
+#: ../src/protocols/bonjour/bonjour.c:479
+#: ../src/protocols/bonjour/bonjour.c:537
+msgid "Gaim User"
+msgstr "Utente di Gaim"
 
 #. Creating the user splits
-#: src/protocols/bonjour/bonjour.c:417
-#, fuzzy
-msgid "Host name"
-msgstr "Cognome:"
+#: ../src/protocols/bonjour/bonjour.c:575 ../src/protocols/silc/silc.c:935
+msgid "Hostname"
+msgstr "Nome host"
 
 #. Creating the options for the protocol
-#: src/protocols/bonjour/bonjour.c:421 src/protocols/irc/irc.c:822
-#: src/protocols/msn/msn.c:1968 src/protocols/napster/napster.c:712
-#: src/protocols/silc/silc.c:1597
+#. port to connect to
+#: ../src/protocols/bonjour/bonjour.c:579 ../src/protocols/irc/irc.c:900
+#: ../src/protocols/msn/msn.c:2049 ../src/protocols/napster/napster.c:724
+#: ../src/protocols/oscar/oscar.c:6466
+#: ../src/protocols/sametime/sametime.c:5635 ../src/protocols/silc/silc.c:1858
+#: ../src/protocols/toc/toc.c:2344
 msgid "Port"
 msgstr "Porta"
 
-#: src/protocols/bonjour/bonjour.c:424 src/protocols/gg/gg.c:405
-#, fuzzy
+#: ../src/protocols/bonjour/bonjour.c:582 ../src/protocols/gg/gg.c:622
+#: ../src/protocols/jabber/jabber.c:774
 msgid "First name"
-msgstr "Nome:"
-
-#: src/protocols/bonjour/bonjour.c:427 src/protocols/gg/gg.c:401
-#, fuzzy
+msgstr "Nome"
+
+#: ../src/protocols/bonjour/bonjour.c:585 ../src/protocols/gg/gg.c:617
+#: ../src/protocols/jabber/jabber.c:779
 msgid "Last name"
-msgstr "Cognome:"
-
-#: src/protocols/bonjour/bonjour.c:430 src/protocols/jabber/buddy.c:261
-#: src/protocols/jabber/buddy.c:772 src/protocols/jabber/buddy.c:780
-#: src/protocols/silc/silc.c:661 src/protocols/silc/util.c:511
-#: src/protocols/yahoo/yahoo_profile.c:995
-msgid "Email"
+msgstr "Cognome"
+
+#: ../src/protocols/bonjour/bonjour.c:588 ../src/protocols/gg/gg.c:468
+#: ../src/protocols/jabber/jabber.c:764 ../src/protocols/silc/silc.c:699
+#: ../src/protocols/silc/silc.c:939
+msgid "E-mail"
 msgstr "Email"
 
-#: src/protocols/bonjour/bonjour.h:35
+#: ../src/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
-msgstr ""
-
-#: src/protocols/gg/gg.c:136 src/protocols/gg/gg.c:155
-#, fuzzy
+msgstr "Bonjour"
+
+#: ../src/protocols/bonjour/jabber.c:357
+#, c-format
+msgid "%s has closed the conversation."
+msgstr "%s ha chiuso la conversazione."
+
+#: ../src/protocols/bonjour/jabber.c:439
+msgid "Cannot open socket"
+msgstr "Impossibile aprire il socket"
+
+#: ../src/protocols/bonjour/jabber.c:447
+msgid "Error setting socket options"
+msgstr "Errore nell'impostazione delle opzioni per il socket"
+
+#: ../src/protocols/bonjour/jabber.c:458
+msgid "Cannot bind socket to port"
+msgstr "Impossibile associare il socket alla porta"
+
+#: ../src/protocols/bonjour/jabber.c:465
+msgid "Cannot listen on socket"
+msgstr "Impossibile ascoltare sul socket"
+
+#: ../src/protocols/bonjour/jabber.c:559
+#, fuzzy
+msgid "Unable to send the message, the conversation couldn't be started."
+msgstr "Impossibile inviare il messaggio. Il messaggio  troppo grande."
+
+#: ../src/protocols/gg/gg.c:76 ../src/proxy.c:2346
+msgid "Invalid proxy settings"
+msgstr "Impostazioni del proxy non valide"
+
+#: ../src/protocols/gg/gg.c:77 ../src/proxy.c:2346
+msgid ""
+"Either the host name or port number specified for your given proxy type is "
+"invalid."
+msgstr "Il nome dell'host o il numero della porta specificati non sono validi."
+
+#: ../src/protocols/gg/gg.c:115 ../src/protocols/gg/gg.c:137
+#: ../src/protocols/gg/gg.c:180
+msgid "Token Error"
+msgstr "Errore di token"
+
+#: ../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 "Impossibile recuperare il token.\n"
+
+#: ../src/protocols/gg/gg.c:269 ../src/protocols/gg/gg.c:288
 msgid "Save Buddylist..."
-msgstr "Invia la lista contatti"
-
-#: src/protocols/gg/gg.c:137
+msgstr "Salva la lista contatti..."
+
+#: ../src/protocols/gg/gg.c:270
 msgid "Your buddylist is empty, nothing was written to the file."
-msgstr ""
-
-#: src/protocols/gg/gg.c:143 src/protocols/gg/gg.c:145
-#: src/protocols/gg/gg.c:176
-#, fuzzy
+msgstr "La tua lista contatti  vuota. Non  stato scritto niente sul file."
+
+#: ../src/protocols/gg/gg.c:276 ../src/protocols/gg/gg.c:278
 msgid "Couldn't open file"
-msgstr "Impossibile inviare il file"
-
-#: src/protocols/gg/gg.c:156
-#, fuzzy
+msgstr "Impossibile aprire il file"
+
+#: ../src/protocols/gg/gg.c:289
 msgid "Buddylist saved successfully!"
-msgstr "Password modificata con successo"
-
-#: src/protocols/gg/gg.c:178
-#, fuzzy
-msgid "Could't open file"
-msgstr "Impossibile inviare il file"
-
-#: src/protocols/gg/gg.c:199
-#, fuzzy
+msgstr "Lista contatti salvata con successo!"
+
+#: ../src/protocols/gg/gg.c:307 ../src/protocols/gg/gg.c:308
+msgid "Couldn't load buddylist"
+msgstr "Impossibile caricare la lista contatti"
+
+#: ../src/protocols/gg/gg.c:324
 msgid "Load Buddylist..."
-msgstr "_Alias per il contatto..."
-
-#: src/protocols/gg/gg.c:200
-#, fuzzy
+msgstr "Apri lista contatti..."
+
+#: ../src/protocols/gg/gg.c:325
 msgid "Buddylist loaded successfully!"
-msgstr "Password modificata con successo"
-
-#: src/protocols/gg/gg.c:211
-#, fuzzy
+msgstr "Lista contatti aperta con successo!"
+
+#: ../src/protocols/gg/gg.c:336
 msgid "Save buddylist..."
-msgstr "Invia la lista contatti"
-
-#: src/protocols/gg/gg.c:254
+msgstr "Salva lista contatti..."
+
+#: ../src/protocols/gg/gg.c:380
 msgid "Fill in the registration fields."
-msgstr ""
-
-#: src/protocols/gg/gg.c:259
-#, fuzzy
+msgstr "Riempi i campi per la registrazione."
+
+#: ../src/protocols/gg/gg.c:385
 msgid "Passwords do not match."
-msgstr "Le nuove password non coincidono."
-
-#: src/protocols/gg/gg.c:266
-#, fuzzy
+msgstr "Le password non coincidono."
+
+#: ../src/protocols/gg/gg.c:394
 msgid "Unable to register new account. Error occurred.\n"
-msgstr "Impossibile creare una nuova connessione."
-
-#: src/protocols/gg/gg.c:279
+msgstr "Impossibile registrare il nuovo account. Si  verificato un errore.\n"
+
+#: ../src/protocols/gg/gg.c:407
 msgid "New Gadu-Gadu Account Registered"
-msgstr ""
-
-#: src/protocols/gg/gg.c:280
-#, fuzzy
+msgstr "Nuovo account Gadu-Gadu registrato"
+
+#: ../src/protocols/gg/gg.c:408
 msgid "Registration completed successfully!"
-msgstr "Registrazione riuscita"
-
-#: src/protocols/gg/gg.c:409 src/protocols/gg/gg.c:1665
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:698
-#: src/protocols/jabber/buddy.c:1341 src/protocols/jabber/jabber.c:648
-#: src/protocols/msn/msn.c:1394 src/protocols/silc/buddy.c:1480
-#: src/protocols/silc/ops.c:822 src/protocols/silc/ops.c:965
-#: src/protocols/silc/ops.c:1114 src/protocols/yahoo/yahoo_profile.c:1000
+msgstr "Registrazione completata con successo!"
+
+#: ../src/protocols/gg/gg.c:473 ../src/protocols/gg/gg.c:764
+#: ../src/protocols/jabber/jabber.c:753 ../src/protocols/jabber/jabber.c:1310
+msgid "Password"
+msgstr "Password"
+
+#: ../src/protocols/gg/gg.c:478 ../src/protocols/gg/gg.c:769
+msgid "Password (retype)"
+msgstr "Password (di nuovo)"
+
+#: ../src/protocols/gg/gg.c:483 ../src/protocols/gg/gg.c:774
+#, fuzzy
+msgid "Enter current token"
+msgstr "%s non  attualmente connesso."
+
+#: ../src/protocols/gg/gg.c:489 ../src/protocols/gg/gg.c:780
+#, fuzzy
+msgid "Current token"
+msgstr "Attualmente su"
+
+#: ../src/protocols/gg/gg.c:493 ../src/protocols/gg/gg.c:494
+msgid "Register New Gadu-Gadu Account"
+msgstr "Registra un nuovo account Gadu-Gadu"
+
+#: ../src/protocols/gg/gg.c:495
+msgid "Please, fill in the following fields"
+msgstr "Riempi i seguenti campi"
+
+#. General
+#: ../src/protocols/gg/gg.c:627 ../src/protocols/gg/gg.c:1038
+#: ../src/protocols/gg/gg.c:1104 ../src/protocols/gg/gg.c:2175
+#: ../src/protocols/jabber/buddy.c:271 ../src/protocols/jabber/buddy.c:803
+#: ../src/protocols/jabber/buddy.c:1522 ../src/protocols/jabber/buddy.c:1704
+#: ../src/protocols/jabber/jabber.c:769 ../src/protocols/msn/msn.c:1368
+#: ../src/protocols/msn/msn.c:1530 ../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 "Nickname"
 
-#: src/protocols/gg/gg.c:413 src/protocols/jabber/jabber.c:668
-#: src/protocols/oscar/oscar.c:6006 src/protocols/oscar/oscar.c:6014
+#: ../src/protocols/gg/gg.c:632 ../src/protocols/gg/gg.c:1043
+#: ../src/protocols/gg/gg.c:1107 ../src/protocols/jabber/jabber.c:789
+#: ../src/protocols/oscar/oscar.c:3687 ../src/protocols/oscar/oscar.c:3695
 msgid "City"
 msgstr "Citt"
 
-#: src/protocols/gg/gg.c:417
+#: ../src/protocols/gg/gg.c:637
 msgid "Year of birth"
-msgstr ""
-
-#: src/protocols/gg/gg.c:426
+msgstr "Anno di nascita"
+
+#: ../src/protocols/gg/gg.c:640 ../src/protocols/msn/msn.c:1532
+#: ../src/protocols/oscar/oscar.c:3651
+#: ../src/protocols/yahoo/yahoo_profile.c:1066
+msgid "Gender"
+msgstr "Sesso"
+
+#: ../src/protocols/gg/gg.c:641
+msgid "Male or female"
+msgstr "Maschile o femminile"
+
+#: ../src/protocols/gg/gg.c:642 ../src/protocols/oscar/oscar.c:3651
+msgid "Male"
+msgstr "Maschile"
+
+#: ../src/protocols/gg/gg.c:643 ../src/protocols/oscar/oscar.c:3651
+msgid "Female"
+msgstr "Femminile"
+
+#: ../src/protocols/gg/gg.c:647
 #, fuzzy
 msgid "Only online"
 msgstr "Online"
 
-#: src/protocols/gg/gg.c:430 src/protocols/gg/gg.c:431
-#: src/protocols/gg/gg.c:1510
-#, fuzzy
+#: ../src/protocols/gg/gg.c:651 ../src/protocols/gg/gg.c:652
 msgid "Find buddies"
-msgstr "Contatti inattivi in _grigio"
-
-#: src/protocols/gg/gg.c:432
+msgstr "Cerca contatti"
+
+#: ../src/protocols/gg/gg.c:653
 #, fuzzy
 msgid "Please, enter your search criteria below"
 msgstr "Inserisci la tua nuova password"
 
-#: src/protocols/gg/gg.c:465
+#: ../src/protocols/gg/gg.c:690
 msgid "Fill in the fields."
-msgstr ""
-
-#: src/protocols/gg/gg.c:476
+msgstr "Riempi i campi."
+
+#: ../src/protocols/gg/gg.c:702
 msgid "Your current password is different from the one that you specified."
-msgstr ""
-
-#: src/protocols/gg/gg.c:491
+msgstr "La tua password attuale  diversa da quella specificata."
+
+#: ../src/protocols/gg/gg.c:716
 #, fuzzy
 msgid "Unable to change password. Error occured.\n"
 msgstr "Impossibile cambiare la password di Gadu-Gadu"
 
-#: src/protocols/gg/gg.c:500
-#, fuzzy
+#: ../src/protocols/gg/gg.c:725
 msgid "Change password for the Gadu-Gadu account"
-msgstr "Cambia la password per %s"
-
-#: src/protocols/gg/gg.c:501
-#, fuzzy
+msgstr "Cambia la password per l'account Gadu-Gadu"
+
+#: ../src/protocols/gg/gg.c:726
 msgid "Password was changed successfully!"
-msgstr "Password modificata con successo"
-
-#: src/protocols/gg/gg.c:535
-#, fuzzy
-msgid "Token Error"
-msgstr "Errore sconosciuto"
-
-#: src/protocols/gg/gg.c:536
-#, fuzzy
-msgid "Unable to fetch the token.\n"
-msgstr "Impossibile recuperare la lista delle stanze."
-
-#: src/protocols/gg/gg.c:551
-#, fuzzy
+msgstr "Password modificata con successo!"
+
+#: ../src/protocols/gg/gg.c:759
 msgid "Current password"
-msgstr "Password non corretta."
-
-#: src/protocols/gg/gg.c:555 src/protocols/gg/gg.c:1476
-#: src/protocols/jabber/jabber.c:632 src/protocols/jabber/jabber.c:1150
-msgid "Password"
-msgstr "Password"
-
-#: src/protocols/gg/gg.c:559 src/protocols/gg/gg.c:1480
-#, fuzzy
-msgid "Password (retype)"
-msgstr "Password inviata"
-
-#: src/protocols/gg/gg.c:563 src/protocols/gg/gg.c:1484
-#, fuzzy
-msgid "Enter current token"
-msgstr "%s non  attualmente connesso."
-
-#. original size: 60x24
-#: src/protocols/gg/gg.c:568 src/protocols/gg/gg.c:1489
-#, fuzzy
-msgid "Current token"
-msgstr "Attualmente su"
-
-#: src/protocols/gg/gg.c:574
+msgstr "Password attuale"
+
+#: ../src/protocols/gg/gg.c:784
 #, fuzzy
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Inserisci la tua password attuale e la nuova password."
 
-#: src/protocols/gg/gg.c:578 src/protocols/gg/gg.c:579
-#, fuzzy
+#: ../src/protocols/gg/gg.c:788 ../src/protocols/gg/gg.c:789
 msgid "Change Gadu-Gadu Password"
-msgstr "Impossibile cambiare la password di Gadu-Gadu"
-
-#: src/protocols/gg/gg.c:649
+msgstr "Cambia la password per Gadu-Gadu"
+
+#: ../src/protocols/gg/gg.c:863
 #, fuzzy, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Rimuovi la chat dalla lista dei contatti"
 
-#: src/protocols/gg/gg.c:651 src/protocols/gg/gg.c:652
-#, fuzzy
+#: ../src/protocols/gg/gg.c:866 ../src/protocols/gg/gg.c:867
 msgid "Add to chat..."
-msgstr "Aggiungi una c_hat"
-
-#: src/protocols/gg/gg.c:812
-msgid "Unable to read socket"
-msgstr "Impossibile leggere il socket"
-
-#: src/protocols/gg/gg.c:959
+msgstr "Aggiungi alla chat..."
+
+#: ../src/protocols/gg/gg.c:1029 ../src/protocols/gg/gg.c:1098
+#: ../src/protocols/oscar/oscar.c:3623
+msgid "UIN"
+msgstr "UIN"
+
+#: ../src/protocols/gg/gg.c:1033 ../src/protocols/gg/gg.c:1101
+#: ../src/protocols/jabber/buddy.c:1518 ../src/protocols/jabber/buddy.c:1694
+#: ../src/protocols/oscar/oscar.c:3634 ../src/protocols/silc/ops.c:1024
+msgid "First Name"
+msgstr "Nome"
+
+#: ../src/protocols/gg/gg.c:1052 ../src/protocols/gg/gg.c:1110
+msgid "Birth Year"
+msgstr "Anno di nascita"
+
+#: ../src/protocols/gg/gg.c:1092 ../src/protocols/gg/gg.c:1161
+#: ../src/protocols/oscar/oscar.c:3798
+#, fuzzy
+msgid "Unable to display the search results."
+msgstr "Impossibile invitare l'utente (%s)."
+
+#: ../src/protocols/gg/gg.c:1152
 msgid "Gadu-Gadu Public Directory"
-msgstr ""
-
-#: src/protocols/gg/gg.c:960
-#, fuzzy
+msgstr "Directory pubblica di Gadu-Gadu"
+
+#: ../src/protocols/gg/gg.c:1153
 msgid "Search results"
 msgstr "Risultati della ricerca"
 
-#. zephyr has several exposures
-#. NONE (where you are hidden, and zephyrs to you are in practice silently dropped -- yes this is wrong)
-#. OPSTAFF "hidden"
-#. REALM-VISIBLE visible to people in local realm
-#. REALM-ANNOUNCED REALM-VISIBLE+ plus your logins/logouts are announced to <login,username,*>
-#. NET-VISIBLE REALM-ANNOUNCED, plus visible to people in foreign realm
-#. NET-ANNOUNCED NET-VISIBLE, plus logins/logouts are announced	 to <login,username,*>
-#.
-#. Online will set the user to the exposure they have in their options (defaulting to REALM-VISIBLE),
-#. Hidden, will set the user's exposure to OPSTAFF
-#.
-#. Away won't change their exposure but will set an auto away message (for IMs only)
-#.
-#: src/protocols/gg/gg.c:1087 src/protocols/jabber/buddy.c:1089
-#: src/protocols/napster/napster.c:578 src/protocols/oscar/oscar.c:713
-#: src/protocols/yahoo/yahoo.c:2639 src/protocols/zephyr/zephyr.c:2252
-msgid "Online"
-msgstr "Online"
-
-#. type = gaim_status_type_new_with_attrs(GAIM_STATUS_UNAVAILABLE, "not-available", "Not Available",
-#. TRUE, TRUE, FALSE, "message", _("Message"),
-#. gaim_value_new(GAIM_TYPE_STRING), NULL);
-#. types = g_list_append(types, type);
-#: src/protocols/gg/gg.c:1106 src/protocols/msn/msn.c:585
-#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2828
-#: src/protocols/novell/novell.c:2962 src/protocols/novell/novell.c:3044
-#: src/protocols/silc/buddy.c:1421 src/protocols/silc/silc.c:54
-#: src/protocols/yahoo/yahoo.c:2617 src/protocols/yahoo/yahoo.c:3233
-msgid "Busy"
-msgstr "Occupato"
-
-#: src/protocols/gg/gg.c:1111 src/protocols/msn/msn.c:554
+#: ../src/protocols/gg/gg.c:1197
+#, fuzzy
+msgid "No matching users found"
+msgstr "Gli host non corrispondono"
+
+#: ../src/protocols/gg/gg.c:1198
+#, fuzzy
+msgid "There are no users matching your search criteria."
+msgstr "Inserisci la tua nuova password"
+
+#: ../src/protocols/gg/gg.c:1292 ../src/protocols/gg/gg.c:1439
+msgid "Unable to read socket"
+msgstr "Impossibile leggere il socket"
+
+#: ../src/protocols/gg/gg.c:1375
+msgid "Buddy list downloaded"
+msgstr "Lista contatti scaricata"
+
+#: ../src/protocols/gg/gg.c:1376
+msgid "Your buddy list was downloaded from the server."
+msgstr "La tua lista contatti  stata scaricata dal server."
+
+#: ../src/protocols/gg/gg.c:1383
+#, fuzzy
+msgid "Buddy list uploaded"
+msgstr "Lista contatti"
+
+#: ../src/protocols/gg/gg.c:1384
+#, fuzzy
+msgid "Your buddy list was stored on the server."
+msgstr "Non c' nessuna lista contatti conservata sul server Gadu-Gadu."
+
+#: ../src/protocols/gg/gg.c:1485 ../src/protocols/gg/gg.c:1709
+msgid "Connection failed."
+msgstr "Connessione fallita."
+
+#: ../src/protocols/gg/gg.c:1615 ../src/protocols/msn/msn.c:564
 msgid "Blocked"
 msgstr "Bloccato"
 
-#: src/protocols/gg/gg.c:1129
-#, fuzzy
+#: ../src/protocols/gg/gg.c:1638
 msgid "Add to chat"
-msgstr "Aggiungi una chat"
-
-#: src/protocols/gg/gg.c:1133
-#, fuzzy
+msgstr "Aggiungi alla chat"
+
+#: ../src/protocols/gg/gg.c:1647
 msgid "Unblock"
+msgstr "Sblocca"
+
+#: ../src/protocols/gg/gg.c:1651
+msgid "Block"
 msgstr "Blocca"
 
-#: src/protocols/gg/gg.c:1149
+#: ../src/protocols/gg/gg.c:1668
 #, fuzzy
 msgid "Chat _name:"
 msgstr "Cognome:"
 
-#: src/protocols/gg/gg.c:1183
-#, fuzzy
-msgid "Connection failed."
-msgstr "Connessione fallita"
-
-#: src/protocols/gg/gg.c:1357
+#: ../src/protocols/gg/gg.c:1896
 #, fuzzy
 msgid "Chat error"
 msgstr "Errore di lettura"
 
-#: src/protocols/gg/gg.c:1358
+#: ../src/protocols/gg/gg.c:1897
 #, fuzzy
 msgid "This chat name is already in use"
 msgstr "Il file esiste gi."
 
-#: src/protocols/gg/gg.c:1435
+#: ../src/protocols/gg/gg.c:1980
 #, fuzzy
 msgid "Not connected to the server."
 msgstr "Sei stato disconnesso dal server."
 
-#: src/protocols/gg/gg.c:1456
-msgid "Token Error: Unable to fetch the token.\n"
-msgstr ""
-
-#: src/protocols/gg/gg.c:1472
-#, fuzzy
-msgid "e-Mail"
-msgstr "Email"
-
-#: src/protocols/gg/gg.c:1495 src/protocols/gg/gg.c:1496
-#, fuzzy
-msgid "Register New Gadu-Gadu Account"
-msgstr "Registra un nuovo account Jabber"
-
-#: src/protocols/gg/gg.c:1497
-msgid "Please, fill in the following fields"
-msgstr ""
-
-#: src/protocols/gg/gg.c:1515
-#, fuzzy
-msgid "Change password"
-msgstr "Cambia password"
-
-#: src/protocols/gg/gg.c:1520
+#: ../src/protocols/gg/gg.c:2003
+#, fuzzy
+msgid "Find buddies..."
+msgstr "Contatti inattivi in _grigio"
+
+#: ../src/protocols/gg/gg.c:2009
+msgid "Change password..."
+msgstr "Cambia password..."
+
+#: ../src/protocols/gg/gg.c:2015
 #, fuzzy
 msgid "Upload buddylist to Server"
 msgstr "Esporta la lista contatti sul server"
 
-#: src/protocols/gg/gg.c:1523
+#: ../src/protocols/gg/gg.c:2019
 #, fuzzy
 msgid "Download buddylist from Server"
 msgstr "Elimina la lista contatti dal server"
 
-#: src/protocols/gg/gg.c:1526
+#: ../src/protocols/gg/gg.c:2023
 #, fuzzy
 msgid "Delete buddylist from Server"
 msgstr "Elimina la lista contatti dal server"
 
-#: src/protocols/gg/gg.c:1529
-msgid "Save buddylist to file"
-msgstr ""
-
-#: src/protocols/gg/gg.c:1532
-#, fuzzy
-msgid "Load buddylist from file"
+#: ../src/protocols/gg/gg.c:2027
+msgid "Save buddylist to file..."
+msgstr "Salva la lista contatti nel file..."
+
+#: ../src/protocols/gg/gg.c:2031
+#, fuzzy
+msgid "Load buddylist from file..."
 msgstr "Importa la lista contatti dal server"
 
 #. magic
@@ -5091,119 +5999,119 @@
 #. id
 #. name
 #. version
-#: src/protocols/gg/gg.c:1617
+#: ../src/protocols/gg/gg.c:2127
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Plugin per il protocollo Gadu-Gadu"
 
 #. summary
-#: src/protocols/gg/gg.c:1618
+#: ../src/protocols/gg/gg.c:2128
 msgid "Polish popular IM"
-msgstr ""
-
-#: src/protocols/gg/gg.c:1665
-#, fuzzy
+msgstr "IM popolare in Polonia"
+
+#: ../src/protocols/gg/gg.c:2176
 msgid "Gadu-Gadu User"
-msgstr "Motore di ricerca di Gadu-Gadu"
-
-#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1313
+msgstr "Utente Gadu-Gadu"
+
+#: ../src/protocols/irc/cmds.c:43 ../src/protocols/silc/silc.c:1585
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Comando sconosciuto: %s"
 
-#: src/protocols/irc/cmds.c:468 src/protocols/jabber/chat.c:592
-#: src/protocols/silc/silc.c:1021
+#: ../src/protocols/irc/cmds.c:482 ../src/protocols/jabber/chat.c:590
+#: ../src/protocols/silc/silc.c:1293
 #, c-format
 msgid "current topic is: %s"
 msgstr "l'argomento attuale : %s"
 
-#: src/protocols/irc/cmds.c:472 src/protocols/jabber/chat.c:596
-#: src/protocols/silc/silc.c:1025
+#: ../src/protocols/irc/cmds.c:486 ../src/protocols/jabber/chat.c:594
+#: ../src/protocols/silc/silc.c:1297
 msgid "No topic is set"
 msgstr "Non  impostato nessun argomento"
 
-#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:173
-#: src/protocols/yahoo/yahoo_filexfer.c:182
-#: src/protocols/yahoo/yahoo_filexfer.c:191
-#, fuzzy
+#: ../src/protocols/irc/dcc_send.c:287 ../src/protocols/irc/dcc_send.c:326
+#: ../src/protocols/yahoo/yahoo_filexfer.c:252
+#: ../src/protocols/yahoo/yahoo_filexfer.c:261
+#: ../src/protocols/yahoo/yahoo_filexfer.c:270
 msgid "File Transfer Failed"
-msgstr "Trasferimento file annullato"
-
-#: src/protocols/irc/dcc_send.c:273
+msgstr "Trasferimento file fallito"
+
+#: ../src/protocols/irc/dcc_send.c:288 ../src/protocols/irc/dcc_send.c:327
 msgid "Gaim could not open a listening port."
 msgstr "Impossibile aprire una porta in ascolto."
 
-#: src/protocols/irc/irc.c:79
+#: ../src/protocols/irc/irc.c:78
 msgid "Error displaying MOTD"
 msgstr "Errore di visualizzazione del MOTD"
 
-#: src/protocols/irc/irc.c:79
+#: ../src/protocols/irc/irc.c:78
 msgid "No MOTD available"
 msgstr "Nessun MOTD disponibile"
 
-#: src/protocols/irc/irc.c:80
+#: ../src/protocols/irc/irc.c:79
 msgid "There is no MOTD associated with this connection."
 msgstr "Non c' nessun MOTD associato con questa connessione."
 
-#: src/protocols/irc/irc.c:83
+#: ../src/protocols/irc/irc.c:82
 #, c-format
 msgid "MOTD for %s"
 msgstr "MOTD per %s"
 
-#: src/protocols/irc/irc.c:103 src/protocols/irc/irc.c:522
-#: src/protocols/irc/irc.c:544
+#: ../src/protocols/irc/irc.c:119 ../src/protocols/irc/irc.c:149
+#: ../src/protocols/irc/irc.c:604 ../src/protocols/irc/irc.c:629
 msgid "Server has disconnected"
 msgstr "Il server ti ha disconnesso"
 
-#: src/protocols/irc/irc.c:188
+#: ../src/protocols/irc/irc.c:242
 msgid "View MOTD"
 msgstr "Leggi il MOTD"
 
-#: src/protocols/irc/irc.c:200 src/protocols/silc/chat.c:32
+#: ../src/protocols/irc/irc.c:254 ../src/protocols/silc/chat.c:33
 msgid "_Channel:"
 msgstr "_Canale:"
 
-#: src/protocols/irc/irc.c:206 src/protocols/jabber/chat.c:59
+#: ../src/protocols/irc/irc.c:260 ../src/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "_Password:"
 
-#: src/protocols/irc/irc.c:238
+#: ../src/protocols/irc/irc.c:292
 msgid "IRC nicks may not contain whitespace"
 msgstr "I nick IRC non devono contenere spazi bianchi"
 
-#: src/protocols/irc/irc.c:266 src/protocols/jabber/jabber.c:433
-#: src/protocols/jabber/jabber.c:770
+#: ../src/protocols/irc/irc.c:321 ../src/protocols/jabber/jabber.c:554
+#: ../src/protocols/jabber/jabber.c:893
 msgid "SSL support unavailable"
 msgstr "Supporto SSL non disponibile"
 
-#: src/protocols/irc/irc.c:277 src/protocols/simple/simple.c:383
-#: src/protocols/simple/simple.c:1219
+#: ../src/protocols/irc/irc.c:333 ../src/protocols/simple/simple.c:452
+#: ../src/protocols/simple/simple.c:1521
 msgid "Couldn't create socket"
 msgstr "Impossibile creare il socket"
 
-#: src/protocols/irc/irc.c:348 src/protocols/jabber/jabber.c:306
-#: src/protocols/oscar/oscar.c:1744 src/protocols/oscar/oscar.c:1812
+#: ../src/protocols/irc/irc.c:404 ../src/protocols/jabber/jabber.c:426
+#: ../src/protocols/oscar/oscar.c:1246
 msgid "Couldn't connect to host"
 msgstr "Impossibile connettersi all'host"
 
-#: src/protocols/irc/irc.c:373 src/protocols/jabber/jabber.c:333
+#: ../src/protocols/irc/irc.c:429 ../src/protocols/jabber/jabber.c:453
 msgid "Connection Failed"
 msgstr "Connessione fallita"
 
-#: src/protocols/irc/irc.c:376 src/protocols/jabber/jabber.c:336
+#: ../src/protocols/irc/irc.c:432 ../src/protocols/jabber/jabber.c:456
 msgid "SSL Handshake Failed"
 msgstr "Handshake SSL fallito"
 
-#: src/protocols/irc/irc.c:519 src/protocols/irc/irc.c:541
+#: ../src/protocols/irc/irc.c:601 ../src/protocols/irc/irc.c:626
 msgid "Read error"
 msgstr "Errore di lettura"
 
-#: src/protocols/irc/irc.c:690 src/protocols/silc/chat.c:1388
-#: src/protocols/yahoo/yahoochat.c:1376
+#: ../src/protocols/irc/irc.c:765 ../src/protocols/silc/chat.c:1421
+#: ../src/protocols/yahoo/yahoochat.c:1430
 msgid "Users"
 msgstr "Utenti"
 
-#: src/protocols/irc/irc.c:693 src/protocols/silc/chat.c:1391
-#: src/protocols/silc/ops.c:1166 src/protocols/yahoo/yahoochat.c:1385
+#: ../src/protocols/irc/irc.c:768 ../src/protocols/sametime/sametime.c:3354
+#: ../src/protocols/silc/chat.c:1424 ../src/protocols/silc/ops.c:1380
+#: ../src/protocols/yahoo/yahoochat.c:1439
 msgid "Topic"
 msgstr "Argomento"
 
@@ -5215,34 +6123,39 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:799
+#: ../src/protocols/irc/irc.c:877
 msgid "IRC Protocol Plugin"
 msgstr "Plugin per il protocollo IRC"
 
 #. *  summary
-#: src/protocols/irc/irc.c:800
+#: ../src/protocols/irc/irc.c:878
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Il plugin per il protocollo IRC che fa meno schifo"
 
-#: src/protocols/irc/irc.c:819 src/protocols/irc/msgs.c:233
-#: src/protocols/jabber/jabber.c:1708 src/protocols/napster/napster.c:707
-#: src/protocols/simple/simple.c:1428 src/protocols/silc/ops.c:1028
-#: src/protocols/silc/ops.c:1130
+#. host to connect to
+#: ../src/protocols/irc/irc.c:897 ../src/protocols/irc/msgs.c:235
+#: ../src/protocols/jabber/jabber.c:1908 ../src/protocols/msn/msn.c:2044
+#: ../src/protocols/napster/napster.c:719 ../src/protocols/oscar/oscar.c:6463
+#: ../src/protocols/sametime/sametime.c:5630 ../src/protocols/silc/ops.c:1242
+#: ../src/protocols/silc/ops.c:1344 ../src/protocols/simple/simple.c:1769
+#: ../src/protocols/toc/toc.c:2340
 msgid "Server"
 msgstr "Server"
 
-#: src/protocols/irc/irc.c:825
+#: ../src/protocols/irc/irc.c:903
 msgid "Encodings"
 msgstr "Codifiche"
 
-#: src/protocols/irc/irc.c:828 src/protocols/irc/msgs.c:227
-#: src/protocols/jabber/jabber.c:628 src/protocols/silc/buddy.c:1483
-#: src/protocols/silc/ops.c:975 src/protocols/silc/ops.c:977
-#: src/protocols/silc/ops.c:1124 src/protocols/silc/ops.c:1126
+#: ../src/protocols/irc/irc.c:906 ../src/protocols/irc/msgs.c:229
+#: ../src/protocols/jabber/jabber.c:749 ../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:933
 msgid "Username"
 msgstr "Nome utente"
 
-#: src/protocols/irc/irc.c:831
+#: ../src/protocols/irc/irc.c:909 ../src/protocols/irc/msgs.c:230
+#: ../src/protocols/silc/silc.c:937
 msgid "Real name"
 msgstr "Vero nome"
 
@@ -5250,159 +6163,172 @@
 #. option = gaim_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: src/protocols/irc/irc.c:839
-#, fuzzy
+#: ../src/protocols/irc/irc.c:917
 msgid "Use SSL"
-msgstr "SSL"
-
-#: src/protocols/irc/msgs.c:105
+msgstr "Utilizza SSL"
+
+#: ../src/protocols/irc/msgs.c:107
 msgid "Bad mode"
 msgstr "Modalit non valida"
 
-#: src/protocols/irc/msgs.c:116
+#: ../src/protocols/irc/msgs.c:118
 #, c-format
 msgid "You are banned from %s."
 msgstr "Sei stato cacciato da %s."
 
-#: src/protocols/irc/msgs.c:117
+#: ../src/protocols/irc/msgs.c:119
 msgid "Banned"
 msgstr "Cacciato"
 
-#: src/protocols/irc/msgs.c:134
+#: ../src/protocols/irc/msgs.c:136
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "Impossibile cacciare %s: la lista dei ban  piena"
 
-#: src/protocols/irc/msgs.c:213 src/protocols/irc/msgs.c:233
-#: src/protocols/irc/msgs.c:246
+#: ../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:213 src/protocols/oscar/oscar.c:5952
-#: src/protocols/silc/ops.c:1198
+#: ../src/protocols/irc/msgs.c:215 ../src/protocols/oscar/oscar.c:3624
+#: ../src/protocols/silc/ops.c:1412
 msgid "Nick"
 msgstr "Nickname"
 
-#: src/protocols/irc/msgs.c:216
+#: ../src/protocols/irc/msgs.c:218
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: src/protocols/irc/msgs.c:217
+#: ../src/protocols/irc/msgs.c:219
 msgid " <i>(identified)</i>"
 msgstr " <i>(identificato)</i>"
 
-#: src/protocols/irc/msgs.c:221 src/protocols/irc/msgs.c:227
-#: src/protocols/irc/msgs.c:228 src/protocols/irc/msgs.c:239
-#: src/protocols/yahoo/yahoo_profile.c:660
+#: ../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:228 src/protocols/silc/ops.c:969
-#: src/protocols/silc/ops.c:1118 src/protocols/yahoo/yahoo_profile.c:1005
-msgid "Realname"
-msgstr "Vero nome"
-
-#: src/protocols/irc/msgs.c:239 src/protocols/silc/ops.c:1041
+#: ../src/protocols/irc/msgs.c:241 ../src/protocols/silc/ops.c:1255
 msgid "Currently on"
 msgstr "Attualmente su"
 
-#: src/protocols/irc/msgs.c:244
+#: ../src/protocols/irc/msgs.c:246
 #, c-format
 msgid "<b>Idle for:</b> %s<br>"
 msgstr "<b>Inattivo per:</b> %s<br>"
 
-#: src/protocols/irc/msgs.c:246
+#: ../src/protocols/irc/msgs.c:248
 msgid "Online since"
 msgstr "Online da"
 
-#: src/protocols/irc/msgs.c:249
+#: ../src/protocols/irc/msgs.c:252
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr "<br><b>Aggettivo descrittivo:</b> Glorioso<br>"
 
-#: src/protocols/irc/msgs.c:317
+#: ../src/protocols/irc/msgs.c:329
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s ha scelto come argomento: %s"
 
-#: src/protocols/irc/msgs.c:322
+#: ../src/protocols/irc/msgs.c:331
+#, fuzzy, c-format
+msgid "%s has cleared the topic."
+msgstr "%s ha scelto come argomento: %s"
+
+#: ../src/protocols/irc/msgs.c:339
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "L'argomento di %s : %s"
 
-#: src/protocols/irc/msgs.c:339
+#: ../src/protocols/irc/msgs.c:357
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Messaggio sconosciuto '%s'"
 
-#: src/protocols/irc/msgs.c:340
+#: ../src/protocols/irc/msgs.c:358
 msgid "Unknown message"
 msgstr "Messaggio sconosciuto"
 
-#: src/protocols/irc/msgs.c:340
+#: ../src/protocols/irc/msgs.c:358
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim ha inviato un messaggio che il server IRC non comprende."
 
-#: src/protocols/irc/msgs.c:363
+#: ../src/protocols/irc/msgs.c:381
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Utenti su %s: %s"
 
-#: src/protocols/irc/msgs.c:482
+#: ../src/protocols/irc/msgs.c:509
 msgid "Time Response"
 msgstr "Risposta sull'orario"
 
-#: src/protocols/irc/msgs.c:483
+#: ../src/protocols/irc/msgs.c:510
 msgid "The IRC server's local time is:"
 msgstr "L'ora locale del sever IRC :"
 
-#: src/protocols/irc/msgs.c:494
+#: ../src/protocols/irc/msgs.c:521
 msgid "No such channel"
 msgstr "Canale inesistente"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:505
+#: ../src/protocols/irc/msgs.c:532
 msgid "no such channel"
 msgstr "canale inesistente"
 
-#: src/protocols/irc/msgs.c:508
+#: ../src/protocols/irc/msgs.c:535
 msgid "User is not logged in"
 msgstr "L'utente non  connesso"
 
-#: src/protocols/irc/msgs.c:513
+#: ../src/protocols/irc/msgs.c:540
 msgid "No such nick or channel"
 msgstr "Nick/Canale inesistente"
 
-#: src/protocols/irc/msgs.c:533
+#: ../src/protocols/irc/msgs.c:560
 msgid "Could not send"
 msgstr "Impossibile inviare"
 
-#: src/protocols/irc/msgs.c:589
+#: ../src/protocols/irc/msgs.c:616
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Per entrare in %s  necessario un invito."
 
-#: src/protocols/irc/msgs.c:590
+#: ../src/protocols/irc/msgs.c:617
 msgid "Invitation only"
 msgstr "Solo su invito"
 
-#: src/protocols/irc/msgs.c:692
+#: ../src/protocols/irc/msgs.c:718
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Sei stato cacciato da %s: (%s)"
 
-#: src/protocols/irc/msgs.c:697
+#. Remove user from channel
+#: ../src/protocols/irc/msgs.c:723 ../src/protocols/silc/ops.c:721
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Cacciato da %s: (%s)"
 
-#: src/protocols/irc/msgs.c:721
+#: ../src/protocols/irc/msgs.c:746
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "modalit (%s %s) da %s"
 
-#: src/protocols/irc/msgs.c:805
+#: ../src/protocols/irc/msgs.c:831 ../src/protocols/irc/msgs.c:832
+msgid "Invalid nickname"
+msgstr "Nickname non valido"
+
+#: ../src/protocols/irc/msgs.c:833
+#, fuzzy
+msgid ""
+"Your selected nickname was rejected by the server.  It probably contains "
+"invalid characters."
+msgstr ""
+"Il nome per l'account selezionato  stato rifiutato dal server. "
+"Probabilmente contiene caratteri non validi."
+
+#: ../src/protocols/irc/msgs.c:837
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -5410,52 +6336,51 @@
 "Il nome per l'account selezionato  stato rifiutato dal server. "
 "Probabilmente contiene caratteri non validi."
 
-#: src/protocols/irc/msgs.c:844
+#: ../src/protocols/irc/msgs.c:876
 msgid "Cannot change nick"
 msgstr "Impossibile cambiare nick"
 
-#: src/protocols/irc/msgs.c:844
+#: ../src/protocols/irc/msgs.c:876
 msgid "Could not change nick"
 msgstr "Impossibile cambiare nick"
 
-#: src/protocols/irc/msgs.c:865
+#: ../src/protocols/irc/msgs.c:897
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Hai abbandonato il canale%s%s"
 
-#: src/protocols/irc/msgs.c:907
+#: ../src/protocols/irc/msgs.c:939
 msgid "Error: invalid PONG from server"
 msgstr "Errore: PONG non valido dal server"
 
-#: src/protocols/irc/msgs.c:909
+#: ../src/protocols/irc/msgs.c:941
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "Risposta PING -- Ritardo: %lu secondi"
 
-#: src/protocols/irc/msgs.c:984
+#: ../src/protocols/irc/msgs.c:1022
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Impossibile entrare in %s:"
 
-#: src/protocols/irc/msgs.c:985 src/protocols/silc/ops.c:914
+#: ../src/protocols/irc/msgs.c:1023 ../src/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Impossibile entrare nel canale"
 
-#: src/protocols/irc/msgs.c:1019
-#, fuzzy
+#: ../src/protocols/irc/msgs.c:1057
 msgid "Nick or channel is temporarily unavailable."
-msgstr "Il servizio  temporaneamente non disponibile."
-
-#: src/protocols/irc/msgs.c:1031
+msgstr "Il nick o il canale  temporaneamente non disponibile."
+
+#: ../src/protocols/irc/msgs.c:1069
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallop da %s"
 
-#: src/protocols/irc/parse.c:114
+#: ../src/protocols/irc/parse.c:114
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;azione da eseguire&gt;: Esegue un'azione."
 
-#: src/protocols/irc/parse.c:115
+#: ../src/protocols/irc/parse.c:115
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
@@ -5463,7 +6388,12 @@
 "away [messaggio]: Imposta un messaggio di assenza. Non immettere alcun "
 "messaggio per ritornare dall'assenza."
 
-#: src/protocols/irc/parse.c:116
+#: ../src/protocols/irc/parse.c:116
+#, fuzzy
+msgid "chanserv: Send a command to chanserv"
+msgstr "quote [...]: Invia un comando grezzo al server."
+
+#: ../src/protocols/irc/parse.c:117
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
@@ -5471,7 +6401,7 @@
 "deop &lt;nick1&gt; [nick2] ...: Toglie lo status di operatore del canale a "
 "qualcuno. Bisogna essere operatore del canale."
 
-#: src/protocols/irc/parse.c:117
+#: ../src/protocols/irc/parse.c:118
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -5481,7 +6411,7 @@
 "impedendo che possa parlare se il canale  moderato (+m). Bisogna essere "
 "operatore del canale."
 
-#: src/protocols/irc/parse.c:118
+#: ../src/protocols/irc/parse.c:119
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
@@ -5489,7 +6419,7 @@
 "invite &lt;nick&gt; [stanza]: Invita qualcuno a raggiungerti nella stanza "
 "specificata o in quella corrente."
 
-#: src/protocols/irc/parse.c:119
+#: ../src/protocols/irc/parse.c:120
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -5497,7 +6427,7 @@
 "j &lt;stanza1&gt;[,stanza2][,...] [chiave1[,chiave2][,...]]: Entra in una o "
 "pi stanze, fornendo opzionalmente una chiave per ciascuna, se necessario."
 
-#: src/protocols/irc/parse.c:120
+#: ../src/protocols/irc/parse.c:121
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -5505,7 +6435,7 @@
 "join &lt;stanza1&gt;[,stanza2][,...] [chiave1[,chiave2][,...]]: Entra in una "
 "o pi stanze, fornendo opzionalmente una chiave per ciascuna, se necessario."
 
-#: src/protocols/irc/parse.c:121
+#: ../src/protocols/irc/parse.c:122
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
@@ -5513,7 +6443,7 @@
 "kick &lt;nick&gt; [messaggio]: Espelle qualcuno dal canale. Bisogna essere "
 "operatore del canale."
 
-#: src/protocols/irc/parse.c:122
+#: ../src/protocols/irc/parse.c:123
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
@@ -5521,11 +6451,16 @@
 "list: Mostra la lista delle chat room presenti sulla rete. <i>Attenzione. "
 "Alcuni server potrebbero disconnetterti dopo questo comando.</i>"
 
-#: src/protocols/irc/parse.c:123
+#: ../src/protocols/irc/parse.c:124
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;azione da eseguire&gt;: Esegue un'azione."
 
-#: src/protocols/irc/parse.c:124
+#: ../src/protocols/irc/parse.c:125
+#, fuzzy
+msgid "memoserv: Send a command to memoserv"
+msgstr "quote [...]: Invia un comando grezzo al server."
+
+#: ../src/protocols/irc/parse.c:126
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
@@ -5533,7 +6468,7 @@
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|canale&gt;: Imposta o rimuove una "
 "modalit del canale o dell'utente."
 
-#: src/protocols/irc/parse.c:125
+#: ../src/protocols/irc/parse.c:127
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -5541,15 +6476,20 @@
 "msg &lt;nick&gt; &lt;messaggio&gt;: Invia un messaggio privato a un utente "
 "(in opposizione al canale)."
 
-#: src/protocols/irc/parse.c:126
+#: ../src/protocols/irc/parse.c:128
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [canale]: Elenca gli utenti presenti nel canale."
 
-#: src/protocols/irc/parse.c:127 src/protocols/jabber/jabber.c:1555
+#: ../src/protocols/irc/parse.c:129 ../src/protocols/jabber/jabber.c:1746
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;nuovo nickname&gt;: Cambia il tuo nickname."
 
-#: src/protocols/irc/parse.c:128
+#: ../src/protocols/irc/parse.c:130
+#, fuzzy
+msgid "nickserv: Send a command to nickserv"
+msgstr "quote [...]: Invia un comando grezzo al server."
+
+#: ../src/protocols/irc/parse.c:131
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
@@ -5557,7 +6497,7 @@
 "op &lt;nick1&gt; [nick2] ...:  Concede lo stato di operatore del canale a "
 "qualcuno. Devi essere operatore del canale."
 
-#: src/protocols/irc/parse.c:129
+#: ../src/protocols/irc/parse.c:132
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
@@ -5565,7 +6505,12 @@
 "operwall &lt;messaggio&gt;: Se non sai di cosa si tratta, probabilmente non "
 "sei in grado di usarlo."
 
-#: src/protocols/irc/parse.c:130
+#: ../src/protocols/irc/parse.c:133
+#, fuzzy
+msgid "operserv: Send a command to operserv"
+msgstr "quote [...]: Invia un comando grezzo al server."
+
+#: ../src/protocols/irc/parse.c:134
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
@@ -5573,7 +6518,7 @@
 "part [stanza] [messaggio]: Abbandona il canale corrente o un canale "
 "specificato con un messaggio opzionale."
 
-#: src/protocols/irc/parse.c:131
+#: ../src/protocols/irc/parse.c:135
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -5581,7 +6526,7 @@
 "ping [nick]: Chiede quanto ritardo ha un utente (o il server, se non  "
 "specificato nessun utente)."
 
-#: src/protocols/irc/parse.c:132
+#: ../src/protocols/irc/parse.c:136
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -5589,15 +6534,15 @@
 "query &lt;nick&gt; &lt;messaggio&gt;: Invia un messaggio privato a un utente "
 "(in opposizione al canale)."
 
-#: src/protocols/irc/parse.c:133
+#: ../src/protocols/irc/parse.c:137
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [messaggio]: Disconnette dal server, con un messaggio opzionale."
 
-#: src/protocols/irc/parse.c:134
+#: ../src/protocols/irc/parse.c:138
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]: Invia un comando grezzo al server."
 
-#: src/protocols/irc/parse.c:135
+#: ../src/protocols/irc/parse.c:139
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
@@ -5605,20 +6550,20 @@
 "remove &lt;nick&gt; [messaggio]: Rimuove qualcuno da una stanza. Devi essere "
 "operatore del canale."
 
-#: src/protocols/irc/parse.c:136
+#: ../src/protocols/irc/parse.c:140
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: Mostra l'attuale ora locale del server IRC."
 
-#: src/protocols/irc/parse.c:137
+#: ../src/protocols/irc/parse.c:141
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [nuovo argomento]: Visualizza o modifica l'argomento del canale."
 
-#: src/protocols/irc/parse.c:138
+#: ../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;: Imposta o rimuove una modalit utente."
 
-#: src/protocols/irc/parse.c:139
+#: ../src/protocols/irc/parse.c:143
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
@@ -5626,7 +6571,7 @@
 "voice &lt;nick1&gt; [nick2] ...: Concede lo status voice a qualcuno. Bisogna "
 "essere operatore del canale."
 
-#: src/protocols/irc/parse.c:140
+#: ../src/protocols/irc/parse.c:144
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
@@ -5634,31 +6579,30 @@
 "wallops &lt;messaggio&gt;: Se non sai cos', probabilmente non sei in grado "
 "di usarlo."
 
-#: src/protocols/irc/parse.c:141
+#: ../src/protocols/irc/parse.c:145
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [server] &lt;nick&gt;: Ottiene informazioni su di un utente."
 
-#: src/protocols/irc/parse.c:422
+#: ../src/protocols/irc/parse.c:439
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Tempo di risposta da %s: %lu secondi"
 
-#: src/protocols/irc/parse.c:423
+#: ../src/protocols/irc/parse.c:440
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:423
+#: ../src/protocols/irc/parse.c:440
 msgid "CTCP PING reply"
 msgstr "Risposta PING CTCP"
 
-#: src/protocols/irc/parse.c:526 src/protocols/irc/parse.c:530
-#: src/protocols/oscar/oscar.c:1653 src/protocols/toc/toc.c:190
-#: src/protocols/toc/toc.c:688 src/protocols/toc/toc.c:704
-#: src/protocols/toc/toc.c:780
+#: ../src/protocols/irc/parse.c:542 ../src/protocols/irc/parse.c:546
+#: ../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."
 msgstr "Disconnesso."
 
-#: src/protocols/jabber/auth.c:51
+#: ../src/protocols/jabber/auth.c:51
 msgid ""
 "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
 "account properties"
@@ -5666,29 +6610,29 @@
 "Il server richiede TLS/SSL per il login. Selezionare \"Utilizza TLS se "
 "disponibile\" nella finestra delle propriet dell'account."
 
-#: src/protocols/jabber/auth.c:53
+#: ../src/protocols/jabber/auth.c:53
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr ""
 "Il server richiede TLS/SSL per il login. Nessun supporto TLS/SSL trovato."
 
-#: src/protocols/jabber/auth.c:114
+#: ../src/protocols/jabber/auth.c:114
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 "Il server richiede l'autenticazione sotto forma di testo semplice su uno "
 "stream non criptato"
 
-#: src/protocols/jabber/auth.c:133 src/protocols/jabber/auth.c:207
-#: src/protocols/jabber/auth.c:375 src/protocols/jabber/auth.c:473
-#: src/protocols/jabber/auth.c:485 src/protocols/jabber/jabber.c:110
-msgid "Invalid response from server."
-msgstr "Risposta non valida da parte del server."
-
-#: src/protocols/jabber/auth.c:163 src/protocols/jabber/auth.c:164
-#: src/protocols/jabber/auth.c:244 src/protocols/jabber/auth.c:245
+#: ../src/protocols/jabber/auth.c:234
+msgid "Server couldn't authenticate you without a password"
+msgstr "Il server non pu autenticarti senza una password"
+
+#: ../src/protocols/jabber/auth.c:237 ../src/protocols/jabber/auth.c:238
+#: ../src/protocols/jabber/auth.c:398 ../src/protocols/jabber/auth.c:399
+#: ../src/protocols/jabber/auth.c:480 ../src/protocols/jabber/auth.c:481
 msgid "Plaintext Authentication"
 msgstr "Autenticazione come testo semplice"
 
-#: src/protocols/jabber/auth.c:165 src/protocols/jabber/auth.c:246
+#: ../src/protocols/jabber/auth.c:239 ../src/protocols/jabber/auth.c:400
+#: ../src/protocols/jabber/auth.c:482
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -5696,84 +6640,104 @@
 "Il server richiede l'autenticazione sotto forma di testo semplice su una "
 "connessione non criptata. Procedere con l'autenticazione?"
 
-#: src/protocols/jabber/auth.c:173 src/protocols/jabber/auth.c:254
+#: ../src/protocols/jabber/auth.c:245 ../src/protocols/jabber/auth.c:408
+#: ../src/protocols/jabber/auth.c:490
 msgid "Server does not use any supported authentication method"
 msgstr "Il server non usa nessun metodo di autenticazione supportato"
 
-#: src/protocols/jabber/auth.c:396
+#. This should never happen!
+#: ../src/protocols/jabber/auth.c:321 ../src/protocols/jabber/auth.c:443
+#: ../src/protocols/jabber/auth.c:611 ../src/protocols/jabber/auth.c:744
+#: ../src/protocols/jabber/auth.c:756 ../src/protocols/jabber/auth.c:775
+#: ../src/protocols/jabber/jabber.c:110
+msgid "Invalid response from server."
+msgstr "Risposta non valida da parte del server."
+
+#: ../src/protocols/jabber/auth.c:632
 msgid "Invalid challenge from server"
 msgstr "Challenge non valido dal server"
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:667
-#: src/protocols/silc/ops.c:806
+#: ../src/protocols/jabber/auth.c:719
+msgid "SASL error"
+msgstr "Errore SASL"
+
+#: ../src/protocols/jabber/buddy.c:268 ../src/protocols/jabber/buddy.c:772
+#: ../src/protocols/silc/ops.c:1020
 msgid "Full Name"
 msgstr "Nome"
 
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:680
-#: src/protocols/silc/ops.c:818
+#: ../src/protocols/jabber/buddy.c:269 ../src/protocols/jabber/buddy.c:785
+#: ../src/protocols/silc/ops.c:1032
 msgid "Family Name"
 msgstr "Cognome"
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:684
+#: ../src/protocols/jabber/buddy.c:270 ../src/protocols/jabber/buddy.c:789
 msgid "Given Name"
 msgstr "Soprannome"
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/jabber.c:688
+#: ../src/protocols/jabber/buddy.c:272 ../src/protocols/jabber/jabber.c:809
 msgid "URL"
 msgstr "Sito Web"
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:726
+#: ../src/protocols/jabber/buddy.c:273 ../src/protocols/jabber/buddy.c:841
 msgid "Street Address"
 msgstr "Indirizzo"
 
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:722
+#: ../src/protocols/jabber/buddy.c:274 ../src/protocols/jabber/buddy.c:837
 msgid "Extended Address"
 msgstr "Indirizzo esteso"
 
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:730
+#: ../src/protocols/jabber/buddy.c:275 ../src/protocols/jabber/buddy.c:845
 msgid "Locality"
 msgstr "Localit"
 
-#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:734
+#: ../src/protocols/jabber/buddy.c:276 ../src/protocols/jabber/buddy.c:849
 msgid "Region"
 msgstr "Regione"
 
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:738
-#: src/protocols/jabber/jabber.c:678
+#: ../src/protocols/jabber/buddy.c:277 ../src/protocols/jabber/buddy.c:853
 msgid "Postal Code"
 msgstr "Codice postale"
 
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:743
+#: ../src/protocols/jabber/buddy.c:278 ../src/protocols/jabber/buddy.c:858
+#: ../src/protocols/silc/silc.c:943
 msgid "Country"
 msgstr "Paese"
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:754
-#: src/protocols/jabber/buddy.c:761
+#: ../src/protocols/jabber/buddy.c:279 ../src/protocols/jabber/buddy.c:869
+#: ../src/protocols/jabber/buddy.c:876
 msgid "Telephone"
 msgstr "Telefono"
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:795
+#: ../src/protocols/jabber/buddy.c:280 ../src/protocols/jabber/buddy.c:887
+#: ../src/protocols/jabber/buddy.c:895 ../src/protocols/jabber/buddy.c:1524
+#: ../src/protocols/silc/ops.c:1075 ../src/protocols/silc/util.c:526
+#: ../src/protocols/yahoo/yahoo_profile.c:1036
+msgid "E-Mail"
+msgstr "Email"
+
+#: ../src/protocols/jabber/buddy.c:281 ../src/protocols/jabber/buddy.c:910
 msgid "Organization Name"
 msgstr "Organizzazione"
 
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:799
+#: ../src/protocols/jabber/buddy.c:282 ../src/protocols/jabber/buddy.c:914
 msgid "Organization Unit"
 msgstr "Ufficio"
 
-#: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:808
+#: ../src/protocols/jabber/buddy.c:284 ../src/protocols/jabber/buddy.c:923
 msgid "Role"
 msgstr "Ruolo"
 
-#: src/protocols/jabber/buddy.c:266 src/protocols/jabber/buddy.c:701
-#: src/protocols/oscar/oscar.c:5987
+#: ../src/protocols/jabber/buddy.c:285 ../src/protocols/jabber/buddy.c:806
+#: ../src/protocols/msn/msn.c:1589 ../src/protocols/oscar/oscar.c:3667
 msgid "Birthday"
 msgstr "Compleanno"
 
-#: src/protocols/jabber/buddy.c:567 src/protocols/jabber/buddy.c:568
+#: ../src/protocols/jabber/buddy.c:588 ../src/protocols/jabber/buddy.c:589
 msgid "Edit Jabber vCard"
 msgstr "Modifica la vCard di Jabber"
 
-#: src/protocols/jabber/buddy.c:569
+#: ../src/protocols/jabber/buddy.c:590
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -5781,633 +6745,665 @@
 "Tutti i campi seguenti sono opzionali. Inserisci solamente le informazioni "
 "che desideri."
 
-#: src/protocols/jabber/buddy.c:616
-msgid "Jabber ID"
-msgstr "ID Jabber"
-
-#: src/protocols/jabber/buddy.c:642 src/protocols/jabber/jabber.c:1711
+#: ../src/protocols/jabber/buddy.c:646 ../src/protocols/jabber/buddy.c:677
+msgid "Client:"
+msgstr ""
+
+#: ../src/protocols/jabber/buddy.c:650 ../src/protocols/jabber/buddy.c:681
+#, fuzzy
+msgid "Operating System"
+msgstr "Nascondi il sistema operativo"
+
+#: ../src/protocols/jabber/buddy.c:660 ../src/protocols/jabber/jabber.c:1911
 msgid "Resource"
 msgstr "Risorsa"
 
-#: src/protocols/jabber/buddy.c:688 src/protocols/silc/ops.c:814
+#: ../src/protocols/jabber/buddy.c:793 ../src/protocols/silc/ops.c:1028
 msgid "Middle Name"
 msgstr "Secondo nome"
 
-#: src/protocols/jabber/buddy.c:706 src/protocols/jabber/jabber.c:663
-#: src/protocols/oscar/oscar.c:6005 src/protocols/oscar/oscar.c:6013
-#: src/protocols/silc/ops.c:850
+#: ../src/protocols/jabber/buddy.c:826 ../src/protocols/jabber/jabber.c:784
+#: ../src/protocols/oscar/oscar.c:3686 ../src/protocols/oscar/oscar.c:3694
+#: ../src/protocols/silc/ops.c:1064
 msgid "Address"
 msgstr "Indirizzo"
 
-#: src/protocols/jabber/buddy.c:718
+#: ../src/protocols/jabber/buddy.c:833
 msgid "P.O. Box"
 msgstr "Codice postale"
 
-#: src/protocols/jabber/buddy.c:832
+#: ../src/protocols/jabber/buddy.c:947
 msgid "Photo"
 msgstr "Foto"
 
-#: src/protocols/jabber/buddy.c:832
+#: ../src/protocols/jabber/buddy.c:947
 msgid "Logo"
 msgstr "Logo"
 
-#: src/protocols/jabber/buddy.c:1035
+#: ../src/protocols/jabber/buddy.c:1304
 msgid "Un-hide From"
 msgstr "Annulla nascondi \"Da\""
 
-#: src/protocols/jabber/buddy.c:1038
+#: ../src/protocols/jabber/buddy.c:1308
 msgid "Temporarily Hide From"
 msgstr "Nascondi temporaneamente \"Da\""
 
 #. && NOT ME
-#: src/protocols/jabber/buddy.c:1045
+#: ../src/protocols/jabber/buddy.c:1316
 msgid "Cancel Presence Notification"
 msgstr "Elimina la notifica di presenza"
 
-#: src/protocols/jabber/buddy.c:1051
+#: ../src/protocols/jabber/buddy.c:1323
 msgid "(Re-)Request authorization"
 msgstr "Richiedi nuovamente l'autorizzazione"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: src/protocols/jabber/buddy.c:1059
+#: ../src/protocols/jabber/buddy.c:1332
 msgid "Unsubscribe"
 msgstr "Annulla la sottoscrizione"
 
-#: src/protocols/jabber/buddy.c:1085 src/protocols/jabber/chat.c:677
-#: src/protocols/jabber/chat.c:688 src/protocols/jabber/jabber.c:1018
-#: src/protocols/silc/ops.c:1235
+#: ../src/protocols/jabber/buddy.c:1359 ../src/protocols/jabber/chat.c:675
+#: ../src/protocols/jabber/chat.c:686 ../src/protocols/jabber/jabber.c:1168
+#: ../src/protocols/silc/ops.c:1449
 msgid "Error"
 msgstr "Errore"
 
-#: src/protocols/jabber/buddy.c:1091 src/protocols/jabber/jabber.c:1047
+#: ../src/protocols/jabber/buddy.c:1365 ../src/protocols/jabber/jabber.c:1193
 msgid "Chatty"
 msgstr " in chat"
 
-#: src/protocols/jabber/buddy.c:1095 src/protocols/jabber/jabber.c:1063
-#: src/status.c:159
+#: ../src/protocols/jabber/buddy.c:1369 ../src/status.c:159
 msgid "Extended Away"
 msgstr "Ancora assente"
 
-#: src/protocols/jabber/buddy.c:1097 src/protocols/jabber/jabber.c:1071
-#: src/protocols/oscar/oscar.c:701 src/protocols/oscar/oscar.c:7791
-#: src/protocols/sametime/sametime.c:2770
+#: ../src/protocols/jabber/buddy.c:1371 ../src/protocols/jabber/jabber.c:1223
+#: ../src/protocols/oscar/oscar.c:713 ../src/protocols/oscar/oscar.c:5619
+#: ../src/protocols/sametime/sametime.c:3277
 msgid "Do Not Disturb"
 msgstr "Non disturbare"
 
-#: src/protocols/jabber/buddy.c:1235
-msgid "The following are the results of your search"
-msgstr ""
-
-#: src/protocols/jabber/buddy.c:1327
-msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr ""
-
-#: src/protocols/jabber/buddy.c:1331 src/protocols/jabber/jabber.c:653
-#: src/protocols/oscar/oscar.c:5962 src/protocols/silc/ops.c:810
-msgid "First Name"
-msgstr "Nome"
-
-#: src/protocols/jabber/buddy.c:1336 src/protocols/jabber/jabber.c:658
-#: src/protocols/oscar/oscar.c:5963
+#: ../src/protocols/jabber/buddy.c:1516
+msgid "JID"
+msgstr "JID"
+
+#: ../src/protocols/jabber/buddy.c:1520 ../src/protocols/jabber/buddy.c:1699
+#: ../src/protocols/oscar/oscar.c:3635
 msgid "Last Name"
 msgstr "Cognome"
 
-#: src/protocols/jabber/buddy.c:1346
+#: ../src/protocols/jabber/buddy.c:1552
+msgid "The following are the results of your search"
+msgstr "Ecco i risultati della tua ricerca"
+
+#. current comment from Jabber User Directory users.jabber.org
+#: ../src/protocols/jabber/buddy.c:1627
+msgid ""
+"Find a contact by entering the search criteria in the given fields. Note: "
+"Each field supports wild card searches (%)"
+msgstr ""
+
+#: ../src/protocols/jabber/buddy.c:1647
+#, fuzzy
+msgid "Directory Query Failed"
+msgstr "Connessione diretta non riuscita"
+
+#: ../src/protocols/jabber/buddy.c:1648
+#, fuzzy
+msgid "Could not query the directory server."
+msgstr "Impossibile avviare il trasferimento file"
+
+#. Try to translate the message (see static message
+#. list in jabber_user_dir_comments[])
+#: ../src/protocols/jabber/buddy.c:1682
+#, fuzzy, c-format
+msgid "Server Instructions: %s"
+msgstr "Informazioni sul server"
+
+#: ../src/protocols/jabber/buddy.c:1689
+msgid "Fill in one or more fields to search for any matching Jabber users."
+msgstr ""
+
+#: ../src/protocols/jabber/buddy.c:1709 ../src/protocols/novell/novell.c:1488
+#: ../src/protocols/oscar/oscar.c:3637 ../src/protocols/oscar/oscar.c:3644
 msgid "E-Mail Address"
 msgstr "Indirizzo e-mail"
 
-#: src/protocols/jabber/buddy.c:1355 src/protocols/jabber/buddy.c:1356
-#, fuzzy
+#: ../src/protocols/jabber/buddy.c:1718 ../src/protocols/jabber/buddy.c:1719
 msgid "Search for Jabber users"
-msgstr "Cerca un contatto attraverso il suo indirizzo e-mail"
-
-#: src/protocols/jabber/buddy.c:1370
-#, fuzzy
+msgstr "Cerca utenti Jabber"
+
+#: ../src/protocols/jabber/buddy.c:1733
 msgid "Invalid Directory"
-msgstr "Errore non valido"
-
-#: src/protocols/jabber/buddy.c:1387
-#, fuzzy
+msgstr "Directory non valida"
+
+#: ../src/protocols/jabber/buddy.c:1750
 msgid "Enter a User Directory"
-msgstr "Impossibile inviare una directory."
-
-#: src/protocols/jabber/buddy.c:1388
-#, fuzzy
+msgstr "Inserisci una directory utenti"
+
+#: ../src/protocols/jabber/buddy.c:1751
 msgid "Select a user directory to search"
-msgstr "Scegli un server per le conferenze al quale connettersi"
-
-#: src/protocols/jabber/buddy.c:1391
-#, fuzzy
+msgstr "Scegli una directory utenti per la ricerca"
+
+#: ../src/protocols/jabber/buddy.c:1754
 msgid "Search Directory"
-msgstr "_Cerca:"
-
-#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:7318
-#: src/protocols/yahoo/yahoochat.c:979
+msgstr "Cerca directory"
+
+#: ../src/protocols/jabber/chat.c:41 ../src/protocols/oscar/oscar.c:5104
+#: ../src/protocols/yahoo/yahoochat.c:998
 msgid "_Room:"
 msgstr "_Stanza:"
 
-#: src/protocols/jabber/chat.c:47
+#: ../src/protocols/jabber/chat.c:47
 msgid "_Server:"
 msgstr "_Server:"
 
-#: src/protocols/jabber/chat.c:53
+#: ../src/protocols/jabber/chat.c:53
 msgid "_Handle:"
 msgstr "_Handle:"
 
-#: src/protocols/jabber/chat.c:223
+#: ../src/protocols/jabber/chat.c:223
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s non  un nome della stanza valido"
 
-#: src/protocols/jabber/chat.c:224
+#: ../src/protocols/jabber/chat.c:224
 msgid "Invalid Room Name"
 msgstr "Nome della stanza non valido"
 
-#: src/protocols/jabber/chat.c:229
+#: ../src/protocols/jabber/chat.c:229
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s non  un nome del server valido"
 
-#: src/protocols/jabber/chat.c:230 src/protocols/jabber/chat.c:231
+#: ../src/protocols/jabber/chat.c:230 ../src/protocols/jabber/chat.c:231
 msgid "Invalid Server Name"
 msgstr "Nome del server non valido"
 
-#: src/protocols/jabber/chat.c:235
+#: ../src/protocols/jabber/chat.c:235
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s non  un gestore della stanza valido"
 
-#: src/protocols/jabber/chat.c:236 src/protocols/jabber/chat.c:237
+#: ../src/protocols/jabber/chat.c:236 ../src/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
 msgstr "Handle della stanza non valido"
 
-#: src/protocols/jabber/chat.c:395
+#: ../src/protocols/jabber/chat.c:395
 msgid "Configuration error"
 msgstr "Errore di configurazione"
 
-#: src/protocols/jabber/chat.c:404 src/protocols/jabber/chat.c:549
+#: ../src/protocols/jabber/chat.c:404 ../src/protocols/jabber/chat.c:547
 msgid "Unable to configure"
 msgstr "Impossibile configurare"
 
-#: src/protocols/jabber/chat.c:420
+#: ../src/protocols/jabber/chat.c:419
 msgid "Room Configuration Error"
 msgstr "Errore di configurazione della stanza"
 
-#: src/protocols/jabber/chat.c:421
+#: ../src/protocols/jabber/chat.c:420
 msgid "This room is not capable of being configured"
 msgstr "Questa stanza non  configurabile"
 
-#: src/protocols/jabber/chat.c:471 src/protocols/jabber/chat.c:540
+#: ../src/protocols/jabber/chat.c:469 ../src/protocols/jabber/chat.c:538
 msgid "Registration error"
 msgstr "Errore di registrazione"
 
-#: src/protocols/jabber/chat.c:628
+#: ../src/protocols/jabber/chat.c:626
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "La modifica del nick non  supportata nelle chat room non MUC"
 
-#: src/protocols/jabber/chat.c:678 src/protocols/jabber/chat.c:689
-#: src/protocols/silc/ops.c:1235
+#: ../src/protocols/jabber/chat.c:676 ../src/protocols/jabber/chat.c:687
+#: ../src/protocols/silc/ops.c:1449
 #, fuzzy
 msgid "Error retrieving room list"
 msgstr "Errore nella ricezione della lista delle stanze"
 
-#: src/protocols/jabber/chat.c:737
+#: ../src/protocols/jabber/chat.c:735
 msgid "Invalid Server"
 msgstr "Server non valido"
 
-#: src/protocols/jabber/chat.c:775
+#: ../src/protocols/jabber/chat.c:773
 msgid "Enter a Conference Server"
 msgstr "Entra in un server per le conferenze"
 
-#: src/protocols/jabber/chat.c:776
+#: ../src/protocols/jabber/chat.c:774
 msgid "Select a conference server to query"
 msgstr "Scegli un server per le conferenze al quale connettersi"
 
-#: src/protocols/jabber/chat.c:779
+#: ../src/protocols/jabber/chat.c:777
 msgid "Find Rooms"
 msgstr "Cerca stanze"
 
-#: src/protocols/jabber/jabber.c:79
+#: ../src/protocols/jabber/jabber.c:79
 msgid "Error initializing session"
 msgstr "Errore nell'inizializzazione della sezione"
 
-#: src/protocols/jabber/jabber.c:215
+#: ../src/protocols/jabber/jabber.c:232 ../src/protocols/jabber/jabber.c:281
+#: ../src/protocols/jabber/jabber.c:309
 msgid "Write error"
 msgstr "Errore di scrittura"
 
-#: src/protocols/jabber/jabber.c:253 src/protocols/jabber/jabber.c:273
+#: ../src/protocols/jabber/jabber.c:361 ../src/protocols/jabber/jabber.c:394
 msgid "Read Error"
 msgstr "Errore di lettura"
 
-#: src/protocols/jabber/jabber.c:359 src/protocols/jabber/jabber.c:780
+#: ../src/protocols/jabber/jabber.c:479 ../src/protocols/jabber/jabber.c:903
 msgid "Unable to create socket"
 msgstr "Impossibile creare il socket"
 
-#: src/protocols/jabber/jabber.c:403 src/protocols/jabber/jabber.c:740
+#: ../src/protocols/jabber/jabber.c:524 ../src/protocols/jabber/jabber.c:861
 msgid "Invalid Jabber ID"
 msgstr "ID Jabber non valido"
 
-#: src/protocols/jabber/jabber.c:473
+#: ../src/protocols/jabber/jabber.c:594
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registrazione di %s@%s avvenuta con successo"
 
-#: src/protocols/jabber/jabber.c:475 src/protocols/jabber/jabber.c:476
+#: ../src/protocols/jabber/jabber.c:596 ../src/protocols/jabber/jabber.c:597
 msgid "Registration Successful"
 msgstr "Registrazione riuscita"
 
-#: src/protocols/jabber/jabber.c:482 src/protocols/jabber/jabber.c:1299
+#: ../src/protocols/jabber/jabber.c:603 ../src/protocols/jabber/jabber.c:1459
 msgid "Unknown Error"
 msgstr "Errore sconosciuto"
 
-#: src/protocols/jabber/jabber.c:484 src/protocols/jabber/jabber.c:485
+#: ../src/protocols/jabber/jabber.c:605 ../src/protocols/jabber/jabber.c:606
 msgid "Registration Failed"
 msgstr "Registrazione fallita"
 
-#: src/protocols/jabber/jabber.c:596 src/protocols/jabber/jabber.c:597
+#: ../src/protocols/jabber/jabber.c:717 ../src/protocols/jabber/jabber.c:718
 msgid "Already Registered"
 msgstr "Gi registrato"
 
-#: src/protocols/jabber/jabber.c:643
-msgid "E-Mail"
-msgstr "Email"
-
-#: src/protocols/jabber/jabber.c:673 src/protocols/oscar/oscar.c:6007
-#: src/protocols/oscar/oscar.c:6015
+#: ../src/protocols/jabber/jabber.c:794 ../src/protocols/oscar/oscar.c:3688
+#: ../src/protocols/oscar/oscar.c:3696
 msgid "State"
 msgstr "Stato"
 
-#: src/protocols/jabber/jabber.c:683 src/protocols/silc/ops.c:855
-#: src/protocols/silc/silc.c:663 src/protocols/silc/util.c:513
+#: ../src/protocols/jabber/jabber.c:799
+msgid "Postal code"
+msgstr "Codice postale"
+
+#: ../src/protocols/jabber/jabber.c:804 ../src/protocols/silc/ops.c:1069
+#: ../src/protocols/silc/silc.c:701 ../src/protocols/silc/util.c:528
 msgid "Phone"
 msgstr "Telefono"
 
-#: src/protocols/jabber/jabber.c:693
+#: ../src/protocols/jabber/jabber.c:814
 msgid "Date"
 msgstr "Data"
 
-#: src/protocols/jabber/jabber.c:701
+#: ../src/protocols/jabber/jabber.c:822
 msgid "Please fill out the information below to register your new account."
 msgstr "Riempi i seguenti campi per registrare il tuo nuovo account."
 
-#: src/protocols/jabber/jabber.c:704 src/protocols/jabber/jabber.c:705
+#: ../src/protocols/jabber/jabber.c:825 ../src/protocols/jabber/jabber.c:826
 msgid "Register New Jabber Account"
 msgstr "Registra un nuovo account Jabber"
 
-#: src/protocols/jabber/jabber.c:842
+#: ../src/protocols/jabber/jabber.c:987
 msgid "Initializing Stream"
 msgstr "Inizializzazione dello stream"
 
-#: src/protocols/jabber/jabber.c:848 src/protocols/msn/session.c:368
+#: ../src/protocols/jabber/jabber.c:992 ../src/protocols/msn/session.c:350
 msgid "Authenticating"
 msgstr "Autenticazione"
 
-#: src/protocols/jabber/jabber.c:857
+#: ../src/protocols/jabber/jabber.c:1001
 msgid "Re-initializing Stream"
 msgstr "Reinizializzazione dello stream"
 
-#: src/protocols/jabber/jabber.c:928 src/protocols/jabber/jabber.c:1277
-#: src/protocols/jabber/jabber.c:1318 src/protocols/jabber/jabber.c:1351
-#: src/protocols/oscar/oscar.c:767 src/protocols/oscar/oscar.c:7589
+#: ../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:782 ../src/protocols/oscar/oscar.c:5410
 msgid "Not Authorized"
 msgstr "Non autorizzato"
 
-#: src/protocols/jabber/jabber.c:971
+#: ../src/protocols/jabber/jabber.c:1114
 msgid "Both"
 msgstr "Entrambi"
 
-#: src/protocols/jabber/jabber.c:973
+#: ../src/protocols/jabber/jabber.c:1116
 msgid "From (To pending)"
 msgstr "Da (In attesa di \"Per\")"
 
-#: src/protocols/jabber/jabber.c:975
-msgid "From"
-msgstr "Da"
-
-#: src/protocols/jabber/jabber.c:978
+#: ../src/protocols/jabber/jabber.c:1121
 msgid "To"
 msgstr "Per"
 
-#: src/protocols/jabber/jabber.c:980
+#: ../src/protocols/jabber/jabber.c:1123
 msgid "None (To pending)"
 msgstr "Nessuna (In attesa di \"Per\")"
 
-#: src/protocols/jabber/jabber.c:982 src/protocols/yahoo/yahoo.c:2780
-msgid "None"
-msgstr "Nessuno"
-
-#: src/protocols/jabber/jabber.c:984
+#: ../src/protocols/jabber/jabber.c:1127
 msgid "Subscription"
 msgstr "Sottoscrizione"
 
-#: src/protocols/jabber/jabber.c:1039 src/protocols/jabber/jabber.c:1047
-#: src/protocols/jabber/jabber.c:1055 src/protocols/jabber/jabber.c:1063
-#: src/protocols/jabber/jabber.c:1071
-#, fuzzy
+#: ../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
 msgid "Priority"
-msgstr "Porta"
-
-#: src/protocols/jabber/jabber.c:1093
+msgstr "Priorit"
+
+#: ../src/protocols/jabber/jabber.c:1253
 msgid "Password Changed"
 msgstr "Password modificata"
 
-#: src/protocols/jabber/jabber.c:1094
+#: ../src/protocols/jabber/jabber.c:1254
 msgid "Your password has been changed."
 msgstr "La tua password  stata modificata."
 
-#: src/protocols/jabber/jabber.c:1098 src/protocols/jabber/jabber.c:1099
+#: ../src/protocols/jabber/jabber.c:1258 ../src/protocols/jabber/jabber.c:1259
 msgid "Error changing password"
 msgstr "Errore nella modifica della password"
 
-#: src/protocols/jabber/jabber.c:1155
+#: ../src/protocols/jabber/jabber.c:1315
 msgid "Password (again)"
 msgstr "Password (di nuovo)"
 
-#: src/protocols/jabber/jabber.c:1160 src/protocols/jabber/jabber.c:1161
+#: ../src/protocols/jabber/jabber.c:1320 ../src/protocols/jabber/jabber.c:1321
 msgid "Change Jabber Password"
 msgstr "Cambia la password di Jabber"
 
-#: src/protocols/jabber/jabber.c:1161
+#: ../src/protocols/jabber/jabber.c:1321
 msgid "Please enter your new password"
 msgstr "Inserisci la tua nuova password"
 
-#: src/protocols/jabber/jabber.c:1171 src/protocols/toc/toc.c:1684
-msgid "Set User Info"
-msgstr "Imposta le informazioni utente"
+#: ../src/protocols/jabber/jabber.c:1331 ../src/protocols/oscar/oscar.c:6180
+#: ../src/protocols/silc/silc.c:1023
+msgid "Set User Info..."
+msgstr "Imposta le informazioni utente..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: src/protocols/jabber/jabber.c:1176 src/protocols/toc/toc.c:1694
-msgid "Change Password"
-msgstr "Cambia password"
+#: ../src/protocols/jabber/jabber.c:1336 ../src/protocols/oscar/oscar.c:6191
+#: ../src/protocols/silc/silc.c:1019
+msgid "Change Password..."
+msgstr "Cambia password..."
 
 #. }
-#: src/protocols/jabber/jabber.c:1181
-#, fuzzy
-msgid "Search for users"
-msgstr "_Cerca:"
-
-#: src/protocols/jabber/jabber.c:1257
+#: ../src/protocols/jabber/jabber.c:1341
+msgid "Search for Users..."
+msgstr "Cerca utenti..."
+
+#: ../src/protocols/jabber/jabber.c:1417
 msgid "Bad Request"
 msgstr "Richiesta non valida"
 
-#: src/protocols/jabber/jabber.c:1259
+#: ../src/protocols/jabber/jabber.c:1419
 msgid "Conflict"
 msgstr "Conflitto"
 
-#: src/protocols/jabber/jabber.c:1261
+#: ../src/protocols/jabber/jabber.c:1421
 msgid "Feature Not Implemented"
 msgstr "Caratteristica non implementata"
 
-#: src/protocols/jabber/jabber.c:1263
+#: ../src/protocols/jabber/jabber.c:1423
 msgid "Forbidden"
 msgstr "Vietato"
 
-#: src/protocols/jabber/jabber.c:1265
+#: ../src/protocols/jabber/jabber.c:1425
 msgid "Gone"
 msgstr "Andato"
 
-#: src/protocols/jabber/jabber.c:1267 src/protocols/jabber/jabber.c:1341
+#: ../src/protocols/jabber/jabber.c:1427 ../src/protocols/jabber/jabber.c:1502
 msgid "Internal Server Error"
 msgstr "Errore interno del server"
 
-#: src/protocols/jabber/jabber.c:1269
+#: ../src/protocols/jabber/jabber.c:1429
 msgid "Item Not Found"
 msgstr "Elemento non trovato"
 
-#: src/protocols/jabber/jabber.c:1271
+#: ../src/protocols/jabber/jabber.c:1431
 msgid "Malformed Jabber ID"
 msgstr "Formato ID Jabber non valido"
 
-#: src/protocols/jabber/jabber.c:1273
+#: ../src/protocols/jabber/jabber.c:1433
 msgid "Not Acceptable"
 msgstr "Non accettabile"
 
-#: src/protocols/jabber/jabber.c:1275
+#: ../src/protocols/jabber/jabber.c:1435
 msgid "Not Allowed"
 msgstr "Non permesso"
 
-#: src/protocols/jabber/jabber.c:1279
+#: ../src/protocols/jabber/jabber.c:1439
 msgid "Payment Required"
 msgstr "Richiesto pagamento"
 
-#: src/protocols/jabber/jabber.c:1281
+#: ../src/protocols/jabber/jabber.c:1441
 msgid "Recipient Unavailable"
 msgstr "Destinatario non disponibile"
 
-#: src/protocols/jabber/jabber.c:1285
+#: ../src/protocols/jabber/jabber.c:1445
 msgid "Registration Required"
 msgstr "Richiesta registrazione"
 
-#: src/protocols/jabber/jabber.c:1287
+#: ../src/protocols/jabber/jabber.c:1447
 msgid "Remote Server Not Found"
 msgstr "Server remoto non trovato"
 
-#: src/protocols/jabber/jabber.c:1289
+#: ../src/protocols/jabber/jabber.c:1449
 msgid "Remote Server Timeout"
 msgstr "Timeout del server remoto"
 
-#: src/protocols/jabber/jabber.c:1291
+#: ../src/protocols/jabber/jabber.c:1451
 msgid "Server Overloaded"
 msgstr "Server sovraccarico"
 
-#: src/protocols/jabber/jabber.c:1293
+#: ../src/protocols/jabber/jabber.c:1453
 msgid "Service Unavailable"
 msgstr "Servizio non disponibile"
 
-#: src/protocols/jabber/jabber.c:1295
+#: ../src/protocols/jabber/jabber.c:1455
 msgid "Subscription Required"
 msgstr "Richiesta sottoscrizione"
 
-#: src/protocols/jabber/jabber.c:1297
+#: ../src/protocols/jabber/jabber.c:1457
 msgid "Unexpected Request"
 msgstr "Richiesta inattesa"
 
-#: src/protocols/jabber/jabber.c:1304
+#: ../src/protocols/jabber/jabber.c:1464
 msgid "Authorization Aborted"
 msgstr "Autorizzazione annullata"
 
-#: src/protocols/jabber/jabber.c:1306
+#: ../src/protocols/jabber/jabber.c:1466
 msgid "Incorrect encoding in authorization"
 msgstr "Codifica non corretta nell'autorizzazione"
 
-#: src/protocols/jabber/jabber.c:1309
+#: ../src/protocols/jabber/jabber.c:1469
 msgid "Invalid authzid"
 msgstr "Authzid non valido"
 
-#: src/protocols/jabber/jabber.c:1312
+#: ../src/protocols/jabber/jabber.c:1472
 msgid "Invalid Authorization Mechanism"
 msgstr "Meccanismo di autorizzazione non valido"
 
-#: src/protocols/jabber/jabber.c:1315
+#: ../src/protocols/jabber/jabber.c:1475
 msgid "Authorization mechanism too weak"
 msgstr "Meccanismo di autorizzazione troppo debole"
 
-#: src/protocols/jabber/jabber.c:1320
+#: ../src/protocols/jabber/jabber.c:1480
 msgid "Temporary Authentication Failure"
 msgstr "Autenticazione temporaneamente non riuscita"
 
-#: src/protocols/jabber/jabber.c:1322
+#: ../src/protocols/jabber/jabber.c:1483
 msgid "Authentication Failure"
 msgstr "Autenticazione fallita"
 
-#: src/protocols/jabber/jabber.c:1326
+#: ../src/protocols/jabber/jabber.c:1487
 msgid "Bad Format"
 msgstr "Formato non valido"
 
-#: src/protocols/jabber/jabber.c:1328
+#: ../src/protocols/jabber/jabber.c:1489
 msgid "Bad Namespace Prefix"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1331
+#: ../src/protocols/jabber/jabber.c:1492
 msgid "Resource Conflict"
 msgstr "Conflitto di risorsa"
 
-#: src/protocols/jabber/jabber.c:1333 src/protocols/silc/ops.c:1514
+#: ../src/protocols/jabber/jabber.c:1494 ../src/protocols/silc/ops.c:1728
 msgid "Connection Timeout"
 msgstr "Connessione scaduta"
 
-#: src/protocols/jabber/jabber.c:1335
+#: ../src/protocols/jabber/jabber.c:1496
 msgid "Host Gone"
 msgstr "Il server non  pi in linea"
 
-#: src/protocols/jabber/jabber.c:1337
+#: ../src/protocols/jabber/jabber.c:1498
 msgid "Host Unknown"
 msgstr "Host sconosciuto"
 
-#: src/protocols/jabber/jabber.c:1339
+#: ../src/protocols/jabber/jabber.c:1500
 msgid "Improper Addressing"
 msgstr "Indirizzamento sbagliato"
 
-#: src/protocols/jabber/jabber.c:1343
+#: ../src/protocols/jabber/jabber.c:1504
 msgid "Invalid ID"
 msgstr "ID non valido"
 
-#: src/protocols/jabber/jabber.c:1345
+#: ../src/protocols/jabber/jabber.c:1506
 msgid "Invalid Namespace"
 msgstr "Namespace non valido"
 
-#: src/protocols/jabber/jabber.c:1347
+#: ../src/protocols/jabber/jabber.c:1508
 msgid "Invalid XML"
 msgstr "XML non valido"
 
-#: src/protocols/jabber/jabber.c:1349
+#: ../src/protocols/jabber/jabber.c:1510
 msgid "Non-matching Hosts"
 msgstr "Gli host non corrispondono"
 
-#: src/protocols/jabber/jabber.c:1353
+#: ../src/protocols/jabber/jabber.c:1514
 msgid "Policy Violation"
 msgstr "Violazione delle regole di policy"
 
-#: src/protocols/jabber/jabber.c:1355
+#: ../src/protocols/jabber/jabber.c:1516
 msgid "Remote Connection Failed"
 msgstr "Controllo remoto fallito"
 
-#: src/protocols/jabber/jabber.c:1357
+#: ../src/protocols/jabber/jabber.c:1518
 msgid "Resource Constraint"
 msgstr "Vincolo sulla risorsa"
 
-#: src/protocols/jabber/jabber.c:1359
+#: ../src/protocols/jabber/jabber.c:1520
 msgid "Restricted XML"
 msgstr "XML limitato"
 
-#: src/protocols/jabber/jabber.c:1361
+#: ../src/protocols/jabber/jabber.c:1522
 msgid "See Other Host"
 msgstr "Vedi gli altri host"
 
-#: src/protocols/jabber/jabber.c:1363
+#: ../src/protocols/jabber/jabber.c:1524
 msgid "System Shutdown"
 msgstr "Arresto del sistema"
 
-#: src/protocols/jabber/jabber.c:1365
+#: ../src/protocols/jabber/jabber.c:1526
 msgid "Undefined Condition"
 msgstr "Condizione non definita"
 
-#: src/protocols/jabber/jabber.c:1367
+#: ../src/protocols/jabber/jabber.c:1528
 msgid "Unsupported Encoding"
 msgstr "Codifica non supportata"
 
-#: src/protocols/jabber/jabber.c:1369
+#: ../src/protocols/jabber/jabber.c:1530
 msgid "Unsupported Stanza Type"
 msgstr "Tipo di stanza non supportato"
 
-#: src/protocols/jabber/jabber.c:1371
+#: ../src/protocols/jabber/jabber.c:1532
 msgid "Unsupported Version"
 msgstr "Versione non supportata"
 
-#: src/protocols/jabber/jabber.c:1373
+#: ../src/protocols/jabber/jabber.c:1534
 msgid "XML Not Well Formed"
 msgstr "XML non creato correttamente"
 
-#: src/protocols/jabber/jabber.c:1375
+#: ../src/protocols/jabber/jabber.c:1536
 msgid "Stream Error"
 msgstr "Errore di stream"
 
-#: src/protocols/jabber/jabber.c:1442
+#: ../src/protocols/jabber/jabber.c:1603
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Impossibile allontanare l'utente %s"
 
-#: src/protocols/jabber/jabber.c:1464
+#: ../src/protocols/jabber/jabber.c:1623
 #, fuzzy, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Comando sconosciuto: %s"
 
-#: src/protocols/jabber/jabber.c:1469
+#: ../src/protocols/jabber/jabber.c:1628
 #, fuzzy, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Impossibile invitare l'utente (%s)."
 
-#: src/protocols/jabber/jabber.c:1521
+#: ../src/protocols/jabber/jabber.c:1647
+#, fuzzy, c-format
+msgid "Unknown role: \"%s\""
+msgstr "Comando sconosciuto: %s"
+
+#: ../src/protocols/jabber/jabber.c:1654
+#, fuzzy, c-format
+msgid "Unable to set role \"%s\" for user: %s"
+msgstr "Impossibile inviare il messaggio: %s"
+
+#: ../src/protocols/jabber/jabber.c:1707
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Impossibile espellere l'utente %s"
 
-#: src/protocols/jabber/jabber.c:1547
+#: ../src/protocols/jabber/jabber.c:1738
 msgid "config:  Configure a chat room."
 msgstr "config: Configura una chat room."
 
-#: src/protocols/jabber/jabber.c:1551
+#: ../src/protocols/jabber/jabber.c:1742
 msgid "configure:  Configure a chat room."
 msgstr "configure: Configura una chat room."
 
-#: src/protocols/jabber/jabber.c:1560
+#: ../src/protocols/jabber/jabber.c:1751
 msgid "part [room]:  Leave the room."
 msgstr "part [stanza]: Abbandona la stanza."
 
-#: src/protocols/jabber/jabber.c:1565
+#: ../src/protocols/jabber/jabber.c:1756
 msgid "register:  Register with a chat room."
 msgstr "register: Iscrizione ad una chat room."
 
-#: src/protocols/jabber/jabber.c:1571
+#: ../src/protocols/jabber/jabber.c:1762
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [nuovo argomento]: Visualizza o modifica l'argomento."
 
-#: src/protocols/jabber/jabber.c:1577
+#: ../src/protocols/jabber/jabber.c:1768
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;utente&gt; [stanza]: Allontana un utente dalla stanza."
 
-#: src/protocols/jabber/jabber.c:1583
+#: ../src/protocols/jabber/jabber.c:1774
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1589
+#: ../src/protocols/jabber/jabber.c:1780
+msgid ""
+"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
+"role in the room."
+msgstr ""
+
+#: ../src/protocols/jabber/jabber.c:1786
 #, fuzzy
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;utente&gt; [stanza]: Invita un utente nella stanza."
 
-#: src/protocols/jabber/jabber.c:1595
+#: ../src/protocols/jabber/jabber.c:1792
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;stanza&gt; [server]: Entra in una chat su questo sever."
 
-#: src/protocols/jabber/jabber.c:1601
+#: ../src/protocols/jabber/jabber.c:1798
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;utente&gt; [stanza]: Espelle un utente dalla stanza."
 
-#: src/protocols/jabber/jabber.c:1606
+#: ../src/protocols/jabber/jabber.c:1803
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
@@ -6424,96 +7420,94 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1686 src/protocols/jabber/jabber.c:1688
+#: ../src/protocols/jabber/jabber.c:1886 ../src/protocols/jabber/jabber.c:1888
 msgid "Jabber Protocol Plugin"
 msgstr "Plugin per il protocollo Jabber"
 
-#: src/protocols/jabber/jabber.c:1714
+#: ../src/protocols/jabber/jabber.c:1914
 msgid "Use TLS if available"
 msgstr "Utilizza TLS se disponibile"
 
-#: src/protocols/jabber/jabber.c:1719
+#: ../src/protocols/jabber/jabber.c:1919
 msgid "Require TLS"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1722
-#, fuzzy
+msgstr "Richiedi TLS"
+
+#: ../src/protocols/jabber/jabber.c:1922
 msgid "Force old (port 5223) SSL"
-msgstr "Forza il vecchio SSL"
-
-#: src/protocols/jabber/jabber.c:1727
+msgstr "Forza il vecchio SSL (porta 5223)"
+
+#: ../src/protocols/jabber/jabber.c:1927
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Consenti l'autenticazione come testo semplice su stream non criptati"
 
-#: src/protocols/jabber/jabber.c:1732
-#, fuzzy
+#: ../src/protocols/jabber/jabber.c:1932 ../src/protocols/simple/simple.c:1775
 msgid "Connect port"
-msgstr "Connetti"
+msgstr "Porta per la connessione"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1736 src/protocols/silc/silc.c:1593
+#: ../src/protocols/jabber/jabber.c:1936 ../src/protocols/silc/silc.c:1854
 msgid "Connect server"
 msgstr "Server di connessione"
 
-#: src/protocols/jabber/message.c:114
+#: ../src/protocols/jabber/message.c:117
 #, c-format
 msgid "Message from %s"
 msgstr "Messaggio da %s"
 
-#: src/protocols/jabber/message.c:178
+#: ../src/protocols/jabber/message.c:181
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s ha scelto come argomento: %s"
 
-#: src/protocols/jabber/message.c:180
+#: ../src/protocols/jabber/message.c:183
 #, c-format
 msgid "The topic is: %s"
 msgstr "L'argomento : %s"
 
-#: src/protocols/jabber/message.c:230
+#: ../src/protocols/jabber/message.c:233
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Invio del messaggio a %s fallito: %s"
 
-#: src/protocols/jabber/message.c:233
+#: ../src/protocols/jabber/message.c:236
 msgid "Jabber Message Error"
 msgstr "Errore messaggio Jabber"
 
-#: src/protocols/jabber/message.c:297
+#: ../src/protocols/jabber/message.c:319
 #, c-format
 msgid " (Code %s)"
 msgstr " (Codice %s)"
 
-#: src/protocols/jabber/parser.c:131
+#: ../src/protocols/jabber/parser.c:279 ../src/protocols/jabber/parser.c:288
 msgid "XML Parse error"
 msgstr "Errore di parsing XML"
 
-#: src/protocols/jabber/presence.c:284
+#: ../src/protocols/jabber/presence.c:308
 msgid "Unknown Error in presence"
 msgstr "Errore sconosciuto nella presenza"
 
-#: src/protocols/jabber/presence.c:289 src/protocols/msn/userlist.c:93
+#: ../src/protocols/jabber/presence.c:313 ../src/protocols/msn/userlist.c:104
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list."
 msgstr "L'utente %s vuole aggiungere %s alla sua lista dei contatti."
 
-#: src/protocols/jabber/presence.c:297 src/protocols/msn/userlist.c:100
-#: src/protocols/oscar/oscar.c:4602 src/protocols/oscar/oscar.c:7248
-#: src/protocols/yahoo/yahoo.c:895
-msgid "Authorize"
-msgstr "Autorizza"
-
-#: src/protocols/jabber/presence.c:298 src/protocols/msn/userlist.c:101
-#: src/protocols/oscar/oscar.c:4604 src/protocols/oscar/oscar.c:7249
-#: src/protocols/yahoo/yahoo.c:897
-msgid "Deny"
+#: ../src/protocols/jabber/presence.c:322 ../src/protocols/oscar/oscar.c:2381
+#: ../src/protocols/oscar/oscar.c:5035
+msgid "_Authorize"
+msgstr "_Autorizza"
+
+#: ../src/protocols/jabber/presence.c:323 ../src/protocols/oscar/oscar.c:2383
+#: ../src/protocols/oscar/oscar.c:5036
+#, fuzzy
+msgid "_Deny"
 msgstr "Blocca"
 
-#: src/protocols/jabber/presence.c:345 src/protocols/jabber/presence.c:346
+#: ../src/protocols/jabber/presence.c:380
+#: ../src/protocols/jabber/presence.c:381
 msgid "Create New Room"
 msgstr "Crea una nuova stanza"
 
-#: src/protocols/jabber/presence.c:347
+#: ../src/protocols/jabber/presence.c:382
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -6521,40 +7515,40 @@
 "Stai per creare una nuova stanza. Vuoi configurarla oppure accettare le "
 "impostazioni predefinite?"
 
-#: src/protocols/jabber/presence.c:349
-msgid "Configure Room"
-msgstr "Configura la stanza"
-
-#: src/protocols/jabber/presence.c:351
-msgid "Accept Defaults"
-msgstr "Accetta impostazioni predefinite"
-
-#: src/protocols/jabber/presence.c:388
+#: ../src/protocols/jabber/presence.c:385
+msgid "_Configure Room"
+msgstr "_Configura la stanza"
+
+#: ../src/protocols/jabber/presence.c:387
+msgid "_Accept Defaults"
+msgstr "_Accetta impostazioni predefinite"
+
+#: ../src/protocols/jabber/presence.c:425
 #, c-format
 msgid "Error in chat %s"
 msgstr "Errore nella chat %s"
 
-#: src/protocols/jabber/presence.c:391
+#: ../src/protocols/jabber/presence.c:428
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Errore nell'ingresso nella chat %s"
 
-#: src/protocols/jabber/si.c:591
+#: ../src/protocols/jabber/si.c:728
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 "Impossibile inviare il file a %s. L'utente non supporta il trasferimento file"
 
-#: src/protocols/jabber/si.c:592 src/protocols/jabber/si.c:593
+#: ../src/protocols/jabber/si.c:729 ../src/protocols/jabber/si.c:730
 msgid "File Send Failed"
 msgstr "Invio file fallito"
 
-#: src/protocols/msn/dialog.c:91
+#: ../src/protocols/msn/dialog.c:92
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "Problema di sincronizzazione della lista contatti in %s (%s)"
 
-#: src/protocols/msn/dialog.c:97
+#: ../src/protocols/msn/dialog.c:98
 #, c-format
 msgid ""
 "%s on the local list is inside the group \"%s\" but not on the server list. "
@@ -6563,7 +7557,7 @@
 "%s appartiene al gruppo \"%s\" sulla lista locale ma non sulla lista del "
 "server. Vuoi che questo contatto venga aggiunto?"
 
-#: src/protocols/msn/dialog.c:105
+#: ../src/protocols/msn/dialog.c:106
 #, c-format
 msgid ""
 "%s is on the local list but not on the server list. Do you want this buddy "
@@ -6572,263 +7566,264 @@
 "%s  presente sulla lista locale ma non sulla lista del server. Vuoi che "
 "questo contatto venga aggiunto?"
 
-#: src/protocols/msn/error.c:35
+#: ../src/protocols/msn/error.c:35
 msgid "Unable to parse message"
 msgstr "Impossibile effettuare il parsing del messaggio."
 
-#: src/protocols/msn/error.c:38
+#: ../src/protocols/msn/error.c:38
 msgid "Syntax Error (probably a Gaim bug)"
 msgstr "Errore di sintassi (probabilmente un bug di Gaim)"
 
-#: src/protocols/msn/error.c:42
+#: ../src/protocols/msn/error.c:42
 msgid "Invalid e-mail address"
 msgstr "Indirizzo e-mail non valido"
 
-#: src/protocols/msn/error.c:45
+#: ../src/protocols/msn/error.c:45
 msgid "User does not exist"
 msgstr "L'utente non esiste"
 
-#: src/protocols/msn/error.c:49
+#: ../src/protocols/msn/error.c:49
 msgid "Fully Qualified Domain Name missing"
 msgstr "Manca un nome di dominio corretto"
 
-#: src/protocols/msn/error.c:52
+#: ../src/protocols/msn/error.c:52
 msgid "Already Logged In"
 msgstr "Gi connesso"
 
-#: src/protocols/msn/error.c:55
+#: ../src/protocols/msn/error.c:55
 msgid "Invalid Username"
 msgstr "Username non valido"
 
-#: src/protocols/msn/error.c:58
+#: ../src/protocols/msn/error.c:58
 msgid "Invalid Friendly Name"
 msgstr "Alias non valido"
 
-#: src/protocols/msn/error.c:61
+#: ../src/protocols/msn/error.c:61
 msgid "List Full"
 msgstr "Lista piena"
 
-#: src/protocols/msn/error.c:64
+#: ../src/protocols/msn/error.c:64
 msgid "Already there"
 msgstr "C' gi"
 
-#: src/protocols/msn/error.c:67
+#: ../src/protocols/msn/error.c:67
 msgid "Not on list"
 msgstr "Non  nella 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 "L'utente non  in linea"
 
-#: src/protocols/msn/error.c:73
+#: ../src/protocols/msn/error.c:73
 msgid "Already in the mode"
 msgstr "Gi nella modalit"
 
-#: src/protocols/msn/error.c:76
+#: ../src/protocols/msn/error.c:76
 msgid "Already in opposite list"
 msgstr "Gi nella lista opposta"
 
-#: src/protocols/msn/error.c:79
+#: ../src/protocols/msn/error.c:79
 msgid "Too many groups"
 msgstr "Troppi gruppi"
 
-#: src/protocols/msn/error.c:82
+#: ../src/protocols/msn/error.c:82
 msgid "Invalid group"
 msgstr "Gruppo non valido"
 
-#: src/protocols/msn/error.c:85
+#: ../src/protocols/msn/error.c:85
 msgid "User not in group"
 msgstr "L'utente non  nel gruppo"
 
-#: src/protocols/msn/error.c:88
+#: ../src/protocols/msn/error.c:88
 msgid "Group name too long"
 msgstr "Nome del gruppo troppo lungo"
 
-#: src/protocols/msn/error.c:91
+#: ../src/protocols/msn/error.c:91
 msgid "Cannot remove group zero"
 msgstr "Impossibile rimuovere il gruppo zero"
 
-#: src/protocols/msn/error.c:95
-msgid "Tried to add a contact to a group that doesn't exist"
+#: ../src/protocols/msn/error.c:95
+#, fuzzy
+msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Stai cercando di aggiungere un contatto ad un gruppo che non esiste"
 
-#: src/protocols/msn/error.c:99
+#: ../src/protocols/msn/error.c:99
 msgid "Switchboard failed"
 msgstr "Switchboard fallito"
 
-#: src/protocols/msn/error.c:102
+#: ../src/protocols/msn/error.c:102
 msgid "Notify Transfer failed"
 msgstr "Notifica trasferimento fallita"
 
-#: src/protocols/msn/error.c:106
+#: ../src/protocols/msn/error.c:106
 msgid "Required fields missing"
 msgstr "Mancano dei campi richiesti"
 
-#: src/protocols/msn/error.c:109
+#: ../src/protocols/msn/error.c:109
 msgid "Too many hits to a FND"
 msgstr ""
 
-#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:206
+#: ../src/protocols/msn/error.c:112 ../src/protocols/oscar/oscar.c:148
 msgid "Not logged in"
 msgstr "Non connesso"
 
-#: src/protocols/msn/error.c:116
+#: ../src/protocols/msn/error.c:116
 msgid "Service Temporarily Unavailable"
 msgstr "Servizio temporaneamente non disponibile"
 
-#: src/protocols/msn/error.c:119
+#: ../src/protocols/msn/error.c:119
 msgid "Database server error"
 msgstr "Errore del server database"
 
-#: src/protocols/msn/error.c:122
+#: ../src/protocols/msn/error.c:122
 msgid "Command disabled"
 msgstr "Comando disabilitato"
 
-#: src/protocols/msn/error.c:125
+#: ../src/protocols/msn/error.c:125
 msgid "File operation error"
 msgstr "Operazione illegale sul file"
 
-#: src/protocols/msn/error.c:128
+#: ../src/protocols/msn/error.c:128
 msgid "Memory allocation error"
 msgstr "Errore di allocazione della memoria"
 
-#: src/protocols/msn/error.c:131
+#: ../src/protocols/msn/error.c:131
 msgid "Wrong CHL value sent to server"
 msgstr " stato inviato al server un valore CHL sbagliato"
 
-#: src/protocols/msn/error.c:135
+#: ../src/protocols/msn/error.c:135
 msgid "Server busy"
 msgstr "Server occupato"
 
-#: src/protocols/msn/error.c:138 src/protocols/msn/error.c:151
-#: src/protocols/msn/error.c:206
+#: ../src/protocols/msn/error.c:138 ../src/protocols/msn/error.c:151
+#: ../src/protocols/msn/error.c:206
 msgid "Server unavailable"
 msgstr "Server non disponibile"
 
-#: src/protocols/msn/error.c:141
+#: ../src/protocols/msn/error.c:141
 msgid "Peer Notification server down"
 msgstr "Server di notifica non attivo"
 
-#: src/protocols/msn/error.c:144
+#: ../src/protocols/msn/error.c:144
 msgid "Database connect error"
 msgstr "Errore di connessione al database"
 
-#: src/protocols/msn/error.c:148
+#: ../src/protocols/msn/error.c:148
 msgid "Server is going down (abandon ship)"
 msgstr "Il server sta per essere disattivato (abbandona la nave)"
 
-#: src/protocols/msn/error.c:155
+#: ../src/protocols/msn/error.c:155
 msgid "Error creating connection"
 msgstr "Errore nella creazione della connessione"
 
-#: src/protocols/msn/error.c:159
+#: ../src/protocols/msn/error.c:159
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "I parametri CVR sono sconosciuti o non consentiti"
 
-#: src/protocols/msn/error.c:162
+#: ../src/protocols/msn/error.c:162
 msgid "Unable to write"
 msgstr "Impossibile scrivere"
 
-#: src/protocols/msn/error.c:165
+#: ../src/protocols/msn/error.c:165
 msgid "Session overload"
 msgstr "Sessione sovraccarica"
 
-#: src/protocols/msn/error.c:168
+#: ../src/protocols/msn/error.c:168
 msgid "User is too active"
 msgstr "L'utente  troppo attivo"
 
-#: src/protocols/msn/error.c:171
+#: ../src/protocols/msn/error.c:171
 msgid "Too many sessions"
 msgstr "Troppe sessioni"
 
-#: src/protocols/msn/error.c:174
+#: ../src/protocols/msn/error.c:174
 msgid "Passport not verified"
 msgstr "Profilo Passport non verificato"
 
-#: src/protocols/msn/error.c:177
+#: ../src/protocols/msn/error.c:177
 msgid "Bad friend file"
 msgstr ""
 
-#: src/protocols/msn/error.c:180
+#: ../src/protocols/msn/error.c:180
 msgid "Not expected"
 msgstr "Non atteso"
 
-#: src/protocols/msn/error.c:185
+#: ../src/protocols/msn/error.c:185
 msgid "Friendly name changes too rapidly"
 msgstr "L'alias cambia troppo rapidamente"
 
-#: src/protocols/msn/error.c:194
+#: ../src/protocols/msn/error.c:194
 msgid "Server too busy"
 msgstr "Server occupato"
 
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2756
-#: src/protocols/silc/ops.c:1503 src/protocols/toc/toc.c:722
+#: ../src/protocols/msn/error.c:198 ../src/protocols/oscar/oscar.c:1331
+#: ../src/protocols/silc/ops.c:1717 ../src/protocols/toc/toc.c:722
 msgid "Authentication failed"
 msgstr "Autenticazione fallita"
 
-#: src/protocols/msn/error.c:201
+#: ../src/protocols/msn/error.c:201
 msgid "Not allowed when offline"
 msgstr "Non consentito quando non sei in linea"
 
-#: src/protocols/msn/error.c:209
+#: ../src/protocols/msn/error.c:209
 msgid "Not accepting new users"
 msgstr "Non accetta nuovi utenti"
 
-#: src/protocols/msn/error.c:213
+#: ../src/protocols/msn/error.c:213
 msgid "Kids Passport without parental consent"
 msgstr "Kids Passport senza il consenso parentale"
 
-#: src/protocols/msn/error.c:217
+#: ../src/protocols/msn/error.c:217
 msgid "Passport account not yet verified"
 msgstr "Profilo Passport non ancora verificato"
 
-#: src/protocols/msn/error.c:220
+#: ../src/protocols/msn/error.c:220
 msgid "Bad ticket"
 msgstr "Biglietto non valido"
 
-#: src/protocols/msn/error.c:224
+#: ../src/protocols/msn/error.c:224
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "Codice di errore sconosciuto %d"
 
-#: src/protocols/msn/error.c:236
+#: ../src/protocols/msn/error.c:236
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "Errore di MSN: %s\n"
 
-#: src/protocols/msn/msn.c:113
+#: ../src/protocols/msn/msn.c:113
 msgid "You have just sent a Nudge!"
 msgstr ""
 
-#: src/protocols/msn/msn.c:138
+#: ../src/protocols/msn/msn.c:138
 msgid "Your new MSN friendly name is too long."
 msgstr "Il tuo nuovo alias MSN  troppo lungo."
 
-#: src/protocols/msn/msn.c:246
+#: ../src/protocols/msn/msn.c:246
 msgid "Set your friendly name."
 msgstr "Imposta un alias."
 
-#: src/protocols/msn/msn.c:247
+#: ../src/protocols/msn/msn.c:247
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Questo  il nome con il quale i contatti MSN ti vedranno."
 
-#: src/protocols/msn/msn.c:263
+#: ../src/protocols/msn/msn.c:263
 msgid "Set your home phone number."
 msgstr "Imposta il telefono di casa."
 
-#: src/protocols/msn/msn.c:278
+#: ../src/protocols/msn/msn.c:278
 msgid "Set your work phone number."
 msgstr "Imposta il telefono dell'ufficio."
 
-#: src/protocols/msn/msn.c:293
+#: ../src/protocols/msn/msn.c:293
 msgid "Set your mobile phone number."
 msgstr "Imposta il numero di cellulare."
 
-#: src/protocols/msn/msn.c:306
+#: ../src/protocols/msn/msn.c:306
 msgid "Allow MSN Mobile pages?"
 msgstr "Consenti le \"MSN Mobile Pages\"?"
 
-#: src/protocols/msn/msn.c:307
+#: ../src/protocols/msn/msn.c:307
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
@@ -6836,29 +7831,29 @@
 "Vuoi permettere ai contatti della tua lista di inviarti \"MSN Mobile pages\" "
 "sul tuo cellulare o su un altro dispositivo portatile?"
 
-#: src/protocols/msn/msn.c:311
+#: ../src/protocols/msn/msn.c:311
 msgid "Allow"
 msgstr "Permetti"
 
-#: src/protocols/msn/msn.c:312
+#: ../src/protocols/msn/msn.c:312
 msgid "Disallow"
 msgstr "Vieta"
 
-#: src/protocols/msn/msn.c:328
+#: ../src/protocols/msn/msn.c:328
 msgid "This Hotmail account may not be active."
 msgstr ""
 
-#: src/protocols/msn/msn.c:354
+#: ../src/protocols/msn/msn.c:354
 msgid "Send a mobile message."
 msgstr "Invia un messaggio ad un dispositivo portatile."
 
-#: src/protocols/msn/msn.c:356
+#: ../src/protocols/msn/msn.c:356
 msgid "Page"
 msgstr "Page"
 
-#: src/protocols/msn/msn.c:544 src/protocols/msn/msn.c:551
-#: src/protocols/msn/msn.c:554 src/protocols/yahoo/yahoo.c:2787
-#: src/protocols/yahoo/yahoo.c:2793
+#: ../src/protocols/msn/msn.c:548 ../src/protocols/msn/msn.c:555
+#: ../src/protocols/msn/msn.c:564 ../src/protocols/sametime/sametime.c:3239
+#: ../src/protocols/yahoo/yahoo.c:2878 ../src/protocols/yahoo/yahoo.c:2884
 #, c-format
 msgid ""
 "\n"
@@ -6867,67 +7862,69 @@
 "\n"
 "<b>%s:</b> %s"
 
-#: src/protocols/msn/msn.c:551
+#: ../src/protocols/msn/msn.c:555
 msgid "Has you"
 msgstr "Sei nella sua lista"
 
-#: src/protocols/msn/msn.c:581 src/protocols/msn/state.c:33
-#: src/protocols/yahoo/yahoo.c:2615 src/protocols/yahoo/yahoo.c:3230
+#: ../src/protocols/msn/msn.c:585 ../src/protocols/msn/state.c:33
+#: ../src/protocols/yahoo/yahoo.c:2707 ../src/protocols/yahoo/yahoo.c:3292
 msgid "Be Right Back"
 msgstr "Torno subito"
 
-#: src/protocols/msn/msn.c:589 src/protocols/msn/state.c:35
-#: src/protocols/yahoo/yahoo.c:2625 src/protocols/yahoo/yahoo.c:3245
-msgid "On The Phone"
+#: ../src/protocols/msn/msn.c:589 ../src/protocols/msn/state.c:31
+#: ../src/protocols/novell/novell.c:2849 ../src/protocols/novell/novell.c:2983
+#: ../src/protocols/silc/buddy.c:1473 ../src/protocols/silc/silc.c:53
+#: ../src/protocols/yahoo/yahoo.c:2709 ../src/protocols/yahoo/yahoo.c:3295
+msgid "Busy"
+msgstr "Occupato"
+
+#: ../src/protocols/msn/msn.c:593 ../src/protocols/yahoo/yahoo.c:2717
+#: ../src/protocols/yahoo/yahoo.c:3307
+msgid "On the Phone"
 msgstr "Al telefono"
 
-#: src/protocols/msn/msn.c:593 src/protocols/msn/state.c:36
-#: src/protocols/yahoo/yahoo.c:2629 src/protocols/yahoo/yahoo.c:3251
-msgid "Out To Lunch"
+#: ../src/protocols/msn/msn.c:597 ../src/protocols/yahoo/yahoo.c:2721
+#: ../src/protocols/yahoo/yahoo.c:3313
+msgid "Out to Lunch"
 msgstr "A pranzo"
 
-#: src/protocols/msn/msn.c:597 src/protocols/zephyr/zephyr.c:2255
-#: src/status.c:157
-msgid "Hidden"
-msgstr "Nascosto"
-
-#: src/protocols/msn/msn.c:613
-msgid "Set Friendly Name"
-msgstr "Imposta un alias"
-
-#: src/protocols/msn/msn.c:618
-msgid "Set Home Phone Number"
-msgstr "Imposta il telefono di casa"
-
-#: src/protocols/msn/msn.c:622
-msgid "Set Work Phone Number"
-msgstr "Imposta il telefono dell'ufficio"
-
-#: src/protocols/msn/msn.c:626
-msgid "Set Mobile Phone Number"
-msgstr "Imposta il numero di cellulare"
-
-#: src/protocols/msn/msn.c:632
-msgid "Enable/Disable Mobile Devices"
-msgstr "Abilita/Disabilita i dispositivi portatili"
-
-#: src/protocols/msn/msn.c:637
-msgid "Allow/Disallow Mobile Pages"
-msgstr "Permetti/Vieta Mobile Pages"
-
-#: src/protocols/msn/msn.c:647
+#: ../src/protocols/msn/msn.c:621
+msgid "Set Friendly Name..."
+msgstr "Imposta un alias..."
+
+#: ../src/protocols/msn/msn.c:626
+msgid "Set Home Phone Number..."
+msgstr "Imposta il telefono di casa..."
+
+#: ../src/protocols/msn/msn.c:630
+msgid "Set Work Phone Number..."
+msgstr "Imposta il telefono dell'ufficio..."
+
+#: ../src/protocols/msn/msn.c:634
+msgid "Set Mobile Phone Number..."
+msgstr "Imposta il numero di cellulare..."
+
+#: ../src/protocols/msn/msn.c:640
+msgid "Enable/Disable Mobile Devices..."
+msgstr "Abilita/Disabilita i dispositivi portatili..."
+
+#: ../src/protocols/msn/msn.c:645
+msgid "Allow/Disallow Mobile Pages..."
+msgstr "Permetti/Vieta Mobile Pages..."
+
+#: ../src/protocols/msn/msn.c:655
 msgid "Open Hotmail Inbox"
-msgstr ""
-
-#: src/protocols/msn/msn.c:671
+msgstr "Apri posta su Hotmail"
+
+#: ../src/protocols/msn/msn.c:679
 msgid "Send to Mobile"
 msgstr "Invia ad un dispositivo portatile"
 
-#: src/protocols/msn/msn.c:680 src/protocols/novell/novell.c:3442
+#: ../src/protocols/msn/msn.c:689 ../src/protocols/novell/novell.c:3439
 msgid "Initiate _Chat"
 msgstr "Inizia una _chat"
 
-#: src/protocols/msn/msn.c:717
+#: ../src/protocols/msn/msn.c:727
 msgid ""
 "SSL support is needed for MSN. Please install a supported SSL library. See "
 "http://gaim.sf.net/faq-ssl.php for more information."
@@ -6935,89 +7932,233 @@
 "Il supporto SSL  necessario per MSN. Installare una libreria SSL "
 "supportata. Vai su http://gaim.sf.net/faq-ssl.php per maggiori informazioni."
 
-#: src/protocols/msn/msn.c:745
+#: ../src/protocols/msn/msn.c:755
 msgid "Failed to connect to server."
 msgstr "Impossibile connettersi al server."
 
-#: src/protocols/msn/msn.c:1387 src/protocols/yahoo/yahoo_profile.c:654
-#: src/protocols/zephyr/zephyr.c:721 src/protocols/zephyr/zephyr.c:1135
+#: ../src/protocols/msn/msn.c:1361 ../src/protocols/yahoo/yahoo_profile.c:685
+#: ../src/protocols/zephyr/zephyr.c:736 ../src/protocols/zephyr/zephyr.c:1153
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr "<b>Alias:</b> %s<br>"
 
 #. put a link to the actual profile URL
-#: src/protocols/msn/msn.c:1394 src/protocols/msn/msn.c:1740
-#: src/protocols/yahoo/yahoo_profile.c:1167 src/util.c:801
+#: ../src/protocols/msn/msn.c:1368 ../src/protocols/yahoo/yahoo_profile.c:1208
+#: ../src/util.c:1061
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b> "
 
-#: src/protocols/msn/msn.c:1471
+#: ../src/protocols/msn/msn.c:1458
 msgid "MSN Profile"
 msgstr "Profilo MSN"
 
-#: src/protocols/msn/msn.c:1476 src/protocols/msn/msn.c:1727
-#: src/protocols/yahoo/yahoo_profile.c:760
+#: ../src/protocols/msn/msn.c:1463 ../src/protocols/msn/msn.c:1789
+#: ../src/protocols/yahoo/yahoo_profile.c:795
 msgid "Error retrieving profile"
 msgstr "Errore nella ricezione del profilo"
 
-#: src/protocols/msn/msn.c:1546 src/protocols/oscar/oscar.c:5992
-#: src/protocols/yahoo/yahoo_profile.c:1015
+#: ../src/protocols/msn/msn.c:1531 ../src/protocols/oscar/oscar.c:3673
+#: ../src/protocols/yahoo/yahoo_profile.c:1056
 msgid "Age"
 msgstr "Et"
 
-#: src/protocols/msn/msn.c:1553 src/protocols/oscar/oscar.c:5979
-#: src/protocols/yahoo/yahoo_profile.c:1025
-msgid "Gender"
-msgstr "Sesso"
-
-#: src/protocols/msn/msn.c:1562 src/protocols/yahoo/yahoo_profile.c:1020
-msgid "Marital Status"
-msgstr "Stato civile"
-
-#: src/protocols/msn/msn.c:1569 src/protocols/novell/novell.c:1454
-#: src/protocols/yahoo/yahoo_profile.c:1010
-msgid "Location"
-msgstr "Localit"
-
-#: src/protocols/msn/msn.c:1577 src/protocols/yahoo/yahoo_profile.c:1030
+#: ../src/protocols/msn/msn.c:1533 ../src/protocols/yahoo/yahoo_profile.c:1071
 msgid "Occupation"
 msgstr "Occupazione"
 
-#: src/protocols/msn/msn.c:1594 src/protocols/msn/msn.c:1600
-#: src/protocols/msn/msn.c:1607 src/protocols/msn/msn.c:1615
-#: src/protocols/msn/msn.c:1622
-msgid "A Little About Me"
-msgstr "Qualcosa su di me"
-
-#: src/protocols/msn/msn.c:1631 src/protocols/msn/msn.c:1637
-#: src/protocols/msn/msn.c:1644 src/protocols/msn/msn.c:1651
-msgid "Favorite Things"
-msgstr "Preferenze"
-
-#: src/protocols/msn/msn.c:1660 src/protocols/msn/msn.c:1666
-#: src/protocols/msn/msn.c:1673
+#: ../src/protocols/msn/msn.c:1534 ../src/protocols/novell/novell.c:1478
+#: ../src/protocols/yahoo/yahoo_profile.c:1051
+msgid "Location"
+msgstr "Localit"
+
+#: ../src/protocols/msn/msn.c:1539 ../src/protocols/msn/msn.c:1718
+#: ../src/protocols/msn/msn.c:1724 ../src/protocols/msn/msn.c:1731
 msgid "Hobbies and Interests"
 msgstr "Hobbies e interessi"
 
-#: src/protocols/msn/msn.c:1682 src/protocols/msn/msn.c:1688
-#: src/protocols/yahoo/yahoo_profile.c:1072
+#: ../src/protocols/msn/msn.c:1545 ../src/protocols/msn/msn.c:1652
+#: ../src/protocols/msn/msn.c:1658 ../src/protocols/msn/msn.c:1665
+#: ../src/protocols/msn/msn.c:1673 ../src/protocols/msn/msn.c:1680
+msgid "A Little About Me"
+msgstr "Qualcosa su di me"
+
+#: ../src/protocols/msn/msn.c:1551
+#, fuzzy, c-format
+msgid "%s<b>General</b><br>%s"
+msgstr "<b>Utente:</b> %s<br>"
+
+#. Social
+#: ../src/protocols/msn/msn.c:1560 ../src/protocols/yahoo/yahoo_profile.c:1061
+msgid "Marital Status"
+msgstr "Stato civile"
+
+#: ../src/protocols/msn/msn.c:1561
+msgid "Interests"
+msgstr "Interessi"
+
+#: ../src/protocols/msn/msn.c:1562
+#, fuzzy
+msgid "Pets"
+msgstr "Porte"
+
+#: ../src/protocols/msn/msn.c:1563
+msgid "Hometown"
+msgstr ""
+
+#: ../src/protocols/msn/msn.c:1564
+msgid "Places Lived"
+msgstr ""
+
+#: ../src/protocols/msn/msn.c:1565
+msgid "Fashion"
+msgstr ""
+
+#: ../src/protocols/msn/msn.c:1566
+msgid "Humor"
+msgstr ""
+
+#: ../src/protocols/msn/msn.c:1567
+msgid "Music"
+msgstr "Musica"
+
+#: ../src/protocols/msn/msn.c:1568 ../src/protocols/msn/msn.c:1740
+#: ../src/protocols/msn/msn.c:1746 ../src/protocols/yahoo/yahoo_profile.c:1113
 msgid "Favorite Quote"
 msgstr "Citazione preferita"
 
-#: src/protocols/msn/msn.c:1696
+#: ../src/protocols/msn/msn.c:1572
+#, fuzzy, c-format
+msgid "%s<b>Social</b><br>%s"
+msgstr "<b>Alias:</b> %s<br>"
+
+#: ../src/protocols/msn/msn.c:1581
+msgid "Significant Other"
+msgstr ""
+
+#: ../src/protocols/msn/msn.c:1582
+msgid "Home Phone"
+msgstr "Telefono di casa"
+
+#: ../src/protocols/msn/msn.c:1583
+msgid "Home Phone 2"
+msgstr "Telefono di casa 2"
+
+#: ../src/protocols/msn/msn.c:1584 ../src/protocols/oscar/oscar.c:3685
+msgid "Home Address"
+msgstr "Indirizzo di casa"
+
+#: ../src/protocols/msn/msn.c:1585
+msgid "Personal Mobile"
+msgstr "Cellulare personale"
+
+#: ../src/protocols/msn/msn.c:1586
+msgid "Home Fax"
+msgstr "Fax di casa"
+
+#: ../src/protocols/msn/msn.c:1587
+msgid "Personal E-Mail"
+msgstr "Email personale"
+
+#: ../src/protocols/msn/msn.c:1588
+#, fuzzy
+msgid "Personal IM"
+msgstr "Titolo personale"
+
+#: ../src/protocols/msn/msn.c:1590
+msgid "Anniversary"
+msgstr "Anniversario"
+
+#: ../src/protocols/msn/msn.c:1591 ../src/protocols/msn/msn.c:1615
+msgid "Notes"
+msgstr "Note"
+
+#: ../src/protocols/msn/msn.c:1595
+#, fuzzy, c-format
+msgid "<br><b>Personal</b><br>%s"
+msgstr "<br><b>Argomento del canale:</b><br>%s"
+
+#: ../src/protocols/msn/msn.c:1602 ../src/protocols/silc/ops.c:1044
+msgid "Job Title"
+msgstr "Impiego"
+
+#: ../src/protocols/msn/msn.c:1603 ../src/protocols/oscar/oscar.c:3702
+msgid "Company"
+msgstr "Compagnia"
+
+#: ../src/protocols/msn/msn.c:1604 ../src/protocols/novell/novell.c:1480
+msgid "Department"
+msgstr "Dipartimento"
+
+#: ../src/protocols/msn/msn.c:1605
+msgid "Profession"
+msgstr "Professione"
+
+#: ../src/protocols/msn/msn.c:1606
+msgid "Work Phone"
+msgstr "Telefono dell'ufficio"
+
+#: ../src/protocols/msn/msn.c:1607
+msgid "Work Phone 2"
+msgstr "Telefono dell'ufficio 2"
+
+#: ../src/protocols/msn/msn.c:1608 ../src/protocols/oscar/oscar.c:3693
+msgid "Work Address"
+msgstr "Indirizzo di lavoro"
+
+#: ../src/protocols/msn/msn.c:1609
+msgid "Work Mobile"
+msgstr "Cellulare lavoro"
+
+#: ../src/protocols/msn/msn.c:1610
+msgid "Work Pager"
+msgstr "Pager lavoro"
+
+#: ../src/protocols/msn/msn.c:1611
+msgid "Work Fax"
+msgstr "Fax ufficio"
+
+#: ../src/protocols/msn/msn.c:1612
+msgid "Work E-Mail"
+msgstr "Email ufficio"
+
+#: ../src/protocols/msn/msn.c:1613
+msgid "Work IM"
+msgstr ""
+
+#: ../src/protocols/msn/msn.c:1614
+#, fuzzy
+msgid "Start Date"
+msgstr "Stato"
+
+#: ../src/protocols/msn/msn.c:1619
+#, fuzzy, c-format
+msgid "<br><b>Business</b><br>%s"
+msgstr "<br><b>Argomento del canale:</b><br>%s"
+
+#: ../src/protocols/msn/msn.c:1630
+#, c-format
+msgid "<hr><b>Contact Info</b>%s%s"
+msgstr "<hr><b>Informazioni sul contatto</b>%s%s"
+
+#: ../src/protocols/msn/msn.c:1689 ../src/protocols/msn/msn.c:1695
+#: ../src/protocols/msn/msn.c:1702 ../src/protocols/msn/msn.c:1709
+msgid "Favorite Things"
+msgstr "Preferenze"
+
+#: ../src/protocols/msn/msn.c:1754
 msgid "Last Updated"
 msgstr "Ultima modifica"
 
-#: src/protocols/msn/msn.c:1707 src/protocols/silc/ops.c:846
+#: ../src/protocols/msn/msn.c:1766 ../src/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "Homepage"
 
-#: src/protocols/msn/msn.c:1729
+#: ../src/protocols/msn/msn.c:1791
 msgid "The user has not created a public profile."
 msgstr "L'utente non ha creato un profilo pubblico."
 
-#: src/protocols/msn/msn.c:1730
+#: ../src/protocols/msn/msn.c:1792
 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 "
@@ -7027,7 +8168,7 @@
 "Questo significa che l'utente non esiste oppure che esiste ma non ha creato "
 "un profilo pubblico."
 
-#: src/protocols/msn/msn.c:1734
+#: ../src/protocols/msn/msn.c:1796
 msgid ""
 "Gaim could not find any information in the user's profile. The user most "
 "likely does not exist."
@@ -7035,7 +8176,13 @@
 "Gaim non ha trovato nessuna informazione nel profilo dell'utente. Molto "
 "probabilmente l'utente non esiste."
 
-#: src/protocols/msn/msn.c:1740 src/protocols/yahoo/yahoo_profile.c:1167
+#. put a link to the actual profile URL
+#: ../src/protocols/msn/msn.c:1801
+#, c-format
+msgid "<hr><b>%s:</b> "
+msgstr "<hr><b>%s:</b> "
+
+#: ../src/protocols/msn/msn.c:1801 ../src/protocols/yahoo/yahoo_profile.c:1208
 msgid "Profile URL"
 msgstr "URL del profilo"
 
@@ -7049,77 +8196,82 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1942 src/protocols/msn/msn.c:1944
+#: ../src/protocols/msn/msn.c:2023 ../src/protocols/msn/msn.c:2025
 msgid "MSN Protocol Plugin"
 msgstr "Plugin per il protocollo MSN"
 
-#: src/protocols/msn/msn.c:1963
-msgid "Login server"
-msgstr "Sever di login"
-
-#: src/protocols/msn/msn.c:1972
+#: ../src/protocols/msn/msn.c:2053
 msgid "Use HTTP Method"
 msgstr "Usa il metodo HTTP"
 
-#: src/protocols/msn/msn.c:1980
-#, fuzzy
-msgid "nudge: nudge a contact to get their attention"
+#: ../src/protocols/msn/msn.c:2058
+msgid "Show custom smileys"
+msgstr "Mostra gli smiley personalizzati"
+
+#: ../src/protocols/msn/msn.c:2066
+#, fuzzy
+msgid "nudge: nudge a user to get their attention"
 msgstr "buzz: Richiama l'attenzione di un contatto con un buzz"
 
-#: src/protocols/msn/nexus.c:103 src/protocols/msn/servconn.c:127
-#: src/protocols/yahoo/yahoochat.c:1326
+#: ../src/protocols/msn/nexus.c:141 ../src/protocols/msn/servconn.c:133
+#: ../src/protocols/yahoo/yahoochat.c:1345
+#: ../src/protocols/yahoo/yahoochat.c:1372
 msgid "Unable to connect"
 msgstr "Impossibile connettersi"
 
-#: src/protocols/msn/notification.c:178
+#: ../src/protocols/msn/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s non  un gruppo valido"
 
-#: src/protocols/msn/notification.c:184 src/protocols/msn/notification.c:528
-#: src/protocols/msn/session.c:347
+#: ../src/protocols/msn/notification.c:184
+#: ../src/protocols/msn/notification.c:532 ../src/protocols/msn/session.c:329
 msgid "Unknown error."
 msgstr "Errore sconosciuto."
 
-#: src/protocols/msn/notification.c:187
+#: ../src/protocols/msn/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s su %s: (%s)"
 
-#: src/protocols/msn/notification.c:498
+#: ../src/protocols/msn/notification.c:498
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "Impossibile aggiungere l'utente su %s (%s)"
 
-#: src/protocols/msn/notification.c:502
+#: ../src/protocols/msn/notification.c:502
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "Impossibile bloccare l'utente su %s (%s)"
 
-#: src/protocols/msn/notification.c:506
+#: ../src/protocols/msn/notification.c:506
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "Impossibile autorizzare l'utente su %s (%s)"
 
-#: src/protocols/msn/notification.c:514
+#: ../src/protocols/msn/notification.c:514
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "%s non pu essere aggiunto perch la tua lista contatti  piena."
 
-#: src/protocols/msn/notification.c:523
+#: ../src/protocols/msn/notification.c:523
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s non  un profilo passport valido"
 
-#: src/protocols/msn/notification.c:815
+#: ../src/protocols/msn/notification.c:528
+msgid "Service Temporarily Unavailable."
+msgstr "Servizio temporaneamente non disponibile."
+
+#: ../src/protocols/msn/notification.c:820
 msgid "Unable to rename group"
 msgstr "Impossibile rinominare il gruppo"
 
-#: src/protocols/msn/notification.c:870
+#: ../src/protocols/msn/notification.c:875
 msgid "Unable to delete group"
 msgstr "Impossibile cancellare il gruppo"
 
-#: src/protocols/msn/notification.c:1303
+#: ../src/protocols/msn/notification.c:1308
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7146,205 +8298,215 @@
 "\n"
 "Quando la manutenzione sar terminata, potrai collegarti nuovamente."
 
-#: src/protocols/msn/servconn.c:129
+#: ../src/protocols/msn/servconn.c:135
 msgid "Writing error"
 msgstr "Errore in scrittura"
 
-#: src/protocols/msn/servconn.c:131
+#: ../src/protocols/msn/servconn.c:137
 msgid "Reading error"
 msgstr "Errore in lettura"
 
-#: src/protocols/msn/servconn.c:133 src/protocols/msn/session.c:339
-#: src/protocols/oscar/oscar.c:4925
-msgid "Unknown error"
-msgstr "Errore sconosciuto"
-
-#: src/protocols/msn/servconn.c:136
-#, c-format
-msgid ""
-"Connection error from %s server (%s):\n"
+#: ../src/protocols/msn/servconn.c:144
+#, fuzzy, c-format
+msgid ""
+"Connection error from %s server:\n"
 "%s"
 msgstr ""
 "Errore sconosciuto dal server %s (%s):\n"
 "%s"
 
-#: src/protocols/msn/session.c:317
+#: ../src/protocols/msn/session.c:299
 msgid "Our protocol is not supported by the server."
 msgstr "Il nostro protocollo non  supportato dal server."
 
-#: src/protocols/msn/session.c:321
+#: ../src/protocols/msn/session.c:303
 msgid "Error parsing HTTP."
 msgstr "Errore di parsing HTTP."
 
 #. MSG_SERVER_GHOST
 #. Looks like someone logged in as us! =-O
-#: src/protocols/msn/session.c:325 src/protocols/napster/napster.c:450
-#: src/protocols/oscar/oscar.c:5629 src/protocols/yahoo/yahoo.c:194
+#: ../src/protocols/msn/session.c:307 ../src/protocols/napster/napster.c:456
+#: ../src/protocols/oscar/oscar.c:3416 ../src/protocols/yahoo/yahoo.c:191
 msgid "You have signed on from another location."
-msgstr "Sei connesso da un'altro posto."
-
-#: src/protocols/msn/session.c:328
+msgstr "Sei connesso da un'altra postazione."
+
+#: ../src/protocols/msn/session.c:310
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "I server MSN sono temporaneamente non disponibili. Riprova pi tardi."
 
-#: src/protocols/msn/session.c:333
+#: ../src/protocols/msn/session.c:315
 msgid "The MSN servers are going down temporarily."
 msgstr "I server MSN sono temporaneamente disattivi."
 
-#: src/protocols/msn/session.c:337
+#: ../src/protocols/msn/session.c:319
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Impossibile autenticare: %s"
 
-#: src/protocols/msn/session.c:342
+#: ../src/protocols/msn/session.c:324
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "La tua lista contatti MSN  temporaneamente non disponibile. Riprova pi "
 "tardi."
 
-#: src/protocols/msn/session.c:363 src/protocols/msn/session.c:365
+#: ../src/protocols/msn/session.c:345 ../src/protocols/msn/session.c:347
 msgid "Handshaking"
 msgstr "Handshake in corso"
 
-#: src/protocols/msn/session.c:364
+#: ../src/protocols/msn/session.c:346
 msgid "Transferring"
 msgstr "Trasferimento in corso"
 
-#: src/protocols/msn/session.c:366
+#: ../src/protocols/msn/session.c:348
 msgid "Starting authentication"
 msgstr "Avvio autenticazione in corso"
 
-#: src/protocols/msn/session.c:367
+#: ../src/protocols/msn/session.c:349
 msgid "Getting cookie"
 msgstr "Ricezione cookie in corso"
 
-#: src/protocols/msn/session.c:369
+#: ../src/protocols/msn/session.c:351
 msgid "Sending cookie"
 msgstr "Invio cookie in corso"
 
-#: src/protocols/msn/session.c:370
+#: ../src/protocols/msn/session.c:352
 msgid "Retrieving buddy list"
 msgstr "Ricezione della lista contatti in corso"
 
-#: src/protocols/msn/state.c:34
+#: ../src/protocols/msn/state.c:34
 msgid "Away From Computer"
 msgstr "Lontano dal computer"
 
-#: src/protocols/msn/switchboard.c:403
+#: ../src/protocols/msn/state.c:35
+msgid "On The Phone"
+msgstr "Al telefono"
+
+#: ../src/protocols/msn/state.c:36
+msgid "Out To Lunch"
+msgstr "A pranzo"
+
+#: ../src/protocols/msn/switchboard.c:401
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "Il messaggio potrebbe non essere stato inviato a causa di un timeout:"
 
-#: src/protocols/msn/switchboard.c:411
+#: ../src/protocols/msn/switchboard.c:409
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr ""
 "Il messaggio non  stato inviato. Non  permesso quando sei invisibile:"
 
-#: src/protocols/msn/switchboard.c:415
+#: ../src/protocols/msn/switchboard.c:413
 msgid "Message could not be sent because the user is offline:"
 msgstr "Il messaggio non  stato inviato poich l'utente non  in linea:"
 
-#: src/protocols/msn/switchboard.c:419
+#: ../src/protocols/msn/switchboard.c:417
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "Il messaggio non  stato inviato a causa di un errore di connessione:"
 
-#: src/protocols/msn/switchboard.c:423
+#: ../src/protocols/msn/switchboard.c:421
+#, fuzzy
+msgid "Message could not be sent because we are sending too quickly:"
+msgstr "Il messaggio non  stato inviato poich l'utente non  in linea:"
+
+#: ../src/protocols/msn/switchboard.c:425
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr ""
 "Il messaggio non  stato inviato a causa di un errore con lo switchboard:"
 
-#: src/protocols/msn/switchboard.c:431
+#: ../src/protocols/msn/switchboard.c:433
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 "Il messaggio potrebbe non essere stato inviato a causa di un errore "
 "sconosciuto:"
 
-#: src/protocols/msn/switchboard.c:952
+#: ../src/protocols/msn/switchboard.c:953
 #, fuzzy, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s vuole inviarti un file"
 
-#: src/protocols/msn/userlist.c:85
+#: ../src/protocols/msn/userlist.c:96
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "L'utente %s (%s )vuole aggiungere %s nella sua lista dei contatti."
 
-#: src/protocols/msn/userlist.c:275
+#: ../src/protocols/msn/userlist.c:111 ../src/protocols/yahoo/yahoo.c:913
+msgid "Authorize"
+msgstr "Autorizza"
+
+#: ../src/protocols/msn/userlist.c:112 ../src/protocols/yahoo/yahoo.c:915
+msgid "Deny"
+msgstr "Blocca"
+
+#: ../src/protocols/msn/userlist.c:286
 #, fuzzy, c-format
-msgid "%s has added you to his or her contact list."
+msgid "%s has added you to his or her buddy list."
 msgstr "L'utente %s vuole aggiungere %s alla sua lista dei contatti."
 
-#: src/protocols/msn/userlist.c:339
-#, c-format
-msgid "%s has removed you from his or her contact list."
-msgstr ""
-
-#: src/protocols/msn/userlist.c:659
+#: ../src/protocols/msn/userlist.c:350
 #, fuzzy, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "L'utente %s vuole aggiungere %s alla sua lista dei contatti."
+
+#: ../src/protocols/msn/userlist.c:667
+#, c-format
 msgid "Unable to add \"%s\"."
-msgstr "Impossibile leggere il file %s."
-
-#: src/protocols/msn/userlist.c:661
-#, fuzzy
+msgstr "Impossibile aggiungere \"%s\"."
+
+#: ../src/protocols/msn/userlist.c:669
 msgid "The screen name specified is invalid."
-msgstr "La chiave SecurID immessa non  valida."
-
-#: src/protocols/napster/napster.c:260
+msgstr "Il nome utente specificato non  valido"
+
+#: ../src/protocols/napster/napster.c:266
 msgid "Unable to read header from server"
 msgstr "Impossibile leggere l'header dal server"
 
-#: src/protocols/napster/napster.c:274
+#: ../src/protocols/napster/napster.c:280
 #, c-format
 msgid "Unable to read message from server: %s.  Command is %hd, length is %hd."
 msgstr ""
 "Impossibile leggere il messaggio dal server: %s. Il comando  %hd, la "
 "lunghezza  %hd."
 
-#: src/protocols/napster/napster.c:290
-#, fuzzy
+#: ../src/protocols/napster/napster.c:296
 msgid "Unknown server error."
-msgstr "Errore sconosciuto."
-
-#: src/protocols/napster/napster.c:339
+msgstr "Errore sconosciuto del server."
+
+#: ../src/protocols/napster/napster.c:345
 #, c-format
 msgid "users: %s, files: %s, size: %sGB"
 msgstr "Utenti: %s, file: %s, dimensione: %sGB"
 
 #. MSG_SERVER_HOTLIST_ERROR
-#: src/protocols/napster/napster.c:350
+#: ../src/protocols/napster/napster.c:356
 #, c-format
 msgid "Unable to add \"%s\" to your Napster hotlist"
 msgstr "Impossibile aggiungere \"%s\" alla tua hotlist di Napster"
 
-#. MSG_SERVER_DISCONNECTING
-#. we have been kicked off =^(
-#: src/protocols/napster/napster.c:357
-msgid "You were disconnected from the server."
-msgstr "Sei stato disconnesso dal server."
-
 #. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:414
+#: ../src/protocols/napster/napster.c:420
 #, c-format
 msgid "%s requested your information"
 msgstr "%s ha richiesto informazioni su di te"
 
 #. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:454
+#: ../src/protocols/napster/napster.c:460
 #, c-format
 msgid "%s requested a PING"
 msgstr "%s ha richiesto un PING"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/napster/napster.c:501 src/protocols/napster/napster.c:532
-#: src/protocols/toc/toc.c:172 src/protocols/yahoo/yahoo.c:2212
-#: src/protocols/yahoo/yahoo.c:2239 src/protocols/yahoo/yahoo.c:2302
-#: src/protocols/yahoo/yahoo_filexfer.c:69
-#: src/protocols/yahoo/yahoo_filexfer.c:111 src/protocols/yahoo/ycht.c:481
+#: ../src/protocols/napster/napster.c:507
+#: ../src/protocols/napster/napster.c:543 ../src/protocols/toc/toc.c:172
+#: ../src/protocols/yahoo/yahoo.c:2237 ../src/protocols/yahoo/yahoo.c:2264
+#: ../src/protocols/yahoo/yahoo.c:2347 ../src/protocols/yahoo/yahoo.c:2362
+#: ../src/protocols/yahoo/yahoo_filexfer.c:74
+#: ../src/protocols/yahoo/yahoo_filexfer.c:137
+#: ../src/protocols/yahoo/ycht.c:540
 msgid "Unable to connect."
 msgstr "Impossibile connettersi."
 
-#: src/protocols/napster/napster.c:590 src/protocols/toc/toc.c:1367
+#: ../src/protocols/napster/napster.c:599 ../src/protocols/toc/toc.c:1367
 msgid "_Group:"
 msgstr "_Gruppo:"
 
@@ -7358,91 +8520,92 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/napster/napster.c:687 src/protocols/napster/napster.c:689
+#: ../src/protocols/napster/napster.c:699
+#: ../src/protocols/napster/napster.c:701
 msgid "NAPSTER Protocol Plugin"
 msgstr "Plugin per il protocollo NAPSTER"
 
-#: src/protocols/novell/nmuser.c:1868
+#: ../src/protocols/novell/nmuser.c:1868
 msgid "Required parameters not passed in"
 msgstr "Dei parametri richiesti non sono stati passati"
 
-#: src/protocols/novell/nmuser.c:1871
+#: ../src/protocols/novell/nmuser.c:1871
 msgid "Unable to write to network"
 msgstr "Impossibile scriver sulla rete"
 
-#: src/protocols/novell/nmuser.c:1874
+#: ../src/protocols/novell/nmuser.c:1874
 msgid "Unable to read from network"
 msgstr "Impossibile leggere dalla rete"
 
-#: src/protocols/novell/nmuser.c:1877
+#: ../src/protocols/novell/nmuser.c:1877
 msgid "Error communicating with server"
 msgstr "Errore di comunicazione con il server"
 
-#: src/protocols/novell/nmuser.c:1881
+#: ../src/protocols/novell/nmuser.c:1881
 msgid "Conference not found"
 msgstr "Conferenza non trovata"
 
-#: src/protocols/novell/nmuser.c:1884
+#: ../src/protocols/novell/nmuser.c:1884
 msgid "Conference does not exist"
 msgstr "La conferenza non esiste"
 
-#: src/protocols/novell/nmuser.c:1888
+#: ../src/protocols/novell/nmuser.c:1888
 msgid "A folder with that name already exists"
 msgstr "Esiste gi una cartella con quel nome."
 
-#: src/protocols/novell/nmuser.c:1891
+#: ../src/protocols/novell/nmuser.c:1891
 msgid "Not supported"
 msgstr "Non supportato"
 
-#: src/protocols/novell/nmuser.c:1895
+#: ../src/protocols/novell/nmuser.c:1895
 msgid "Password has expired"
 msgstr "La password  scaduta"
 
-#: src/protocols/novell/nmuser.c:1898
+#: ../src/protocols/novell/nmuser.c:1898
 msgid "Invalid password"
 msgstr "Pasword non valida"
 
-#: src/protocols/novell/nmuser.c:1901
+#: ../src/protocols/novell/nmuser.c:1901
 msgid "User not found"
 msgstr "Utente non trovato"
 
-#: src/protocols/novell/nmuser.c:1904
+#: ../src/protocols/novell/nmuser.c:1904
 msgid "Account has been disabled"
 msgstr "L'account  stato disabilitato"
 
-#: src/protocols/novell/nmuser.c:1907
+#: ../src/protocols/novell/nmuser.c:1907
 msgid "The server could not access the directory"
 msgstr "Il server non  riuscito ad accedere alla directory"
 
-#: src/protocols/novell/nmuser.c:1910
+#: ../src/protocols/novell/nmuser.c:1910
 msgid "Your system administrator has disabled this operation"
 msgstr "Il tuo amministartore di sistema ha disabilitato questa operazione"
 
-#: src/protocols/novell/nmuser.c:1913
+#: ../src/protocols/novell/nmuser.c:1913
 msgid "The server is unavailable; try again later"
 msgstr "Il server non  disponibile. Riprovare pi tardi"
 
-#: src/protocols/novell/nmuser.c:1916
+#: ../src/protocols/novell/nmuser.c:1916
 msgid "Cannot add a contact to the same folder twice"
 msgstr "Impossibile aggiungere un contatto due volte nella stessa cartella"
 
-#: src/protocols/novell/nmuser.c:1919
+#: ../src/protocols/novell/nmuser.c:1919
 msgid "Cannot add yourself"
 msgstr "Impossibile aggiungere te stesso"
 
-#: src/protocols/novell/nmuser.c:1922
+#: ../src/protocols/novell/nmuser.c:1922
 msgid "Master archive is misconfigured"
 msgstr "L'archivio principale non  configurato propriamente"
 
-#: src/protocols/novell/nmuser.c:1926
+#: ../src/protocols/novell/nmuser.c:1926
 msgid "Invalid username or password"
 msgstr "Username o password non validi"
 
-#: src/protocols/novell/nmuser.c:1929
+#: ../src/protocols/novell/nmuser.c:1929
 msgid "Could not recognize the host of the username you entered"
 msgstr "Impossibile riconoscere l'host del nome utente inserito"
 
-#: src/protocols/novell/nmuser.c:1932
+#: ../src/protocols/novell/nmuser.c:1932
 msgid ""
 "Your account has been disabled because too many invalid passwords were "
 "entered"
@@ -7450,32 +8613,32 @@
 "Il tuo account  stato disabilitato poich sono state immesse troppe "
 "password non valide"
 
-#: src/protocols/novell/nmuser.c:1935
+#: ../src/protocols/novell/nmuser.c:1935
 msgid "You cannot add the same person twice to a conversation"
 msgstr ""
 "Impossibile aggiungere la stessa persona due volte ad una conversazione"
 
-#: src/protocols/novell/nmuser.c:1939
+#: ../src/protocols/novell/nmuser.c:1939
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "Hai raggiunto il tuo limite per il numero di contatti consentiti"
 
-#: src/protocols/novell/nmuser.c:1942
+#: ../src/protocols/novell/nmuser.c:1942
 msgid "You have entered an invalid username"
 msgstr "Hai immesso un nome utente non valido"
 
-#: src/protocols/novell/nmuser.c:1945
+#: ../src/protocols/novell/nmuser.c:1945
 msgid "An error occurred while updating the directory"
 msgstr "C' stato un errore nell'aggiornamento della directory"
 
-#: src/protocols/novell/nmuser.c:1948
+#: ../src/protocols/novell/nmuser.c:1948
 msgid "Incompatible protocol version"
 msgstr "Versione del protocollo non compatibile"
 
-#: src/protocols/novell/nmuser.c:1951
+#: ../src/protocols/novell/nmuser.c:1951
 msgid "The user has blocked you"
 msgstr "Sei stato bloccato dall'utente"
 
-#: src/protocols/novell/nmuser.c:1954
+#: ../src/protocols/novell/nmuser.c:1954
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
@@ -7483,56 +8646,56 @@
 "Questa versione di prova non consente a pi di dieci utenti di collegarsi "
 "allo stesso tempo"
 
-#: src/protocols/novell/nmuser.c:1957
+#: ../src/protocols/novell/nmuser.c:1957
 msgid "The user is either offline or you are blocked"
 msgstr "L'utente non  in linea oppure sei bloccato"
 
-#: src/protocols/novell/nmuser.c:1960
+#: ../src/protocols/novell/nmuser.c:1960
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "Errore sconosciuto: 0x%X"
 
-#: src/protocols/novell/novell.c:117
+#: ../src/protocols/novell/novell.c:124
 #, c-format
 msgid "Login failed (%s)."
 msgstr "Login non riuscito (%s)."
 
-#: src/protocols/novell/novell.c:232
+#: ../src/protocols/novell/novell.c:247
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr ""
 "Impossibile inviare il messaggio. Impossibile ottenere dettagli per l'utente "
 "(%s)."
 
-#: src/protocols/novell/novell.c:381
+#: ../src/protocols/novell/novell.c:396
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "Impossibile aggiungere %s alla tua lista contatti (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
-#: src/protocols/novell/novell.c:407
+#: ../src/protocols/novell/novell.c:422
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "Impossibile inviare il messaggio (%s)."
 
-#: src/protocols/novell/novell.c:478 src/protocols/novell/novell.c:972
+#: ../src/protocols/novell/novell.c:493 ../src/protocols/novell/novell.c:985
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "Impossibile invitare l'utente (%s)."
 
-#: src/protocols/novell/novell.c:517
+#: ../src/protocols/novell/novell.c:532
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr ""
 "Impossibile inviare il messaggio a %s. Impossibile creare la conferenza (%s)."
 
-#: src/protocols/novell/novell.c:522
+#: ../src/protocols/novell/novell.c:537
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr ""
 "Impossibile inviare il messaggio. Impossibile creare la conferenza (%s)."
 
-#: src/protocols/novell/novell.c:569
+#: ../src/protocols/novell/novell.c:584
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
@@ -7541,7 +8704,7 @@
 "Impossibile spostare l'utente %s nella cartella %s nella lista sul server. "
 "Errore nella creazione della cartella (%s)."
 
-#: src/protocols/novell/novell.c:617
+#: ../src/protocols/novell/novell.c:632
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
@@ -7550,68 +8713,59 @@
 "Impossibile aggiungere %s alla tua lista contatti. Errore nella creazione "
 "della cartella nella lista sul server (%s)."
 
-#: src/protocols/novell/novell.c:690
+#: ../src/protocols/novell/novell.c:705
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "Impossibile ottenere dettagli per l'utente %s (%s)."
 
-#: src/protocols/novell/novell.c:736 src/protocols/novell/novell.c:882
+#: ../src/protocols/novell/novell.c:751 ../src/protocols/novell/novell.c:897
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "Impossibile aggiungere l'utente alla lista privacy (%s)."
 
-#: src/protocols/novell/novell.c:783
+#: ../src/protocols/novell/novell.c:798
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "Impossibile aggiungere %s alla lista contatti bloccati (%s)."
 
-#: src/protocols/novell/novell.c:836
+#: ../src/protocols/novell/novell.c:851
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "Impossibile aggiungere %s alla lista contatti autorizzati (%s)."
 
-#: src/protocols/novell/novell.c:904
+#: ../src/protocols/novell/novell.c:919
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "Impossibile rimuovere %s dalla lista privacy (%s)."
 
-#: src/protocols/novell/novell.c:927 src/protocols/novell/novell.c:1628
+#: ../src/protocols/novell/novell.c:942 ../src/protocols/novell/novell.c:1652
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "Impossibile modificare le impostazioni per la privacy sul server (%s)."
 
-#: src/protocols/novell/novell.c:999
+#: ../src/protocols/novell/novell.c:1012
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Impossibile creare la conferenza (%s)."
 
-#: src/protocols/novell/novell.c:1110 src/protocols/novell/novell.c:1667
+#: ../src/protocols/novell/novell.c:1121 ../src/protocols/novell/novell.c:1691
 msgid "Error communicating with server. Closing connection."
 msgstr ""
 "Errore di comunicazione con il server. Chiusura della connessione in corso."
 
-#: src/protocols/novell/novell.c:1452
+#: ../src/protocols/novell/novell.c:1476
 msgid "Telephone Number"
 msgstr "Numero di telefono"
 
-#: src/protocols/novell/novell.c:1456
-msgid "Department"
-msgstr "Dipartimento"
-
-#: src/protocols/novell/novell.c:1458
+#: ../src/protocols/novell/novell.c:1482
 msgid "Personal Title"
 msgstr "Titolo personale"
 
-#: src/protocols/novell/novell.c:1462
+#: ../src/protocols/novell/novell.c:1486
 msgid "Mailstop"
 msgstr "Fermo posta"
 
-#: src/protocols/novell/novell.c:1464 src/protocols/oscar/oscar.c:5965
-#: src/protocols/oscar/oscar.c:5972
-msgid "Email Address"
-msgstr "Indirizzo e-mail"
-
-#: src/protocols/novell/novell.c:1480
+#: ../src/protocols/novell/novell.c:1504
 msgid "User ID"
 msgstr "ID Utente"
 
@@ -7622,46 +8776,41 @@
 #. tag, value);
 #. }
 #.
-#: src/protocols/novell/novell.c:1494
+#: ../src/protocols/novell/novell.c:1518
 msgid "Full name"
 msgstr "Nome"
 
-#: src/protocols/novell/novell.c:1618
+#: ../src/protocols/novell/novell.c:1642
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "Conferenza GroupWise %d"
 
-#: src/protocols/novell/novell.c:1643
+#: ../src/protocols/novell/novell.c:1667
 msgid "Unable to make SSL connection to server."
 msgstr "Impossibile effettuare una connessione SSL con il server."
 
-#: src/protocols/novell/novell.c:1673
-#, c-format
-msgid "Error processing event or response (%s)."
-msgstr "Errore nell'analisi dell'evento o della risposta (%s)."
-
-#: src/protocols/novell/novell.c:1707
+#: ../src/protocols/novell/novell.c:1724
 msgid "Authenticating..."
 msgstr "Autenticazione in corso..."
 
-#: src/protocols/novell/novell.c:1719
+#: ../src/protocols/novell/novell.c:1736
 msgid "Unable to connect to server."
 msgstr "Impossibile connettersi al server."
 
-#: src/protocols/novell/novell.c:1722
+#: ../src/protocols/novell/novell.c:1739
 msgid "Waiting for response..."
 msgstr "In attesa di risposta..."
 
-#: src/protocols/novell/novell.c:1857
+#: ../src/protocols/novell/novell.c:1874
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s  stato invitato a questa conversazione."
 
-#: src/protocols/novell/novell.c:1885
+#: ../src/protocols/novell/novell.c:1902
 msgid "Invitation to Conversation"
 msgstr "Invito ad una conversazione"
 
-#: src/protocols/novell/novell.c:1886
+#: ../src/protocols/novell/novell.c:1903
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7672,15 +8821,15 @@
 "\n"
 "Inviato: %s"
 
-#: src/protocols/novell/novell.c:1888
+#: ../src/protocols/novell/novell.c:1905
 msgid "Would you like to join the conversation?"
 msgstr "Vuoi entrare nella conversazione?"
 
-#: src/protocols/novell/novell.c:1995
+#: ../src/protocols/novell/novell.c:2012
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "Sei stato disconnesso perch ti sei collegato da un'altra macchina."
 
-#: src/protocols/novell/novell.c:2051
+#: ../src/protocols/novell/novell.c:2068
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -7692,7 +8841,7 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:2149
+#: ../src/protocols/novell/novell.c:2166
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -7700,21 +8849,16 @@
 "Impossibile connettersi al server. Inserisci l'indirizzo del server al quale "
 "connettersi."
 
-#: src/protocols/novell/novell.c:2171
+#: ../src/protocols/novell/novell.c:2188
 msgid "Error. SSL support is not installed."
 msgstr "Errore. Il supporto SSL non  installato."
 
-#: src/protocols/novell/novell.c:2475
+#: ../src/protocols/novell/novell.c:2497
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
 "Questa conferenza  stata chiusa. Non pu essere pi inviato nessun "
 "messaggio."
 
-#: src/protocols/novell/novell.c:2965 src/protocols/novell/novell.c:3047
-#: src/protocols/yahoo/yahoo.c:2839
-msgid "Appear Offline"
-msgstr "Sembra non in linea"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7725,115 +8869,170 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:3540 src/protocols/novell/novell.c:3542
+#: ../src/protocols/novell/novell.c:3541 ../src/protocols/novell/novell.c:3543
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Plugin per il protocollo Novell GroupWise Messenger"
 
-#: src/protocols/novell/novell.c:3561
+#: ../src/protocols/novell/novell.c:3562
 msgid "Server address"
 msgstr "Indirizzo del server"
 
-#: src/protocols/novell/novell.c:3565
+#: ../src/protocols/novell/novell.c:3566
 msgid "Server port"
 msgstr "Porta del server"
 
-#: src/protocols/oscar/oscar.c:202
+#: ../src/protocols/oscar/flap_connection.c:222
+msgid "Server closed the connection."
+msgstr "Il server ha chiuso la connessione."
+
+#: ../src/protocols/oscar/flap_connection.c:224
+msgid "Lost connection with server for an unknown reason."
+msgstr ""
+"La connessione con il server  stata interrotta per un motivo sconosciuto."
+
+#: ../src/protocols/oscar/flap_connection.c:226
+#, fuzzy
+msgid "Received invalid data on connection with server."
+msgstr "Impossibile effettuare una connessione SSL con il server."
+
+#: ../src/protocols/oscar/flap_connection.c:228
+#, fuzzy
+msgid "Could not establish a connection with the server."
+msgstr "Impossibile connettersi al server."
+
+#: ../src/protocols/oscar/odc.c:41
+#, fuzzy
+msgid "The remote user has closed the connection."
+msgstr "%s  stato invitato a questa conversazione."
+
+#: ../src/protocols/oscar/odc.c:45
+#, fuzzy
+msgid "The remote user has declined your request."
+msgstr "Sei stato bloccato dall'utente"
+
+#: ../src/protocols/oscar/odc.c:49
+#, fuzzy
+msgid "Lost connection with the remote user for an unknown reason."
+msgstr "Non hai ricevuto %hu messaggio da %s per un motivo sconosciuto"
+
+#: ../src/protocols/oscar/odc.c:53
+msgid "Received invalid data on connection with remote user."
+msgstr ""
+
+#: ../src/protocols/oscar/odc.c:57
+msgid "Could not establish a connection with the remote user."
+msgstr "Impossibile stabilire una connessione con l'utente remoto."
+
+#: ../src/protocols/oscar/odc.c:567
+#, fuzzy
+msgid "Direct IM established"
+msgstr "IM diretto con %s avviato"
+
+#: ../src/protocols/oscar/oscar.c:144
 msgid "Invalid error"
 msgstr "Errore non valido"
 
-#: src/protocols/oscar/oscar.c:203
+#: ../src/protocols/oscar/oscar.c:145
 msgid "Invalid SNAC"
 msgstr "SNAC non valido"
 
-#: src/protocols/oscar/oscar.c:204
+#: ../src/protocols/oscar/oscar.c:146
 msgid "Rate to host"
 msgstr "Rate verso l'host"
 
-#: src/protocols/oscar/oscar.c:205
+#: ../src/protocols/oscar/oscar.c:147
 msgid "Rate to client"
 msgstr "Rate verso il client"
 
-#: src/protocols/oscar/oscar.c:207
+#: ../src/protocols/oscar/oscar.c:149
 msgid "Service unavailable"
 msgstr "Servizio non disponibile"
 
-#: src/protocols/oscar/oscar.c:208
+#: ../src/protocols/oscar/oscar.c:150
 msgid "Service not defined"
 msgstr "Servizio non definito"
 
-#: src/protocols/oscar/oscar.c:209
+#: ../src/protocols/oscar/oscar.c:151
 msgid "Obsolete SNAC"
 msgstr "SNAC obsoleto"
 
-#: src/protocols/oscar/oscar.c:210
+#: ../src/protocols/oscar/oscar.c:152
 msgid "Not supported by host"
 msgstr "Non supportato dall'host"
 
-#: src/protocols/oscar/oscar.c:211
+#: ../src/protocols/oscar/oscar.c:153
 msgid "Not supported by client"
 msgstr "Non supportato dal client"
 
-#: src/protocols/oscar/oscar.c:212
+#: ../src/protocols/oscar/oscar.c:154
 msgid "Refused by client"
 msgstr "Rifiutato dal client"
 
-#: src/protocols/oscar/oscar.c:213
+#: ../src/protocols/oscar/oscar.c:155
 msgid "Reply too big"
 msgstr "Risposta troppo grande"
 
-#: src/protocols/oscar/oscar.c:214
+#: ../src/protocols/oscar/oscar.c:156
 msgid "Responses lost"
 msgstr "Risposte perse"
 
-#: src/protocols/oscar/oscar.c:215
+#: ../src/protocols/oscar/oscar.c:157
 msgid "Request denied"
 msgstr "Richiesta rifiutata"
 
-#: src/protocols/oscar/oscar.c:216
+#: ../src/protocols/oscar/oscar.c:158
 msgid "Busted SNAC payload"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:217
+#: ../src/protocols/oscar/oscar.c:159
 msgid "Insufficient rights"
 msgstr "Permessi insufficienti"
 
-#: src/protocols/oscar/oscar.c:218
+#: ../src/protocols/oscar/oscar.c:160
 msgid "In local permit/deny"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:219
+#: ../src/protocols/oscar/oscar.c:161
 msgid "Too evil (sender)"
 msgstr "Troppo cattivo (mittente)"
 
-#: src/protocols/oscar/oscar.c:220
+#: ../src/protocols/oscar/oscar.c:162
 msgid "Too evil (receiver)"
 msgstr "Troppo cattivo (ricevente)"
 
-#: src/protocols/oscar/oscar.c:221
+#: ../src/protocols/oscar/oscar.c:163
 msgid "User temporarily unavailable"
 msgstr "Utente temporaneamente non disponibile"
 
-#: src/protocols/oscar/oscar.c:222
+#: ../src/protocols/oscar/oscar.c:164
 msgid "No match"
 msgstr "Nessuna corrispondenza"
 
-#: src/protocols/oscar/oscar.c:223
+#: ../src/protocols/oscar/oscar.c:165
 msgid "List overflow"
 msgstr "Lista troppo grande"
 
-#: src/protocols/oscar/oscar.c:224
+#: ../src/protocols/oscar/oscar.c:166
 msgid "Request ambiguous"
 msgstr "Richiesta ambigua"
 
-#: src/protocols/oscar/oscar.c:225
+#: ../src/protocols/oscar/oscar.c:167
 msgid "Queue full"
 msgstr "Coda piena"
 
-#: src/protocols/oscar/oscar.c:226
+#: ../src/protocols/oscar/oscar.c:168
 msgid "Not while on AOL"
 msgstr "Non  possibile se connessi ad AOL"
 
-#: src/protocols/oscar/oscar.c:417 src/protocols/oscar/oscar.c:502
+#: ../src/protocols/oscar/oscar.c:346
+msgid ""
+"(There was an error receiving this message.  The buddy you are speaking with "
+"is probably using a different encoding than expected.  If you know what "
+"encoding he is using, you can specify it in the advanced account options for "
+"your AIM/ICQ account.)"
+msgstr ""
+
+#: ../src/protocols/oscar/oscar.c:449
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking to "
 "most likely has a buggy client.)"
@@ -7841,185 +9040,143 @@
 "(C' stato un errore nella ricezione questo messaggio. Molto probabilmente "
 "si tratta di un bug nel client del contatto con il quale stai parlando.)"
 
-#: src/protocols/oscar/oscar.c:616
+#: ../src/protocols/oscar/oscar.c:628
 msgid "Voice"
 msgstr "Voce"
 
-#: src/protocols/oscar/oscar.c:619
+#: ../src/protocols/oscar/oscar.c:631
 msgid "AIM Direct IM"
 msgstr "Messaggio istantaneo diretto AIM"
 
-#: src/protocols/oscar/oscar.c:622 src/protocols/silc/silc.c:659
-#: src/protocols/silc/util.c:509
+#: ../src/protocols/oscar/oscar.c:634 ../src/protocols/silc/silc.c:697
+#: ../src/protocols/silc/util.c:524
 msgid "Chat"
 msgstr "Chat"
 
-#: src/protocols/oscar/oscar.c:625 src/protocols/oscar/oscar.c:7898
+#: ../src/protocols/oscar/oscar.c:637 ../src/protocols/oscar/oscar.c:5789
 msgid "Get File"
 msgstr "Ricevi file"
 
-#: src/protocols/oscar/oscar.c:632
+#: ../src/protocols/oscar/oscar.c:644
 msgid "Games"
 msgstr "Giochi"
 
-#: src/protocols/oscar/oscar.c:635
+#: ../src/protocols/oscar/oscar.c:647
 msgid "Add-Ins"
 msgstr "Add-in"
 
-#: src/protocols/oscar/oscar.c:638
+#: ../src/protocols/oscar/oscar.c:650
 msgid "Send Buddy List"
 msgstr "Invia la lista contatti"
 
-#: src/protocols/oscar/oscar.c:641
+#: ../src/protocols/oscar/oscar.c:653
 msgid "ICQ Direct Connect"
 msgstr "Connessione diretta ICQ"
 
-#: src/protocols/oscar/oscar.c:644
+#: ../src/protocols/oscar/oscar.c:656
 msgid "AP User"
 msgstr "Utente AP"
 
-#: src/protocols/oscar/oscar.c:647
+#: ../src/protocols/oscar/oscar.c:659
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: src/protocols/oscar/oscar.c:650
+#: ../src/protocols/oscar/oscar.c:662
 msgid "Nihilist"
 msgstr "Nichilista"
 
-#: src/protocols/oscar/oscar.c:653
+#: ../src/protocols/oscar/oscar.c:665
 msgid "ICQ Server Relay"
 msgstr "Server relay ICQ"
 
-#: src/protocols/oscar/oscar.c:656
+#: ../src/protocols/oscar/oscar.c:668
 msgid "Old ICQ UTF8"
 msgstr "Vecchio ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:659
+#: ../src/protocols/oscar/oscar.c:671
 msgid "Trillian Encryption"
 msgstr "Crittazione di trillian"
 
-#: src/protocols/oscar/oscar.c:662
+#: ../src/protocols/oscar/oscar.c:674
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:665
+#: ../src/protocols/oscar/oscar.c:677
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:668
+#: ../src/protocols/oscar/oscar.c:680
 msgid "Security Enabled"
 msgstr "Sicurezza abilitata"
 
-#: src/protocols/oscar/oscar.c:671
+#: ../src/protocols/oscar/oscar.c:683
 msgid "Video Chat"
 msgstr "Video chat"
 
-#: src/protocols/oscar/oscar.c:675
+#: ../src/protocols/oscar/oscar.c:687
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: src/protocols/oscar/oscar.c:678
+#: ../src/protocols/oscar/oscar.c:690
 msgid "Live Video"
 msgstr "Video live"
 
-#: src/protocols/oscar/oscar.c:681
+#: ../src/protocols/oscar/oscar.c:693
 msgid "Camera"
 msgstr "Fotocamera"
 
-#: src/protocols/oscar/oscar.c:699 src/protocols/oscar/oscar.c:7781
+#: ../src/protocols/oscar/oscar.c:711 ../src/protocols/oscar/oscar.c:5596
 msgid "Free For Chat"
 msgstr "Disponibile alla chat"
 
-#: src/protocols/oscar/oscar.c:703 src/protocols/oscar/oscar.c:7796
+#: ../src/protocols/oscar/oscar.c:715 ../src/protocols/oscar/oscar.c:5624
 msgid "Not Available"
 msgstr "Non disponibile"
 
-#: src/protocols/oscar/oscar.c:705 src/protocols/oscar/oscar.c:7786
+#: ../src/protocols/oscar/oscar.c:717 ../src/protocols/oscar/oscar.c:5614
 msgid "Occupied"
 msgstr "Occupato"
 
-#: src/protocols/oscar/oscar.c:709
+#: ../src/protocols/oscar/oscar.c:721
 msgid "Web Aware"
 msgstr "Rendi visibile il tuo stato sul web"
 
-#: src/protocols/oscar/oscar.c:786 src/protocols/oscar/oscar.c:5050
+#: ../src/protocols/oscar/oscar.c:725
+msgid "Online"
+msgstr "Online"
+
+#: ../src/protocols/oscar/oscar.c:802 ../src/protocols/oscar/oscar.c:2824
 msgid "Warning Level"
 msgstr "Livello di richiamo"
 
-#: src/protocols/oscar/oscar.c:792
-msgid "Capabilities"
-msgstr "Capacit"
-
-#: src/protocols/oscar/oscar.c:801
+#: ../src/protocols/oscar/oscar.c:811
 msgid "Buddy Comment"
 msgstr "Commento per il contatto"
 
-#: src/protocols/oscar/oscar.c:958
-#, c-format
-msgid "Direct IM with %s closed"
-msgstr "IM diretto con %s terminato"
-
-#: src/protocols/oscar/oscar.c:960
-#, c-format
-msgid "Direct IM with %s failed"
-msgstr "IM diretto con %s fallito"
-
-#: src/protocols/oscar/oscar.c:968
-msgid "Direct Connect failed"
-msgstr "Connessione diretta non riuscita"
-
-#: src/protocols/oscar/oscar.c:1045 src/protocols/oscar/oscar.c:1176
-#, c-format
-msgid "Direct IM with %s established"
-msgstr "IM diretto con %s avviato"
-
-#: src/protocols/oscar/oscar.c:1126
-#, c-format
-msgid "Attempting to connect to %s at %s:%hu for Direct IM."
-msgstr "Tentativo di connessione con %s su %s:%hu per MI diretti."
-
-#: src/protocols/oscar/oscar.c:1547
-#, c-format
-msgid "Asking %s to connect to us at %s:%hu for Direct IM."
-msgstr ""
-" in corso la richiesta a %s di connessione verso di noi su %s:%hu per MI "
-"diretti."
-
-#: src/protocols/oscar/oscar.c:1552
-msgid "Unable to open Direct IM"
-msgstr "Impossibile aprire una connessione MI diretta"
-
-#: src/protocols/oscar/oscar.c:1587
-#, c-format
-msgid "You have selected to open a Direct IM connection with %s."
-msgstr "Hai scelto di aprire una connessione IM diretta con %s."
-
-#: src/protocols/oscar/oscar.c:1591
-msgid ""
-"Because this reveals your IP address, it may be considered a privacy risk.  "
-"Do you wish to continue?"
-msgstr ""
-"Poich questo rivela il tuo indirizzo IP, deve essere considerato un rischio "
-"per la privacy. Vuoi continuare?"
-
-#: src/protocols/oscar/oscar.c:1595 src/protocols/oscar/oscar.c:4361
-msgid "Connect"
-msgstr "Connetti"
-
-#: src/protocols/oscar/oscar.c:1661
-#, fuzzy, c-format
-msgid "You have lost your connection to chat room %s."
-msgstr "Sei stato disconnesso dalla chat room %s."
-
-#: src/protocols/oscar/oscar.c:1684
-msgid "Chat is currently unavailable"
-msgstr "La chat non  al momento disponibile"
-
-#: src/protocols/oscar/oscar.c:1754
+#: ../src/protocols/oscar/oscar.c:966
+#, fuzzy
+msgid "Could not connect to authentication server"
+msgstr "Impossibile connettersi per il trasferimento."
+
+#: ../src/protocols/oscar/oscar.c:968
+#, fuzzy
+msgid "Could not connect to BOS server"
+msgstr "Impossibile connettersi al server."
+
+#: ../src/protocols/oscar/oscar.c:998
 msgid "Screen name sent"
 msgstr "Nome utente inviato"
 
-#: src/protocols/oscar/oscar.c:1770
+#: ../src/protocols/oscar/oscar.c:1003
+msgid "Connection established, cookie sent"
+msgstr "Connessione stabilita, cookie inviato"
+
+#. TODO: Don't call this with ssi
+#: ../src/protocols/oscar/oscar.c:1034
+msgid "Finalizing connection"
+msgstr "Finalizzazione della connessione"
+
+#: ../src/protocols/oscar/oscar.c:1219
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -8030,73 +9187,20 @@
 "devono iniziare con una lettera e contenere solo lettere, numeri e spazi "
 "oppure devono contenere solo numeri."
 
-#: src/protocols/oscar/oscar.c:1799
-msgid "Unable to login to AIM"
-msgstr "Impossibile effettuare il login su AIM"
-
-#: src/protocols/oscar/oscar.c:1903 src/protocols/oscar/oscar.c:2846
-msgid "Could Not Connect"
-msgstr "Impossibile connettersi"
-
-#: src/protocols/oscar/oscar.c:1911
-msgid "Connection established, cookie sent"
-msgstr "Connessione stabilita, cookie inviato"
-
-#. clientip & verifiedip failed, request a redirect
-#. * that is, we want the sender to connect to us
-#. Let the user not to lose hope quite yet
-#: src/protocols/oscar/oscar.c:2063
-#, fuzzy
-msgid "Attempting connection redirect..."
-msgstr "Tentativo di connessione con %s su %s:%hu per MI diretti."
-
-#. proxyip timed out
-#. * 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/2 proxied transfer might work when a stage 3 will not.
-#: src/protocols/oscar/oscar.c:2108
-#, c-format
-msgid ""
-"Transfer of file %s timed out.\n"
-" Try enabling proxy servers for file transfers in Tools->Preferences->AIM/"
-"ICQ."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2206 src/protocols/yahoo/yahoo_filexfer.c:174
-#: src/protocols/yahoo/yahoo_filexfer.c:183
-#: src/protocols/yahoo/yahoo_filexfer.c:192
-msgid "Unable to establish file descriptor."
-msgstr "Impossibile creare un descrittore di file."
-
-#: src/protocols/oscar/oscar.c:2211
-msgid "Unable to create new connection."
-msgstr "Impossibile creare una nuova connessione."
-
-#: src/protocols/oscar/oscar.c:2445 src/protocols/oscar/oscar.c:2454
-#: src/protocols/oscar/oscar.c:2468 src/protocols/oscar/oscar.c:2478
-#, fuzzy
-msgid "Unable to log into file transfer proxy."
-msgstr "Impossibile scrivere il file %s."
-
-#: src/protocols/oscar/oscar.c:2532
-#, fuzzy
-msgid "Unable to establish listener socket or no AOL proxy connection present."
-msgstr "Impossibile creare un socket in ascolto."
-
-#: src/protocols/oscar/oscar.c:2733 src/protocols/toc/toc.c:543
+#: ../src/protocols/oscar/oscar.c:1308 ../src/protocols/toc/toc.c:543
 msgid "Incorrect nickname or password."
 msgstr "Password o nickname non corretti."
 
-#: src/protocols/oscar/oscar.c:2738
+#: ../src/protocols/oscar/oscar.c:1313
 msgid "Your account is currently suspended."
 msgstr "Il tuo account  attualmente sospeso."
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:2742
+#: ../src/protocols/oscar/oscar.c:1317
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Il servizio AOL Instant Messenger  temporaneamente non disponibile."
 
-#: src/protocols/oscar/oscar.c:2747
+#: ../src/protocols/oscar/oscar.c:1322
 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."
@@ -8104,34 +9208,33 @@
 "Ti sei connesso e disconnesso con troppa frequenza. Aspetta dieci minuti e "
 "riprova. Se continui a provare, avrai bisogno di aspettare ancora di pi."
 
-#: src/protocols/oscar/oscar.c:2752
+#: ../src/protocols/oscar/oscar.c:1327
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "La versione del client che stai usando  troppo vecchia. Aggiornala su %s"
 
-#: src/protocols/oscar/oscar.c:2783
-msgid "Internal Error"
-msgstr "Errore Interno"
-
-#: src/protocols/oscar/oscar.c:2853
+#: ../src/protocols/oscar/oscar.c:1363
+msgid "Could Not Connect"
+msgstr "Impossibile connettersi"
+
+#: ../src/protocols/oscar/oscar.c:1368
 msgid "Received authorization"
 msgstr "Autorizzazione ricevuta"
 
-#: src/protocols/oscar/oscar.c:2877
+#: ../src/protocols/oscar/oscar.c:1391
 msgid "The SecurID key entered is invalid."
 msgstr "La chiave SecurID immessa non  valida."
 
-#: src/protocols/oscar/oscar.c:2891
+#: ../src/protocols/oscar/oscar.c:1405
 msgid "Enter SecurID"
 msgstr "Immettere SecurID"
 
-#: src/protocols/oscar/oscar.c:2892
+#: ../src/protocols/oscar/oscar.c:1406
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Immettere il numero di 6 cifre del display digitale."
 
-#: src/protocols/oscar/oscar.c:2932 src/protocols/oscar/oscar.c:2962
-#: src/protocols/oscar/oscar.c:3051
+#: ../src/protocols/oscar/oscar.c:1446 ../src/protocols/oscar/oscar.c:1480
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -8140,46 +9243,38 @@
 "Verrai disconnesso a breve. Potresti voler utilizzare TOC finch non  "
 "risolto il problema. Controlla %s per aggiornamenti."
 
-#: src/protocols/oscar/oscar.c:2935 src/protocols/oscar/oscar.c:2965
+#: ../src/protocols/oscar/oscar.c:1449 ../src/protocols/oscar/oscar.c:1483
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim non  in grado di ottenere un hash di login valido per AIM."
 
-#: src/protocols/oscar/oscar.c:3054
+#: ../src/protocols/oscar/oscar.c:1569
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr ""
+"Verrai disconnesso a breve. Potresti voler utilizzare TOC finch non  "
+"risolto il problema. Controlla %s per aggiornamenti."
+
+#: ../src/protocols/oscar/oscar.c:1572
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim non  in grado di ottenere un hash di login valido."
 
-#: src/protocols/oscar/oscar.c:3085
+#: ../src/protocols/oscar/oscar.c:1598
 msgid "Password sent"
 msgstr "Password inviata"
 
-#: src/protocols/oscar/oscar.c:4352
-#, c-format
-msgid "%s has just asked to directly connect to %s"
-msgstr "%s ha chiesto di connettersi direttamente a %s"
-
-#: src/protocols/oscar/oscar.c:4355
-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 "
-"considered a privacy risk."
-msgstr ""
-"Questo richiede una connessione diretta tra i due computer ed  necessario "
-"per le Immagini IM. Poich verr rivelato il tuo indirizzo IP, devi "
-"considerare la cosa come un potenziale rischio per la tua privacy."
-
-#: src/protocols/oscar/oscar.c:4394
+#: ../src/protocols/oscar/oscar.c:2156
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Autorizzami ad includerti nella mia lista contatti."
 
-#: src/protocols/oscar/oscar.c:4402
+#: ../src/protocols/oscar/oscar.c:2165
 msgid "Authorization Request Message:"
 msgstr "Messaggio di richiesta di autorizzazione:"
 
-#: src/protocols/oscar/oscar.c:4403
+#: ../src/protocols/oscar/oscar.c:2166
 msgid "Please authorize me!"
 msgstr "Mi autorizzi, per favore?"
 
-#: src/protocols/oscar/oscar.c:4433
+#: ../src/protocols/oscar/oscar.c:2200
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
@@ -8188,21 +9283,26 @@
 "L'utente %s deve autorizzarti prima che tu possa aggiungerlo alla tua lista "
 "contatti. Vuoi inviare una richiesta di autorizzazione?"
 
-#: src/protocols/oscar/oscar.c:4438 src/protocols/oscar/oscar.c:4440
+#: ../src/protocols/oscar/oscar.c:2205
 msgid "Request Authorization"
 msgstr "Richiesta autorizzazione"
 
-#: src/protocols/oscar/oscar.c:4478 src/protocols/oscar/oscar.c:4484
-#: src/protocols/oscar/oscar.c:4588 src/protocols/oscar/oscar.c:4612
-#: src/protocols/oscar/oscar.c:7234 src/protocols/oscar/oscar.c:7286
+#: ../src/protocols/oscar/oscar.c:2207
+#, fuzzy
+msgid "_Request Authorization"
+msgstr "Richiesta autorizzazione"
+
+#: ../src/protocols/oscar/oscar.c:2251 ../src/protocols/oscar/oscar.c:2259
+#: ../src/protocols/oscar/oscar.c:2367 ../src/protocols/oscar/oscar.c:2391
+#: ../src/protocols/oscar/oscar.c:5021 ../src/protocols/oscar/oscar.c:5073
 msgid "No reason given."
 msgstr "Nessun motivo fornito."
 
-#: src/protocols/oscar/oscar.c:4483
+#: ../src/protocols/oscar/oscar.c:2258
 msgid "Authorization Denied Message:"
 msgstr "Messaggio di autorizzazione rifiutata:"
 
-#: src/protocols/oscar/oscar.c:4590
+#: ../src/protocols/oscar/oscar.c:2369
 #, fuzzy, c-format
 msgid ""
 "The user %u wants to add %s to their buddy list for the following reason:\n"
@@ -8212,11 +9312,11 @@
 "motivo:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4600 src/protocols/oscar/oscar.c:7246
+#: ../src/protocols/oscar/oscar.c:2379 ../src/protocols/oscar/oscar.c:5033
 msgid "Authorization Request"
 msgstr "Richiesta di autorizzazione"
 
-#: src/protocols/oscar/oscar.c:4612
+#: ../src/protocols/oscar/oscar.c:2391
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -8227,19 +9327,19 @@
 "seguente motivo:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4613
+#: ../src/protocols/oscar/oscar.c:2392
 msgid "ICQ authorization denied."
 msgstr "Autorizzazione ICQ rifiutata."
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:4620
+#: ../src/protocols/oscar/oscar.c:2399
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 "L'utente %u ha accolto la tua richiesta di aggiungerlo alla tua lista "
 "contatti."
 
-#: src/protocols/oscar/oscar.c:4628
+#: ../src/protocols/oscar/oscar.c:2407
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8252,7 +9352,7 @@
 "Da: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4636
+#: ../src/protocols/oscar/oscar.c:2415
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8265,7 +9365,7 @@
 "Da: %s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4644
+#: ../src/protocols/oscar/oscar.c:2423
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -8278,34 +9378,34 @@
 "Il messaggio :\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4665
+#: ../src/protocols/oscar/oscar.c:2444
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "L'utente ICQ %u ti ha inviato un contatto: %s (%s)"
 
-#: src/protocols/oscar/oscar.c:4671
+#: ../src/protocols/oscar/oscar.c:2450
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Vuoi aggiungere questo contatto alla tua lista?"
 
-#: src/protocols/oscar/oscar.c:4675
-msgid "Decline"
-msgstr "Declina"
-
-#: src/protocols/oscar/oscar.c:4759
+#: ../src/protocols/oscar/oscar.c:2454
+msgid "_Decline"
+msgstr "_Declina"
+
+#: ../src/protocols/oscar/oscar.c:2538
 #, 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."
 msgstr[0] "Non hai ricevuto %hu messaggio da %s poich non era valido."
 msgstr[1] "Non hai ricevuto %hu messaggi da %s poich non erano validi."
 
-#: src/protocols/oscar/oscar.c:4768
+#: ../src/protocols/oscar/oscar.c:2547
 #, 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."
 msgstr[0] "Non hai ricevuto %hu messaggio da %s poich era troppo grande."
 msgstr[1] "Non hai ricevuto %hu messaggi da %s poich erano troppo grandi."
 
-#: src/protocols/oscar/oscar.c:4777
+#: ../src/protocols/oscar/oscar.c:2556
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -8318,7 +9418,7 @@
 "Non hai ricevuto %hu messaggi da %s poich sono stati spedito troppo "
 "velocemente."
 
-#: src/protocols/oscar/oscar.c:4786
+#: ../src/protocols/oscar/oscar.c:2565
 #, 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."
@@ -8327,70 +9427,81 @@
 msgstr[1] ""
 "Non hai ricevuto %hu messaggi da %s poich l'utente  troppo \"cattivo\"."
 
-#: src/protocols/oscar/oscar.c:4795
+#: ../src/protocols/oscar/oscar.c:2574
 #, 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."
 msgstr[0] "Non hai ricevuto %hu messaggio da %s poich sei troppo \"cattivo\"."
 msgstr[1] "Non hai ricevuto %hu messaggi da %s poich sei troppo \"cattivo\"."
 
-#: src/protocols/oscar/oscar.c:4804
+#: ../src/protocols/oscar/oscar.c:2583
 #, 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."
 msgstr[0] "Non hai ricevuto %hu messaggio da %s per un motivo sconosciuto"
 msgstr[1] "Non hai ricevuto %hu messaggi da %s per un motivo sconosciuto"
 
-#: src/protocols/oscar/oscar.c:4863
+#: ../src/protocols/oscar/oscar.c:2639
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>UIN:</B> %s<BR><B>Stato:</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:4924
+#: ../src/protocols/oscar/oscar.c:2700
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr ""
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:4961
+#: ../src/protocols/oscar/oscar.c:2736
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Impossibile inviare il messaggio: %s"
 
-#: src/protocols/oscar/oscar.c:4961 src/protocols/oscar/oscar.c:4966
-#: src/protocols/oscar/oscar.c:5024 src/protocols/oscar/oscar.c:5028
+#: ../src/protocols/oscar/oscar.c:2736 ../src/protocols/oscar/oscar.c:2741
+#: ../src/protocols/oscar/oscar.c:2799 ../src/protocols/oscar/oscar.c:2803
 msgid "Unknown reason."
 msgstr "Motivo sconosciuto."
 
-#: src/protocols/oscar/oscar.c:4964
+#: ../src/protocols/oscar/oscar.c:2739
+#: ../src/protocols/sametime/sametime.c:2367
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Impossibile inviare il messaggio %s:"
 
-#: src/protocols/oscar/oscar.c:5024
+#: ../src/protocols/oscar/oscar.c:2799
 #, c-format
 msgid "User information not available: %s"
 msgstr "Informazioni sull'utente non disponibili: %s"
 
-#: src/protocols/oscar/oscar.c:5027
+#: ../src/protocols/oscar/oscar.c:2802
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Informazioni sull'utente %s non disponibili:"
 
-#: src/protocols/oscar/oscar.c:5054
+#: ../src/protocols/oscar/oscar.c:2828
 msgid "Online Since"
 msgstr "Online da"
 
-#: src/protocols/oscar/oscar.c:5059 src/protocols/yahoo/yahoo_profile.c:1118
+#: ../src/protocols/oscar/oscar.c:2833
+#: ../src/protocols/yahoo/yahoo_profile.c:1159
 msgid "Member Since"
 msgstr "Membro da"
 
-#: src/protocols/oscar/oscar.c:5142
+#: ../src/protocols/oscar/oscar.c:2838
+msgid "Capabilities"
+msgstr "Capacit"
+
+#: ../src/protocols/oscar/oscar.c:2856
+#, fuzzy
+msgid "Available Message"
+msgstr "Messaggio di disponibilt:"
+
+#: ../src/protocols/oscar/oscar.c:2945
 msgid "Your AIM connection may be lost."
 msgstr "La tua connessione ad AIM potrebbe essere perduta."
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:5328
+#: ../src/protocols/oscar/oscar.c:3126
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -8398,11 +9509,11 @@
 "[Impossibile mostrare un messaggio da questo utente poich contiene "
 "caratteri non validi.]"
 
-#: src/protocols/oscar/oscar.c:5554
+#: ../src/protocols/oscar/oscar.c:3345
 msgid "Rate limiting error."
 msgstr "Rate massimo raggiunto."
 
-#: src/protocols/oscar/oscar.c:5555
+#: ../src/protocols/oscar/oscar.c:3346
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -8410,105 +9521,81 @@
 "L'ultima operazione non  stata eseguita poich sei al di sopra del rate "
 "consentito. Attendi 10 secondi e riprova."
 
-#: src/protocols/oscar/oscar.c:5631
+#: ../src/protocols/oscar/oscar.c:3418
 msgid "You have been signed off for an unknown reason."
 msgstr "Sei stato disconnesso per un motivo sconosciuto."
 
-#: src/protocols/oscar/oscar.c:5644 src/protocols/toc/toc.c:971
+#: ../src/protocols/oscar/oscar.c:3431 ../src/protocols/toc/toc.c:971
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Sei stato disconnesso dalla chat room %s."
 
-#. XXX - Don't call this with ssi
-#: src/protocols/oscar/oscar.c:5669
-msgid "Finalizing connection"
-msgstr "Finalizzazione della connessione"
-
-#: src/protocols/oscar/oscar.c:5951
-msgid "UIN"
-msgstr "UIN"
-
-#: src/protocols/oscar/oscar.c:5977 src/protocols/silc/util.c:541
+#: ../src/protocols/oscar/oscar.c:3649 ../src/protocols/silc/util.c:556
 msgid "Mobile Phone"
 msgstr "Cellulare"
 
-#: src/protocols/oscar/oscar.c:5979
-msgid "Female"
-msgstr "Femminile"
-
-#: src/protocols/oscar/oscar.c:5979
-msgid "Male"
-msgstr "Maschile"
-
-#: src/protocols/oscar/oscar.c:5995
+#: ../src/protocols/oscar/oscar.c:3676
 msgid "Personal Web Page"
 msgstr "Pagina web personale"
 
-#: src/protocols/oscar/oscar.c:5999
+#: ../src/protocols/oscar/oscar.c:3680
 msgid "Additional Information"
 msgstr "Informazioni aggiuntive"
 
-#: src/protocols/oscar/oscar.c:6004
-msgid "Home Address"
-msgstr "Indirizzo di casa"
-
-#: src/protocols/oscar/oscar.c:6008 src/protocols/oscar/oscar.c:6016
+#: ../src/protocols/oscar/oscar.c:3689 ../src/protocols/oscar/oscar.c:3697
 msgid "Zip Code"
 msgstr "Codice postale"
 
-#: src/protocols/oscar/oscar.c:6012
-msgid "Work Address"
-msgstr "Indirizzo di lavoro"
-
-#: src/protocols/oscar/oscar.c:6020
+#: ../src/protocols/oscar/oscar.c:3701
 msgid "Work Information"
 msgstr "Informazioni sul lavoro"
 
-#: src/protocols/oscar/oscar.c:6021
-msgid "Company"
-msgstr "Compagnia"
-
-#: src/protocols/oscar/oscar.c:6022
+#: ../src/protocols/oscar/oscar.c:3703
 msgid "Division"
 msgstr "Divisione"
 
-#: src/protocols/oscar/oscar.c:6023
+#: ../src/protocols/oscar/oscar.c:3704
 msgid "Position"
 msgstr "Posizione"
 
-#: src/protocols/oscar/oscar.c:6025
+#: ../src/protocols/oscar/oscar.c:3706
 msgid "Web Page"
 msgstr "Pagina web"
 
-#: src/protocols/oscar/oscar.c:6082
+#: ../src/protocols/oscar/oscar.c:3764
 msgid "Pop-Up Message"
 msgstr "Messaggio pop-up"
 
-#. TODO: Need to use ngettext() here
-#: src/protocols/oscar/oscar.c:6111
-#, c-format
-msgid "The following screen names are associated with %s"
-msgstr "I seguenti nomi utente sono associati con %s"
-
-#: src/protocols/oscar/oscar.c:6140
+#: ../src/protocols/oscar/oscar.c:3804
+#, fuzzy, c-format
+msgid "The following screen name is associated with %s"
+msgid_plural "The following screen names are associated with %s"
+msgstr[0] "I seguenti nomi utente sono associati con %s"
+msgstr[1] "I seguenti nomi utente sono associati con %s"
+
+#: ../src/protocols/oscar/oscar.c:3809
+msgid "Screen name"
+msgstr "Nome utente"
+
+#: ../src/protocols/oscar/oscar.c:3835
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Nessun risultato trovato per l'indirizzo e-mail %s"
 
-#: src/protocols/oscar/oscar.c:6161
+#: ../src/protocols/oscar/oscar.c:3856
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Dovresti ricevere un'e-mail con la richiesta di conferma per %s."
 
-#: src/protocols/oscar/oscar.c:6163
+#: ../src/protocols/oscar/oscar.c:3858
 msgid "Account Confirmation Requested"
 msgstr "Conferma per l'account richiesta"
 
-#: src/protocols/oscar/oscar.c:6194
+#: ../src/protocols/oscar/oscar.c:3889
 msgid "Error Changing Account Info"
 msgstr "Errore nella modifica delle informazioni sull'account"
 
-#: src/protocols/oscar/oscar.c:6197
+#: ../src/protocols/oscar/oscar.c:3892
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8517,14 +9604,14 @@
 "Errore 0x%04x: Impossibile formattare il nome utente poich il nome utente "
 "richiesto differisce dall'originale."
 
-#: src/protocols/oscar/oscar.c:6200
+#: ../src/protocols/oscar/oscar.c:3895
 #, fuzzy, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr ""
 "Errore 0x%04x: Impossibile formattare il nome utente poich il nome utente "
 "richiesto  troppo lungo."
 
-#: src/protocols/oscar/oscar.c:6203
+#: ../src/protocols/oscar/oscar.c:3898
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8533,7 +9620,7 @@
 "Errore 0x%04x: Impossibile formattare il nome utente poich il nome utente "
 "richiesto  troppo lungo."
 
-#: src/protocols/oscar/oscar.c:6206
+#: ../src/protocols/oscar/oscar.c:3901
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -8542,7 +9629,7 @@
 "Errore 0x%04x: Impossibile cambiare l'indirizzo e-mail poich c' gi una "
 "richiesta in corso per questo nome utente."
 
-#: src/protocols/oscar/oscar.c:6209
+#: ../src/protocols/oscar/oscar.c:3904
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -8551,7 +9638,7 @@
 "Errore 0x%04x: Impossibile cambiare l'indirizzo e-mail poich l'indirizzo "
 "fornito ha troppi nomi utente associati."
 
-#: src/protocols/oscar/oscar.c:6212
+#: ../src/protocols/oscar/oscar.c:3907
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -8560,12 +9647,12 @@
 "Errore 0x%04x: Impossibile cambiare l'indirizzo e-mail poich l'indirizzo "
 "fornito non  valido."
 
-#: src/protocols/oscar/oscar.c:6215
+#: ../src/protocols/oscar/oscar.c:3910
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Errore 0x%04x: Errore sconosciuto."
 
-#: src/protocols/oscar/oscar.c:6225
+#: ../src/protocols/oscar/oscar.c:3920
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -8574,27 +9661,27 @@
 "Il tuo nome utente  attualmente formattato nel seguente modo:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6226 src/protocols/oscar/oscar.c:6233
+#: ../src/protocols/oscar/oscar.c:3921 ../src/protocols/oscar/oscar.c:3928
 msgid "Account Info"
 msgstr "Informazioni sull'account"
 
-#: src/protocols/oscar/oscar.c:6231
+#: ../src/protocols/oscar/oscar.c:3926
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "L'indirizzo e-mail di %s  %s"
 
-#: src/protocols/oscar/oscar.c:6298
+#: ../src/protocols/oscar/oscar.c:4101
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "La tua immagine MI non  stata inviata. Devi essere in connessione diretta "
 "per inviare immagini MI."
 
-#: src/protocols/oscar/oscar.c:6480
+#: ../src/protocols/oscar/oscar.c:4341
 msgid "Unable to set AIM profile."
 msgstr "Impossibile impostare il profilo AIM."
 
-#: src/protocols/oscar/oscar.c:6481
+#: ../src/protocols/oscar/oscar.c:4342
 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 "
@@ -8604,7 +9691,7 @@
 "procedura di login fosse completata. Il tuo profilo rimane non impostato; "
 "prova ad impostarlo di nuovo quando sei connesso correttamente."
 
-#: src/protocols/oscar/oscar.c:6495
+#: ../src/protocols/oscar/oscar.c:4356
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -8619,11 +9706,11 @@
 "La lunghezza massima del profilo di %d byte  stata superata. Gaim l'ha "
 "troncato per te."
 
-#: src/protocols/oscar/oscar.c:6500
+#: ../src/protocols/oscar/oscar.c:4361
 msgid "Profile too long."
 msgstr "Profilo troppo lungo."
 
-#: src/protocols/oscar/oscar.c:6523 src/protocols/oscar/oscar.c:6596
+#: ../src/protocols/oscar/oscar.c:4404
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -8638,25 +9725,11 @@
 "La lunghezza massima del messaggio di assenza di %d byte  stata superata. "
 "Gaim l'ha troncato per te e ti ha impostato come assente."
 
-#: src/protocols/oscar/oscar.c:6528 src/protocols/oscar/oscar.c:6601
+#: ../src/protocols/oscar/oscar.c:4409
 msgid "Away message too long."
 msgstr "Messaggio di assenza troppo lungo."
 
-#: src/protocols/oscar/oscar.c:6560
-msgid "Unable to set AIM away message."
-msgstr "Impossibile impostare un messaggio di assenza per AIM."
-
-#: src/protocols/oscar/oscar.c:6561
-msgid ""
-"You have probably requested to set your away message before the login "
-"procedure completed.  You remain in a \"present\" state; try setting it "
-"again when you are fully connected."
-msgstr ""
-"Hai probabilmente richiesto di impostare il tuo messaggio di assenza prima "
-"che la procedura di login fosse ultimata. Rimani in uno stato di \"presente"
-"\". Prova ad impostarlo di nuovo quando sarai connesso correttamente."
-
-#: src/protocols/oscar/oscar.c:6691
+#: ../src/protocols/oscar/oscar.c:4478
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8667,16 +9740,16 @@
 "nickname devono iniziare con una lettera e contenere solo lettere, numeri e "
 "spazi oppure devono contenere solo numeri."
 
-#: src/protocols/oscar/oscar.c:6693 src/protocols/oscar/oscar.c:7092
-#: src/protocols/oscar/oscar.c:7106 src/protocols/simple/simple.c:203
+#: ../src/protocols/oscar/oscar.c:4480 ../src/protocols/oscar/oscar.c:4879
+#: ../src/protocols/oscar/oscar.c:4893
 msgid "Unable To Add"
 msgstr "Impossibile aggiungere"
 
-#: src/protocols/oscar/oscar.c:6798
+#: ../src/protocols/oscar/oscar.c:4584
 msgid "Unable To Retrieve Buddy List"
 msgstr "Impossibile ricevere la lista contatti"
 
-#: src/protocols/oscar/oscar.c:6799
+#: ../src/protocols/oscar/oscar.c:4585
 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 "
@@ -8686,13 +9759,13 @@
 "server AIM. La tua lista contatti non  persa e sar probabilmente "
 "disponibile tra poche ore."
 
-#: src/protocols/oscar/oscar.c:6983 src/protocols/oscar/oscar.c:6984
-#: src/protocols/oscar/oscar.c:6989 src/protocols/oscar/oscar.c:7150
-#: src/protocols/oscar/oscar.c:7151 src/protocols/oscar/oscar.c:7156
+#: ../src/protocols/oscar/oscar.c:4777 ../src/protocols/oscar/oscar.c:4778
+#: ../src/protocols/oscar/oscar.c:4783 ../src/protocols/oscar/oscar.c:4937
+#: ../src/protocols/oscar/oscar.c:4938 ../src/protocols/oscar/oscar.c:4943
 msgid "Orphans"
 msgstr "Orfani"
 
-#: src/protocols/oscar/oscar.c:7090
+#: ../src/protocols/oscar/oscar.c:4877
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -8701,11 +9774,11 @@
 "Impossibile aggiungere il contatto %s poich hai troppi contatti nella tua "
 "lista. Rimuovine uno e prova nuovamente."
 
-#: src/protocols/oscar/oscar.c:7090 src/protocols/oscar/oscar.c:7104
+#: ../src/protocols/oscar/oscar.c:4877 ../src/protocols/oscar/oscar.c:4891
 msgid "(no name)"
 msgstr "(nessun nome)"
 
-#: src/protocols/oscar/oscar.c:7104
+#: ../src/protocols/oscar/oscar.c:4891
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -8716,7 +9789,7 @@
 "pi comune di questo problema  che hai raggiunto il massimo numero "
 "consentito di contatti nella tua lista."
 
-#: src/protocols/oscar/oscar.c:7187
+#: ../src/protocols/oscar/oscar.c:4974
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -8725,11 +9798,11 @@
 "L'utente %s ti ha dato il permesso di aggiungerti alla sua lista contatti. "
 "Vuoi aggiungerlo alla tua?"
 
-#: src/protocols/oscar/oscar.c:7193
+#: ../src/protocols/oscar/oscar.c:4980
 msgid "Authorization Given"
 msgstr "Autorizzazione concessa"
 
-#: src/protocols/oscar/oscar.c:7237
+#: ../src/protocols/oscar/oscar.c:5024
 #, fuzzy, c-format
 msgid ""
 "The user %s wants to add %s to their buddy list for the following reason:\n"
@@ -8740,19 +9813,19 @@
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:7282
+#: ../src/protocols/oscar/oscar.c:5069
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 "L'utente %s ha accolto la tua richiesta di aggiungerlo nella tua lista "
 "contatti."
 
-#: src/protocols/oscar/oscar.c:7283
+#: ../src/protocols/oscar/oscar.c:5070
 msgid "Authorization Granted"
 msgstr "Autorizzazione concessa"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:7286
+#: ../src/protocols/oscar/oscar.c:5073
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8763,100 +9836,113 @@
 "contatti per il seguente motivo:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:7287
+#: ../src/protocols/oscar/oscar.c:5074
 msgid "Authorization Denied"
 msgstr "Autorizzazione rifiutata"
 
-#: src/protocols/oscar/oscar.c:7324 src/protocols/toc/toc.c:1372
+#: ../src/protocols/oscar/oscar.c:5110 ../src/protocols/toc/toc.c:1372
 msgid "_Exchange:"
 msgstr "_Scambio:"
 
-#: src/protocols/oscar/oscar.c:7360
+#: ../src/protocols/oscar/oscar.c:5150
 msgid "Invalid chat name specified."
 msgstr "Il nome della chat specificato non  valido."
 
-#: src/protocols/oscar/oscar.c:7430
+#: ../src/protocols/oscar/oscar.c:5220
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "La tua immagine MI non  stata inviata. Non puoi inviare immagini MI nelle "
 "chat AIM."
 
-#: src/protocols/oscar/oscar.c:7565
-msgid "Away Message"
-msgstr "Messaggio di assenza"
-
-#: src/protocols/oscar/oscar.c:7854
+#: ../src/protocols/oscar/oscar.c:5382
+#, fuzzy
+msgid "<i>(retrieving)</i>"
+msgstr " <i>(identificato)</i>"
+
+#: ../src/protocols/oscar/oscar.c:5687
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Commento per il contatto %s"
 
-#: src/protocols/oscar/oscar.c:7855
+#: ../src/protocols/oscar/oscar.c:5688
 msgid "Buddy Comment:"
 msgstr "Commento per il contatto:"
 
-#: src/protocols/oscar/oscar.c:7874
+#: ../src/protocols/oscar/oscar.c:5734
+#, c-format
+msgid "You have selected to open a Direct IM connection with %s."
+msgstr "Hai scelto di aprire una connessione IM diretta con %s."
+
+#: ../src/protocols/oscar/oscar.c:5738
+#, fuzzy
+msgid ""
+"Because this reveals your IP address, it may be considered a security risk.  "
+"Do you wish to continue?"
+msgstr ""
+"Poich questo rivela il tuo indirizzo IP, deve essere considerato un rischio "
+"per la privacy. Vuoi continuare?"
+
+#: ../src/protocols/oscar/oscar.c:5742 ../src/protocols/oscar/peer.c:941
+msgid "_Connect"
+msgstr "_Connetti"
+
+#: ../src/protocols/oscar/oscar.c:5760
 msgid "Edit Buddy Comment"
 msgstr "Modifica il commento per il contatto"
 
-#: src/protocols/oscar/oscar.c:7880
+#: ../src/protocols/oscar/oscar.c:5768
 msgid "Get Status Msg"
 msgstr "Ottieni messaggio di stato"
 
-#: src/protocols/oscar/oscar.c:7892
+#: ../src/protocols/oscar/oscar.c:5781
 msgid "Direct IM"
 msgstr "Messaggio istantaneo diretto"
 
-#: src/protocols/oscar/oscar.c:7909
+#: ../src/protocols/oscar/oscar.c:5803
 msgid "Re-request Authorization"
 msgstr "Richiedi nuovamente l'autorizzazione"
 
-#: src/protocols/oscar/oscar.c:7969
+#: ../src/protocols/oscar/oscar.c:5860
 #, fuzzy
 msgid "Require authorization"
 msgstr "Richiesta autorizzazione"
 
-#: src/protocols/oscar/oscar.c:7972
-#, fuzzy
-msgid "Hide IP address"
-msgstr "Indirizzo IP"
-
-#: src/protocols/oscar/oscar.c:7975
-#, fuzzy
-msgid "Web aware"
-msgstr "Rendi visibile il tuo stato sul web"
-
-#: src/protocols/oscar/oscar.c:7980
+#: ../src/protocols/oscar/oscar.c:5863
+msgid "Web aware (enabling this will cause you to receive SPAM!)"
+msgstr ""
+
+#: ../src/protocols/oscar/oscar.c:5868
 #, fuzzy
 msgid "ICQ Privacy Options"
 msgstr "Opzioni del proxy"
 
-#: src/protocols/oscar/oscar.c:7997
+#: ../src/protocols/oscar/oscar.c:5885
 msgid "The new formatting is invalid."
 msgstr "La nuova formattazione non  valida."
 
-#: src/protocols/oscar/oscar.c:7998
+#: ../src/protocols/oscar/oscar.c:5886
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "La formattazione del nome utente pu modificare solo le maiuscole/minuscole "
 "e gli spazi bianchi."
 
-#: src/protocols/oscar/oscar.c:8005
+#: ../src/protocols/oscar/oscar.c:5893
 msgid "New screen name formatting:"
 msgstr "Nuova formattazione del nome utente:"
 
-#: src/protocols/oscar/oscar.c:8057
+#: ../src/protocols/oscar/oscar.c:5949
 msgid "Change Address To:"
 msgstr "Cambia l'indirizzo in:"
 
-#: src/protocols/oscar/oscar.c:8102
+#: ../src/protocols/oscar/oscar.c:5994
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>non stai attendendo nessuna autorizzazione</i>"
 
-#: src/protocols/oscar/oscar.c:8105
+#: ../src/protocols/oscar/oscar.c:5997
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Stai attendendo autorizzazione dai seguenti contatti"
 
-#: src/protocols/oscar/oscar.c:8106
+#: ../src/protocols/oscar/oscar.c:5998
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -8864,88 +9950,79 @@
 "Puoi richiedere nuovamente autorizzazione da questi contatti cliccando col "
 "tasto destro su di essi e scegliendo \"Richiedi nuovamente autorizzazione\""
 
-#: src/protocols/oscar/oscar.c:8123
+#: ../src/protocols/oscar/oscar.c:6015
 msgid "Find Buddy by E-Mail"
 msgstr "Cerca un contatto per e-mail"
 
-#: src/protocols/oscar/oscar.c:8124
+#: ../src/protocols/oscar/oscar.c:6016
 msgid "Search for a buddy by e-mail address"
 msgstr "Cerca un contatto attraverso il suo indirizzo e-mail"
 
-#: src/protocols/oscar/oscar.c:8125
+#: ../src/protocols/oscar/oscar.c:6017
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Inserisci l'indirizzo e-mail del contatto che stai cercando."
 
-#: src/protocols/oscar/oscar.c:8212 src/protocols/silc/silc.c:817
-msgid "Set User Info..."
-msgstr "Imposta le informazioni utente..."
-
-#: src/protocols/oscar/oscar.c:8218
+#: ../src/protocols/oscar/oscar.c:6186
 msgid "Set User Info (URL)..."
 msgstr "Imposta le informazioni utente (URL)..."
 
-#: src/protocols/oscar/oscar.c:8223 src/protocols/silc/silc.c:813
-msgid "Change Password..."
-msgstr "Cambia password..."
-
-#: src/protocols/oscar/oscar.c:8229
+#: ../src/protocols/oscar/oscar.c:6197
 msgid "Change Password (URL)"
 msgstr "Cambia password (URL)"
 
-#: src/protocols/oscar/oscar.c:8233
+#: ../src/protocols/oscar/oscar.c:6201
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configura l'inoltro dei messaggi immediati (URL)"
 
 #. ICQ actions
-#: src/protocols/oscar/oscar.c:8243
-#, fuzzy
-msgid "Show privacy options..."
+#: ../src/protocols/oscar/oscar.c:6211
+#, fuzzy
+msgid "Set Privacy Options..."
 msgstr "Mostra pi opzioni"
 
 #. AIM actions
-#: src/protocols/oscar/oscar.c:8250
+#: ../src/protocols/oscar/oscar.c:6218
 msgid "Format Screen Name..."
 msgstr "Formato per il nome utente..."
 
-#: src/protocols/oscar/oscar.c:8254
+#: ../src/protocols/oscar/oscar.c:6222
 msgid "Confirm Account"
 msgstr "Conferma account"
 
-#: src/protocols/oscar/oscar.c:8258
-msgid "Display Currently Registered Address"
+#: ../src/protocols/oscar/oscar.c:6226
+#, fuzzy
+msgid "Display Currently Registered E-Mail Address"
 msgstr "Mostra l'attuale indirizzo registrato"
 
-#: src/protocols/oscar/oscar.c:8262
-msgid "Change Currently Registered Address..."
+#: ../src/protocols/oscar/oscar.c:6230
+#, fuzzy
+msgid "Change Currently Registered E-Mail Address..."
 msgstr "Modifica l'attuale indirizzo registrato..."
 
-#: src/protocols/oscar/oscar.c:8269
+#: ../src/protocols/oscar/oscar.c:6237
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Mostra i contatti dai quali attendi autorizzazione"
 
-#: src/protocols/oscar/oscar.c:8275
-msgid "Search for Buddy by E-Mail..."
+#: ../src/protocols/oscar/oscar.c:6243
+#, fuzzy
+msgid "Search for Buddy by E-Mail Address..."
 msgstr "Cerca un contatto per e-mail..."
 
-#: src/protocols/oscar/oscar.c:8280
+#: ../src/protocols/oscar/oscar.c:6248
 msgid "Search for Buddy by Information"
 msgstr "Cerca un contatto per informazione"
 
-#: src/protocols/oscar/oscar.c:8350
+#: ../src/protocols/oscar/oscar.c:6314
 #, fuzzy
 msgid "Use recent buddies group"
 msgstr "L'utente non  nel gruppo"
 
-#: src/protocols/oscar/oscar.c:8353
+#: ../src/protocols/oscar/oscar.c:6317
 #, fuzzy
 msgid "Show how long you have been idle"
 msgstr ""
 "Consente di configurare manualmente per quanto tempo sei stato inattivo."
 
-#: src/protocols/oscar/oscar.c:8362
-msgid "Use AIM/ICQ proxy server (Slower/More Secure/Usually Works)"
-msgstr ""
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -8956,178 +10033,584 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:8476 src/protocols/oscar/oscar.c:8478
+#: ../src/protocols/oscar/oscar.c:6442 ../src/protocols/oscar/oscar.c:6444
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "Plugin per il protocollo AIM/ICQ"
 
-#: src/protocols/oscar/oscar.c:8497
-msgid "Auth host"
-msgstr "Host auth"
-
-#: src/protocols/oscar/oscar.c:8500
-msgid "Auth port"
-msgstr "Porta auth"
-
-#: src/protocols/oscar/oscar.c:8503 src/protocols/zephyr/zephyr.c:2892
+#: ../src/protocols/oscar/oscar.c:6469 ../src/protocols/zephyr/zephyr.c:2920
 msgid "Encoding"
 msgstr "Codifica"
 
-#: src/protocols/sametime/sametime.c:1134
+#: ../src/protocols/oscar/oscar.c:6473
+msgid ""
+"Always use AIM/ICQ proxy server\n"
+"(slower, but does not reveal your IP address)"
+msgstr ""
+"Utilizzare sempre il server proxy AIM/ICQ\n"
+"(pi lento, ma non rivela il tuo indirizzo IP)"
+
+#: ../src/protocols/oscar/peer.c:613
+#, c-format
+msgid "Asking %s to connect to us at %s:%hu for Direct IM."
+msgstr ""
+" in corso la richiesta a %s di connessione verso di noi su %s:%hu per MI "
+"diretti."
+
+#: ../src/protocols/oscar/peer.c:662 ../src/protocols/oscar/peer.c:693
+#, fuzzy, c-format
+msgid "Attempting to connect to %s:%hu."
+msgstr "Tentativo di connessione con %s su %s:%hu per MI diretti."
+
+#: ../src/protocols/oscar/peer.c:753
+#, fuzzy
+msgid "Attempting to connect via proxy server."
+msgstr "Tentativo di connessione con %s su %s:%hu per MI diretti."
+
+#: ../src/protocols/oscar/peer.c:931
+#, c-format
+msgid "%s has just asked to directly connect to %s"
+msgstr "%s ha chiesto di connettersi direttamente a %s"
+
+#: ../src/protocols/oscar/peer.c:935
+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 "
+"considered a privacy risk."
+msgstr ""
+"Questo richiede una connessione diretta tra i due computer ed  necessario "
+"per le Immagini IM. Poich verr rivelato il tuo indirizzo IP, devi "
+"considerare la cosa come un potenziale rischio per la tua privacy."
+
+#: ../src/protocols/sametime/sametime.c:415
+#, fuzzy
+msgid "Connection closed (writing)"
+msgstr "Connessione chiusa"
+
+#: ../src/protocols/sametime/sametime.c:1261
+#, fuzzy, c-format
+msgid "<b>Group Title:</b> %s<br>"
+msgstr "<b>Utente:</b> %s<br>"
+
+#: ../src/protocols/sametime/sametime.c:1262
+#, fuzzy, c-format
+msgid "<b>Notes Group ID:</b> %s<br>"
+msgstr "<b>Utente:</b> %s<br>"
+
+#: ../src/protocols/sametime/sametime.c:1264
+#, c-format
+msgid "Info for Group %s"
+msgstr "Informazioni per il gruppo %s"
+
+#: ../src/protocols/sametime/sametime.c:1266
+#, fuzzy
+msgid "Notes Address Book Information"
+msgstr "Informazioni sul lavoro"
+
+#: ../src/protocols/sametime/sametime.c:1298
+#, fuzzy
+msgid "Invite Group to Conference..."
+msgstr "Inizia una conferenza"
+
+#: ../src/protocols/sametime/sametime.c:1308
+#, fuzzy
+msgid "Get Notes Address Book Info"
+msgstr "Aggiungi alla rubrica"
+
+#: ../src/protocols/sametime/sametime.c:1461
 #, fuzzy
 msgid "Sending Handshake"
 msgstr "Invio cookie in corso"
 
-#: src/protocols/sametime/sametime.c:1139
+#: ../src/protocols/sametime/sametime.c:1466
 #, fuzzy
 msgid "Waiting for Handshake Acknowledgement"
 msgstr "In attesa dell'inizio del trasferimento"
 
-#: src/protocols/sametime/sametime.c:1144
+#: ../src/protocols/sametime/sametime.c:1471
 msgid "Handshake Acknowledged, Sending Login"
 msgstr ""
 
-#: src/protocols/sametime/sametime.c:1149
+#: ../src/protocols/sametime/sametime.c:1476
 msgid "Waiting for Login Acknowledgement"
 msgstr ""
 
-#: src/protocols/sametime/sametime.c:1154
-#, fuzzy
+#: ../src/protocols/sametime/sametime.c:1481
 msgid "Login Redirected"
-msgstr "Sever di login"
-
-#: src/protocols/sametime/sametime.c:1159
+msgstr "Login rediretto"
+
+#: ../src/protocols/sametime/sametime.c:1487
 #, fuzzy
 msgid "Forcing Login"
 msgstr "Login in corso"
 
-#: src/protocols/sametime/sametime.c:1163
+#: ../src/protocols/sametime/sametime.c:1491
 msgid "Login Acknowledged"
 msgstr ""
 
-#: src/protocols/sametime/sametime.c:1168
-#, fuzzy
-msgid "Connected to Sametime Community Server"
+#: ../src/protocols/sametime/sametime.c:1496
+#, fuzzy
+msgid "Starting Services"
+msgstr "Servizi on line"
+
+#: ../src/protocols/sametime/sametime.c:1501
+msgid "Connected"
+msgstr "Connesso"
+
+#: ../src/protocols/sametime/sametime.c:1599
+#, c-format
+msgid ""
+"A Sametime administrator has issued the following announcement on server %s"
+msgstr ""
+
+#: ../src/protocols/sametime/sametime.c:1604
+msgid "Sametime Administrator Announcement"
+msgstr ""
+
+#: ../src/protocols/sametime/sametime.c:1656
+#, fuzzy
+msgid "Connection reset"
+msgstr "Connessione chiusa"
+
+#: ../src/protocols/sametime/sametime.c:1663
+#, c-format
+msgid "Error reading from socket: %s"
+msgstr "Errore di lettura dal socket: %s"
+
+#. this is a regular connect, error out
+#: ../src/protocols/sametime/sametime.c:1692
+#: ../src/protocols/sametime/sametime.c:3688
+msgid "Unable to connect to host"
+msgstr "Impossibile connettersi all'host"
+
+#: ../src/protocols/sametime/sametime.c:1730
+#, c-format
+msgid "Announcement from %s"
+msgstr ""
+
+#: ../src/protocols/sametime/sametime.c:1904
+msgid "Conference Closed"
+msgstr "Conferenza chiusa"
+
+#: ../src/protocols/sametime/sametime.c:2361
+msgid "Unable to send message: "
+msgstr "Impossibile inviare il messaggio:"
+
+#: ../src/protocols/sametime/sametime.c:2918
+msgid "Place Closed"
+msgstr ""
+
+#: ../src/protocols/sametime/sametime.c:3209
+msgid "Microphone"
+msgstr "Microfono"
+
+#: ../src/protocols/sametime/sametime.c:3210
+msgid "Speakers"
+msgstr "Altoparlanti"
+
+#: ../src/protocols/sametime/sametime.c:3211
+msgid "Video Camera"
+msgstr "Video camera"
+
+#: ../src/protocols/sametime/sametime.c:3215
+msgid "File Transfer"
+msgstr "Trasferimento file"
+
+#: ../src/protocols/sametime/sametime.c:3249
+#, fuzzy, c-format
+msgid ""
+"\n"
+"<b>Supports:</b> %s"
+msgstr ""
+"\n"
+"<b>Stato</b>: Impressionante"
+
+#: ../src/protocols/sametime/sametime.c:3254
+#, fuzzy
+msgid ""
+"\n"
+"<b>External User</b>"
+msgstr ""
+"\n"
+"<b>Richiamato:</b>"
+
+#: ../src/protocols/sametime/sametime.c:3360
+#, fuzzy
+msgid "Create conference with user"
+msgstr "Scegli un server per le conferenze al quale connettersi"
+
+#: ../src/protocols/sametime/sametime.c:3361
+#, c-format
+msgid ""
+"Please enter a topic for the new conference, and an invitation message to be "
+"sent to %s"
+msgstr ""
+
+#: ../src/protocols/sametime/sametime.c:3365
+msgid "New Conference"
+msgstr "Nuova conferenza"
+
+#: ../src/protocols/sametime/sametime.c:3367
+msgid "Create"
+msgstr "Crea"
+
+#: ../src/protocols/sametime/sametime.c:3431
+msgid "Available Conferences"
+msgstr "Conferenze disponibili"
+
+#: ../src/protocols/sametime/sametime.c:3437
+msgid "Create New Conference..."
+msgstr "Crea una nuova conferenza..."
+
+#: ../src/protocols/sametime/sametime.c:3444
+msgid "Invite user to a conference"
+msgstr "Invita un utente in conferenza"
+
+#: ../src/protocols/sametime/sametime.c:3445
+#, c-format
+msgid ""
+"Select a conference from the list below to send an invite to user %s. Select "
+"\"Create New Conference\" if you'd like to create a new conference to invite "
+"this user to."
+msgstr ""
+
+#: ../src/protocols/sametime/sametime.c:3450
+msgid "Invite to Conference"
+msgstr "Invita in conferenza"
+
+#: ../src/protocols/sametime/sametime.c:3452
+msgid "Invite"
+msgstr "Invita"
+
+#: ../src/protocols/sametime/sametime.c:3540
+msgid "Invite to Conference..."
+msgstr "Invita in conferenza..."
+
+#: ../src/protocols/sametime/sametime.c:3545
+msgid "Send TEST Announcement"
+msgstr ""
+
+#: ../src/protocols/sametime/sametime.c:3592
+#, fuzzy
+msgid "No Sametime Community Server specified"
+msgstr "Connessione al server SILC in corso"
+
+#: ../src/protocols/sametime/sametime.c:3614
+#, c-format
+msgid ""
+"No host or IP address has been configured for the Meanwhile account %s. "
+"Please enter one below to continue logging in."
+msgstr ""
+
+#: ../src/protocols/sametime/sametime.c:3619
+msgid "Meanwhile Connection Setup"
+msgstr ""
+
+#: ../src/protocols/sametime/sametime.c:3620
+#, fuzzy
+msgid "No Sametime Community Server Specified"
 msgstr "Connessione al server SILC in corso"
 
-#. * @todo Admin alerts should probably be in a conversation window
-#. rather than a gaim_notify_message. Or in some sort of updating
-#. dialog, or something.
-#: src/protocols/sametime/sametime.c:1263
-msgid "Admin Alert"
-msgstr ""
-
-#: src/protocols/sametime/sametime.c:2758
-msgid "Active"
-msgstr "Attivo"
-
-#: src/protocols/simple/simple.c:202
-#, c-format
-msgid ""
-"Could not add the buddy %s because every simple user has to start with "
-"'sip:'."
-msgstr ""
-
-#: src/protocols/simple/simple.c:1209
-#, fuzzy
-msgid "Could not create listen socket"
-msgstr "Impossibile creare il socket"
-
-#: src/protocols/simple/simple.c:1263
-#, fuzzy
-msgid "SIP usernames may not contain whitespaces or @ symbols"
-msgstr "I nick IRC non devono contenere spazi bianchi"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#: src/protocols/simple/simple.c:1408
-#, fuzzy
-msgid "SIP/SIMPLE Protocol Plugin"
-msgstr "Plugin per il protocollo SILC"
-
-#. *  summary
-#: src/protocols/simple/simple.c:1409
-#, fuzzy
-msgid "The SIP/SIMPLE Protocol Plugin"
-msgstr "Plugin per il protocollo SILC"
-
-#. *  description
-#: src/protocols/simple/simple.c:1410
-msgid "Thomas Butter <butter@uni-mannheim.de>"
-msgstr ""
-
-#: src/protocols/simple/simple.c:1431
-msgid "Publish Status (note: everyone may watch you)"
-msgstr ""
-
-#: src/protocols/simple/simple.c:1434
-#, fuzzy
-msgid "Use UDP"
-msgstr "ID Utente"
-
-#: src/protocols/simple/simple.c:1436
-#, fuzzy
-msgid "Use Proxy"
-msgstr "Nessun proxy"
-
-#: src/protocols/simple/simple.c:1438
-#, fuzzy
-msgid "Proxy"
-msgstr "Nessun proxy"
-
-#: src/protocols/silc/buddy.c:51 src/protocols/silc/buddy.c:419
-#: src/protocols/silc/buddy.c:544 src/protocols/silc/buddy.c:711
-#: src/protocols/silc/ft.c:338
+#: ../src/protocols/sametime/sametime.c:4077
+#, fuzzy
+msgid "<b>External User</b><br>"
+msgstr "<b>Utente:</b> %s<br>"
+
+#: ../src/protocols/sametime/sametime.c:4080
+#, fuzzy, c-format
+msgid "<b>User ID:</b> %s<br>"
+msgstr "<b>Utente:</b> %s<br>"
+
+#: ../src/protocols/sametime/sametime.c:4086
+#, fuzzy, c-format
+msgid "<b>Full Name:</b> %s<br>"
+msgstr "<b>Alias:</b> %s<br>"
+
+#: ../src/protocols/sametime/sametime.c:4092
+#, fuzzy
+msgid "<b>Last Known Client:</b> "
+msgstr ""
+"\n"
+"<b>%s:</b> %s"
+
+#: ../src/protocols/sametime/sametime.c:4100
+#, c-format
+msgid "Unknown (0x%04x)<br>"
+msgstr "Sconosciuto (0x%04x)<br>"
+
+#: ../src/protocols/sametime/sametime.c:4107
+#, fuzzy, c-format
+msgid "<b>Supports:</b> %s<br>"
+msgstr "<b>%s:</b> %s<br>"
+
+#: ../src/protocols/sametime/sametime.c:4113
+#, fuzzy, c-format
+msgid "<b>Status:</b> %s"
+msgstr ""
+"\n"
+"<b>Stato</b>: Impressionante"
+
+#: ../src/protocols/sametime/sametime.c:4256
+#: ../src/protocols/sametime/sametime.c:5419
+msgid "User Name"
+msgstr "Nome utente"
+
+#: ../src/protocols/sametime/sametime.c:4259
+#: ../src/protocols/sametime/sametime.c:5422
+msgid "Sametime ID"
+msgstr ""
+
+#: ../src/protocols/sametime/sametime.c:4283
+msgid "An ambiguous user ID was entered"
+msgstr ""
+
+#: ../src/protocols/sametime/sametime.c:4284
+#, fuzzy, c-format
+msgid ""
+"The identifier '%s' may possibly refer to any of the following users. Please "
+"select the correct user from the list below to add them to your buddy list."
+msgstr ""
+" stato trovato pi di un utente con lo stesso nome. Scegliere dalla lista "
+"l'utente corretto da aggiungere alla lista contatti."
+
+#: ../src/protocols/sametime/sametime.c:4289
+msgid "Select User"
+msgstr "Scegli l'utente"
+
+#: ../src/protocols/sametime/sametime.c:4359
+msgid "Unable to add user: user not found"
+msgstr "Impossibile aggiungere l'utente: utente non trovato"
+
+#: ../src/protocols/sametime/sametime.c:4361
+#, c-format
+msgid ""
+"The identifier '%s' did not match any users in your Sametime community. This "
+"entry has been removed from your buddy list."
+msgstr ""
+
+#: ../src/protocols/sametime/sametime.c:4366
+msgid "Unable to add user"
+msgstr "Impossibile aggiungere l'utente"
+
+#: ../src/protocols/sametime/sametime.c:4938
+#, c-format
+msgid ""
+"Error reading file %s: \n"
+"%s\n"
+msgstr ""
+"Errore nella lettura del file %s: \n"
+"%s\n"
+
+#: ../src/protocols/sametime/sametime.c:5069
+#, fuzzy
+msgid "Remotely Stored Buddy List"
+msgstr "Invia la lista contatti"
+
+#: ../src/protocols/sametime/sametime.c:5074
+#, fuzzy
+msgid "Buddy List Storage Mode"
+msgstr "Ordinamento della lista contatti"
+
+#: ../src/protocols/sametime/sametime.c:5077
+#, fuzzy
+msgid "Local Buddy List Only"
+msgstr "Lista contatti _agganciabile"
+
+#: ../src/protocols/sametime/sametime.c:5079
+#, fuzzy
+msgid "Merge List from Server"
+msgstr "Elimina la lista contatti dal server"
+
+#: ../src/protocols/sametime/sametime.c:5081
+#, fuzzy
+msgid "Merge and Save List to Server"
+msgstr " stato inviato al server un valore CHL sbagliato"
+
+#: ../src/protocols/sametime/sametime.c:5083
+msgid "Synchronize List with Server"
+msgstr ""
+
+#: ../src/protocols/sametime/sametime.c:5132
+#, c-format
+msgid "Import Sametime List for Account %s"
+msgstr ""
+
+#: ../src/protocols/sametime/sametime.c:5171
+#, c-format
+msgid "Export Sametime List for Account %s"
+msgstr ""
+
+#: ../src/protocols/sametime/sametime.c:5224
+msgid "Unable to add group: group exists"
+msgstr "Impossibile aggiungere il gruppo: il gruppo esiste"
+
+#: ../src/protocols/sametime/sametime.c:5225
+#, c-format
+msgid "A group named '%s' already exists in your buddy list."
+msgstr ""
+
+#: ../src/protocols/sametime/sametime.c:5228
+#: ../src/protocols/sametime/sametime.c:5357
+msgid "Unable to add group"
+msgstr "Impossibile aggiungere il gruppo"
+
+#: ../src/protocols/sametime/sametime.c:5287
+msgid "Possible Matches"
+msgstr ""
+
+#: ../src/protocols/sametime/sametime.c:5303
+msgid "Notes Address Book group results"
+msgstr ""
+
+#: ../src/protocols/sametime/sametime.c:5304
+#, c-format
+msgid ""
+"The identifier '%s' may possibly refer to any of the following Notes Address "
+"Book groups. Please select the correct group from the list below to add it "
+"to your buddy list."
+msgstr ""
+
+#: ../src/protocols/sametime/sametime.c:5309
+#, fuzzy
+msgid "Select Notes Address Book"
+msgstr "Aggiungi alla rubrica"
+
+#: ../src/protocols/sametime/sametime.c:5351
+msgid "Unable to add group: group not found"
+msgstr "Impossibile aggiungere il gruppo: gruppo non trovato"
+
+#: ../src/protocols/sametime/sametime.c:5353
+#, c-format
+msgid ""
+"The identifier '%s' did not match any Notes Address Book groups in your "
+"Sametime community."
+msgstr ""
+
+#: ../src/protocols/sametime/sametime.c:5394
+#, fuzzy
+msgid "Notes Address Book Group"
+msgstr "Aggiungi alla rubrica"
+
+#: ../src/protocols/sametime/sametime.c:5395
+msgid ""
+"Enter the name of a Notes Address Book group in the field below to add the "
+"group and its members to your buddy list."
+msgstr ""
+
+#: ../src/protocols/sametime/sametime.c:5443
+#, c-format
+msgid "Search results for '%s'"
+msgstr "Risultati della ricerca per '%s'"
+
+#: ../src/protocols/sametime/sametime.c:5444
+#, c-format
+msgid ""
+"The identifier '%s' may possibly refer to any of the following users. You "
+"may add these users to your buddy list or send them messages with the action "
+"buttons below."
+msgstr ""
+
+#: ../src/protocols/sametime/sametime.c:5476
+msgid "No matches"
+msgstr "Nessuna corrispondenza"
+
+#: ../src/protocols/sametime/sametime.c:5477
+#, c-format
+msgid "The identifier '%s' did not match any users in your Sametime community."
+msgstr ""
+
+#: ../src/protocols/sametime/sametime.c:5481
+msgid "No Matches"
+msgstr "Nessuna corrispondenza"
+
+#: ../src/protocols/sametime/sametime.c:5518
+msgid "Search for a user"
+msgstr "Cerca utente"
+
+#: ../src/protocols/sametime/sametime.c:5519
+msgid ""
+"Enter a name or partial ID in the field below to search for matching users "
+"in your Sametime community."
+msgstr ""
+
+#: ../src/protocols/sametime/sametime.c:5522
+#, fuzzy
+msgid "User Search"
+msgstr "Ricerca"
+
+#: ../src/protocols/sametime/sametime.c:5534
+msgid "Import Sametime List..."
+msgstr ""
+
+#: ../src/protocols/sametime/sametime.c:5538
+msgid "Export Sametime List..."
+msgstr ""
+
+#: ../src/protocols/sametime/sametime.c:5542
+#, fuzzy
+msgid "Add Notes Address Book Group..."
+msgstr "Aggiungi alla rubrica"
+
+#: ../src/protocols/sametime/sametime.c:5546
+msgid "User Search..."
+msgstr "Ricerca utente..."
+
+#: ../src/protocols/sametime/sametime.c:5643
+msgid "Force login (ignore server redirects)"
+msgstr ""
+
+#. pretend to be Sametime Connect
+#: ../src/protocols/sametime/sametime.c:5653
+msgid "Hide client identity"
+msgstr "Nascondi l'identit del client"
+
+#: ../src/protocols/silc/buddy.c:52 ../src/protocols/silc/buddy.c:420
+#: ../src/protocols/silc/buddy.c:545 ../src/protocols/silc/buddy.c:711
+#: ../src/protocols/silc/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "L'utente %s non  presente nella rete"
 
-#: src/protocols/silc/buddy.c:52 src/protocols/silc/buddy.c:114
-#: src/protocols/silc/buddy.c:119 src/protocols/silc/buddy.c:123
-#: src/protocols/silc/buddy.c:128 src/protocols/silc/buddy.c:133
-#: src/protocols/silc/buddy.c:138 src/protocols/silc/buddy.c:256
+#: ../src/protocols/silc/buddy.c:53 ../src/protocols/silc/buddy.c:115
+#: ../src/protocols/silc/buddy.c:120 ../src/protocols/silc/buddy.c:124
+#: ../src/protocols/silc/buddy.c:129 ../src/protocols/silc/buddy.c:134
+#: ../src/protocols/silc/buddy.c:139 ../src/protocols/silc/buddy.c:257
 msgid "Key Agreement"
 msgstr "Scambio delle chiavi"
 
-#: src/protocols/silc/buddy.c:53
+#: ../src/protocols/silc/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr "Impossibile eseguire lo scambio delle chiavi"
 
-#: src/protocols/silc/buddy.c:115
+#: ../src/protocols/silc/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr "C' stato un errore durante lo scambio delle chiavi"
 
-#: src/protocols/silc/buddy.c:119
+#: ../src/protocols/silc/buddy.c:120
 msgid "Key Agreement failed"
 msgstr "Scambio delle chiavi fallito"
 
-#: src/protocols/silc/buddy.c:124
+#: ../src/protocols/silc/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr "Tempo scaduto durante lo scambio delle chiavi"
 
-#: src/protocols/silc/buddy.c:129
+#: ../src/protocols/silc/buddy.c:130
 msgid "Key agreement was aborted"
 msgstr "Lo scambio delle chiavi  stato interrotto"
 
-#: src/protocols/silc/buddy.c:134
+#: ../src/protocols/silc/buddy.c:135
 msgid "Key agreement is already started"
 msgstr "Lo scambio delle chiavi  gi stato avviato"
 
-#: src/protocols/silc/buddy.c:139
+#: ../src/protocols/silc/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
 msgstr "Impossibile avviare uno scambio delle chiavi con te stesso"
 
-#: src/protocols/silc/buddy.c:257 src/protocols/silc/buddy.c:387
-#: src/protocols/silc/buddy.c:512
+#: ../src/protocols/silc/buddy.c:258 ../src/protocols/silc/buddy.c:388
+#: ../src/protocols/silc/buddy.c:513
 msgid "The remote user is not present in the network any more"
 msgstr "L'utente remoto non  pi presente nella rete"
 
-#: src/protocols/silc/buddy.c:293
+#: ../src/protocols/silc/buddy.c:294
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
@@ -9136,7 +10619,7 @@
 "Ricevuta una richiesta di scambio chiavi da %s. Vuoi eseguire lo scambio "
 "delle chiavi?"
 
-#: src/protocols/silc/buddy.c:297
+#: ../src/protocols/silc/buddy.c:298
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -9147,59 +10630,59 @@
 "Host remoto: %s\n"
 "Porta remota: %d"
 
-#: src/protocols/silc/buddy.c:310
+#: ../src/protocols/silc/buddy.c:311
 msgid "Key Agreement Request"
 msgstr "Richiesta di scambio chiavi"
 
-#: src/protocols/silc/buddy.c:386 src/protocols/silc/buddy.c:421
-#: src/protocols/silc/buddy.c:463
+#: ../src/protocols/silc/buddy.c:387 ../src/protocols/silc/buddy.c:422
+#: ../src/protocols/silc/buddy.c:464
 msgid "IM With Password"
 msgstr "MI con password"
 
-#: src/protocols/silc/buddy.c:422
+#: ../src/protocols/silc/buddy.c:423
 msgid "Cannot set IM key"
 msgstr "Impossibile impostare la chiave MI"
 
-#: src/protocols/silc/buddy.c:464
+#: ../src/protocols/silc/buddy.c:465
 msgid "Set IM Password"
 msgstr "Imposta la password MI"
 
-#: src/protocols/silc/buddy.c:511 src/protocols/silc/buddy.c:546
-#: src/protocols/silc/ops.c:1278 src/protocols/silc/ops.c:1289
+#: ../src/protocols/silc/buddy.c:512 ../src/protocols/silc/buddy.c:547
+#: ../src/protocols/silc/ops.c:1492 ../src/protocols/silc/ops.c:1503
 msgid "Get Public Key"
 msgstr "Ottieni chiave pubblica"
 
-#: src/protocols/silc/buddy.c:547 src/protocols/silc/ops.c:1279
-#: src/protocols/silc/ops.c:1290
+#: ../src/protocols/silc/buddy.c:548 ../src/protocols/silc/ops.c:1493
+#: ../src/protocols/silc/ops.c:1504
 msgid "Cannot fetch the public key"
 msgstr "Impossibile recuperare la chiave pubblica"
 
-#: src/protocols/silc/buddy.c:634 src/protocols/silc/buddy.c:1583
+#: ../src/protocols/silc/buddy.c:634 ../src/protocols/silc/buddy.c:1647
 msgid "Show Public Key"
 msgstr "Mostra la chaive pubblica"
 
-#: src/protocols/silc/buddy.c:635 src/protocols/silc/buddy.c:994
-#: src/protocols/silc/chat.c:235
+#: ../src/protocols/silc/buddy.c:635 ../src/protocols/silc/buddy.c:1030
+#: ../src/protocols/silc/chat.c:237
 msgid "Could not load public key"
 msgstr "Impossibile caricare la chiave pubblica"
 
-#: src/protocols/silc/buddy.c:712 src/protocols/silc/ops.c:873
-#: src/protocols/silc/ops.c:945 src/protocols/silc/ops.c:1080
-#: src/protocols/silc/ops.c:1081 src/protocols/silc/ops.c:1099
+#: ../src/protocols/silc/buddy.c:712 ../src/protocols/silc/ops.c:1087
+#: ../src/protocols/silc/ops.c:1159 ../src/protocols/silc/ops.c:1294
+#: ../src/protocols/silc/ops.c:1295 ../src/protocols/silc/ops.c:1313
 msgid "User Information"
 msgstr "Informazioni sull'utente"
 
-#: src/protocols/silc/buddy.c:713 src/protocols/silc/ops.c:946
-#: src/protocols/silc/ops.c:1100
+#: ../src/protocols/silc/buddy.c:713 ../src/protocols/silc/ops.c:1160
+#: ../src/protocols/silc/ops.c:1314
 msgid "Cannot get user information"
 msgstr "Impossibile ottenere le informazioni sull'utente"
 
-#: src/protocols/silc/buddy.c:734
+#: ../src/protocols/silc/buddy.c:734
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "Il contatto %s non  fidato"
 
-#: src/protocols/silc/buddy.c:737
+#: ../src/protocols/silc/buddy.c:737
 msgid ""
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
@@ -9209,16 +10692,16 @@
 "la chiave pubblica."
 
 #. Open file selector to select the public key.
-#: src/protocols/silc/buddy.c:1028
+#: ../src/protocols/silc/buddy.c:1064
 msgid "Open..."
 msgstr "Apri..."
 
-#: src/protocols/silc/buddy.c:1037
+#: ../src/protocols/silc/buddy.c:1073
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "Il contatto %s non  presente nella rete"
 
-#: src/protocols/silc/buddy.c:1040
+#: ../src/protocols/silc/buddy.c:1076
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
@@ -9226,15 +10709,15 @@
 "Per poter aggiungere il contatto devi importare la sua chiave pubblica. Fai "
 "clic su \"Importa\" per importare una chiave pubblica."
 
-#: src/protocols/silc/buddy.c:1043
-msgid "Import..."
-msgstr "Importa..."
-
-#: src/protocols/silc/buddy.c:1130
+#: ../src/protocols/silc/buddy.c:1079
+msgid "_Import..."
+msgstr "_Importa..."
+
+#: ../src/protocols/silc/buddy.c:1175
 msgid "Select correct user"
 msgstr "Scegliere l'utente corretto"
 
-#: src/protocols/silc/buddy.c:1132
+#: ../src/protocols/silc/buddy.c:1177
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
@@ -9242,7 +10725,7 @@
 " stato trovato pi di un utente con la stessa chiave pubblica. Scegliere "
 "dalla lista l'utente corretto da aggiungere alla lista contatti."
 
-#: src/protocols/silc/buddy.c:1134
+#: ../src/protocols/silc/buddy.c:1179
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
@@ -9250,213 +10733,213 @@
 " stato trovato pi di un utente con lo stesso nome. Scegliere dalla lista "
 "l'utente corretto da aggiungere alla lista contatti."
 
-#: src/protocols/silc/buddy.c:1415
+#: ../src/protocols/silc/buddy.c:1467
 msgid "Detached"
 msgstr "Distaccato"
 
-#: src/protocols/silc/buddy.c:1419 src/protocols/silc/silc.c:56
+#: ../src/protocols/silc/buddy.c:1471 ../src/protocols/silc/silc.c:55
 msgid "Indisposed"
 msgstr "Indisposto"
 
-#: src/protocols/silc/buddy.c:1423 src/protocols/silc/silc.c:58
+#: ../src/protocols/silc/buddy.c:1475 ../src/protocols/silc/silc.c:57
 msgid "Wake Me Up"
 msgstr "Svegliami"
 
-#: src/protocols/silc/buddy.c:1425 src/protocols/silc/silc.c:50
+#: ../src/protocols/silc/buddy.c:1477 ../src/protocols/silc/silc.c:49
 msgid "Hyper Active"
 msgstr "Iperattivo"
 
-#: src/protocols/silc/buddy.c:1427
+#: ../src/protocols/silc/buddy.c:1479
 msgid "Robot"
 msgstr "Robot"
 
-#: src/protocols/silc/buddy.c:1434 src/protocols/silc/silc.c:634
-#: src/protocols/silc/util.c:472
+#: ../src/protocols/silc/buddy.c:1486 ../src/protocols/silc/silc.c:672
+#: ../src/protocols/silc/util.c:487
 msgid "Happy"
 msgstr "Felice"
 
-#: src/protocols/silc/buddy.c:1436 src/protocols/silc/silc.c:636
-#: src/protocols/silc/util.c:474
+#: ../src/protocols/silc/buddy.c:1488 ../src/protocols/silc/silc.c:674
+#: ../src/protocols/silc/util.c:489
 msgid "Sad"
 msgstr "Triste"
 
-#: src/protocols/silc/buddy.c:1438 src/protocols/silc/silc.c:638
-#: src/protocols/silc/util.c:476
+#: ../src/protocols/silc/buddy.c:1490 ../src/protocols/silc/silc.c:676
+#: ../src/protocols/silc/util.c:491
 msgid "Angry"
 msgstr "Arrabbiato"
 
-#: src/protocols/silc/buddy.c:1440 src/protocols/silc/silc.c:640
-#: src/protocols/silc/util.c:478
+#: ../src/protocols/silc/buddy.c:1492 ../src/protocols/silc/silc.c:678
+#: ../src/protocols/silc/util.c:493
 msgid "Jealous"
 msgstr "Geloso"
 
-#: src/protocols/silc/buddy.c:1442 src/protocols/silc/silc.c:642
-#: src/protocols/silc/util.c:480
+#: ../src/protocols/silc/buddy.c:1494 ../src/protocols/silc/silc.c:680
+#: ../src/protocols/silc/util.c:495
 msgid "Ashamed"
 msgstr "Vergognoso"
 
-#: src/protocols/silc/buddy.c:1444 src/protocols/silc/silc.c:644
-#: src/protocols/silc/util.c:482
+#: ../src/protocols/silc/buddy.c:1496 ../src/protocols/silc/silc.c:682
+#: ../src/protocols/silc/util.c:497
 msgid "Invincible"
 msgstr "Invincibile"
 
-#: src/protocols/silc/buddy.c:1446 src/protocols/silc/silc.c:646
-#: src/protocols/silc/util.c:484
+#: ../src/protocols/silc/buddy.c:1498 ../src/protocols/silc/util.c:499
 msgid "In Love"
 msgstr "Innamorato"
 
-#: src/protocols/silc/buddy.c:1448 src/protocols/silc/silc.c:648
-#: src/protocols/silc/util.c:486
+#: ../src/protocols/silc/buddy.c:1500 ../src/protocols/silc/silc.c:686
+#: ../src/protocols/silc/util.c:501
 msgid "Sleepy"
 msgstr "Assonnato"
 
-#: src/protocols/silc/buddy.c:1450 src/protocols/silc/silc.c:650
-#: src/protocols/silc/util.c:488
+#: ../src/protocols/silc/buddy.c:1502 ../src/protocols/silc/silc.c:688
+#: ../src/protocols/silc/util.c:503
 msgid "Bored"
 msgstr "Annoiato"
 
-#: src/protocols/silc/buddy.c:1452 src/protocols/silc/silc.c:652
-#: src/protocols/silc/util.c:490
+#: ../src/protocols/silc/buddy.c:1504 ../src/protocols/silc/silc.c:690
+#: ../src/protocols/silc/util.c:505
 msgid "Excited"
 msgstr "Eccitato"
 
-#: src/protocols/silc/buddy.c:1454 src/protocols/silc/silc.c:654
-#: src/protocols/silc/util.c:492
+#: ../src/protocols/silc/buddy.c:1506 ../src/protocols/silc/silc.c:692
+#: ../src/protocols/silc/util.c:507
 msgid "Anxious"
 msgstr "Ansioso"
 
-#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:982
+#: ../src/protocols/silc/buddy.c:1534 ../src/protocols/silc/ops.c:1196
 msgid "User Modes"
 msgstr "Modalit utente"
 
-#: src/protocols/silc/buddy.c:1495 src/protocols/silc/ops.c:991
+#: ../src/protocols/silc/buddy.c:1550 ../src/protocols/silc/ops.c:1205
 msgid "Mood"
 msgstr "Umore"
 
-#: src/protocols/silc/buddy.c:1499 src/protocols/silc/ops.c:997
-msgid "Status Text"
-msgstr "Testo di stato"
-
-#: src/protocols/silc/buddy.c:1504 src/protocols/silc/ops.c:1003
+#: ../src/protocols/silc/buddy.c:1555 ../src/protocols/silc/ops.c:1217
 msgid "Preferred Contact"
 msgstr "Contatti preferiti"
 
-#: src/protocols/silc/buddy.c:1509 src/protocols/silc/ops.c:1008
+#: ../src/protocols/silc/buddy.c:1560 ../src/protocols/silc/ops.c:1222
 msgid "Preferred Language"
 msgstr "Lingua preferita"
 
-#: src/protocols/silc/buddy.c:1514 src/protocols/silc/ops.c:1013
+#: ../src/protocols/silc/buddy.c:1565 ../src/protocols/silc/ops.c:1227
 msgid "Device"
 msgstr "Dispositivo"
 
-#: src/protocols/silc/buddy.c:1519 src/protocols/silc/ops.c:1018
-#: src/protocols/silc/silc.c:702 src/protocols/silc/silc.c:704
+#: ../src/protocols/silc/buddy.c:1570 ../src/protocols/silc/ops.c:1232
+#: ../src/protocols/silc/silc.c:740 ../src/protocols/silc/silc.c:742
 msgid "Timezone"
 msgstr "Fuso orario"
 
-#: src/protocols/silc/buddy.c:1524 src/protocols/silc/ops.c:1023
+#: ../src/protocols/silc/buddy.c:1575 ../src/protocols/silc/ops.c:1237
 msgid "Geolocation"
 msgstr "Localit geografica"
 
-#: src/protocols/silc/buddy.c:1567
+#: ../src/protocols/silc/buddy.c:1629
 msgid "Reset IM Key"
 msgstr "Resetta la chiave MI"
 
-#: src/protocols/silc/buddy.c:1572
+#: ../src/protocols/silc/buddy.c:1635
 msgid "IM with Key Exchange"
 msgstr "MI con scambio di chiavi"
 
-#: src/protocols/silc/buddy.c:1576
+#: ../src/protocols/silc/buddy.c:1640
 msgid "IM with Password"
 msgstr "MI con password"
 
-#: src/protocols/silc/buddy.c:1588
+#: ../src/protocols/silc/buddy.c:1653
 msgid "Get Public Key..."
 msgstr "Ottieni la chiave pubblica..."
 
-#: src/protocols/silc/buddy.c:1595 src/protocols/silc/ops.c:1409
+#: ../src/protocols/silc/buddy.c:1660 ../src/protocols/silc/ops.c:1623
 msgid "Kill User"
 msgstr "Uccidi utente"
 
-#: src/protocols/silc/chat.c:38
+#: ../src/protocols/silc/buddy.c:1670 ../src/protocols/silc/chat.c:972
+msgid "Draw On Whiteboard"
+msgstr ""
+
+#: ../src/protocols/silc/chat.c:39
 msgid "_Passphrase:"
 msgstr "_Passphrase:"
 
-#: src/protocols/silc/chat.c:79
+#: ../src/protocols/silc/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "Il canale %s non esiste nella rete"
 
-#: src/protocols/silc/chat.c:80 src/protocols/silc/chat.c:172
+#: ../src/protocols/silc/chat.c:81 ../src/protocols/silc/chat.c:174
 msgid "Channel Information"
 msgstr "Informazioni sul canale"
 
-#: src/protocols/silc/chat.c:81
+#: ../src/protocols/silc/chat.c:82
 msgid "Cannot get channel information"
 msgstr "Impossibile ottenere informazioni sul canale"
 
-#: src/protocols/silc/chat.c:118
+#: ../src/protocols/silc/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>Nome del canale:</b> %s"
 
-#: src/protocols/silc/chat.c:121
+#: ../src/protocols/silc/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>Numero di utenti:</b> %d"
 
-#: src/protocols/silc/chat.c:128
+#: ../src/protocols/silc/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>Fondatore del canale:</b> %s"
 
-#: src/protocols/silc/chat.c:137
+#: ../src/protocols/silc/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>Cipher del canale:</b> %s"
 
-#: src/protocols/silc/chat.c:140
+#. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
+#: ../src/protocols/silc/chat.c:142
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>HMAC del canale:</b> %s"
 
-#: src/protocols/silc/chat.c:145
+#: ../src/protocols/silc/chat.c:147
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Argomento del canale:</b><br>%s"
 
-#: src/protocols/silc/chat.c:150
+#: ../src/protocols/silc/chat.c:152
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Modalit del canale:</b>"
 
-#: src/protocols/silc/chat.c:163
+#: ../src/protocols/silc/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Fingerprint della chiave del fondatore:</b><br>%s"
 
-#: src/protocols/silc/chat.c:164
+#: ../src/protocols/silc/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>Babbleprint della chiave del fondatore:</b><br>%s"
 
-#: src/protocols/silc/chat.c:234
+#: ../src/protocols/silc/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "Aggiungi la chiave pubblica del canale"
 
 #. Add new public key
-#: src/protocols/silc/chat.c:289
+#: ../src/protocols/silc/chat.c:291
 msgid "Open Public Key..."
 msgstr "Apri chiave pubblica..."
 
-#: src/protocols/silc/chat.c:398
+#: ../src/protocols/silc/chat.c:400
 msgid "Channel Passphrase"
 msgstr "Passphrase del canale"
 
-#: src/protocols/silc/chat.c:405
+#: ../src/protocols/silc/chat.c:407
 msgid "Channel Public Keys List"
 msgstr "Lista delle chaivi pubbliche del canale"
 
-#: src/protocols/silc/chat.c:410
+#: ../src/protocols/silc/chat.c:412
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -9471,318 +10954,326 @@
 "canale, solamente gli utenti le cui chiavi pubbliche sono elencate saranno "
 "in grado di entrare."
 
-#: src/protocols/silc/chat.c:419 src/protocols/silc/chat.c:420
-#: src/protocols/silc/chat.c:457 src/protocols/silc/chat.c:458
-#: src/protocols/silc/chat.c:891
+#: ../src/protocols/silc/chat.c:421 ../src/protocols/silc/chat.c:422
+#: ../src/protocols/silc/chat.c:459 ../src/protocols/silc/chat.c:460
+#: ../src/protocols/silc/chat.c:906
 msgid "Channel Authentication"
 msgstr "Autenticazione del canale"
 
-#: src/protocols/silc/chat.c:421 src/protocols/silc/chat.c:459
+#: ../src/protocols/silc/chat.c:423 ../src/protocols/silc/chat.c:461
 msgid "Add / Remove"
 msgstr "Aggiungi / rimuovi"
 
-#: src/protocols/silc/chat.c:576
+#: ../src/protocols/silc/chat.c:578
 msgid "Group Name"
 msgstr "Nome del gruppo"
 
-#: src/protocols/silc/chat.c:580 src/protocols/silc/ops.c:1694
+#: ../src/protocols/silc/chat.c:582 ../src/protocols/silc/ops.c:1908
+#: ../src/protocols/silc/silc.c:948
 msgid "Passphrase"
 msgstr "Passphrase"
 
-#: src/protocols/silc/chat.c:591
+#: ../src/protocols/silc/chat.c:593
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "Inserisci il nome del gruppo privato del canale %s e la passphrase."
 
-#: src/protocols/silc/chat.c:593
+#: ../src/protocols/silc/chat.c:595
 msgid "Add Channel Private Group"
 msgstr "Inserisci un gruppo privato al canale"
 
-#: src/protocols/silc/chat.c:720
+#: ../src/protocols/silc/chat.c:722
 msgid "User Limit"
 msgstr "Limite utenti"
 
-#: src/protocols/silc/chat.c:721
+#: ../src/protocols/silc/chat.c:723
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 "Imposta un limite per gli utenti del canale. Scegli zero per rimuovere il "
 "limite."
 
-#: src/protocols/silc/chat.c:863
+#: ../src/protocols/silc/chat.c:878
 msgid "Get Info"
 msgstr "Info"
 
-#: src/protocols/silc/chat.c:871
+#: ../src/protocols/silc/chat.c:886
 msgid "Invite List"
 msgstr "Lista degli inviti"
 
-#: src/protocols/silc/chat.c:876
+#: ../src/protocols/silc/chat.c:891
 msgid "Ban List"
 msgstr "Lista dei ban"
 
-#: src/protocols/silc/chat.c:884
+#: ../src/protocols/silc/chat.c:899
 msgid "Add Private Group"
 msgstr "Aggiungi un gruppo privato"
 
-#: src/protocols/silc/chat.c:897
+#: ../src/protocols/silc/chat.c:912
 msgid "Reset Permanent"
 msgstr "Rimuovere la modalit permanente"
 
-#: src/protocols/silc/chat.c:902
+#: ../src/protocols/silc/chat.c:917
 msgid "Set Permanent"
 msgstr "Impostare la modalit permanente"
 
-#: src/protocols/silc/chat.c:910
+#: ../src/protocols/silc/chat.c:925
 msgid "Set User Limit"
 msgstr "Imposta il limte utenti"
 
-#: src/protocols/silc/chat.c:916
+#: ../src/protocols/silc/chat.c:931
 msgid "Reset Topic Restriction"
 msgstr "Azzera le restrizioni sull'argomento"
 
-#: src/protocols/silc/chat.c:921
+#: ../src/protocols/silc/chat.c:936
 msgid "Set Topic Restriction"
 msgstr "Imposta restrizioni sull'argomento"
 
-#: src/protocols/silc/chat.c:928
+#: ../src/protocols/silc/chat.c:943
 msgid "Reset Private Channel"
 msgstr "Azzera i canali privati"
 
-#: src/protocols/silc/chat.c:933
+#: ../src/protocols/silc/chat.c:948
 msgid "Set Private Channel"
 msgstr "Imposta un canale privato"
 
-#: src/protocols/silc/chat.c:940
+#: ../src/protocols/silc/chat.c:955
 msgid "Reset Secret Channel"
 msgstr "Azzera i canali segreti"
 
-#: src/protocols/silc/chat.c:945
+#: ../src/protocols/silc/chat.c:960
 msgid "Set Secret Channel"
 msgstr "Imposta un canale segreto"
 
-#: src/protocols/silc/chat.c:1008
+#: ../src/protocols/silc/chat.c:1034
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "Sei il fondatore del canale su <I>%s</I>"
 
-#: src/protocols/silc/chat.c:1012
+#: ../src/protocols/silc/chat.c:1038
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "Il fondatore del canale su <I>%s</I>  <I>%s</I>"
 
-#: src/protocols/silc/chat.c:1071
+#: ../src/protocols/silc/chat.c:1097
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr "Devi entrare nel canale %s prima di poter entrare nel gruppo privato"
 
-#: src/protocols/silc/chat.c:1073
+#: ../src/protocols/silc/chat.c:1099
 msgid "Join Private Group"
 msgstr "Entra nel gruppo privato"
 
-#: src/protocols/silc/chat.c:1074
+#: ../src/protocols/silc/chat.c:1100
 msgid "Cannot join private group"
 msgstr "Impossibile entrare nel gruppo privato"
 
-#: src/protocols/silc/chat.c:1267 src/protocols/silc/silc.c:917
+#: ../src/protocols/silc/chat.c:1294 ../src/protocols/silc/silc.c:1156
+#, fuzzy
+msgid "Call Command"
+msgstr "Comando"
+
+#: ../src/protocols/silc/chat.c:1294 ../src/protocols/silc/silc.c:1156
 msgid "Cannot call command"
 msgstr "Impossibile richiamare il comando"
 
-#: src/protocols/silc/chat.c:1268 src/protocols/silc/silc.c:918
+#: ../src/protocols/silc/chat.c:1295 ../src/protocols/silc/silc.c:1157
 msgid "Unknown command"
 msgstr "Comando sconosciuto"
 
-#: src/protocols/silc/ft.c:89 src/protocols/silc/ft.c:92
-#: src/protocols/silc/ft.c:96 src/protocols/silc/ft.c:100
-#: src/protocols/silc/ft.c:104 src/protocols/silc/ft.c:205
-#: src/protocols/silc/ft.c:210 src/protocols/silc/ft.c:215
-#: src/protocols/silc/ft.c:221 src/protocols/silc/ft.c:340
+#: ../src/protocols/silc/ft.c:89 ../src/protocols/silc/ft.c:92
+#: ../src/protocols/silc/ft.c:96 ../src/protocols/silc/ft.c:100
+#: ../src/protocols/silc/ft.c:104 ../src/protocols/silc/ft.c:205
+#: ../src/protocols/silc/ft.c:210 ../src/protocols/silc/ft.c:215
+#: ../src/protocols/silc/ft.c:221 ../src/protocols/silc/ft.c:340
 msgid "Secure File Transfer"
 msgstr "Trasferimento file sicuro"
 
-#: src/protocols/silc/ft.c:90 src/protocols/silc/ft.c:93
-#: src/protocols/silc/ft.c:97 src/protocols/silc/ft.c:101
-#: src/protocols/silc/ft.c:105
+#: ../src/protocols/silc/ft.c:90 ../src/protocols/silc/ft.c:93
+#: ../src/protocols/silc/ft.c:97 ../src/protocols/silc/ft.c:101
+#: ../src/protocols/silc/ft.c:105
 msgid "Error during file transfer"
 msgstr "Errore nel trasferimento del file"
 
-#: src/protocols/silc/ft.c:94
+#: ../src/protocols/silc/ft.c:94
 msgid "Permission denied"
 msgstr "Pemesso negato"
 
-#: src/protocols/silc/ft.c:98
+#: ../src/protocols/silc/ft.c:98
 msgid "Key agreement failed"
 msgstr "Scambio delle chiavi fallito"
 
-#: src/protocols/silc/ft.c:102
-#, fuzzy
+#: ../src/protocols/silc/ft.c:102
 msgid "File transfer session does not exist"
 msgstr "La sessione di trasferimento file non esiste"
 
-#: src/protocols/silc/ft.c:206
+#: ../src/protocols/silc/ft.c:206
 msgid "No file transfer session active"
 msgstr "Nessuna sessione di trasferimento file attiva"
 
-#: src/protocols/silc/ft.c:211
+#: ../src/protocols/silc/ft.c:211
 msgid "File transfer already started"
 msgstr "Il trasferimento file  giiniziato"
 
-#: src/protocols/silc/ft.c:216
+#: ../src/protocols/silc/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr "Impossibile eseguire lo scambio delle chiavi per il trasferimento file"
 
-#: src/protocols/silc/ft.c:222
+#: ../src/protocols/silc/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "Impossibile avviare il trasferimento file"
 
-#: src/protocols/silc/ft.c:341
+#: ../src/protocols/silc/ft.c:341
 msgid "Cannot send file"
 msgstr "Impossibile inviare il file"
 
-#: src/protocols/silc/ops.c:341 src/protocols/silc/ops.c:350
-#: src/protocols/silc/ops.c:359
+#: ../src/protocols/silc/ops.c:555 ../src/protocols/silc/ops.c:564
+#: ../src/protocols/silc/ops.c:573
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s ha scelto come argomento di <I>%s</I>: %s"
 
-#: src/protocols/silc/ops.c:425
+#: ../src/protocols/silc/ops.c:639
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> ha impostato le modalit del canale <I>%s</I> a: %s"
 
-#: src/protocols/silc/ops.c:429
+#: ../src/protocols/silc/ops.c:643
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> ha rimosso tutte le modalit del canale <I>%s</I>"
 
-#: src/protocols/silc/ops.c:462
+#: ../src/protocols/silc/ops.c:676
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> ha impostato le modalit di <I>%s</I> a : %s"
 
-#: src/protocols/silc/ops.c:470
+#: ../src/protocols/silc/ops.c:684
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> ha rimosso tutte le modalit di <I>%s</I>"
 
-#: src/protocols/silc/ops.c:499
+#: ../src/protocols/silc/ops.c:713
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "Sei stato espulso (kick) da <I>%s</I> da parte di <I>%s</I> (%s)"
 
-#: src/protocols/silc/ops.c:529 src/protocols/silc/ops.c:534
-#: src/protocols/silc/ops.c:539
+#: ../src/protocols/silc/ops.c:743 ../src/protocols/silc/ops.c:748
+#: ../src/protocols/silc/ops.c:753
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "Sei stato ucciso (kill) da %s (%s)"
 
-#: src/protocols/silc/ops.c:560 src/protocols/silc/ops.c:565
-#: src/protocols/silc/ops.c:570
+#: ../src/protocols/silc/ops.c:774 ../src/protocols/silc/ops.c:779
+#: ../src/protocols/silc/ops.c:784
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "Ucciso (kill) da %s (%s)"
 
-#: src/protocols/silc/ops.c:616
+#: ../src/protocols/silc/ops.c:830
 msgid "Server signoff"
 msgstr "Disconnessione dal server"
 
-#: src/protocols/silc/ops.c:803
+#: ../src/protocols/silc/ops.c:1017
 msgid "Personal Information"
 msgstr "Informazioni personali"
 
-#: src/protocols/silc/ops.c:826
+#: ../src/protocols/silc/ops.c:1040
 msgid "Birth Day"
 msgstr "Compleanno"
 
-#: src/protocols/silc/ops.c:830
-msgid "Job Title"
-msgstr "Impiego"
-
-#: src/protocols/silc/ops.c:834
+#: ../src/protocols/silc/ops.c:1048
 msgid "Job Role"
 msgstr "Posizione lavorativa"
 
-#: src/protocols/silc/ops.c:838
+#: ../src/protocols/silc/ops.c:1052 ../src/protocols/silc/silc.c:941
 msgid "Organization"
 msgstr "Organizzazione"
 
-#: src/protocols/silc/ops.c:842
+#: ../src/protocols/silc/ops.c:1056
 msgid "Unit"
 msgstr "Unit"
 
-#: src/protocols/silc/ops.c:861
-msgid "EMail"
-msgstr "Email"
-
-#: src/protocols/silc/ops.c:866
+#: ../src/protocols/silc/ops.c:1080
 msgid "Note"
 msgstr "Note"
 
-#: src/protocols/silc/ops.c:914
+#: ../src/protocols/silc/ops.c:1128
 msgid "Join Chat"
 msgstr "Entra in chat"
 
-#: src/protocols/silc/ops.c:1070 src/protocols/silc/ops.c:1140
+#: ../src/protocols/silc/ops.c:1183 ../src/protocols/silc/ops.c:1332
+#: ../src/protocols/yahoo/yahoo_profile.c:1046
+#, fuzzy
+msgid "Real Name"
+msgstr "Vero nome"
+
+#: ../src/protocols/silc/ops.c:1211
+msgid "Status Text"
+msgstr "Testo di stato"
+
+#: ../src/protocols/silc/ops.c:1284 ../src/protocols/silc/ops.c:1354
 msgid "Public Key Fingerprint"
 msgstr "Fingerprint della chiave pubblica"
 
-#: src/protocols/silc/ops.c:1071 src/protocols/silc/ops.c:1141
+#: ../src/protocols/silc/ops.c:1285 ../src/protocols/silc/ops.c:1355
 msgid "Public Key Babbleprint"
 msgstr "Babbleprint della chiave pubblica"
 
-#: src/protocols/silc/ops.c:1084
-msgid "More..."
+#: ../src/protocols/silc/ops.c:1298
+#, fuzzy
+msgid "_More..."
 msgstr "Ancora..."
 
-#: src/protocols/silc/ops.c:1155 src/protocols/silc/silc.c:805
+#: ../src/protocols/silc/ops.c:1369 ../src/protocols/silc/silc.c:1007
 msgid "Detach From Server"
 msgstr "Distacca dal server"
 
-#: src/protocols/silc/ops.c:1155
+#: ../src/protocols/silc/ops.c:1369
 msgid "Cannot detach"
 msgstr "Impossibile distaccarsi"
 
-#: src/protocols/silc/ops.c:1166
+#: ../src/protocols/silc/ops.c:1380
 msgid "Cannot set topic"
 msgstr "Impossibile impostare l'argomento"
 
-#: src/protocols/silc/ops.c:1198
+#: ../src/protocols/silc/ops.c:1412
 msgid "Failed to change nickname"
 msgstr "Modifica del nickname non riuscita"
 
-#: src/protocols/silc/ops.c:1246
+#: ../src/protocols/silc/ops.c:1460
 msgid "Roomlist"
 msgstr "Lista delle stanze"
 
-#: src/protocols/silc/ops.c:1246
+#: ../src/protocols/silc/ops.c:1460
 msgid "Cannot get room list"
 msgstr "Impossibile recuperare la lista delle stanze"
 
-#: src/protocols/silc/ops.c:1291
+#: ../src/protocols/silc/ops.c:1505
 msgid "No public key was received"
 msgstr "Non  stata ricevuta nessuna chiave pubblica"
 
-#: src/protocols/silc/ops.c:1304 src/protocols/silc/ops.c:1317
+#: ../src/protocols/silc/ops.c:1518 ../src/protocols/silc/ops.c:1531
 msgid "Server Information"
 msgstr "Informazioni sul server"
 
-#: src/protocols/silc/ops.c:1305
+#: ../src/protocols/silc/ops.c:1519
 msgid "Cannot get server information"
 msgstr "Impossibile ottenere le informazioni sul server"
 
-#: src/protocols/silc/ops.c:1334 src/protocols/silc/ops.c:1343
+#: ../src/protocols/silc/ops.c:1548 ../src/protocols/silc/ops.c:1557
 msgid "Server Statistics"
 msgstr "Statistiche del server"
 
-#: src/protocols/silc/ops.c:1335
+#: ../src/protocols/silc/ops.c:1549
 msgid "Cannot get server statistics"
 msgstr "Impossibile ottenere le statistiche sul server"
 
-#: src/protocols/silc/ops.c:1344
+#: ../src/protocols/silc/ops.c:1558
 msgid "No server statistics available"
 msgstr "Statistiche sul server non disponibili"
 
-#: src/protocols/silc/ops.c:1366
+#: ../src/protocols/silc/ops.c:1580
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -9817,105 +11308,105 @@
 "Operatori server totali: %d\n"
 "Operatori router totali: %d\n"
 
-#: src/protocols/silc/ops.c:1389
+#: ../src/protocols/silc/ops.c:1603
 msgid "Network Statistics"
 msgstr "Statistiche sulla rete"
 
-#: src/protocols/silc/ops.c:1397 src/protocols/silc/ops.c:1402
+#: ../src/protocols/silc/ops.c:1611 ../src/protocols/silc/ops.c:1616
 msgid "Ping"
 msgstr "Ping"
 
-#: src/protocols/silc/ops.c:1397
+#: ../src/protocols/silc/ops.c:1611
 msgid "Ping failed"
 msgstr "Ping non riuscito"
 
-#: src/protocols/silc/ops.c:1402
+#: ../src/protocols/silc/ops.c:1616
 msgid "Ping reply received from server"
 msgstr "Ricevuta risposta al ping dal server"
 
-#: src/protocols/silc/ops.c:1410
+#: ../src/protocols/silc/ops.c:1624
 msgid "Could not kill user"
 msgstr "Impossibile uccidere (kill) l'utente"
 
-#: src/protocols/silc/ops.c:1494
+#: ../src/protocols/silc/ops.c:1708
 msgid "Error during connecting to SILC Server"
 msgstr "Errore nella connessione al server SILC"
 
-#: src/protocols/silc/ops.c:1499
+#: ../src/protocols/silc/ops.c:1713
 msgid "Key Exchange failed"
 msgstr "Scambio delle chiavi fallito"
 
-#: src/protocols/silc/ops.c:1508
+#: ../src/protocols/silc/ops.c:1722
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 "Ripristino della sessione distaccata non riuscito. Fai clic su \"Connetti di "
 "nuovo\" per creare una nuova connessione."
 
-#: src/protocols/silc/ops.c:1543
+#: ../src/protocols/silc/ops.c:1757
 msgid "Disconnected by server"
 msgstr "Disconnesso dal server"
 
-#: src/protocols/silc/ops.c:1605 src/protocols/silc/ops.c:1652
-#: src/protocols/silc/silc.c:194
+#: ../src/protocols/silc/ops.c:1819 ../src/protocols/silc/ops.c:1866
+#: ../src/protocols/silc/silc.c:199
 msgid "Resuming session"
 msgstr "Ripristino della sessione in corso"
 
-#: src/protocols/silc/ops.c:1607
+#: ../src/protocols/silc/ops.c:1821
 msgid "Authenticating connection"
 msgstr "Autenticazione della connessione in corso"
 
-#: src/protocols/silc/ops.c:1654
+#: ../src/protocols/silc/ops.c:1868
 msgid "Verifying server public key"
 msgstr "Verifica della chiave pubblica del server in corso"
 
-#: src/protocols/silc/ops.c:1695
+#: ../src/protocols/silc/ops.c:1909
 msgid "Passphrase required"
 msgstr "Passphrase richiesta"
 
-#: src/protocols/silc/ops.c:1724
+#: ../src/protocols/silc/ops.c:1938
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Non riuscito: Versioni non coincidenti. Aggiorna il tuo client"
 
-#: src/protocols/silc/ops.c:1727
+#: ../src/protocols/silc/ops.c:1941
 msgid "Failure: Remote does not trust/support your public key"
 msgstr ""
 "Non riuscito: La controparte non accetta o non supporta la tua chiave "
 "pubblica"
 
-#: src/protocols/silc/ops.c:1730
+#: ../src/protocols/silc/ops.c:1944
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Non riuscito: La controparte non supporta il gruppo KE proposto"
 
-#: src/protocols/silc/ops.c:1733
+#: ../src/protocols/silc/ops.c:1947
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Non riuscito: La controparte non supporta il cipher proposto"
 
-#: src/protocols/silc/ops.c:1736
+#: ../src/protocols/silc/ops.c:1950
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Non riuscito: La controparte non supporta il PKCS proposto"
 
-#: src/protocols/silc/ops.c:1739
+#: ../src/protocols/silc/ops.c:1953
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Non riuscito: La controparte non supporta la funzione di hash proposta"
 
-#: src/protocols/silc/ops.c:1742
+#: ../src/protocols/silc/ops.c:1956
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Non riuscito: La controparte non supporta l'HMAC proposto"
 
-#: src/protocols/silc/ops.c:1744
+#: ../src/protocols/silc/ops.c:1958
 msgid "Failure: Incorrect signature"
 msgstr "Non riuscito: Firma non corretta"
 
-#: src/protocols/silc/ops.c:1746
+#: ../src/protocols/silc/ops.c:1960
 msgid "Failure: Invalid cookie"
 msgstr "Non riuscito: Cookie non valido"
 
-#: src/protocols/silc/ops.c:1757
+#: ../src/protocols/silc/ops.c:1971
 msgid "Failure: Authentication failed"
 msgstr "Non riuscito: Autenticazione fallita"
 
-#: src/protocols/silc/pk.c:103
+#: ../src/protocols/silc/pk.c:103
 #, c-format
 msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
@@ -9924,12 +11415,12 @@
 "Ricevuta la chiave pubblica di %s. La tua copia locale non coincide con "
 "questa chiave. Vuoi accettare in ogni caso questa chiave pubblica?"
 
-#: src/protocols/silc/pk.c:108
+#: ../src/protocols/silc/pk.c:108
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr "Ricevuta la chiave pubblica di %s. Vuoi accettare questa chiave?"
 
-#: src/protocols/silc/pk.c:112
+#: ../src/protocols/silc/pk.c:112
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -9942,48 +11433,67 @@
 "%s\n"
 "%s\n"
 
-#: src/protocols/silc/pk.c:115 src/protocols/silc/pk.c:140
+#: ../src/protocols/silc/pk.c:115 ../src/protocols/silc/pk.c:140
 msgid "Verify Public Key"
 msgstr "Verifica della chiave pubblica"
 
-#: src/protocols/silc/pk.c:119
-msgid "View..."
+#: ../src/protocols/silc/pk.c:119
+#, fuzzy
+msgid "_View..."
 msgstr "Vedi..."
 
-#: src/protocols/silc/pk.c:141
+#: ../src/protocols/silc/pk.c:141
 msgid "Unsupported public key type"
 msgstr "Tipo di chiave pubblica non supportato"
 
-#: src/protocols/silc/silc.c:154
+#: ../src/protocols/silc/silc.c:158
 msgid "Connection failed"
 msgstr "Connessione fallita"
 
-#: src/protocols/silc/silc.c:186
+#: ../src/protocols/silc/silc.c:191
 msgid "Cannot initialize SILC Client connection"
 msgstr "Impossibile inizializzare la connessione client SILC"
 
-#: src/protocols/silc/silc.c:197
+#: ../src/protocols/silc/silc.c:202
 msgid "Performing key exchange"
 msgstr "Scambio delle chiavi in corso"
 
-#: src/protocols/silc/silc.c:270
+#: ../src/protocols/silc/silc.c:287
 msgid "Out of memory"
 msgstr "Memoria esaurita"
 
+#: ../src/protocols/silc/silc.c:328
+msgid "Cannot initialize SILC protocol"
+msgstr "Impossibile inizializzare il protocollo SILC"
+
+#: ../src/protocols/silc/silc.c:335
+#, fuzzy
+msgid "Cannot find/access ~/.silc directory"
+msgstr "Impossibile inviare una directory."
+
 #. Progress
-#: src/protocols/silc/silc.c:309
+#: ../src/protocols/silc/silc.c:340
 msgid "Connecting to SILC Server"
 msgstr "Connessione al server SILC in corso"
 
-#: src/protocols/silc/silc.c:630
+#: ../src/protocols/silc/silc.c:349
+#, fuzzy, c-format
+msgid "Could not load SILC key pair: %s"
+msgstr "Impossibile caricare la chiave pubblica"
+
+#: ../src/protocols/silc/silc.c:369
+msgid "Unable to create connection"
+msgstr "Impossibile creare la connessione"
+
+#: ../src/protocols/silc/silc.c:668
 msgid "Your Current Mood"
 msgstr "Il tuo umore attuale"
 
-#: src/protocols/silc/silc.c:632
-msgid "Normal"
-msgstr "Normale"
-
-#: src/protocols/silc/silc.c:657
+#: ../src/protocols/silc/silc.c:684
+msgid "In love"
+msgstr "Innamorato"
+
+#: ../src/protocols/silc/silc.c:695
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9991,43 +11501,43 @@
 "\n"
 "I tuoi metodi di contatto preferiti"
 
-#: src/protocols/silc/silc.c:665 src/protocols/silc/util.c:517
+#: ../src/protocols/silc/silc.c:703 ../src/protocols/silc/util.c:532
 msgid "SMS"
 msgstr "SMS"
 
-#: src/protocols/silc/silc.c:667 src/protocols/silc/util.c:519
+#: ../src/protocols/silc/silc.c:705 ../src/protocols/silc/util.c:534
 msgid "MMS"
 msgstr "MMS"
 
-#: src/protocols/silc/silc.c:669 src/protocols/silc/util.c:521
-msgid "Video Conferencing"
+#: ../src/protocols/silc/silc.c:707
+msgid "Video conferencing"
 msgstr "Video conferenza"
 
-#: src/protocols/silc/silc.c:674
+#: ../src/protocols/silc/silc.c:712
 msgid "Your Current Status"
 msgstr "Il tuo stato attuale"
 
-#: src/protocols/silc/silc.c:681
+#: ../src/protocols/silc/silc.c:719
 msgid "Online Services"
 msgstr "Servizi on line"
 
-#: src/protocols/silc/silc.c:684
+#: ../src/protocols/silc/silc.c:722
 msgid "Let others see what services you are using"
 msgstr "Lascia che gli altri vedono quali servizi stai usando"
 
-#: src/protocols/silc/silc.c:690
+#: ../src/protocols/silc/silc.c:728
 msgid "Let others see what computer you are using"
 msgstr "Lascia che gli altri vedano quale computer stai usando"
 
-#: src/protocols/silc/silc.c:697
+#: ../src/protocols/silc/silc.c:735
 msgid "Your VCard File"
 msgstr "Il tuo file VCard"
 
-#: src/protocols/silc/silc.c:710 src/protocols/silc/silc.c:711
+#: ../src/protocols/silc/silc.c:747 ../src/protocols/silc/silc.c:748
 msgid "User Online Status Attributes"
 msgstr "Attributi di stato degli utenti"
 
-#: src/protocols/silc/silc.c:712
+#: ../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 "
@@ -10037,130 +11547,173 @@
 "connessione e le tue informazioni personali. Immetti le informazioni che "
 "vuoi rendere note agli altri utenti."
 
-#: src/protocols/silc/silc.c:752 src/protocols/silc/silc.c:758
-#: src/protocols/silc/silc.c:1162
+#: ../src/protocols/silc/silc.c:789 ../src/protocols/silc/silc.c:795
+#: ../src/protocols/silc/silc.c:1434
 msgid "Message of the Day"
 msgstr "Messaggio del giorno"
 
-#: src/protocols/silc/silc.c:752
+#: ../src/protocols/silc/silc.c:789
 msgid "No Message of the Day available"
 msgstr "Nessun messaggio del giorno disponibile"
 
-#: src/protocols/silc/silc.c:753 src/protocols/silc/silc.c:1157
+#: ../src/protocols/silc/silc.c:790 ../src/protocols/silc/silc.c:1429
 msgid "There is no Message of the Day associated with this connection"
 msgstr "Non c' nessun messaggio del giorno associato con questa connessione"
 
-#: src/protocols/silc/silc.c:800
+#: ../src/protocols/silc/silc.c:841 ../src/protocols/silc/silc.c:885
+#: ../src/protocols/silc/silc.c:956 ../src/protocols/silc/silc.c:957
+#, fuzzy
+msgid "Create New SILC Key Pair"
+msgstr "Creazione della coppia di chiavi SILC in corso..."
+
+#: ../src/protocols/silc/silc.c:841
+#, fuzzy
+msgid "Passphrases do not match"
+msgstr "Le nuove password non coincidono."
+
+#: ../src/protocols/silc/silc.c:885
+#, fuzzy
+msgid "Key Pair Generation failed"
+msgstr "Scambio delle chiavi fallito"
+
+#: ../src/protocols/silc/silc.c:924
+msgid "Key length"
+msgstr "Lunghezza della chiave"
+
+#: ../src/protocols/silc/silc.c:926
+msgid "Public key file"
+msgstr "File per la chiave pubblica"
+
+#: ../src/protocols/silc/silc.c:928
+msgid "Private key file"
+msgstr "File per la chiave privata"
+
+#: ../src/protocols/silc/silc.c:951
+#, fuzzy
+msgid "Passphrase (retype)"
+msgstr "Password inviata"
+
+#: ../src/protocols/silc/silc.c:958
+#, fuzzy
+msgid "Generate Key Pair"
+msgstr "File per la chiave privata"
+
+#: ../src/protocols/silc/silc.c:1002
 msgid "Online Status"
 msgstr "Stato di connessione"
 
-#: src/protocols/silc/silc.c:809
+#: ../src/protocols/silc/silc.c:1011
 msgid "View Message of the Day"
 msgstr "Visualizza il messaggio del giorno"
 
-#: src/protocols/silc/silc.c:882
+#: ../src/protocols/silc/silc.c:1015
+#, fuzzy
+msgid "Create SILC Key Pair..."
+msgstr "Creazione della coppia di chiavi SILC in corso..."
+
+#: ../src/protocols/silc/silc.c:1114
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "L'utente <I>%s</I> non  presente nella rete"
 
-#: src/protocols/silc/silc.c:1033
+#: ../src/protocols/silc/silc.c:1305
 msgid "Topic too long"
 msgstr "Argomento troppo lungo"
 
-#: src/protocols/silc/silc.c:1114
+#: ../src/protocols/silc/silc.c:1386
 msgid "You must specify a nick"
 msgstr "Devi specificare un nick"
 
-#: src/protocols/silc/silc.c:1216
+#: ../src/protocols/silc/silc.c:1488
 #, c-format
 msgid "channel %s not found"
 msgstr "canale %s non trovato"
 
-#: src/protocols/silc/silc.c:1221
+#: ../src/protocols/silc/silc.c:1493
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "modalit del canale per %s: %s"
 
-#: src/protocols/silc/silc.c:1223
+#: ../src/protocols/silc/silc.c:1495
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "non  impostata alcuna modalit del canale su %s"
 
-#: src/protocols/silc/silc.c:1236
+#: ../src/protocols/silc/silc.c:1508
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Impossibile impostare i cmodes per %s"
 
-#: src/protocols/silc/silc.c:1266
+#: ../src/protocols/silc/silc.c:1538
 #, c-format
 msgid "Unknown command: %s, (may be a Gaim bug)"
 msgstr "Comando sconosciuto: %s, (potrebbe essere un bug di Gaim)"
 
-#: src/protocols/silc/silc.c:1329
+#: ../src/protocols/silc/silc.c:1601
 msgid "part [channel]:  Leave the chat"
 msgstr "part [canale]: Abbandona la chat"
 
-#: src/protocols/silc/silc.c:1333
+#: ../src/protocols/silc/silc.c:1605
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [canale]: Abbandona la chat"
 
-#: src/protocols/silc/silc.c:1337
+#: ../src/protocols/silc/silc.c:1609
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;nuovo argomento&gt;]: Visualizza o modifica l'argomento."
 
-#: src/protocols/silc/silc.c:1342
+#: ../src/protocols/silc/silc.c:1614
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr ""
 "join: &lt;canale&gt; [&lt;password&gt;]: Entra in una chat su questa rete."
 
-#: src/protocols/silc/silc.c:1346
+#: ../src/protocols/silc/silc.c:1618
 msgid "list:  List channels on this network"
 msgstr "list: Elenca i canali presenti su questa rete"
 
-#: src/protocols/silc/silc.c:1350
+#: ../src/protocols/silc/silc.c:1622
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;nick&gt;: Visualizza le informazioni sul nick"
 
-#: src/protocols/silc/silc.c:1354 src/protocols/zephyr/zephyr.c:2597
+#: ../src/protocols/silc/silc.c:1626 ../src/protocols/zephyr/zephyr.c:2622
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
 "msg &lt;nick&gt; &lt;messaggio&gt;: Invia un messaggio privato ad un utente"
 
-#: src/protocols/silc/silc.c:1358
+#: ../src/protocols/silc/silc.c:1630
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 "query &lt;nick&gt; [&lt;message&gt;]: Invia un messaggio privato ad un utente"
 
-#: src/protocols/silc/silc.c:1362
+#: ../src/protocols/silc/silc.c:1634
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd: Visualizza il messaggio del giorno"
 
-#: src/protocols/silc/silc.c:1366
+#: ../src/protocols/silc/silc.c:1638
 msgid "detach:  Detach this session"
 msgstr "detach: Distacca questa sessione"
 
-#: src/protocols/silc/silc.c:1370
+#: ../src/protocols/silc/silc.c:1642
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [messaggio]: Disconnette dal server, con un messaggio opzionale"
 
-#: src/protocols/silc/silc.c:1374
+#: ../src/protocols/silc/silc.c:1646
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;comando&gt;: Richiama qualunque comando client silc"
 
-#: src/protocols/silc/silc.c:1380
+#: ../src/protocols/silc/silc.c:1652
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr ""
 "kill &lt;nick&gt; [-pubkey|&lt;motivo&gt;]: Uccide (kill) il nick indicato"
 
-#: src/protocols/silc/silc.c:1384
+#: ../src/protocols/silc/silc.c:1656
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;nuovo nickname&gt;: Cambia il tuo nickname"
 
-#: src/protocols/silc/silc.c:1388
+#: ../src/protocols/silc/silc.c:1660
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;nick&gt;: Visualizza le informazioni sul nick"
 
-#: src/protocols/silc/silc.c:1392
+#: ../src/protocols/silc/silc.c:1664
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -10168,7 +11721,7 @@
 "cmode &lt;canale&gt; [+|-&lt;modalit&gt;] [argomenti]: Cambia o mostra le "
 "modalit del canale"
 
-#: src/protocols/silc/silc.c:1396
+#: ../src/protocols/silc/silc.c:1668
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -10176,16 +11729,16 @@
 "cumode &lt;canale&gt; +|-&lt;modalit&gt; &lt;nick&gt;: Cambia le modalit "
 "sul canale per il nick indicato"
 
-#: src/protocols/silc/silc.c:1400
+#: ../src/protocols/silc/silc.c:1672
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;modalit utente&gt;: Imposta le tue modalit nella rete"
 
-#: src/protocols/silc/silc.c:1404
+#: ../src/protocols/silc/silc.c:1676
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr ""
 "oper &lt;nick&gt; [-pubkey]: Ottiene i privilegi di operatore del server"
 
-#: src/protocols/silc/silc.c:1408
+#: ../src/protocols/silc/silc.c:1680
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -10193,40 +11746,40 @@
 "invite &lt;canale&gt; [-|+]&lt;nick&gt;: invita il nick indicato o lo "
 "aggiunge/rimuove dalla lista degli inviti del canale"
 
-#: src/protocols/silc/silc.c:1412
+#: ../src/protocols/silc/silc.c:1684
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 "kick &lt;canale&gt; &lt;nick&gt; [commento]: Espelle (kick) il client dal "
 "canale"
 
-#: src/protocols/silc/silc.c:1416
+#: ../src/protocols/silc/silc.c:1688
 msgid "info [server]:  View server administrative details"
 msgstr "info [server]: Visualizza dettagli amministrativi del server"
 
-#: src/protocols/silc/silc.c:1420
+#: ../src/protocols/silc/silc.c:1692
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr ""
 "ban [&lt;canale&gt; +|-&lt;nick&gt;]: Allontana (ban) il client dal canale"
 
-#: src/protocols/silc/silc.c:1424
+#: ../src/protocols/silc/silc.c:1696
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 "getkey &lt;nick|server&gt;: Recupera la chiave pubblica del client o del "
 "server"
 
-#: src/protocols/silc/silc.c:1428
+#: ../src/protocols/silc/silc.c:1700
 msgid "stats:  View server and network statistics"
 msgstr "stats: Visualizza le statistiche del server e della rete"
 
-#: src/protocols/silc/silc.c:1432
+#: ../src/protocols/silc/silc.c:1704
 msgid "ping:  Send PING to the connected server"
 msgstr "ping: Invia un PING al server a cui si  connessi"
 
-#: src/protocols/silc/silc.c:1437
+#: ../src/protocols/silc/silc.c:1709
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;canale&gt;: Elenca gli utenti presenti nel canale."
 
-#: src/protocols/silc/silc.c:1441
+#: ../src/protocols/silc/silc.c:1713
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -10234,30 +11787,6 @@
 "names [-count|-ops|-halfops|-voices|-normal] &lt;canale(i)&gt;: Elenca "
 "utenti specifici nel canale (nei canali)"
 
-#: src/protocols/silc/silc.c:1453
-msgid "Instant Messages"
-msgstr "Messaggi immediati"
-
-#: src/protocols/silc/silc.c:1458
-msgid "Digitally sign all IM messages"
-msgstr "Firma tutti i messaggi immediati"
-
-#: src/protocols/silc/silc.c:1463
-msgid "Verify all IM message signatures"
-msgstr "Verifica tutte le firme dei MI"
-
-#: src/protocols/silc/silc.c:1466
-msgid "Channel Messages"
-msgstr "Messaggi del canale"
-
-#: src/protocols/silc/silc.c:1471
-msgid "Digitally sign all channel messages"
-msgstr "Firma tutti i messaggi del canale"
-
-#: src/protocols/silc/silc.c:1476
-msgid "Verify all channel message signatures"
-msgstr "Verifica tutte le firme dei messaggi del canale"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -10267,91 +11796,113 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1564
+#: ../src/protocols/silc/silc.c:1822
 msgid "SILC Protocol Plugin"
 msgstr "Plugin per il protocollo SILC"
 
 #. *  description
-#: src/protocols/silc/silc.c:1566
+#: ../src/protocols/silc/silc.c:1824
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Protocollo Secure Internet Live Conferencing (SILC)"
 
-#: src/protocols/silc/silc.c:1600
+#: ../src/protocols/silc/silc.c:1861
 msgid "Public Key file"
 msgstr "File per la chiave pubblica"
 
-#: src/protocols/silc/silc.c:1604
+#: ../src/protocols/silc/silc.c:1865
 msgid "Private Key file"
 msgstr "File per la chiave privata"
 
-#: src/protocols/silc/silc.c:1607
+#: ../src/protocols/silc/silc.c:1875
+msgid "Cipher"
+msgstr ""
+
+#: ../src/protocols/silc/silc.c:1885
+msgid "HMAC"
+msgstr ""
+
+#: ../src/protocols/silc/silc.c:1888
 msgid "Public key authentication"
 msgstr "Autenticazione con chiave pubblica"
 
-#: src/protocols/silc/silc.c:1611
+#: ../src/protocols/silc/silc.c:1891
 msgid "Reject watching by other users"
 msgstr "Rifiuta di essere osservato dagli altri utenti"
 
-#: src/protocols/silc/silc.c:1614
+#: ../src/protocols/silc/silc.c:1894
 msgid "Block invites"
 msgstr "Blocca gli inviti"
 
-#: src/protocols/silc/silc.c:1617
+#: ../src/protocols/silc/silc.c:1897
 msgid "Block IMs without Key Exchange"
 msgstr "Blocca i MI senza scambio di chiavi"
 
-#: src/protocols/silc/silc.c:1620
+#: ../src/protocols/silc/silc.c:1900
 msgid "Reject online status attribute requests"
 msgstr "Rifiuta le richieste di attributi di stato"
 
-#: src/protocols/silc/util.c:205 src/protocols/silc/util.c:230
+#: ../src/protocols/silc/silc.c:1903
+msgid "Block messages to whiteboard"
+msgstr ""
+
+#: ../src/protocols/silc/silc.c:1906
+#, fuzzy
+msgid "Automatically open whiteboard"
+msgstr "_Massimizza automaticamente le liste dei contatti"
+
+#: ../src/protocols/silc/silc.c:1909
+#, fuzzy
+msgid "Digitally sign and verify all messages"
+msgstr "Firma tutti i messaggi immediati"
+
+#: ../src/protocols/silc/util.c:207 ../src/protocols/silc/util.c:233
 msgid "Creating SILC key pair..."
 msgstr "Creazione della coppia di chiavi SILC in corso..."
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: src/protocols/silc/util.c:313
+#: ../src/protocols/silc/util.c:328
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Vero nome: \t%s\n"
 
-#: src/protocols/silc/util.c:315
+#: ../src/protocols/silc/util.c:330
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Nome utente: \t%s\n"
 
-#: src/protocols/silc/util.c:317
-#, c-format
-msgid "EMail: \t\t%s\n"
+#: ../src/protocols/silc/util.c:332
+#, c-format
+msgid "E-Mail: \t\t%s\n"
 msgstr "Email: \t\t%s\n"
 
-#: src/protocols/silc/util.c:319
+#: ../src/protocols/silc/util.c:334
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Nome host: \t%s\n"
 
-#: src/protocols/silc/util.c:321
+#: ../src/protocols/silc/util.c:336
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Organizzazione: \t%s\n"
 
-#: src/protocols/silc/util.c:323
+#: ../src/protocols/silc/util.c:338
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "Paese: \t%s\n"
 
-#: src/protocols/silc/util.c:324
+#: ../src/protocols/silc/util.c:339
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algoritmo: \t%s\n"
 
-#: src/protocols/silc/util.c:325
-#, c-format
-msgid "Key length: \t%d bits\n"
+#: ../src/protocols/silc/util.c:340
+#, c-format
+msgid "Key Length: \t%d bits\n"
 msgstr "Lunghezza della chiave: \t%d bit\n"
 
-#: src/protocols/silc/util.c:327
+#: ../src/protocols/silc/util.c:342
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -10362,7 +11913,7 @@
 "%s\n"
 "\n"
 
-#: src/protocols/silc/util.c:328
+#: ../src/protocols/silc/util.c:343
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -10371,145 +11922,239 @@
 "Babbleprint della chiave pubblica:\n"
 "%s"
 
-#: src/protocols/silc/util.c:332 src/protocols/silc/util.c:333
+#: ../src/protocols/silc/util.c:347 ../src/protocols/silc/util.c:348
 msgid "Public Key Information"
 msgstr "Informazioni sulla chiave pubblica"
 
-#: src/protocols/silc/util.c:515
+#: ../src/protocols/silc/util.c:530
 msgid "Paging"
 msgstr "Numero del pager"
 
-#: src/protocols/silc/util.c:539
+#: ../src/protocols/silc/util.c:536
+msgid "Video Conferencing"
+msgstr "Video conferenza"
+
+#: ../src/protocols/silc/util.c:554
 msgid "Computer"
 msgstr "Computer"
 
-#: src/protocols/silc/util.c:543
+#: ../src/protocols/silc/util.c:558
 msgid "PDA"
 msgstr "PDA"
 
-#: src/protocols/silc/util.c:545
+#: ../src/protocols/silc/util.c:560
 msgid "Terminal"
 msgstr "Terminale"
 
-#: src/protocols/toc/toc.c:139
+#: ../src/protocols/silc/wb.c:284
+#, c-format
+msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
+msgstr ""
+
+#: ../src/protocols/silc/wb.c:288
+#, c-format
+msgid ""
+"%s sent message to whiteboard on %s channel. Would you like to open the "
+"whiteboard?"
+msgstr ""
+
+#: ../src/protocols/silc/wb.c:302
+msgid "Whiteboard"
+msgstr ""
+
+#. TODO: do we really want to disconnect on a failure to write?
+#: ../src/protocols/simple/simple.c:411
+#, fuzzy
+msgid "Could not write"
+msgstr "Impossibile inviare"
+
+#: ../src/protocols/simple/simple.c:426 ../src/protocols/simple/simple.c:1425
+msgid "Could not connect"
+msgstr "Impossibile connettersi"
+
+#: ../src/protocols/simple/simple.c:997
+msgid "Wrong Password"
+msgstr "Password errata"
+
+#: ../src/protocols/simple/simple.c:1456 ../src/protocols/simple/simple.c:1495
+#: ../src/protocols/simple/simple.c:1507 ../src/protocols/simple/simple.c:1565
+msgid "Could not create listen socket"
+msgstr "Impossibile creare il socket in ascolto"
+
+#: ../src/protocols/simple/simple.c:1477
+#, fuzzy
+msgid "Couldn't resolve host"
+msgstr "Impossibile connettersi all'host"
+
+#: ../src/protocols/simple/simple.c:1587
+#, fuzzy
+msgid "SIP usernames may not contain whitespaces or @ symbols"
+msgstr "I nick IRC non devono contenere spazi bianchi"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: ../src/protocols/simple/simple.c:1749
+#, fuzzy
+msgid "SIP/SIMPLE Protocol Plugin"
+msgstr "Plugin per il protocollo SILC"
+
+#. *  summary
+#: ../src/protocols/simple/simple.c:1750
+#, fuzzy
+msgid "The SIP/SIMPLE Protocol Plugin"
+msgstr "Plugin per il protocollo SILC"
+
+#: ../src/protocols/simple/simple.c:1772
+msgid "Publish status (note: everyone may watch you)"
+msgstr ""
+
+#: ../src/protocols/simple/simple.c:1778
+msgid "Use UDP"
+msgstr "Utilizza UDP"
+
+#: ../src/protocols/simple/simple.c:1780
+msgid "Use proxy"
+msgstr "Utilizza proxy"
+
+#: ../src/protocols/simple/simple.c:1782
+msgid "Proxy"
+msgstr "Proxy"
+
+#: ../src/protocols/simple/simple.c:1784
+#, fuzzy
+msgid "Auth User"
+msgstr "Utente AP"
+
+#: ../src/protocols/simple/simple.c:1786
+#, fuzzy
+msgid "Auth Domain"
+msgstr "Automatico"
+
+#: ../src/protocols/toc/toc.c:139
 #, c-format
 msgid "Looking up %s"
 msgstr "Ricerca di %s in corso"
 
-#: src/protocols/toc/toc.c:148
+#: ../src/protocols/toc/toc.c:148
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Connessione a %s fallita"
 
-#: src/protocols/toc/toc.c:200
+#: ../src/protocols/toc/toc.c:200
 #, c-format
 msgid "Signon: %s"
 msgstr "Connessione a: %s"
 
-#: src/protocols/toc/toc.c:482
+#: ../src/protocols/toc/toc.c:482
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Impossibile scrivere il file %s."
 
-#: src/protocols/toc/toc.c:485
+#: ../src/protocols/toc/toc.c:485
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Impossibile leggere il file %s."
 
-#: src/protocols/toc/toc.c:488
+#: ../src/protocols/toc/toc.c:488
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Messaggio troppo lungo. Troncati gli ultimi %s byte."
 
-#: src/protocols/toc/toc.c:491
+#: ../src/protocols/toc/toc.c:491
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s non  attualmente connesso."
 
-#: src/protocols/toc/toc.c:494
+#: ../src/protocols/toc/toc.c:494
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Richiamo a %s non consentito."
 
-#: src/protocols/toc/toc.c:497
+#: ../src/protocols/toc/toc.c:497
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr ""
 "Un messaggio  stato rifiutato. Stai superando il limite di velocit del "
 "server."
 
-#: src/protocols/toc/toc.c:500
+#: ../src/protocols/toc/toc.c:500
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "La chat in %s non  disponibile."
 
-#: src/protocols/toc/toc.c:503
+#: ../src/protocols/toc/toc.c:503
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Stai inviando troppo velocemente messaggi a %s."
 
-#: src/protocols/toc/toc.c:506
+#: ../src/protocols/toc/toc.c:506
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "Non hai ricevuto un messaggio da %s poich era troppo grande."
 
-#: src/protocols/toc/toc.c:509
+#: ../src/protocols/toc/toc.c:509
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr ""
 "Non hai ricevuto un messaggio da %s poich  stato spedito troppo "
 "velocemente."
 
-#: src/protocols/toc/toc.c:512
+#: ../src/protocols/toc/toc.c:512
 msgid "Failure."
 msgstr "Fallimento."
 
-#: src/protocols/toc/toc.c:515
+#: ../src/protocols/toc/toc.c:515
 msgid "Too many matches."
 msgstr "Troppe corrispondenze."
 
-#: src/protocols/toc/toc.c:518
+#: ../src/protocols/toc/toc.c:518
 msgid "Need more qualifiers."
 msgstr "Servono pi qualificatori."
 
-#: src/protocols/toc/toc.c:521
+#: ../src/protocols/toc/toc.c:521
 msgid "Dir service temporarily unavailable."
 msgstr "Servizio di directory temporaneamente non disponibile."
 
-#: src/protocols/toc/toc.c:524
+#: ../src/protocols/toc/toc.c:524
 msgid "E-mail lookup restricted."
 msgstr "Ricerca e-mail limitata."
 
-#: src/protocols/toc/toc.c:527
+#: ../src/protocols/toc/toc.c:527
 msgid "Keyword ignored."
 msgstr "Parola chiave ignorata."
 
-#: src/protocols/toc/toc.c:530
+#: ../src/protocols/toc/toc.c:530
 msgid "No keywords."
 msgstr "Nessuna parola chiave."
 
-#: src/protocols/toc/toc.c:533
+#: ../src/protocols/toc/toc.c:533
 msgid "User has no directory information."
 msgstr "Non c' nessuna informazione sull'utente nella directory."
 
-#: src/protocols/toc/toc.c:537
+#: ../src/protocols/toc/toc.c:537
 msgid "Country not supported."
 msgstr "Paese non supportato."
 
-#: src/protocols/toc/toc.c:540
+#: ../src/protocols/toc/toc.c:540
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Errore sconosciuto: %s."
 
-#: src/protocols/toc/toc.c:546
+#: ../src/protocols/toc/toc.c:546
 msgid "The service is temporarily unavailable."
 msgstr "Il servizio  temporaneamente non disponibile."
 
-#: src/protocols/toc/toc.c:549
+#: ../src/protocols/toc/toc.c:549
 msgid "Your warning level is currently too high to log in."
 msgstr ""
 "Il tuo livello di richiamo  attualmente troppo alto per poterti connettere."
 
-#: src/protocols/toc/toc.c:552
+#: ../src/protocols/toc/toc.c:552
 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."
@@ -10517,42 +12162,41 @@
 "Ti sei connesso e disconnesso troppo frequentemente. Attendi 10 minuti e "
 "riprova. Se continui a provare, avrai bisogno di aspettare ancora di pi."
 
-#: src/protocols/toc/toc.c:554
+#: ../src/protocols/toc/toc.c:554
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Si  verificato un errore sconosciuto di connessione: %s."
 
-#: src/protocols/toc/toc.c:557
+#: ../src/protocols/toc/toc.c:557
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "Si  verificato un errore sconosciuto, %d. Info: %s"
 
-#: src/protocols/toc/toc.c:584
-#, fuzzy
+#: ../src/protocols/toc/toc.c:584
 msgid "Invalid Groupname"
-msgstr "Gruppo non valido"
-
-#: src/protocols/toc/toc.c:668
+msgstr "Nome gruppo non valido"
+
+#: ../src/protocols/toc/toc.c:668
 msgid "Connection Closed"
 msgstr "Connessione chiusa"
 
-#: src/protocols/toc/toc.c:708
+#: ../src/protocols/toc/toc.c:708
 msgid "Waiting for reply..."
 msgstr "In attesa di risposta..."
 
-#: src/protocols/toc/toc.c:786
+#: ../src/protocols/toc/toc.c:786
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC  ritornato dalla pausa. Puoi nuovamente inviare messaggi."
 
-#: src/protocols/toc/toc.c:989
+#: ../src/protocols/toc/toc.c:989
 msgid "Password Change Successful"
 msgstr "Password modificata con successo"
 
-#: src/protocols/toc/toc.c:993
+#: ../src/protocols/toc/toc.c:993
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC ha inviato un comando PAUSE."
 
-#: src/protocols/toc/toc.c:994
+#: ../src/protocols/toc/toc.c:994
 msgid ""
 "When this happens, TOC ignores any messages sent to it, and may kick you off "
 "if you send a message. Gaim will prevent anything from going through. This "
@@ -10562,45 +12206,49 @@
 "disconnetterti se invii un messaggio. Gaim impedir che le cose vadano male. "
 " solo un problema temporaneo, sii paziente."
 
-#: src/protocols/toc/toc.c:1549
+#: ../src/protocols/toc/toc.c:1549
 msgid "Get Dir Info"
 msgstr "Ottieni informazioni dalla Directory"
 
-#: src/protocols/toc/toc.c:1689
+#: ../src/protocols/toc/toc.c:1689
 msgid "Set Dir Info"
 msgstr "Imposta le informazioni sulla Directory"
 
-#: src/protocols/toc/toc.c:1811
+#: ../src/protocols/toc/toc.c:1694
+msgid "Change Password"
+msgstr "Cambia password"
+
+#: ../src/protocols/toc/toc.c:1811
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "Impossibile aprire %s in scrittura!"
 
-#: src/protocols/toc/toc.c:1847
+#: ../src/protocols/toc/toc.c:1847
 msgid "File transfer failed; other side probably canceled."
 msgstr ""
 "Trasferimento file fallito: probabilmente  stato annullato dall'altra parte."
 
-#: src/protocols/toc/toc.c:1892 src/protocols/toc/toc.c:1932
-#: src/protocols/toc/toc.c:2056 src/protocols/toc/toc.c:2144
+#: ../src/protocols/toc/toc.c:1892 ../src/protocols/toc/toc.c:1932
+#: ../src/protocols/toc/toc.c:2056 ../src/protocols/toc/toc.c:2144
 msgid "Could not connect for transfer."
 msgstr "Impossibile connettersi per il trasferimento."
 
-#: src/protocols/toc/toc.c:2089
+#: ../src/protocols/toc/toc.c:2089
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "Impossibile scrivere l'header del file. Il file non verr inviato."
 
-#: src/protocols/toc/toc.c:2189
+#: ../src/protocols/toc/toc.c:2189
 msgid "Gaim - Save As..."
 msgstr "Gaim - Salva con nome..."
 
-#: src/protocols/toc/toc.c:2223
+#: ../src/protocols/toc/toc.c:2223
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] "%s chiede a %s di accettare %d file: %s (%.2f %s)%s%s"
 msgstr[1] "%s chiede a %s di accettare %d file: %s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:2230
+#: ../src/protocols/toc/toc.c:2230
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s chiede che tu gli invii un file"
@@ -10615,27 +12263,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2316 src/protocols/toc/toc.c:2318
+#: ../src/protocols/toc/toc.c:2319 ../src/protocols/toc/toc.c:2321
 msgid "TOC Protocol Plugin"
 msgstr "Plugin per il protocollo TOC"
 
-#: src/protocols/toc/toc.c:2337
-msgid "TOC host"
-msgstr "Host TOC"
-
-#: src/protocols/toc/toc.c:2341
-msgid "TOC port"
-msgstr "Porta TOC"
-
-#: src/protocols/yahoo/yahoo.c:706
+#: ../src/protocols/yahoo/yahoo.c:710
 msgid "Your Yahoo! message did not get sent."
 msgstr "Il tuo messaggio di Yahoo! non  stato inviato."
 
-#: src/protocols/yahoo/yahoo.c:752 src/protocols/yahoo/yahoo.c:3499
+#: ../src/protocols/yahoo/yahoo.c:764 ../src/protocols/yahoo/yahoo.c:3564
 msgid "Buzz!!"
 msgstr "Buzz!!"
 
-#: src/protocols/yahoo/yahoo.c:797
+#: ../src/protocols/yahoo/yahoo.c:809
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Messaggio di sistema Yahoo! per %s:"
@@ -10643,24 +12283,24 @@
 #. TODO: this is almost exactly the same as what MSN does,
 #. * this should probably be moved to the core.
 #.
-#: src/protocols/yahoo/yahoo.c:887
+#: ../src/protocols/yahoo/yahoo.c:905
 #, fuzzy, c-format
 msgid "The user %s wants to add %s to his or her buddy list%s%s."
 msgstr "L'utente %s vuole aggiungere %s alla sua lista dei contatti."
 
-#: src/protocols/yahoo/yahoo.c:893
+#: ../src/protocols/yahoo/yahoo.c:911
 #, fuzzy
 msgid "Message (optional) :"
 msgstr "Notifica messaggi"
 
-#: src/protocols/yahoo/yahoo.c:935
+#: ../src/protocols/yahoo/yahoo.c:953
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 "%s ha (retroattivamente) rifiutato la tua richiesta di aggiungerlo alla tua "
 "lista contatti."
 
-#: src/protocols/yahoo/yahoo.c:938
+#: ../src/protocols/yahoo/yahoo.c:956
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -10669,11 +12309,11 @@
 "%s ha (retroattivamente) rifiutato la tua richiesta di aggiungerlo alla tua "
 "lista contatti per il seguente motivo: %s."
 
-#: src/protocols/yahoo/yahoo.c:941
+#: ../src/protocols/yahoo/yahoo.c:959
 msgid "Add buddy rejected"
 msgstr "Aggiungi un contatto rifiutato"
 
-#: src/protocols/yahoo/yahoo.c:1684
+#: ../src/protocols/yahoo/yahoo.c:1702
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10684,11 +12324,11 @@
 "riconosciuto. Questa versione di Gaim probabilmente non sar in grado di "
 "connettersi con successo a Yahoo. Controlla %s per aggiornamenti."
 
-#: src/protocols/yahoo/yahoo.c:1687
+#: ../src/protocols/yahoo/yahoo.c:1705
 msgid "Failed Yahoo! Authentication"
 msgstr "Autenticazione Yahoo! fallita"
 
-#: src/protocols/yahoo/yahoo.c:1760
+#: ../src/protocols/yahoo/yahoo.c:1771
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -10697,19 +12337,19 @@
 "Hai cercato di ignorare %s, ma l'utente  nella tua lista contatti. Facendo "
 "clic su \"S\" il contatto verr rimosso ed ignorato."
 
-#: src/protocols/yahoo/yahoo.c:1763
+#: ../src/protocols/yahoo/yahoo.c:1774
 msgid "Ignore buddy?"
 msgstr "Ignora il contatto?"
 
-#: src/protocols/yahoo/yahoo.c:1797
+#: ../src/protocols/yahoo/yahoo.c:1808
 msgid "Invalid username."
 msgstr "Username non valido."
 
-#: src/protocols/yahoo/yahoo.c:1808
+#: ../src/protocols/yahoo/yahoo.c:1819
 msgid "Normal authentication failed!"
 msgstr "Autenticazione normale fallita!"
 
-#: src/protocols/yahoo/yahoo.c:1809
+#: ../src/protocols/yahoo/yahoo.c:1820
 msgid ""
 "The normal authentication method has failed. This means either your password "
 "is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
@@ -10722,131 +12362,148 @@
 "l'autenticazione Web Messenger la quale per comporta una riduzione delle "
 "caratteristiche e delle funzionalit."
 
-#: src/protocols/yahoo/yahoo.c:1817
+#: ../src/protocols/yahoo/yahoo.c:1828
 msgid "Incorrect password."
 msgstr "Password non corretta."
 
-#: src/protocols/yahoo/yahoo.c:1820
+#: ../src/protocols/yahoo/yahoo.c:1831
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr ""
 "Il tuo account  bloccato. Per piacere, effettua il login sul sito web di "
 "Yahoo!."
 
-#: src/protocols/yahoo/yahoo.c:1823
+#: ../src/protocols/yahoo/yahoo.c:1834
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Codice di errore %d sconosciuto. Il problema potrebbe essere risolto "
 "effettuando il login sul sito web di Yahoo!."
 
-#: src/protocols/yahoo/yahoo.c:1877
+#: ../src/protocols/yahoo/yahoo.c:1888
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Impossibile aggiungere il contatto %s al gruppo %s alla lista del server per "
 "l'account %s."
 
-#: src/protocols/yahoo/yahoo.c:1880
+#: ../src/protocols/yahoo/yahoo.c:1891
 msgid "Could not add buddy to server list"
 msgstr "Impossibile aggiungere il contatto alla lista del server"
 
-#: src/protocols/yahoo/yahoo.c:2124 src/protocols/yahoo/yahoo.c:2270
-#: src/protocols/yahoo/ycht.c:413
+#: ../src/protocols/yahoo/yahoo.c:2010
+#, c-format
+msgid "[ Audible %s/%s/%s.swf ] %s"
+msgstr ""
+
+#: ../src/protocols/yahoo/yahoo.c:2149 ../src/protocols/yahoo/yahoo.c:2296
+#: ../src/protocols/yahoo/yahoo.c:2311 ../src/protocols/yahoo/ycht.c:472
 msgid "Unable to read"
 msgstr "Impossibile leggere"
 
-#: src/protocols/yahoo/yahoo.c:2292 src/protocols/yahoo/yahoo.c:2420
-#: src/protocols/yahoo/yahoo.c:2506 src/protocols/yahoo/yahoo.c:2516
-#: src/protocols/yahoo/yahoochat.c:1393 src/protocols/yahoo/yahoochat.c:1460
-#: src/protocols/yahoo/ycht.c:517
+#: ../src/protocols/yahoo/yahoo.c:2335 ../src/protocols/yahoo/yahoo.c:2492
+#: ../src/protocols/yahoo/yahoo.c:2594 ../src/protocols/yahoo/yahoo.c:2604
+#: ../src/protocols/yahoo/yahoochat.c:1447
+#: ../src/protocols/yahoo/yahoochat.c:1517 ../src/protocols/yahoo/ycht.c:576
 msgid "Connection problem"
 msgstr "Problema di connessione"
 
-#: src/protocols/yahoo/yahoo.c:2619 src/protocols/yahoo/yahoo.c:3236
-msgid "Not At Home"
+#: ../src/protocols/yahoo/yahoo.c:2711 ../src/protocols/yahoo/yahoo.c:3298
+msgid "Not at Home"
 msgstr "Non a casa"
 
-#: src/protocols/yahoo/yahoo.c:2621 src/protocols/yahoo/yahoo.c:3239
-msgid "Not At Desk"
-msgstr "Non al computer"
-
-#: src/protocols/yahoo/yahoo.c:2623 src/protocols/yahoo/yahoo.c:3242
-msgid "Not In Office"
+#: ../src/protocols/yahoo/yahoo.c:2713 ../src/protocols/yahoo/yahoo.c:3301
+msgid "Not at Desk"
+msgstr "Non alla scrivania"
+
+#: ../src/protocols/yahoo/yahoo.c:2715 ../src/protocols/yahoo/yahoo.c:3304
+msgid "Not in Office"
 msgstr "Non in ufficio"
 
-#: src/protocols/yahoo/yahoo.c:2627 src/protocols/yahoo/yahoo.c:3248
+#: ../src/protocols/yahoo/yahoo.c:2719 ../src/protocols/yahoo/yahoo.c:3310
 msgid "On Vacation"
 msgstr "In vacanza"
 
-#: src/protocols/yahoo/yahoo.c:2631 src/protocols/yahoo/yahoo.c:3254
+#: ../src/protocols/yahoo/yahoo.c:2723 ../src/protocols/yahoo/yahoo.c:3316
 msgid "Stepped Out"
 msgstr "A fare 2 passi"
 
-#: src/protocols/yahoo/yahoo.c:2723 src/protocols/yahoo/yahoo.c:2750
+#: ../src/protocols/yahoo/yahoo.c:2816 ../src/protocols/yahoo/yahoo.c:2846
 msgid "Not on server list"
 msgstr "Non  nella lista del server"
 
-#: src/protocols/yahoo/yahoo.c:2773 src/protocols/yahoo/yahoo.c:2833
+#: ../src/protocols/yahoo/yahoo.c:2863 ../src/protocols/yahoo/yahoo.c:2922
 #, fuzzy
 msgid "Appear Online"
-msgstr "Sembra non in linea"
-
-#: src/protocols/yahoo/yahoo.c:2776 src/protocols/yahoo/yahoo.c:2855
+msgstr "Sembra in linea"
+
+#: ../src/protocols/yahoo/yahoo.c:2866 ../src/protocols/yahoo/yahoo.c:2943
 #, fuzzy
 msgid "Appear Permanently Offline"
+msgstr "Sembra permanentemente non in linea"
+
+#: ../src/protocols/yahoo/yahoo.c:2885
+#, fuzzy
+msgid "Presence"
+msgstr "Preferenze"
+
+#: ../src/protocols/yahoo/yahoo.c:2928
+msgid "Appear Offline"
 msgstr "Sembra non in linea"
 
-#: src/protocols/yahoo/yahoo.c:2794
-#, fuzzy
-msgid "Stealth"
-msgstr "Stato"
-
-#: src/protocols/yahoo/yahoo.c:2849
+#: ../src/protocols/yahoo/yahoo.c:2937
 #, fuzzy
 msgid "Don't Appear Permanently Offline"
 msgstr "Sembra non in linea"
 
-#: src/protocols/yahoo/yahoo.c:2896
+#: ../src/protocols/yahoo/yahoo.c:2985
 msgid "Join in Chat"
 msgstr "Entra nella chat"
 
-#: src/protocols/yahoo/yahoo.c:2901
+#: ../src/protocols/yahoo/yahoo.c:2991
 msgid "Initiate Conference"
 msgstr "Inizia una conferenza"
 
-#: src/protocols/yahoo/yahoo.c:2926
-msgid "Stealth Settings"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:2932
+#: ../src/protocols/yahoo/yahoo.c:3019
+#, fuzzy
+msgid "Presence Settings"
+msgstr "Utilizza le opzioni globali"
+
+#: ../src/protocols/yahoo/yahoo.c:3025
 msgid "Start Doodling"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2963
+#: ../src/protocols/yahoo/yahoo.c:3057
 msgid "Active which ID?"
 msgstr "Quale ID vuoi attivare?"
 
-#: src/protocols/yahoo/yahoo.c:2972
+#: ../src/protocols/yahoo/yahoo.c:3066
 msgid "Join who in chat?"
 msgstr "A chi vuoi unirti nella chat?"
 
-#: src/protocols/yahoo/yahoo.c:2982
+#: ../src/protocols/yahoo/yahoo.c:3076
 msgid "Activate ID..."
 msgstr "Attiva l'ID..."
 
-#: src/protocols/yahoo/yahoo.c:2986
-msgid "Join user in chat..."
+#: ../src/protocols/yahoo/yahoo.c:3080
+#, fuzzy
+msgid "Join User in Chat..."
 msgstr "Unisciti ad un utente in chat..."
 
-#: src/protocols/yahoo/yahoo.c:3541
+#: ../src/protocols/yahoo/yahoo.c:3623
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join &lt;stanza&gt;: Entra in una chat room sul network Yahoo"
 
-#: src/protocols/yahoo/yahoo.c:3545
-msgid "buzz: Buzz a contact to get their attention"
+#: ../src/protocols/yahoo/yahoo.c:3628
+#, fuzzy
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: Elenca i canali presenti su questa rete"
+
+#: ../src/protocols/yahoo/yahoo.c:3632
+#, fuzzy
+msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Richiama l'attenzione di un contatto con un buzz"
 
-#: src/protocols/yahoo/yahoo.c:3550
+#: ../src/protocols/yahoo/yahoo.c:3636
 msgid "doodle: Request user to start a Doodle session"
 msgstr ""
 
@@ -10860,68 +12517,92 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3639 src/protocols/yahoo/yahoo.c:3641
+#: ../src/protocols/yahoo/yahoo.c:3729 ../src/protocols/yahoo/yahoo.c:3731
 msgid "Yahoo Protocol Plugin"
 msgstr "Plugin per il protocollo Yahoo"
 
-#: src/protocols/yahoo/yahoo.c:3658
+#: ../src/protocols/yahoo/yahoo.c:3748
 msgid "Yahoo Japan"
 msgstr "Yahoo Giappone"
 
-#: src/protocols/yahoo/yahoo.c:3661
-msgid "Pager host"
-msgstr "Host Yahoo Pager"
-
-#: src/protocols/yahoo/yahoo.c:3664
-msgid "Japan Pager host"
-msgstr "Host Yahoo Pager Giappone"
-
-#: src/protocols/yahoo/yahoo.c:3667
+#: ../src/protocols/yahoo/yahoo.c:3751
+msgid "Pager server"
+msgstr "Sever pager"
+
+#: ../src/protocols/yahoo/yahoo.c:3754
+msgid "Japan Pager server"
+msgstr "Server pager (Giappone)"
+
+#: ../src/protocols/yahoo/yahoo.c:3757
 msgid "Pager port"
 msgstr "Porta Yahoo Pager"
 
-#: src/protocols/yahoo/yahoo.c:3670
-msgid "File transfer host"
-msgstr "Host trasferimento file"
-
-#: src/protocols/yahoo/yahoo.c:3673
-msgid "Japan File transfer host"
-msgstr "Host trasferimento file Giappone"
-
-#: src/protocols/yahoo/yahoo.c:3676
+#: ../src/protocols/yahoo/yahoo.c:3760
+msgid "File transfer server"
+msgstr "Server per il trasferimento file"
+
+#: ../src/protocols/yahoo/yahoo.c:3763
+msgid "Japan file transfer server"
+msgstr "Server per il trasferimento file (Giappone)"
+
+#: ../src/protocols/yahoo/yahoo.c:3766
 msgid "File transfer port"
 msgstr "Porta trasferimento file"
 
-#: src/protocols/yahoo/yahoo.c:3679
-msgid "Chat Room Locale"
+#: ../src/protocols/yahoo/yahoo.c:3769
+msgid "Chat room locale"
 msgstr "Lingua della chat room"
 
-#: src/protocols/yahoo/yahoo.c:3682
-msgid "Chat Room List Url"
+#: ../src/protocols/yahoo/yahoo.c:3772
+msgid "Ignore conference and chatroom invitations"
+msgstr "Ignora gli inviti a conferenze e a chat room"
+
+#: ../src/protocols/yahoo/yahoo.c:3776
+#, fuzzy
+msgid "Chat room list URL"
 msgstr "Url della lista delle chat room"
 
-#: src/protocols/yahoo/yahoo.c:3685
-msgid "YCHT Host"
-msgstr "Host YCHT"
-
-#: src/protocols/yahoo/yahoo.c:3688
-msgid "YCHT Port"
-msgstr "Porta YCHT"
-
-#: src/protocols/yahoo/yahoo_profile.c:672
+#: ../src/protocols/yahoo/yahoo.c:3779
+msgid "Yahoo Chat server"
+msgstr "Server Yahoo Chat"
+
+#: ../src/protocols/yahoo/yahoo.c:3782
+#, fuzzy
+msgid "Yahoo Chat port"
+msgstr "Yahoo Giappone"
+
+#. 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 ""
+
+#: ../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 "Impossibile creare un descrittore di file."
+
+#. TODO: what to do here - do we really have to disconnect?
+#: ../src/protocols/yahoo/yahoo_packet.c:265
+msgid "Write Error"
+msgstr "Errore di scrittura"
+
+#: ../src/protocols/yahoo/yahoo_profile.c:707
 #, c-format
 msgid "<b>IP Address:</b> %s<br>"
 msgstr "<b>Indirizzo IP:</b> %s<br>"
 
-#: src/protocols/yahoo/yahoo_profile.c:748
+#: ../src/protocols/yahoo/yahoo_profile.c:783
 msgid "Yahoo! Japan Profile"
 msgstr "Profilo Yahoo! Giappone"
 
-#: src/protocols/yahoo/yahoo_profile.c:749
+#: ../src/protocols/yahoo/yahoo_profile.c:784
 msgid "Yahoo! Profile"
 msgstr "Profilo Yahoo!"
 
-#: src/protocols/yahoo/yahoo_profile.c:793
+#: ../src/protocols/yahoo/yahoo_profile.c:828
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
@@ -10929,62 +12610,62 @@
 "Spiacente, i profili contrassegnati come contenenti contenuti per soli "
 "adulti non sono attualmente supportati."
 
-#: src/protocols/yahoo/yahoo_profile.c:795
+#: ../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 vuoi vedere questo profilo, dovrai aprire questo link con il tuo browser"
 
-#: src/protocols/yahoo/yahoo_profile.c:971
+#: ../src/protocols/yahoo/yahoo_profile.c:1012
 msgid "Yahoo! ID"
 msgstr "ID Yahoo!"
 
-#: src/protocols/yahoo/yahoo_profile.c:1043
-#: src/protocols/yahoo/yahoo_profile.c:1047
-#: src/protocols/yahoo/yahoo_profile.c:1051
+#: ../src/protocols/yahoo/yahoo_profile.c:1084
+#: ../src/protocols/yahoo/yahoo_profile.c:1088
+#: ../src/protocols/yahoo/yahoo_profile.c:1092
 msgid "Hobbies"
 msgstr "Hobbies"
 
-#: src/protocols/yahoo/yahoo_profile.c:1061
-#: src/protocols/yahoo/yahoo_profile.c:1065
+#: ../src/protocols/yahoo/yahoo_profile.c:1102
+#: ../src/protocols/yahoo/yahoo_profile.c:1106
 msgid "Latest News"
 msgstr "Ultime notizie"
 
-#: src/protocols/yahoo/yahoo_profile.c:1086
+#: ../src/protocols/yahoo/yahoo_profile.c:1127
 msgid "Home Page"
 msgstr "Homepage"
 
-#: src/protocols/yahoo/yahoo_profile.c:1101
+#: ../src/protocols/yahoo/yahoo_profile.c:1142
 msgid "Cool Link 1"
 msgstr "Link preferito 1"
 
-#: src/protocols/yahoo/yahoo_profile.c:1106
+#: ../src/protocols/yahoo/yahoo_profile.c:1147
 msgid "Cool Link 2"
 msgstr "Link preferito 2"
 
-#: src/protocols/yahoo/yahoo_profile.c:1110
+#: ../src/protocols/yahoo/yahoo_profile.c:1151
 msgid "Cool Link 3"
 msgstr "Link preferito 3"
 
-#: src/protocols/yahoo/yahoo_profile.c:1123
+#: ../src/protocols/yahoo/yahoo_profile.c:1164
 msgid "Last Update"
 msgstr "Ultimo aggiornamento"
 
-#: src/protocols/yahoo/yahoo_profile.c:1129
+#: ../src/protocols/yahoo/yahoo_profile.c:1170
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "Informazioni sull'utente %s non disponibili"
 
-#: src/protocols/yahoo/yahoo_profile.c:1135
-msgid ""
-"Sorry, this profile seems to be in a language that is not supported at this "
-"time."
+#: ../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 ""
 "Spiacente, questo profilo sembra essere in un linguaggio non supportato al "
 "momento."
 
-#: src/protocols/yahoo/yahoo_profile.c:1151
+#: ../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."
@@ -10992,7 +12673,7 @@
 "Impossibile ricevere il profilo dell'utente. Molto probabilmente si tratta "
 "di un problema temporaneo sul server. Riprova pi tardi."
 
-#: src/protocols/yahoo/yahoo_profile.c:1154
+#: ../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 "
@@ -11003,67 +12684,88 @@
 "trovare un profilo utente. Se sei certo che l'utente esista, riprova pi "
 "tardi."
 
-#: src/protocols/yahoo/yahoo_profile.c:1162
+#: ../src/protocols/yahoo/yahoo_profile.c:1203
 msgid "The user's profile is empty."
 msgstr "Il profilo dell'utente  vuoto."
 
-#: src/protocols/yahoo/yahoochat.c:202
+#: ../src/protocols/yahoo/yahoochat.c:203
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr ""
 "%s ha rifiutato il tuo invito alla conferenza nella stanza \"%s\" per il "
 "seguente motivo \"%s\"."
 
-#: src/protocols/yahoo/yahoochat.c:204
+#: ../src/protocols/yahoo/yahoochat.c:205
 msgid "Invitation Rejected"
 msgstr "Invito rifiutato"
 
-#: src/protocols/yahoo/yahoochat.c:358
+#: ../src/protocols/yahoo/yahoochat.c:361
 msgid "Failed to join chat"
 msgstr "Impossibile entrare nella chat"
 
-#: src/protocols/yahoo/yahoochat.c:358
-msgid "Maybe the room is full?"
-msgstr "Forse la stanza  piena?"
-
-#: src/protocols/yahoo/yahoochat.c:435
+#. -6
+#: ../src/protocols/yahoo/yahoochat.c:364
+msgid "Unknown room"
+msgstr "Stanza sconosciuta"
+
+#. -15
+#: ../src/protocols/yahoo/yahoochat.c:367
+msgid "Maybe the room is full"
+msgstr "Forse la stanza  piena"
+
+#. -35
+#: ../src/protocols/yahoo/yahoochat.c:370
+msgid "Not available"
+msgstr "Non disponibile"
+
+#: ../src/protocols/yahoo/yahoochat.c:374
+msgid ""
+"Unknown error. You may need to logout and wait five minutes before being "
+"able to rejoin a chatroom"
+msgstr ""
+"Errore sconosciuto. Potrebbe essere necessario disconnettersi ed aspettare "
+"cinque minuti prima di poter entrare nuovamente nella chat room"
+
+#: ../src/protocols/yahoo/yahoochat.c:452
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "Stai ora conversando in %s."
 
-#: src/protocols/yahoo/yahoochat.c:608
+#: ../src/protocols/yahoo/yahoochat.c:626
 msgid "Failed to join buddy in chat"
 msgstr "Impossibile unirsi al contatto in chat"
 
-#: src/protocols/yahoo/yahoochat.c:609
+#: ../src/protocols/yahoo/yahoochat.c:627
 msgid "Maybe they're not in a chat?"
 msgstr "Forse non sono in chat?"
 
-#: src/protocols/yahoo/yahoochat.c:1326
+#: ../src/protocols/yahoo/yahoochat.c:1345
+#: ../src/protocols/yahoo/yahoochat.c:1372
 msgid "Fetching the room list failed."
 msgstr "Recupero della lista delle stanze fallito."
 
-#: src/protocols/yahoo/yahoochat.c:1379
+#: ../src/protocols/yahoo/yahoochat.c:1433
 msgid "Voices"
 msgstr "Voci"
 
-#: src/protocols/yahoo/yahoochat.c:1382
+#: ../src/protocols/yahoo/yahoochat.c:1436
 msgid "Webcams"
 msgstr "Webcam"
 
-#: src/protocols/yahoo/yahoochat.c:1393 src/protocols/yahoo/yahoochat.c:1460
+#: ../src/protocols/yahoo/yahoochat.c:1447
+#: ../src/protocols/yahoo/yahoochat.c:1517
 msgid "Unable to fetch room list."
 msgstr "Impossibile recuperare la lista delle stanze."
 
-#: src/protocols/yahoo/yahoochat.c:1453
+#: ../src/protocols/yahoo/yahoochat.c:1510
 msgid "User Rooms"
 msgstr "Stanze utente"
 
-#: src/protocols/yahoo/ycht.c:400
+#: ../src/protocols/yahoo/ycht.c:456
 msgid "Connection problem with the YCHT server."
 msgstr "Problema di connessione con il server 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)"
@@ -11071,80 +12773,80 @@
 "(C' stato un errore nella conversione di questo messaggio.\t Controlla "
 "l'opzione 'Codifica' nell'editor degli account)"
 
-#: src/protocols/zephyr/zephyr.c:686
-#, fuzzy, c-format
+#: ../src/protocols/zephyr/zephyr.c:701
+#, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "Impossibile invare alla chat %s,%s,%s"
 
-#: src/protocols/zephyr/zephyr.c:719 src/protocols/zephyr/zephyr.c:1133
+#: ../src/protocols/zephyr/zephyr.c:734 ../src/protocols/zephyr/zephyr.c:1151
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr "<b>Utente:</b> %s<br>"
 
-#: src/protocols/zephyr/zephyr.c:723 src/protocols/zephyr/zephyr.c:1138
+#: ../src/protocols/zephyr/zephyr.c:738 ../src/protocols/zephyr/zephyr.c:1156
 msgid "<br>Hidden or not logged-in"
 msgstr "<br>Nascosto o non connesso"
 
-#: src/protocols/zephyr/zephyr.c:728 src/protocols/zephyr/zephyr.c:1140
+#: ../src/protocols/zephyr/zephyr.c:743 ../src/protocols/zephyr/zephyr.c:1158
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>A %s da %s"
 
-#: src/protocols/zephyr/zephyr.c:1471 src/protocols/zephyr/zephyr.c:1472
+#: ../src/protocols/zephyr/zephyr.c:1490 ../src/protocols/zephyr/zephyr.c:1491
 msgid "Anyone"
 msgstr "Chiunque"
 
-#: src/protocols/zephyr/zephyr.c:2273
+#: ../src/protocols/zephyr/zephyr.c:2298
 msgid "_Class:"
 msgstr "_Classe:"
 
-#: src/protocols/zephyr/zephyr.c:2279
+#: ../src/protocols/zephyr/zephyr.c:2304
 msgid "_Instance:"
 msgstr "_Istanza:"
 
-#: src/protocols/zephyr/zephyr.c:2285
+#: ../src/protocols/zephyr/zephyr.c:2310
 msgid "_Recipient:"
 msgstr "_Destinatario:"
 
-#: src/protocols/zephyr/zephyr.c:2296
+#: ../src/protocols/zephyr/zephyr.c:2321
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "Tentativo di iscrizione a %s,%s,%s fallito"
 
-#: src/protocols/zephyr/zephyr.c:2602
+#: ../src/protocols/zephyr/zephyr.c:2627
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;nick&gt;: Rintraccia l'utente"
 
-#: src/protocols/zephyr/zephyr.c:2607
+#: ../src/protocols/zephyr/zephyr.c:2632
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;nick&gt;: Rinraccia l'utente"
 
-#: src/protocols/zephyr/zephyr.c:2612
+#: ../src/protocols/zephyr/zephyr.c:2637
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "instance &lt;istanza&gt;: Imposta l'istanza da usare su questa classe"
 
-#: src/protocols/zephyr/zephyr.c:2617
+#: ../src/protocols/zephyr/zephyr.c:2642
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;istanza&gt;: Imposta l'istanza da usare su questa classe"
 
-#: src/protocols/zephyr/zephyr.c:2622
+#: ../src/protocols/zephyr/zephyr.c:2647
 #, fuzzy
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;istanza&gt;: Imposta l'istanza da usare su questa classe"
 
-#: src/protocols/zephyr/zephyr.c:2628
+#: ../src/protocols/zephyr/zephyr.c:2653
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 "sub &lt;classe&gt; &lt;istanza&gt; &lt;destinatario&gt;: Entra in una nuova "
 "chat"
 
-#: src/protocols/zephyr/zephyr.c:2633
+#: ../src/protocols/zephyr/zephyr.c:2658
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 "zi &lt;istanza&gt;: Invia un messaggio a &lt;messaggio,<i>istanza</i>,*&gt;"
 
-#: src/protocols/zephyr/zephyr.c:2639
+#: ../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;"
@@ -11152,7 +12854,7 @@
 "zci &lt;classe&gt; &lt;istanza&gt;: Invia un messaggio a &lt;<i>classe</i>,"
 "<i>istanza</i>,*&gt;"
 
-#: src/protocols/zephyr/zephyr.c:2645
+#: ../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;"
@@ -11160,7 +12862,7 @@
 "zcir &lt;classe&gt; &lt;istanza&gt; &lt;destinatario&gt;: Invia un messaggio "
 "a &lt;<i>classe</i>,<i>istanza</i>,<i>destinatario</i>&gt;"
 
-#: src/protocols/zephyr/zephyr.c:2651
+#: ../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;"
@@ -11168,16 +12870,16 @@
 "zir &lt;istanza&gt; &lt;destinatario&gt;: Invia un messaggio a &lt;MESSAGE,"
 "<i>istanza</i>,<i>destinatario</i>&gt;"
 
-#: src/protocols/zephyr/zephyr.c:2656
+#: ../src/protocols/zephyr/zephyr.c:2681
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr ""
 "zc &lt;classe&gt;: Invia un messaggio a &lt;<i>classe</i>,PERSONAL,*&gt;"
 
-#: src/protocols/zephyr/zephyr.c:2762
+#: ../src/protocols/zephyr/zephyr.c:2787
 msgid "Resubscribe"
 msgstr "Effettua nuovamente la sottoscrizione"
 
-#: src/protocols/zephyr/zephyr.c:2765
+#: ../src/protocols/zephyr/zephyr.c:2790
 msgid "Retrieve subscriptions from server"
 msgstr "Recupera le sottoscrizioni dal server"
 
@@ -11191,141 +12893,156 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:2847 src/protocols/zephyr/zephyr.c:2849
+#: ../src/protocols/zephyr/zephyr.c:2875 ../src/protocols/zephyr/zephyr.c:2877
 msgid "Zephyr Protocol Plugin"
 msgstr "Plugin per il protocollo Zephyr"
 
-#: src/protocols/zephyr/zephyr.c:2874
+#: ../src/protocols/zephyr/zephyr.c:2896
+msgid "Use tzc"
+msgstr "Utilizza tzc"
+
+#: ../src/protocols/zephyr/zephyr.c:2899
+msgid "tzc command"
+msgstr "Comando tzc"
+
+#: ../src/protocols/zephyr/zephyr.c:2902
 msgid "Export to .anyone"
 msgstr "Esporta in .anyone"
 
-#: src/protocols/zephyr/zephyr.c:2877
+#: ../src/protocols/zephyr/zephyr.c:2905
 msgid "Export to .zephyr.subs"
 msgstr "Esporta in .zephyr.subs"
 
-#: src/protocols/zephyr/zephyr.c:2880
-#, fuzzy
+#: ../src/protocols/zephyr/zephyr.c:2908
 msgid "Import from .anyone"
-msgstr "Esporta in .anyone"
-
-#: src/protocols/zephyr/zephyr.c:2883
-#, fuzzy
+msgstr "Importa da .anyone"
+
+#: ../src/protocols/zephyr/zephyr.c:2911
 msgid "Import from .zephyr.subs"
-msgstr "Esporta in .zephyr.subs"
-
-#: src/protocols/zephyr/zephyr.c:2886
+msgstr "Importa da .zephyr.subs"
+
+#: ../src/protocols/zephyr/zephyr.c:2914
 #, fuzzy
 msgid "Realm"
 msgstr "Vero nome"
 
-#: src/protocols/zephyr/zephyr.c:2889
+#: ../src/protocols/zephyr/zephyr.c:2917
 msgid "Exposure"
 msgstr "Esposizione"
 
-#. XXX: why in the hell are we calling gaim_connection_error() here?
+#: ../src/proxy.c:1217 ../src/proxy.c:1273 ../src/proxy.c:1321
+#: ../src/proxy.c:1348
+#, c-format
+msgid "Proxy connection error %d"
+msgstr "Errore di connessione al proxy: %d"
+
 #. Forbidden
-#: src/proxy.c:1036
+#: ../src/proxy.c:1337
 #, c-format
 msgid "Access denied: proxy server forbids port %d tunnelling."
 msgstr ""
 "Accesso negato: il sever proxy non permette il tunnelling sulla porta %d."
 
-#: src/proxy.c:1040
-#, c-format
-msgid "Proxy connection error %d"
-msgstr "Errore di connessione al proxy: %d"
-
-#: src/proxy.c:1874
-msgid "Invalid proxy settings"
-msgstr "Impostazioni del proxy non valide"
-
-#: src/proxy.c:1874
-msgid ""
-"Either the host name or port number specified for your given proxy type is "
-"invalid."
-msgstr "Il nome dell'host o il numero della porta specificati non sono validi."
-
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:1341
-msgid "Accept"
-msgstr "Accetta"
-
-#: src/server.c:243
+#: ../src/request.h:1354
+msgid "_Accept"
+msgstr "_Accetta"
+
+#. *
+#. * The default message to use when the user becomes auto-away.
+#.
+#: ../src/savedstatuses.c:45
+msgid "I'm not here right now"
+msgstr "Sono momentaneamente assente"
+
+#: ../src/savedstatuses.c:524
+msgid "saved statuses"
+msgstr "status salvati"
+
+#: ../src/server.c:227
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s  ora conosciuto come %s.\n"
 
-#: src/server.c:625
-#, c-format
-msgid "(%d message)"
-msgid_plural "(%d messages)"
-msgstr[0] "(%d messaggi)"
-msgstr[1] "(%d messaggi)"
-
-#: src/server.c:639
-msgid "(1 message)"
-msgstr "(1 messaggio)"
-
-#: src/server.c:859
-#, fuzzy, c-format
+#: ../src/server.c:681
+#, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
 "%s"
-msgstr "%s ha invitato %s nella chat room: %s\n"
-
-#: src/server.c:864
+msgstr ""
+"%s ha invitato %s nella chat room: %s\n"
+"%s"
+
+#: ../src/server.c:686
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s ha invitato %s nella chat room: %s\n"
 
-#: src/server.c:868
+#: ../src/server.c:690
 msgid "Accept chat invitation?"
 msgstr "Accetti l'invito alla chat?"
 
-#: src/status.c:153
+#: ../src/status.c:153
 #, fuzzy
 msgid "Unset"
 msgstr "Unit"
 
-#: src/status.c:156
+#: ../src/status.c:156
 msgid "Unavailable"
 msgstr "Non Disponibile"
 
-#: src/status.c:621
-#, c-format
-msgid "%s came back"
-msgstr "%s  tornato"
-
-#: src/status.c:626
-#, c-format
-msgid "%s went away"
-msgstr "%s  andato via."
-
-#: src/status.c:1308
+#: ../src/status.c:160
+msgid "Mobile"
+msgstr "Cellulare"
+
+#: ../src/status.c:622
+#, c-format
+msgid "%s changed status from %s to %s"
+msgstr "%s ha cambiato stato da %s a %s"
+
+#: ../src/status.c:632
+#, c-format
+msgid "%s is now %s"
+msgstr "%s  ora %s"
+
+#: ../src/status.c:637
+#, c-format
+msgid "%s is no longer %s"
+msgstr "%s non  pi %s"
+
+#: ../src/status.c:1311
 #, c-format
 msgid "%s became idle"
 msgstr "%s  diventato inattivo"
 
-#: src/status.c:1323
+#: ../src/status.c:1328
 #, c-format
 msgid "%s became unidle"
 msgstr "%s  ritornato attivo"
 
-#: src/status.c:1697
-#, fuzzy
-msgid "Default auto-away"
-msgstr "Assente automatico"
-
-#: src/util.c:2121
-#, fuzzy, c-format
+#: ../src/status.c:1394
+#, c-format
+msgid "+++ %s became idle"
+msgstr "+++ %s  diventato inattivo"
+
+#: ../src/status.c:1396
+#, c-format
+msgid "+++ %s became unidle"
+msgstr "+++ %s  ritornato attivo"
+
+#: ../src/util.c:679
+#, c-format
+msgid "%x %X"
+msgstr "%x %X"
+
+#: ../src/util.c:2453
+#, c-format
 msgid "Error Reading %s"
-msgstr ""
-"Errore di lettura di %s: \n"
-"%s.\n"
-
-#: src/util.c:2122
+msgstr "Errore nella lettura di %s"
+
+#: ../src/util.c:2454
 #, fuzzy, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -11335,51 +13052,381 @@
 "motivo non  stata caricata e la vecchia lista  stata spostata in blist."
 "xml~."
 
-#: src/util.c:2567
+#: ../src/util.c:2903
 msgid "Calculating..."
 msgstr "Calcolo in corso..."
 
-#: src/util.c:2570
+#: ../src/util.c:2906
 msgid "Unknown."
 msgstr "Sconosciuto."
 
-#: src/util.c:2600
-msgid "second"
-msgid_plural "seconds"
-msgstr[0] "secondo"
-msgstr[1] "secondi"
-
-#: src/util.c:2614
-msgid "day"
-msgid_plural "days"
-msgstr[0] "giorno"
-msgstr[1] "giorni"
-
-#: src/util.c:2622
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "ora"
-msgstr[1] "ore"
-
-#: src/util.c:2630
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "minuto"
-msgstr[1] "minuti"
-
-#: src/util.c:3053
+#: ../src/util.c:2932
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d secondo"
+msgstr[1] "%d secondi"
+
+#: ../src/util.c:2944
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d giorno"
+msgstr[1] "%d giorni"
+
+#: ../src/util.c:2952
+#, c-format
+msgid "%s, %d hour"
+msgid_plural "%s, %d hours"
+msgstr[0] "%s, %d ora"
+msgstr[1] "%s, %d ore"
+
+#: ../src/util.c:2958
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d ora"
+msgstr[1] "%d ore"
+
+#: ../src/util.c:2966
+#, c-format
+msgid "%s, %d minute"
+msgid_plural "%s, %d minutes"
+msgstr[0] "%s, %d minuto"
+msgstr[1] "%s, %d minuti"
+
+#: ../src/util.c:2972
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minuto"
+msgstr[1] "%d minuti"
+
+#: ../src/util.c:3439
 msgid "g003: Error opening connection.\n"
 msgstr "g003: Errore di apertura della connessione.\n"
 
-#~ msgid "Buddy List Sorting"
-#~ msgstr "Ordinamento della lista contatti"
+#~ msgid "Unable to play sound because the chosen file (%s) does not exist."
+#~ msgstr ""
+#~ "Impossibile riprodurre il suono poich il file scelto (%s) non esiste."
+
+#~ msgid ""
+#~ "Unable to play sound because the 'Command' sound method has been chosen, "
+#~ "but no command has been set."
+#~ msgstr ""
+#~ "Impossibile riprodurre il suono poich  stato scelto 'Comando' come "
+#~ "metodo del suono, ma non  stato impostato nessun comando."
+
+#~ msgid ""
+#~ "Unable to play sound because the configured sound command could not be "
+#~ "launched: %s"
+#~ msgstr ""
+#~ "Impossibile riprodurre il suono poich il comando per il suono scelto non "
+#~ "pu essere eseguito: %s"
+
+#~ msgid "Auth host"
+#~ msgstr "Host auth"
+
+#~ msgid "Auth port"
+#~ msgstr "Porta auth"
+
+#~ msgid "TOC host"
+#~ msgstr "Host TOC"
+
+#~ msgid "TOC port"
+#~ msgstr "Porta TOC"
+
+#~ msgid "Pager host"
+#~ msgstr "Host Yahoo Pager"
+
+#, fuzzy
+#~ msgid "YCHT host"
+#~ msgstr "Host YCHT"
+
+#, fuzzy
+#~ msgid "YCHT port"
+#~ msgstr "Porta YCHT"
+
+#~ msgid "Error Message Suppression"
+#~ msgstr "Soppressione dei messaggi di errore"
+
+#~ msgid "Hide Disconnect Errors"
+#~ msgstr "Nascondi gli errori di disconnessione"
+
+#~ msgid "Hide Login Errors"
+#~ msgstr "Nascondi gli errori di login"
+
+#, fuzzy
+#~ msgid "Hide Reconnecting Dialog"
+#~ msgstr "Nascondi gli errori di disconnessione"
+
+#~ msgid "When you are kicked offline, this reconnects you."
+#~ msgstr "Ti riconnette automaticamente quando sei cacciato fuori."
+
+#~ msgid "Use last matching buddy"
+#~ msgstr "Utilizza l'ultimo contatto corrispondente"
+
+#, fuzzy
+#~ msgid ""
+#~ "The buddy with the lowest score is the buddy who will have priority in "
+#~ "the contact.\n"
+#~ "The default values (offline = 4, away = 2, and idle = 1) will use what "
+#~ "used to be\n"
+#~ "the built-in order: active, idle, away, away + idle, offline."
+#~ msgstr ""
+#~ "Il contatto con il punteggio pi basso  quello che avr priorit nella "
+#~ "lista.\n"
+#~ "I valori predefiniti sono: non connesso=4, assente=2, inattivo=1."
+
+#~ msgid "Gaim - Signed off"
+#~ msgstr "Gaim - Non connesso"
+
+#~ msgid "Gaim - Away"
+#~ msgstr "Gaim - Assente"
+
+#~ msgid "Join A Chat..."
+#~ msgstr "Entra in chat..."
+
+#~ msgid "(+%d more)"
+#~ msgstr "(+%d in pi)"
+
+#~ msgid " left the room (%s)."
+#~ msgstr " ha abbandonato la stanza (%s)."
+
+#~ msgid "Screen Name:"
+#~ msgstr "Nome utente:"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "Do you wish to add him or her to your buddy list?"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "Vuoi aggiungerlo alla tua lista dei contatti?"
+
+#~ msgid "_Alias Buddy..."
+#~ msgstr "_Alias per il contatto..."
+
+#~ msgid "Alias Contact..."
+#~ msgstr "Alias per la lista..."
+
+#~ msgid "/Tools/Account Ac_tions"
+#~ msgstr "/Strumenti/A_zioni di account"
+
+#~ msgid "/Tools/A_ccounts"
+#~ msgstr "/Strumenti/A_ccount"
+
+#, fuzzy
+#~ msgid "Idle "
+#~ msgstr "Inattivo"
+
+#~ msgid "Offline "
+#~ msgstr "Non connesso "
+
+#~ msgid "/Tools/Account Actions"
+#~ msgstr "/Strumenti/Azioni di account"
+
+#~ msgid "me is using Gaim v%s."
+#~ msgstr "sto utilizzando Gaim v%s."
+
+#, fuzzy
+#~ msgid ""
+#~ "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
+#~ "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu "
+#~ "all at once.  It is written using GTK+ and is licensed under the GNU GPL."
+#~ "<BR><BR>"
+#~ msgstr ""
+#~ "Gaim  un client modulare per messaggi immediati in grado di usare AIM, "
+#~ "MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr e "
+#~ "Gadu-Gadu allo stesso tempo.  scritto utilizzando Gtk+ ed  distribuito "
+#~ "sotto licenza GPL.<BR><BR>"
+
+#~ msgid "Active Developers"
+#~ msgstr "Sviluppatori attivi"
+
+#~ msgid "_Keep the dialog open"
+#~ msgstr "_Mantieni la finestra aperta"
+
+#, fuzzy
+#~ msgid "Conversation in %s on %s"
+#~ msgstr "Conversazioni con %s"
+
+#, fuzzy
+#~ msgid "Default"
+#~ msgstr "Browser predefinito di Gnome"
+
+#~ msgid "<span weight=\"bold\">From:</span> %s\n"
+#~ msgstr "<span weight=\"bold\">Da:</span> %s\n"
+
+#~ msgid "<span weight=\"bold\">Subject:</span> %s\n"
+#~ msgstr "<span weight=\"bold\">Oggetto:</span> %s\n"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
+#~ "\n"
+#~ "%s%s%s%s"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Posta in arrivo!</span>\n"
+#~ "\n"
+#~ "%s%s%s%s"
+
+#~ msgid "Error launching <b>%s</b>: %s"
+#~ msgstr "Errore nell'esecuzione di <b>%s</b>: %s"
+
+#~ msgid "A_way"
+#~ msgstr "_Assente"
+
+#~ msgid "_Idle"
+#~ msgstr "_Inattivo"
+
+#~ msgid "Retur_n from idle"
+#~ msgstr "Ri_torna dall'inattivit"
+
+#~ msgid "Pounce Action"
+#~ msgstr "Azione"
+
+#~ msgid "Bro_wse..."
+#~ msgstr "Sf_oglia..."
+
+#~ msgid "Sav_e this pounce after activation"
+#~ msgstr "_Salva questo allarme dopo l'attivazione"
+
+#~ msgid "Remove Buddy Pounce"
+#~ msgstr "Rimuovi un allarme"
+
+#~ msgid "_Queue new messages when away"
+#~ msgstr "Metti in _coda i nuovi messaggi quando sei assente"
+
+#, fuzzy
+#~ msgid "Custom status"
+#~ msgstr "Per stato"
+
+#, fuzzy
+#~ msgid "Custom..."
+#~ msgstr "Personalizzato"
+
+#~ msgid "_Warn"
+#~ msgstr "_Richiama"
+
+#~ msgid "Email"
+#~ msgstr "Email"
+
+#, fuzzy
+#~ msgid "Could't open file"
+#~ msgstr "Impossibile inviare il file"
+
+#, fuzzy
+#~ msgid "Change password"
+#~ msgstr "Cambia password"
+
+#~ msgid "Realname"
+#~ msgstr "Vero nome"
+
+#~ msgid "Jabber ID"
+#~ msgstr "ID Jabber"
+
+#~ msgid "Hidden"
+#~ msgstr "Nascosto"
+
+#~ msgid "Email Address"
+#~ msgstr "Indirizzo e-mail"
+
+#~ msgid "Error processing event or response (%s)."
+#~ msgstr "Errore nell'analisi dell'evento o della risposta (%s)."
+
+#~ msgid "Direct IM with %s closed"
+#~ msgstr "IM diretto con %s terminato"
+
+#~ msgid "Direct IM with %s failed"
+#~ msgstr "IM diretto con %s fallito"
+
+#~ msgid "Unable to open Direct IM"
+#~ msgstr "Impossibile aprire una connessione MI diretta"
+
+#, fuzzy
+#~ msgid "You have lost your connection to chat room %s."
+#~ msgstr "Sei stato disconnesso dalla chat room %s."
+
+#~ msgid "Chat is currently unavailable"
+#~ msgstr "La chat non  al momento disponibile"
+
+#~ msgid "Unable to login to AIM"
+#~ msgstr "Impossibile effettuare il login su AIM"
+
+#, fuzzy
+#~ msgid "Unable to log into file transfer proxy."
+#~ msgstr "Impossibile scrivere il file %s."
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to establish listener socket or no AOL proxy connection present."
+#~ msgstr "Impossibile creare un socket in ascolto."
+
+#~ msgid "Internal Error"
+#~ msgstr "Errore Interno"
+
+#~ msgid "Unable to set AIM away message."
+#~ msgstr "Impossibile impostare un messaggio di assenza per AIM."
+
+#~ msgid ""
+#~ "You have probably requested to set your away message before the login "
+#~ "procedure completed.  You remain in a \"present\" state; try setting it "
+#~ "again when you are fully connected."
+#~ msgstr ""
+#~ "Hai probabilmente richiesto di impostare il tuo messaggio di assenza "
+#~ "prima che la procedura di login fosse ultimata. Rimani in uno stato di "
+#~ "\"presente\". Prova ad impostarlo di nuovo quando sarai connesso "
+#~ "correttamente."
+
+#~ msgid "Away Message"
+#~ msgstr "Messaggio di assenza"
+
+#, fuzzy
+#~ msgid "Hide IP address"
+#~ msgstr "Indirizzo IP"
+
+#, fuzzy
+#~ msgid "Web aware"
+#~ msgstr "Rendi visibile il tuo stato sul web"
+
+#~ msgid "Active"
+#~ msgstr "Attivo"
+
+#~ msgid "EMail"
+#~ msgstr "Email"
+
+#~ msgid "Verify all IM message signatures"
+#~ msgstr "Verifica tutte le firme dei MI"
+
+#~ msgid "Digitally sign all channel messages"
+#~ msgstr "Firma tutti i messaggi del canale"
+
+#~ msgid "Verify all channel message signatures"
+#~ msgstr "Verifica tutte le firme dei messaggi del canale"
+
+#, fuzzy
+#~ msgid "Stealth"
+#~ msgstr "Stato"
+
+#~ msgid "(%d message)"
+#~ msgid_plural "(%d messages)"
+#~ msgstr[0] "(%d messaggi)"
+#~ msgstr[1] "(%d messaggi)"
+
+#~ msgid "(1 message)"
+#~ msgstr "(1 messaggio)"
+
+#~ msgid "%s came back"
+#~ msgstr "%s  tornato"
+
+#, fuzzy
+#~ msgid "Default auto-away"
+#~ msgstr "Assente automatico"
 
 #~ msgid "_Sorting:"
 #~ msgstr "_Ordinamento:"
 
-#~ msgid "Buddy Display"
-#~ msgstr "Lista contatti"
-
 #, fuzzy
 #~ msgid "Show more buddy details"
 #~ msgstr "Mostra i dettagli dell'utente"
@@ -11412,28 +13459,16 @@
 #~ msgid "Auto-login"
 #~ msgstr "Login automatico"
 
-#~ msgid "New..."
-#~ msgstr "Nuovo..."
-
 #~ msgid "Back"
 #~ msgstr "Ritornato"
 
 #~ msgid "Signoff"
 #~ msgstr "Disconnetti"
 
-#~ msgid "Tray Icon Configuration"
-#~ msgstr "Configurazione dell'icona di notifica"
-
 #~ msgid "_Hide new messages until tray icon is clicked"
 #~ msgstr ""
 #~ "_Nascondi i nuovi messaggi finch non si fa clic sull'icona di notifica"
 
-#~ msgid "Orientation"
-#~ msgstr "Orientazione"
-
-#~ msgid "The orientation of the tray."
-#~ msgstr "L'orientazione del vassoio."
-
 #~ msgid "Not connected to AIM"
 #~ msgstr "Non connesso ad AIM"
 
@@ -11453,9 +13488,6 @@
 #~ "Impossibile assegnare %s ad un socket:\n"
 #~ "%s"
 
-#~ msgid "Unable to open socket"
-#~ msgstr "Impossibile aprire il socket"
-
 #~ msgid "Remote Control"
 #~ msgstr "Controllo remoto"
 
@@ -11469,24 +13501,6 @@
 #~ "Consente di controllare Gaim in remoto con applicazioni esterne o "
 #~ "attraverso il tool \"gaim-remote\"."
 
-#~ msgid "GTK Signals Test"
-#~ msgstr "Test dei segnali GTK"
-
-#~ msgid "Test to see that all ui signals are working properly."
-#~ msgstr ""
-#~ "Verifica se tutti i segnali dell'interfaccia utente funzionano "
-#~ "correttamente."
-
-#~ msgid ""
-#~ "When a new conversation is opened this plugin will insert the last "
-#~ "conversation into the current conversation."
-#~ msgstr ""
-#~ "Quando viene aperta una nuova conversazione, questo plugin inserir "
-#~ "l'ultima conversazione in quella corrente."
-
-#~ msgid "_Apply"
-#~ msgstr "_Applica"
-
 #~ msgid "Docked _Buddy List is always on top"
 #~ msgstr "La lista _contatti agganciata  sempre in primo piano"
 
@@ -11521,18 +13535,12 @@
 #~ msgid "You cannot create an empty away message"
 #~ msgstr "Non puoi creare un messaggio di assenza vuoto"
 
-#~ msgid "New away message"
-#~ msgstr "Nuovo messaggio di assenza"
-
 #~ msgid "Away title: "
 #~ msgstr "Titolo del messaggio: "
 
 #~ msgid "_Save"
 #~ msgstr "_Salva"
 
-#~ msgid "Sa_ve & Use"
-#~ msgstr "Sa_lva e utilizza"
-
 #~ msgid "Buddy List Error"
 #~ msgstr "Errore della lista contatti"
 
@@ -11673,13 +13681,6 @@
 #~ "\n"
 #~ "<b>Account:</b>"
 
-#~ msgid ""
-#~ "\n"
-#~ "<b>Warned:</b>"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Richiamato:</b>"
-
 #~ msgid "Warned (%d%%) "
 #~ msgstr "Richiamato (%d%%)"
 
@@ -11719,17 +13720,6 @@
 #~ msgid "_Reconnect"
 #~ msgstr "_Connetti di nuovo"
 
-#~ msgid ""
-#~ "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
-#~ "\n"
-#~ "%s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"larger\">%s  stato disconnesso</span>\n"
-#~ "\n"
-#~ "%s\n"
-#~ "%s"
-
 #~ msgid "Reason Unknown."
 #~ msgstr "Motivo sconosciuto."
 
@@ -11772,12 +13762,6 @@
 #~ msgid "Remove the user from your buddy list"
 #~ msgstr "Rimuovi l'utente dalla lista dei contatti"
 
-#~ msgid "Send"
-#~ msgstr "Invia"
-
-#~ msgid "Invite"
-#~ msgstr "Invita"
-
 #~ msgid "Invite a user"
 #~ msgstr "Invita un utente"
 
@@ -11812,9 +13796,6 @@
 #~ msgid "Albanian"
 #~ msgstr "Albanese"
 
-#~ msgid "Turkish"
-#~ msgstr "Turco"
-
 #~ msgid "Ukrainian"
 #~ msgstr "Ucraino"
 
@@ -11824,9 +13805,6 @@
 #~ msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
 #~ msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
 
-#~ msgid "_Screen name"
-#~ msgstr "_Nome utente"
-
 #~ msgid "Warn User"
 #~ msgstr "Richiama l'utente"
 
@@ -11859,9 +13837,6 @@
 #~ msgid "Show _timestamp on messages"
 #~ msgstr "Mostra l'_orario nei messaggi"
 
-#~ msgid "Ignore c_olors"
-#~ msgstr "Ignora i _colori"
-
 #~ msgid "Ignore font _faces"
 #~ msgstr "Ignora i _tipi di carattere"
 
@@ -11874,15 +13849,9 @@
 #~ msgid "_Send default formatting with outgoing messages"
 #~ msgstr "_Invia la formattazione predefinita con i messaggi in uscita"
 
-#~ msgid "Send Message"
-#~ msgstr "Invia un messaggio"
-
 #~ msgid "Enter _sends message"
 #~ msgstr "_Invio spedisce un messaggio"
 
-#~ msgid "C_ontrol-Enter sends message"
-#~ msgstr "C_ontrol-Invio spedisce un messaggio"
-
 #~ msgid "Window Closing"
 #~ msgstr "Chiusura della finestra"
 
@@ -11916,9 +13885,6 @@
 #~ msgid "Show _warning levels"
 #~ msgstr "Mostra i livelli di _richiamo"
 
-#~ msgid "_Automatically expand contacts"
-#~ msgstr "_Massimizza automaticamente le liste dei contatti"
-
 #~ msgid "Enable \"_slash\" commands"
 #~ msgstr "Abilita i comandi \"_slash\""
 
@@ -11940,9 +13906,6 @@
 #~ msgid "New conversation _placement:"
 #~ msgstr "_Posizione delle nuove conversazioni:"
 
-#~ msgid "Message Logs"
-#~ msgstr "Log dei messaggi"
-
 #~ msgid "System Logs"
 #~ msgstr "Log di sistema"
 
@@ -11976,19 +13939,6 @@
 #~ msgid ""
 #~ "<span size=\"larger\">%s %s</span>\n"
 #~ "\n"
-#~ "<span weight=\"bold\">Written by:</span>\t%s\n"
-#~ "<span weight=\"bold\">Web site:</span>\t\t%s\n"
-#~ "<span weight=\"bold\">File name:</span>\t%s"
-#~ msgstr ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
-#~ "<span weight=\"bold\">Scritto da:</span>\t%s\n"
-#~ "<span weight=\"bold\">Sito web:</span>\t\t%s\n"
-#~ "<span weight=\"bold\">Nome file:</span>\t\t%s"
-
-#~ msgid ""
-#~ "<span size=\"larger\">%s %s</span>\n"
-#~ "\n"
 #~ "<span weight=\"bold\">Written by:</span>  %s\n"
 #~ "<span weight=\"bold\">URL:</span>  %s\n"
 #~ "<span weight=\"bold\">File name:</span>  %s"
@@ -11999,9 +13949,6 @@
 #~ "<span weight=\"bold\">URL:</span>  %s\n"
 #~ "<span weight=\"bold\">Nome file:</span>  %s"
 
-#~ msgid "Load"
-#~ msgstr "Carica"
-
 #~ msgid "Summary"
 #~ msgstr "Descrizione"
 
@@ -12023,15 +13970,6 @@
 #~ msgid "Away Messages"
 #~ msgstr "Messaggi di assenza"
 
-#~ msgid "Plugins"
-#~ msgstr "Plugin"
-
-#~ msgid "HTML"
-#~ msgstr "HTML"
-
-#~ msgid "Plain text"
-#~ msgstr "Testo semplice"
-
 #~ msgid "Please create an account."
 #~ msgstr "Creare un account."
 
@@ -12118,9 +14056,6 @@
 #~ msgid "Unable to resolve hostname."
 #~ msgstr "Impossibile risolvere il nome dell'host."
 
-#~ msgid "Error while reading from socket."
-#~ msgstr "Errore di lettura dal socket."
-
 #~ msgid "Error while writing to socket."
 #~ msgstr "Errore di scrittura sul socket."
 
@@ -12130,12 +14065,6 @@
 #~ msgid "Unknown Error Code."
 #~ msgstr "Codice di errore sconosciuto."
 
-#~ msgid "Status: %s"
-#~ msgstr "Stato: %s"
-
-#~ msgid "Could not connect"
-#~ msgstr "Impossibile connettersi"
-
 #~ msgid "Reading data"
 #~ msgstr "Lettura dati in corso"
 
@@ -12170,15 +14099,9 @@
 #~ msgid "Couldn't get search results"
 #~ msgstr "Impossibile ottenere i risultati della ricerca"
 
-#~ msgid "Birth Year"
-#~ msgstr "Anno di nascita"
-
 #~ msgid "Sex"
 #~ msgstr "Sesso"
 
-#~ msgid "There is no Buddy List stored on the Gadu-Gadu server."
-#~ msgstr "Non c' nessuna lista contatti conservata sul server Gadu-Gadu."
-
 #~ msgid "Couldn't Import Buddy List from Server"
 #~ msgstr "Impossibile importare la lista contatti dal server"
 
@@ -12218,9 +14141,6 @@
 #~ "Gaim non  in grado di connettersi al server delle liste contatti di Gadu-"
 #~ "Gadu. Riprova pi tardi."
 
-#~ msgid "Couldn't export buddy list"
-#~ msgstr "Impossibile esportare la lista contatti"
-
 #~ msgid ""
 #~ "Gaim was unable to connect to the buddy list server.  Please try again "
 #~ "later."
@@ -12261,9 +14181,6 @@
 #~ "Gaim non  in grado di accedere al profilo di questo utente a causa di un "
 #~ "errore di connessione al server delle directory. Riprova pi tardi."
 
-#~ msgid "Gaim encountered an error communicating with the ICQ server."
-#~ msgstr "Gaim ha incontrato un errore di comunicazione con il server ICQ."
-
 #~ msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
 #~ msgstr "Gli utenti %s (%s%s%s%s%s) richiedono la tua autorizzazione."
 
@@ -12276,9 +14193,6 @@
 #~ msgid "Nick:"
 #~ msgstr "Nickname:"
 
-#~ msgid "Gaim User"
-#~ msgstr "Utente di Gaim"
-
 #~ msgid "File Transfer Aborted"
 #~ msgstr "Trasferimento file interrotto"
 
@@ -12288,9 +14202,6 @@
 #~ msgid "Invalid nickname '%s'"
 #~ msgstr "Nickname '%s' non valido"
 
-#~ msgid "Invalid nickname"
-#~ msgstr "Nickname non valido"
-
 #~ msgid "Jabber Profile"
 #~ msgstr "Profilo di Jabber"
 
@@ -12300,9 +14211,6 @@
 #~ msgid "Logged out"
 #~ msgstr "Disconnesso"
 
-#~ msgid "Hide Operating System"
-#~ msgstr "Nascondi il sistema operativo"
-
 #~ msgid "The user %s wants to add you to their buddy list."
 #~ msgstr "L'utente %s vuole aggiungerti alla sua lista dei contatti."
 
@@ -12349,12 +14257,6 @@
 #~ "Errore 0x%04x: Impossibile formattare il nome utente poich il nome "
 #~ "utente richiesto finisce con uno spazio."
 
-#~ msgid "Visible"
-#~ msgstr "Visibile"
-
-#~ msgid "Available Message:"
-#~ msgstr "Messaggio di disponibilt:"
-
 #~ msgid "I'm doing work and hoping for a distraction--IM me!"
 #~ msgstr ""
 #~ "Sto lavorando e spero che qualcuno mi distragga... Mandatemi un messaggio!"
@@ -12417,15 +14319,9 @@
 #~ msgid "%s logged in."
 #~ msgstr "%s si  connesso."
 
-#~ msgid "%s signed on"
-#~ msgstr "%s si  connesso"
-
 #~ msgid "%s logged out."
 #~ msgstr "%s si  disconnesso."
 
-#~ msgid "%s signed off"
-#~ msgstr "%s si  scollegato"
-
 #~ msgid ""
 #~ "%s has just been warned by %s.\n"
 #~ "Your new warning level is %d%%"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/po/ne.po	Wed Aug 09 14:47:37 2006 +0000
@@ -0,0 +1,11046 @@
+# translation of gaim.ne.po to Nepali
+# Nepali translations for the Gaim package.
+# Copyright (C) 2006 Gaim'S COPYRIGHT HOLDERs
+# This file is distributed under the same license as the Gaim package.
+# Pawan Chitrakar <pchitrakar@gmail.com>, 2006.
+# Shyam Krishna Bal <shyamkrishna_bal@yahoo.com>, 2006.
+# Shiva Prasad Pokharel<pokharelshiva@hotmail.com>,2006.
+msgid ""
+msgstr ""
+"Project-Id-Version: gaim.ne\n"
+"Report-Msgid-Bugs-To:<info@mpp.org.np> \n"
+"POT-Creation-Date: 2006-04-15 11:51+0545\n"
+"PO-Revision-Date: 2006-06-27 21:08+0545\n"
+"Last-Translator: Shyam Krishna Bal <shyamkrishna_bal@yahoo.com>\n"
+"Language-Team: Nepali <info@mpp.org.np>\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)\n"
+"X-Generator: KBabel 1.10.2\n"
+
+#: plugins/autorecon.c:240
+msgid "Error Message Suppression"
+msgstr "त्रुटि सन्देश दबाव"
+
+#: plugins/autorecon.c:244
+msgid "Hide Disconnect Errors"
+msgstr "विच्छेद त्रुटिहरू लुकाउनुहोस्"
+
+#: plugins/autorecon.c:248
+msgid "Hide Login Errors"
+msgstr "लगइन त्रुटिहरू लुकाउनुहोस्"
+
+#: plugins/autorecon.c:252
+msgid "Restore Away State On Reconnect"
+msgstr "पुन:जडानमा 'बाहिर अवस्था'पूर्वावस्थामा ल्याउनुहोस्"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/autorecon.c:276
+msgid "Auto-Reconnect"
+msgstr "स्वत-पुन:जडान गर्नुहोस्"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: plugins/autorecon.c:279 plugins/autorecon.c:281
+msgid "When you are kicked offline, this reconnects you."
+msgstr "तपाईँ अफलाइन हुनुहुन्छ भने, यसले तपाईँलाई पुन:जडान गर्दछ ।"
+
+#: plugins/chkmail.c:94 plugins/chkmail.c:117 plugins/chkmail.c:126
+msgid "Mail Server"
+msgstr "पत्र सर्भर"
+
+#: plugins/chkmail.c:136
+#, c-format
+msgid "%s (%d new/%d total)"
+msgstr "%s (%d नयाँ/%d जम्मा)"
+
+#: plugins/chkmail.c:199
+msgid "Check Mail"
+msgstr "पत्र जाँच्नुहोस्"
+
+#: plugins/chkmail.c:203
+msgid "Check email every X seconds.\n"
+msgstr "हरेक X सेकेन्डमा इमेल जाँच्नुहोस् ।\n"
+
+#: plugins/contact_priority.c:84
+msgid "Point values to use when..."
+msgstr "प्रयोग गर्ने समयमा बिन्दु मानहरू..."
+
+#: plugins/contact_priority.c:93
+msgid "Buddy is offline:"
+msgstr "साथी अफलाइन छ:"
+
+#: plugins/contact_priority.c:107
+msgid "Buddy is away:"
+msgstr "साथी टाढा छ:"
+
+#: plugins/contact_priority.c:121
+msgid "Buddy is idle:"
+msgstr "साथी आइडल छ:"
+
+#: plugins/contact_priority.c:135
+msgid "Use last matching buddy"
+msgstr "अन्तिम जोडा मिल्ने साथी प्रयोग गर्नुहोस्"
+
+#. Explanation
+#: plugins/contact_priority.c:141
+msgid ""
+"The buddy with the lowest score is the buddy who will have priority in the "
+"contact.\n"
+"The default values (offline = 4,away = 2, and idle = 1)\n"
+"will use what used to be the built-in order active->idle->away->away+idle-"
+">offline."
+msgstr ""
+"कम स्कोर भएको साथी त्यो साथी हो जो सम्पर्कमा बढी प्राथमिकता हुनेछ ।\n"
+" पूर्वनिर्धरित मानहरू (offline = 4,away = 2, and idle = 1)\n"
+"ले आदेश active->idle->away->away+idle-"
+">offline निर्माण गर्दा के प्रयोग गर्नुपर्ने भन्ने प्रयोग गर्दछ ।"
+
+#: plugins/contact_priority.c:144
+msgid "Point values to use for Account..."
+msgstr "खाताका लागि प्रयोग गर्न बिन्दु मानहरू..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/contact_priority.c:195
+msgid "Contact Priority"
+msgstr "सम्पर्क प्राथमिकता"
+
+#. *< name
+#. *< version
+#. *< summary
+#: plugins/contact_priority.c:198
+msgid "Allows for controlling the values associated with different buddy states."
+msgstr "सम्बद्ध भएका विभिन्न साथी वस्तुस्थितिहरू सहित नियन्त्रित मानहरूका लागि अनुमति दिन्छ ।"
+
+#. *< description
+#: plugins/contact_priority.c:200
+msgid ""
+"Allows for changing the point values of idle/away/offline states for buddies "
+"in contact priority computations."
+msgstr "सम्पर्क प्राथमिकता गणनहरूमा साथीहरूका लागि निष्क्रिय/टाढा/अफलाइन वस्तुस्थितिको मानहरू परिवर्तन गर्नका लागि अनुमति दिन्छ ।"
+
+#: plugins/docklet/docklet.c:137 src/gtkaccount.c:751 src/gtkaccount.c:2179
+msgid "Auto-login"
+msgstr "स्वत: लगइन"
+
+#: plugins/docklet/docklet.c:140
+msgid "New Message..."
+msgstr "नयाँ सन्देश..."
+
+#: plugins/docklet/docklet.c:141
+msgid "Join A Chat..."
+msgstr "एउटा कुराकानीमा भाग लिनुहोस्..."
+
+#: plugins/docklet/docklet.c:173
+msgid "New..."
+msgstr "नयाँ..."
+
+#: plugins/docklet/docklet.c:177 src/gtkprefs.c:1813 src/protocols/gg/gg.c:52
+#: src/protocols/irc/msgs.c:227 src/protocols/jabber/jabber.c:1000
+#: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:69
+#: src/protocols/jabber/presence.c:132 src/protocols/novell/novell.c:2800
+#: src/protocols/novell/novell.c:2917 src/protocols/novell/novell.c:2969
+#: src/protocols/oscar/oscar.c:693 src/protocols/oscar/oscar.c:6462
+#: src/protocols/oscar/oscar.c:7459 src/protocols/oscar/oscar.c:7659
+#: src/protocols/silc/buddy.c:1388 src/protocols/silc/silc.c:47
+#: src/protocols/silc/silc.c:81
+msgid "Away"
+msgstr "टाढा"
+
+#. else...
+#: plugins/docklet/docklet.c:183 src/away.c:595
+#: src/protocols/oscar/oscar.c:6380 src/protocols/oscar/oscar.c:7667
+msgid "Back"
+msgstr "पछाडि"
+
+#: plugins/docklet/docklet.c:191
+msgid "Mute Sounds"
+msgstr "ध्वनिहरू चुप गर्नुहोस्"
+
+#: plugins/docklet/docklet.c:196 src/gtkft.c:659
+#: src/protocols/oscar/oscar.c:8176
+msgid "File Transfers"
+msgstr "फाइल स्थानान्तरणहरू"
+
+#: plugins/docklet/docklet.c:197 src/gtkaccount.c:2391
+msgid "Accounts"
+msgstr "खाताहरू"
+
+#: plugins/docklet/docklet.c:198 src/gtkprefs.c:2514
+msgid "Preferences"
+msgstr "प्राथमिकताहरू"
+
+#: plugins/docklet/docklet.c:207
+msgid "Signoff"
+msgstr "साइनअफ"
+
+#: plugins/docklet/docklet.c:211
+msgid "Quit"
+msgstr "अन्त्य गर्नुहोस्"
+
+#: plugins/docklet/docklet.c:527
+msgid "Tray Icon Configuration"
+msgstr "ट्रे प्रतिमा कन्फिगरेशन"
+
+#: plugins/docklet/docklet.c:531
+msgid "_Hide new messages until tray icon is clicked"
+msgstr "ट्रे प्रतिमा क्लिक नगरे सम्म नयाँ सन्देशहर लुकाउनुहोस्"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/docklet/docklet.c:557
+msgid "System Tray Icon"
+msgstr "प्रणाली ट्रे प्रतिमा"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/docklet/docklet.c:560
+msgid "Displays an icon for Gaim in the system tray."
+msgstr "प्रणाली ट्रेमा गाइमका लागि प्रतिमा प्रदर्शन गर्दछ ।"
+
+#. *  description
+#: plugins/docklet/docklet.c:562
+msgid ""
+"Displays a system tray icon (in GNOME, KDE or Windows for example) to show "
+"the current status of Gaim, allow fast access to commonly used functions, "
+"and to toggle display of the buddy list or login window. Also allows "
+"messages to be queued until the icon is clicked, similar to ICQ."
+msgstr "गाइमको हालको वस्तुस्थिति देखाउन प्रणाली ट्रे प्रतिमा(उदाहरणका लागि GNOME, KDE वा सञ्झ्यालहरूमा) प्रदर्शन गर्दछ,समान रुपमा प्रयोग भएका प्रकार्यहरू र साथी सूची वा लगइन सञ्झ्याल टगलमा प्रदर्शन गर्न समानरुपले उपलब्धता द्रुत गर्न अनुमति दिन्छ । ICQ मा जस्तै, सधै सन्देशहरू प्रतिमा क्लिक गर्दा सम्म पङ्क्तिबद्ध गर्न अनुमति दिन्छ । "
+
+#.
+#. *  DEFINES, MACROS & DATA TYPES
+#.
+#: plugins/docklet/docklet-win32.c:44
+msgid "Gaim"
+msgstr "गाइम"
+
+#: plugins/docklet/docklet-win32.c:45
+msgid "Gaim - Signed off"
+msgstr "गाइम-साइनअफ गरियो"
+
+#: plugins/docklet/docklet-win32.c:46
+msgid "Gaim - Away"
+msgstr "गाइम - टाढा"
+
+#: plugins/docklet/eggtrayicon.c:122
+msgid "Orientation"
+msgstr "अभिमुखीकरण"
+
+#: plugins/docklet/eggtrayicon.c:123
+msgid "The orientation of the tray."
+msgstr "ट्रेको अभिमुखीकरण"
+
+#: plugins/extplacement.c:77
+msgid "By conversation count"
+msgstr "वार्तालाप गणना द्वारा"
+
+#: plugins/extplacement.c:98
+msgid "Conversation Placement"
+msgstr "वार्तालाप रखाई"
+
+#: plugins/extplacement.c:103
+msgid "Number of conversations per window"
+msgstr "प्रति सञ्झ्याल वार्तालापहरुको संख्या"
+
+#: plugins/extplacement.c:109
+msgid "Separate IM and Chat windows when placing by number"
+msgstr "संख्या राखिसके पाछि IM र कुराकानी सञ्झ्यालहरू छुट्याउनुहोस्"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/extplacement.c:130
+msgid "ExtPlacement"
+msgstr "ExtPlacement"
+
+#. *< name
+#. *< version
+#: plugins/extplacement.c:132
+msgid "Extra conversation placement options."
+msgstr "अतिरिक्त वार्तालाप रखाई विकल्पहरू ।"
+
+#. *< summary
+#. *  description
+#: plugins/extplacement.c:134
+msgid ""
+"Restrict the number of conversations per windows, optionally separating IMs "
+"and Chats"
+msgstr "एच्छिक रुपमा IMहरू र कुराकानी छुट्याउदा, प्रति सञ्झ्यालहरू वार्तालापहरुको संख्या सिमित गरिएको हुन्छ"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/filectl.c:224
+msgid "Gaim File Control"
+msgstr "गाइम फाइल नियन्त्रण"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: plugins/filectl.c:227 plugins/filectl.c:229
+msgid "Allows you to control Gaim by entering commands in a file."
+msgstr "फाइलमा आदेशहरू प्रविष्ट गरेर गाइम नियन्त्रण गर्न तपाईँलाई अनुमति दिन्छ ।"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/gaiminc.c:90
+msgid "Gaim Demonstration Plugin"
+msgstr "गाइम प्रदर्शन प्लगइन"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/gaiminc.c:93
+msgid "An example plugin that does stuff - see the description."
+msgstr "स्टफ गर्ने प्लगइनको उदाहरण  - वर्णन हेर्नुहोस् ।"
+
+#. *  description
+#: plugins/gaiminc.c:95
+msgid ""
+"This is a really cool plugin that does a lot of stuff:\n"
+"- It tells you who wrote the program when you log in\n"
+"- It reverses all incoming text\n"
+"- It sends a message to people on your list immediately when they sign on"
+msgstr ""
+"यो वास्तवमै कूल प्लगइन हो जसले अधिक स्टफ गर्दछ:\n"
+"- यसले तपाईँले लगइन गर्दा कार्यक्रम कसले लेख्यो भन्ने कुरा बताउछ\n"
+"- यसले सबै आएका पाठहरू उल्ट्याउछ\n"
+"- यसले तपाईँको सूचीमा रहेका मानिसले साइनअन गर्ने बित्तिकै सन्देश पठाउँछ"
+
+#: plugins/gaim-remote/remote.c:91
+msgid "Not connected to AIM"
+msgstr "AIM मा जडान हुन सकेन"
+
+#: plugins/gaim-remote/remote.c:100 plugins/gaim-remote/remote.c:139
+msgid "No screenname given."
+msgstr "कुनै पर्दानाम दिइएको छैन ।"
+
+#: plugins/gaim-remote/remote.c:176
+msgid "No roomname given."
+msgstr "कुनै कोठानाम दिइएको छैन ।"
+
+#: plugins/gaim-remote/remote.c:195
+msgid "Invalid AIM URI"
+msgstr "अवैध AIM URI"
+
+#: plugins/gaim-remote/remote.c:673
+#, c-format
+msgid ""
+"Failed to assign %s to a socket:\n"
+"%s"
+msgstr ""
+"एउटा सकेटमा %s मानाङ्कन गर्न असफल भयो:\n"
+"%s"
+
+#: plugins/gaim-remote/remote.c:697
+msgid "Unable to open socket"
+msgstr "सकेट खोल्न अक्षम भयो"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/gaim-remote/remote.c:747
+msgid "Remote Control"
+msgstr "टाढा नियन्त्रण"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/gaim-remote/remote.c:750
+msgid "Provides remote control for gaim applications."
+msgstr "गाइम अनुप्रयोगहरुका लागि टाढा नियन्त्रण उपलब्ध गर्दछ ।"
+
+#. *  description
+#: plugins/gaim-remote/remote.c:752
+msgid ""
+"Gives Gaim the ability to be remote-controlled through third-party "
+"applications or through the gaim-remote tool."
+msgstr "तेस्रो पक्षीय अनुप्रयोगहरू वा गाइम टाढा उपकरण मार्फत टाढा नियन्त्रण गर्न गाइमलाई क्षमता दिन्छ ।"
+
+#. Configuration frame
+#: plugins/gestures/gestures.c:221
+msgid "Mouse Gestures Configuration"
+msgstr "माउस गेस्चर कन्फिगरेसन"
+
+#: plugins/gestures/gestures.c:228
+msgid "Middle mouse button"
+msgstr "मध्य माउस बटन"
+
+#: plugins/gestures/gestures.c:233
+msgid "Right mouse button"
+msgstr "दाहिने माउस बटन"
+
+#. "Visual gesture display" checkbox
+#: plugins/gestures/gestures.c:245
+msgid "_Visual gesture display"
+msgstr "दृश्य गेस्चर प्रदर्शन"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/gestures/gestures.c:274
+msgid "Mouse Gestures"
+msgstr "माउस गेस्चरहरू"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/gestures/gestures.c:277
+msgid "Provides support for mouse gestures"
+msgstr "माउस गेस्चरका लागि समर्थन उपलब्ध गराउछ"
+
+#. *  description
+#: plugins/gestures/gestures.c:279
+msgid ""
+"Allows support for mouse gestures in conversation windows.\n"
+"Drag the middle mouse button to perform certain actions:\n"
+"\n"
+"Drag down and then to the right to close a conversation.\n"
+"Drag up and then to the left to switch to the previous conversation.\n"
+"Drag up and then to the right to switch to the next conversation."
+msgstr ""
+"वार्तालाप सञ्झ्याहरूलमा माउस ग्रेस्चरहरूका लागि समर्थन अनुमति दिन्छ ।\n"
+"निश्चित कार्यहरू सम्पादन गर्न  मध्य माउस बटन तान्नुहोस्:\n"
+"\n"
+"तल तान्नुहोस् र त्यसपछि दायाँमा वार्तालाप बन्द गर्नुहोस् ।\n"
+"माथि तान्नुहोस् र त्यसपछि अघिल्लो वार्तालापमा बायाँ स्विच गर्नुहोस् ।\n"
+"माथि तान्नुहोस् र त्यसपछि पछिल्लो वार्तालापमाा दायाा स्विच गर्ुहोस्न ।"
+
+#: plugins/gevolution/add_buddy_dialog.c:132
+#: plugins/gevolution/assoc-buddy.c:120 src/gtkprefs.c:2168
+#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:609
+#: src/protocols/msn/msn.c:1474 src/protocols/trepia/trepia.c:399
+msgid "Name"
+msgstr "नाम"
+
+#: plugins/gevolution/add_buddy_dialog.c:143
+msgid "Instant Messaging"
+msgstr "शीघ्र सन्देश"
+
+#. Add the label.
+#: plugins/gevolution/add_buddy_dialog.c:455
+msgid "Select a person from your address book below, or add a new person."
+msgstr "तपाईँको तलको ठेगाना पुस्तकबाट व्यक्ति चयन गर्नुहोस्,वा नयाँ व्यक्ति थप्नुहोस् ।"
+
+#. "Search"
+#: plugins/gevolution/add_buddy_dialog.c:468
+#: plugins/gevolution/assoc-buddy.c:354 src/protocols/oscar/oscar.c:7943
+msgid "Search"
+msgstr "खोजी गर्नुहोस्"
+
+#: plugins/gevolution/add_buddy_dialog.c:549
+#: plugins/gevolution/new_person_dialog.c:304 src/gtkblist.c:4186
+#: src/gtkblist.c:4534
+msgid "Group:"
+msgstr "समूह:"
+
+#. "New Person" button
+#: plugins/gevolution/add_buddy_dialog.c:575
+#: plugins/gevolution/assoc-buddy.c:466
+msgid "New Person"
+msgstr "नयाँ व्यक्ति"
+
+#. "Select Buddy" button
+#: plugins/gevolution/add_buddy_dialog.c:592
+msgid "Select Buddy"
+msgstr "साथी चयन गर्नुहोस्"
+
+#. Add the label.
+#: plugins/gevolution/assoc-buddy.c:341
+msgid ""
+"Select a person from your address book to add this buddy to, or create a new "
+"person."
+msgstr "यो साथीलाई पनि थप्नलाई तपाईँको ठेगाना पुस्तकबाट व्यक्ति चयन गर्नुहोस्, वा नयाँ व्यक्ति सिर्जना गर्नुहोस् ।"
+
+#. Add the disclosure
+#: plugins/gevolution/assoc-buddy.c:429
+msgid "Show user details"
+msgstr "प्रयोगकर्ता विवरणहरू देखाउनुहोस्"
+
+#: plugins/gevolution/assoc-buddy.c:430
+msgid "Hide user details"
+msgstr "प्रयोगकर्ता विवरणहरू लुकाउनुहोस्"
+
+#. "Associate Buddy" button
+#: plugins/gevolution/assoc-buddy.c:483
+msgid "_Associate Buddy"
+msgstr "संगठित साथी"
+
+#: plugins/gevolution/eds-utils.c:74 plugins/gevolution/eds-utils.c:87
+#: src/gtkblist.c:3122 src/gtkprefs.c:962 src/gtkprefs.c:1014
+#: src/gtkprefs.c:1827 src/protocols/jabber/jabber.c:951
+msgid "None"
+msgstr "कुनै पनि होइन"
+
+#: plugins/gevolution/gevolution.c:93 plugins/gevolution/gevo-util.c:64
+#: src/blist.c:776 src/blist.c:983 src/blist.c:1936 src/gtkblist.c:4001
+#: src/protocols/jabber/roster.c:67
+msgid "Buddies"
+msgstr "साथीहरू"
+
+#: plugins/gevolution/gevolution.c:225
+msgid "Add to Address Book"
+msgstr "ठेगाना पुस्तकमा थप्नुहोस्"
+
+#. Configuration frame
+#: plugins/gevolution/gevolution.c:348
+msgid "Evolution Integration Configuration"
+msgstr "विकास अनुकलन कन्फिगरेसन"
+
+#. Label
+#: plugins/gevolution/gevolution.c:351
+msgid "Select all accounts that buddies should be auto-added to."
+msgstr "सबै साथीहरू स्वत:थप गर्नुपर्ने सबै खाताहरू चयन गर्नुहोस् ।"
+
+#: plugins/gevolution/gevolution.c:381 plugins/idle.c:52 src/gtkconn.c:627
+msgid "Account"
+msgstr "खाता"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/gevolution/gevolution.c:464
+msgid "Evolution Integration"
+msgstr "विकास अनुकलन"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: plugins/gevolution/gevolution.c:467 plugins/gevolution/gevolution.c:469
+msgid "Provides integration with Ximian Evolution."
+msgstr "ximian विकास सँगै अनुकलन उपलब्ध गर्दछ ।"
+
+#: plugins/gevolution/new_person_dialog.c:264
+msgid "Please enter the person's information below."
+msgstr "कृपाया व्यक्तिहरुको जानकारीहरू तल प्रविष्टि गर्नुहोस् ।"
+
+#: plugins/gevolution/new_person_dialog.c:268
+msgid "Please enter the buddy's screen name and account type below."
+msgstr "कृपया साथीको पर्दाको नाम र खाता प्रकारहरू तल प्रविष्टि गर्नुहोस् ।"
+
+#: plugins/gevolution/new_person_dialog.c:288
+msgid "Account type:"
+msgstr "खाता प्रकार:"
+
+#: plugins/gevolution/new_person_dialog.c:292
+msgid "Screenname:"
+msgstr "स्क्रिननाम:"
+
+#. Optional Information section
+#: plugins/gevolution/new_person_dialog.c:312
+msgid "Optional information:"
+msgstr "वैकल्पिक सूचना:"
+
+#. Label
+#: plugins/gevolution/new_person_dialog.c:335 src/gtkaccount.c:379
+#: src/gtkaccount.c:409 src/protocols/oscar/oscar.c:599
+msgid "Buddy Icon"
+msgstr "साथी प्रतिमा"
+
+#: plugins/gevolution/new_person_dialog.c:347
+msgid "First name:"
+msgstr "पहिलो नाम:"
+
+#: plugins/gevolution/new_person_dialog.c:359
+msgid "Last name:"
+msgstr "अन्तिम नाम:"
+
+#: plugins/gevolution/new_person_dialog.c:379
+msgid "E-mail:"
+msgstr "इ-मेल:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/gtk-signals-test.c:102
+msgid "GTK Signals Test"
+msgstr "GTK संकेतहरू पारिक्षण"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: plugins/gtk-signals-test.c:105 plugins/gtk-signals-test.c:107
+msgid "Test to see that all ui signals are working properly."
+msgstr "हेर्न परिक्षण गर्नुहोस् जसमा सबै ui संकेतहरूले उचितरुपमले कार्य गरिरहन्छन् ।"
+
+#: plugins/history.c:92
+msgid "History"
+msgstr "इतिहास"
+
+#: plugins/history.c:94
+msgid "Shows recently logged conversations in new conversations."
+msgstr "नयाँ वार्तालापहरूमा तुरुन्तै लग गरेका वार्तालापहरू देखाउने छ ।"
+
+#: plugins/history.c:95
+msgid ""
+"When a new conversation is opened this plugin will insert the last "
+"conversation into the current conversation."
+msgstr "जब नयाँ वार्तालाप खोल्छ यो प्लगइनले हालको वार्तालापमा अन्तिम वार्तालाप घुसाउछ ।"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/iconaway.c:104
+msgid "Iconify on Away"
+msgstr "टाढा हुँदा प्रतिमा राख्नुहोस्"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: plugins/iconaway.c:107 plugins/iconaway.c:109
+msgid "Iconifies the buddy list and your conversations when you go away."
+msgstr "जब तपाईँ टाढा जानुहुन्छ साथी सूची र तपाईँको वार्तालापहरू प्रतिमा राख्नुहोस् ।"
+
+#: plugins/idle.c:56
+msgid "Minutes"
+msgstr "मिनेटहरू"
+
+#: plugins/idle.c:63 plugins/idle.c:98
+msgid "I'dle Mak'er"
+msgstr "निष्क्रिय सूचक"
+
+#: plugins/idle.c:64 plugins/idle.c:79
+msgid "Set Account Idle Time"
+msgstr "खातामा निष्क्रिय समयको सेट गर्नुहोस्"
+
+#: plugins/idle.c:67
+msgid "_Set"
+msgstr "सेट गर्नुहोस्"
+
+#: plugins/idle.c:68 src/away.c:922
+msgid "_Cancel"
+msgstr "रद्द गर्नुहोस्"
+
+#: plugins/idle.c:100 plugins/idle.c:101
+msgid "Allows you to hand-configure how long you've been idle for"
+msgstr "तपाईँ कति समयका लागि निस्क्रिय हुनुभयो भन्ने हाते-कनफिगर गर्न अनुमति दिन्छ "
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/ipc-test-client.c:87
+msgid "IPC Test Client"
+msgstr "IPC परिक्षण ग्राहक"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/ipc-test-client.c:90
+msgid "Test plugin IPC support, as a client."
+msgstr "ग्राहकको रुपमा, IPC समर्थन प्लगइन परिक्षण गर्नुहोस् ।"
+
+#. *  description
+#: plugins/ipc-test-client.c:92
+msgid ""
+"Test plugin IPC support, as a client. This locates the server plugin and "
+"calls the commands registered."
+msgstr "ग्राहकको रुपमा, IPC समर्थन प्लगइन परिक्षण गर्नुहोस् । यसले सर्भर प्लगइन स्थपना गर्दछ र रजिस्टर गरेका आदेशहरू बोलाउछ ।"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/ipc-test-server.c:74
+msgid "IPC Test Server"
+msgstr "IPC परिक्षण सर्भर"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/ipc-test-server.c:77
+msgid "Test plugin IPC support, as a server."
+msgstr "सर्भरको रुपमा, IPC समर्थन प्लगइन परिक्षण गर्नुहोस् ।"
+
+#. *  description
+#: plugins/ipc-test-server.c:79
+msgid "Test plugin IPC support, as a server. This registers the IPC commands."
+msgstr "सर्भरको रुपमा, IPC समर्थन प्लगइन परिक्षण गर्नुहोस् । यसले IPC आदेशहरू रजिस्टर गर्दछ ।"
+
+#: plugins/mailchk.c:160
+msgid "Mail Checker"
+msgstr "मेल जाँचकर्ता"
+
+#: plugins/mailchk.c:162
+msgid "Checks for new local mail."
+msgstr "नयाँ स्थानीय मेलका लागि परिक्षण गर्दछ ।"
+
+#: plugins/mailchk.c:163
+msgid "Adds a small box to the buddy list that shows if you have new mail."
+msgstr "साथी सूचीमा सानो बाकस थप्नुहोस् जसले यदि तपाईँको नयाँ मेल आएको खण्डमा देखाउँदछ ।"
+
+#. ---------- "Notify For" ----------
+#: plugins/notify.c:614
+msgid "Notify For"
+msgstr "...का लागि सूचित गर्नुहोस्"
+
+#: plugins/notify.c:618
+msgid "_IM windows"
+msgstr "IM सञ्झ्यालहरू"
+
+#: plugins/notify.c:625
+msgid "C_hat windows"
+msgstr "कुराकानी सञ्झ्यालहरू"
+
+#: plugins/notify.c:632
+msgid "_Focused windows"
+msgstr "फोकस गरेका सञ्झ्यालहरू"
+
+#. ---------- "Notification Methods" ----------
+#: plugins/notify.c:640
+msgid "Notification Methods"
+msgstr "सूचना विधिहरू"
+
+#: plugins/notify.c:647
+msgid "Prepend _string into window title:"
+msgstr "सञ्झ्याल शीर्षक भित्र प्रिपेन्ड स्ट्रिङ"
+
+#. Count method button
+#: plugins/notify.c:666
+msgid "Insert c_ount of new messages into window title"
+msgstr "सञ्झ्याल शीर्षक भित्र नयाँ सन्देशहरुको गणना घुसाउनुहोस्"
+
+#. Urgent method button
+#: plugins/notify.c:674
+msgid "Set window manager \"_URGENT\" hint"
+msgstr "सञ्झ्याल प्रवन्धक \"_URGENT\" हिन्ट सेट गर्नुहोस् ।"
+
+#. ---------- "Notification Removals" ----------
+#: plugins/notify.c:682
+msgid "Notification Removal"
+msgstr "हटाउन मिल्ने सूचना"
+
+#. Remove on focus button
+#: plugins/notify.c:687
+msgid "Remove when conversation window _gains focus"
+msgstr "वार्तालाप सञ्झ्यालले फोकसहरू प्राप्त गर्दा हटाउनुहोस्"
+
+#. Remove on click button
+#: plugins/notify.c:694
+msgid "Remove when conversation window _receives click"
+msgstr "वार्तालाप सञ्झ्यालले क्लिक प्राप्त गर्दा हटाउनुहोस्"
+
+#. Remove on type button
+#: plugins/notify.c:702
+msgid "Remove when _typing in conversation window"
+msgstr "वार्तालाप सञ्झ्यालमा टाइप गर्दा हटाउनुहोस्"
+
+#. Remove on message send button
+#: plugins/notify.c:710
+msgid "Remove when a _message gets sent"
+msgstr "सन्देश पठाउने प्राप्त गर्दा हटाउनुहोस्"
+
+#. Remove on conversation switch button
+#: plugins/notify.c:719
+msgid "Remove on switch to conversation ta_b"
+msgstr "वर्तालाव ट्याबमा स्विच गर्न हटाउनुहोस्"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/notify.c:809
+msgid "Message Notification"
+msgstr "सन्देश सूचना"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: plugins/notify.c:812 plugins/notify.c:814
+msgid "Provides a variety of ways of notifying you of unread messages."
+msgstr "तपाईँलाई नपढेका सन्देशहरुको सूचना गराउने बाटाहरुको प्रकार उपलब्ध गराउछ ।"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/perl/perl.c:535
+msgid "Perl Plugin Loader"
+msgstr "प्रिल प्लगइन लोडर"
+
+#. *< name
+#. *< version
+#. *< summary
+#: plugins/perl/perl.c:537 plugins/perl/perl.c:538
+msgid "Provides support for loading perl plugins."
+msgstr "प्रिल प्लगइनहरू लोड गर्नका लागि समर्थन उपलब्ध गराउछ ।"
+
+#: plugins/raw.c:151
+msgid "Raw"
+msgstr "कच्चा"
+
+#: plugins/raw.c:153
+msgid "Lets you send raw input to text-based protocols."
+msgstr "पाठ आधारित प्रोटोकलहरूमा कच्चा आगत पठाउन सक्नुहुन्छ ।"
+
+#: plugins/raw.c:154
+msgid ""
+"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"'Enter' in the entry box to send. Watch the debug window."
+msgstr "पाठ आधारित प्रोटोकल(Jabber, MSN, IRC, TOC)हरूमा कच्चा आगत पठाउन सक्नुहुन्छ । प्रविष्टि वाकसमा पठाउन प्रविष्टिमा हिट गर्नुहोस् । डिबग सञ्झ्याल हेर्नुहोस् ।"
+
+#: plugins/relnot.c:63
+#, c-format
+msgid "You are using Gaim version %s.  The current version is %s.<hr>"
+msgstr "तपाईँ गाइम संसकरण %s प्रयोग गरिरहनु हुन्छ । %s हालको संसकरण हो ।<hr>"
+
+#: plugins/relnot.c:69
+#, c-format
+msgid ""
+"<b>ChangeLog:</b>\n"
+"%s<br><br>"
+msgstr ""
+"<b>लग परिवर्तन:</b>\n"
+"%s<br><br>"
+
+#: plugins/relnot.c:74
+#, c-format
+msgid ""
+"You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
+"\">http://gaim.sourceforge.net</a>."
+msgstr ""
+"%s बाट तपाईँले संस्करण पाउन सक्नुहुन्छ :<br><a href=\"http://gaim.sourceforge.net/"
+"\">http://gaim.sourceforge.net</a> ।"
+
+#: plugins/relnot.c:78 plugins/relnot.c:79
+msgid "New Version Available"
+msgstr "उपलब्ध नयाँ संस्करण"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/relnot.c:137
+msgid "Release Notification"
+msgstr "सूचना निष्कासन गर्नुहोस्"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/relnot.c:140
+msgid "Checks periodically for new releases."
+msgstr "नयाँ निष्कासनका लागि आवधिक जाँच गर्दछ ।"
+
+#. *  description
+#: plugins/relnot.c:142
+msgid ""
+"Checks periodically for new releases and notifies the user with the "
+"ChangeLog."
+msgstr "नयाँ निष्कासनका लागि आवधिक जाँच गर्दछ र ChangeLog सहित प्रयोगकर्ताहरुलाई सूचना गराउछ ।"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/signals-test.c:601
+msgid "Signals Test"
+msgstr "परिक्षण संकेतहरू"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: plugins/signals-test.c:604 plugins/signals-test.c:606
+msgid "Test to see that all signals are working properly."
+msgstr "सबै संकेतहरूले वास्तविक रुपमा काम गरिरहेका छन् भन्ने हेर्न परिक्षण गर्नुहोस् ।"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/simple.c:34
+msgid "Simple Plugin"
+msgstr "सामान्य प्लगइन"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: plugins/simple.c:37 plugins/simple.c:39
+msgid "Tests to see that most things are working."
+msgstr "धेरै वस्तुहरू कार्य गरिरहेका छन् भन्ने हेर्नका लागि परिक्षण गर्दछ ।"
+
+#: plugins/spellchk.c:416
+msgid "Text Replacements"
+msgstr "पाठ प्रतिस्थापनहरू"
+
+#: plugins/spellchk.c:440
+msgid "You type"
+msgstr "तपाईँ टाइप गर्नुहोस्"
+
+#: plugins/spellchk.c:452
+msgid "You send"
+msgstr "तपाईँ पठाउनुहोस्"
+
+#: plugins/spellchk.c:478
+msgid "Add a new text replacement"
+msgstr "नयाँ पाठ प्रतिस्थापन थप्नुहोस्"
+
+#: plugins/spellchk.c:485
+msgid "You _type:"
+msgstr "तपाईँ टाइप गर्नुहोस्:"
+
+#: plugins/spellchk.c:499
+msgid "You _send:"
+msgstr "तपाईँ पठाउनुहोस्:"
+
+#: plugins/spellchk.c:541
+msgid "Text replacement"
+msgstr "पाठ प्रतिस्थापन"
+
+#: plugins/spellchk.c:543 plugins/spellchk.c:544
+msgid "Replaces text in outgoing messages according to user-defined rules."
+msgstr "प्रयोगकर्ता परिभाषित नियम अनुसार बाहिर जाने सन्देशहरूमा पाठ बदल्छ ।"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/ssl/ssl.c:94
+msgid "SSL"
+msgstr "SSL"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: plugins/ssl/ssl.c:97 plugins/ssl/ssl.c:99
+msgid "Provides a wrapper around SSL support libraries."
+msgstr "SSLसमर्थन लाइब्रेरिहरुको हाराहारिमा बेर्ने उपलब्ध गराउछ ।"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/ssl/ssl-gnutls.c:226
+msgid "GNUTLS"
+msgstr "GNUTLS"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: plugins/ssl/ssl-gnutls.c:229 plugins/ssl/ssl-gnutls.c:231
+msgid "Provides SSL support through GNUTLS."
+msgstr "GNUTLS बाट SSL समर्थनहरू उपलब्ध गराउछ ।"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/ssl/ssl-nss.c:318
+msgid "NSS"
+msgstr "NSS"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: plugins/ssl/ssl-nss.c:321 plugins/ssl/ssl-nss.c:323
+msgid "Provides SSL support through Mozilla NSS."
+msgstr "मोजिल्ला NSS बाट SSL समर्थनहरू उपलब्ध गराउछ ।"
+
+#: plugins/statenotify.c:41
+#, c-format
+msgid "%s has gone away."
+msgstr "%s टाढा गइसक्यो ।"
+
+#: plugins/statenotify.c:48
+#, c-format
+msgid "%s is no longer away."
+msgstr "%s लामो बाटो होइन ।"
+
+#: plugins/statenotify.c:55
+#, c-format
+msgid "%s has become idle."
+msgstr "%s निष्क्रिय बसेको छ ।"
+
+#: plugins/statenotify.c:62
+#, c-format
+msgid "%s is no longer idle."
+msgstr "%s निष्क्रियमा बसेको धेरै भएको छैन ।"
+
+#: plugins/statenotify.c:73
+msgid "Notify When"
+msgstr "जब सूचना दियो"
+
+#: plugins/statenotify.c:76
+msgid "Buddy Goes _Away"
+msgstr "साथी टाढा जान्छ ।"
+
+#: plugins/statenotify.c:79
+msgid "Buddy Goes _Idle"
+msgstr "साथी निष्क्रिय बन्छ"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/statenotify.c:119
+msgid "Buddy State Notification"
+msgstr "साथी स्थितिको सूचना"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: plugins/statenotify.c:122 plugins/statenotify.c:125
+msgid ""
+"Notifies in a conversation window when a buddy goes or returns from away or "
+"idle."
+msgstr "जब साथी टाढा जान्छ वा निष्क्रिय बन्छ वा फर्किन्छ वार्तालाप सञ्झ्यालमा सूचना दिन्छ ।"
+
+#: plugins/tcl/tcl.c:363
+msgid "Tcl Plugin Loader"
+msgstr "Tcl प्लगइन लोडर"
+
+#: plugins/tcl/tcl.c:365 plugins/tcl/tcl.c:366
+msgid "Provides support for loading Tcl plugins"
+msgstr "Tcl प्लगइनहरू लोडगर्दा समर्थनहरू उपलब्ध गराउछ ।"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/ticker/ticker.c:75 plugins/ticker/ticker.c:331
+msgid "Buddy Ticker"
+msgstr "साथीको विश्वास"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: plugins/ticker/ticker.c:334 plugins/ticker/ticker.c:336
+msgid "A horizontal scrolling version of the buddy list."
+msgstr "साथी सूचीको तेर्सो स्क्रोलिङ संस्करण ।"
+
+#: plugins/timestamp.c:186
+msgid "iChat Timestamp"
+msgstr "iChat टाइमस्ट्याप"
+
+#: plugins/timestamp.c:193
+msgid "Delay"
+msgstr "ढिला"
+
+#: plugins/timestamp.c:200
+msgid "minutes."
+msgstr "मिनेट"
+
+#: plugins/timestamp.c:206
+msgid "_Apply"
+msgstr "लागू गर्नुहोस्"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/timestamp.c:271
+msgid "Timestamp"
+msgstr "टाइमस्ट्याम्प"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: plugins/timestamp.c:274 plugins/timestamp.c:276
+msgid "Adds iChat-style timestamps to conversations every N minutes."
+msgstr "प्रतेक N मिनेट वार्तालापहरूमा iChat-शैली टाइमस्ट्यापहरू थप्छ ।"
+
+#: plugins/win32/transparency/win2ktrans.c:134
+#: plugins/win32/transparency/win2ktrans.c:413
+#: plugins/win32/transparency/win2ktrans.c:444
+msgid "Opacity:"
+msgstr "अस्पष्टता:"
+
+#. IM Convo trans options
+#: plugins/win32/transparency/win2ktrans.c:394
+msgid "IM Conversation Windows"
+msgstr "IM वार्तालाप सञ्झ्यालहरू"
+
+#: plugins/win32/transparency/win2ktrans.c:395
+msgid "_IM window transparency"
+msgstr "IM सञ्झ्याल पारदर्शीता"
+
+#: plugins/win32/transparency/win2ktrans.c:405
+msgid "_Show slider bar in IM window"
+msgstr "IM सञ्झ्यालमा स्लाइडर पट्टी देखाउनुहोस्"
+
+#. Buddy List trans options
+#: plugins/win32/transparency/win2ktrans.c:430 src/gtkprefs.c:956
+msgid "Buddy List Window"
+msgstr "साथी सूची सञ्झ्याल"
+
+#: plugins/win32/transparency/win2ktrans.c:431
+msgid "_Buddy List window transparency"
+msgstr "साथी सूची सञ्झ्याल पारदर्शिता"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: plugins/win32/transparency/win2ktrans.c:489
+msgid "Transparency"
+msgstr "पारदर्शी"
+
+#. *< name
+#. *< version
+#. *  summary
+#: plugins/win32/transparency/win2ktrans.c:492
+msgid "Variable Transparency for the buddy list and conversations."
+msgstr "साथी सूची र वार्तालापहरूका लागि पारदर्शिता चल ।"
+
+#. *  description
+#: plugins/win32/transparency/win2ktrans.c:494
+msgid ""
+"This plugin enables variable alpha transparency on conversation windows and "
+"the buddy list.\n"
+"\n"
+"* Note: This plugin requires Win2000 or WinXP."
+msgstr ""
+"प्लगइनले वार्तालाप सञ्झ्याल र साथी सूचीमा चल अल्फा पारदर्शिता सक्षम गर्दछ ।\n"
+"\n"
+"* द्रष्टब्य: यो प्लगइनलाई Win2000 वा WinXP आवश्यक छ ।"
+
+#: plugins/win32/winprefs/winprefs.c:344
+msgid "GTK+ Runtime Version"
+msgstr "GTK+रनटाइम संस्करण"
+
+#. Autostart
+#: plugins/win32/winprefs/winprefs.c:352
+msgid "Startup"
+msgstr "थालनी गर्नुहोस्"
+
+#: plugins/win32/winprefs/winprefs.c:353
+msgid "_Start Gaim on Windows startup"
+msgstr "सञ्झ्यालहरुको थालनीमा गाइम सुरू गर्नुहोस्"
+
+#. Buddy List
+#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3167
+#: src/gtkprefs.c:2421
+msgid "Buddy List"
+msgstr "साथी सूची"
+
+#: plugins/win32/winprefs/winprefs.c:363
+msgid "_Dockable Buddy List"
+msgstr "डक्केवल साथी सूची"
+
+#. Docked Blist On Top
+#: plugins/win32/winprefs/winprefs.c:367
+msgid "Docked _Buddy List is always on top"
+msgstr "कठघर गरिएको साथी सूची सधै माथि हुन्छ"
+
+#. Blist On Top
+#: plugins/win32/winprefs/winprefs.c:377
+msgid "_Keep Buddy List window on top"
+msgstr "माथि साथी सूची सञ्झ्याल राख्नुहोस्"
+
+#. Conversations
+#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:1007
+#: src/gtkprefs.c:2422
+msgid "Conversations"
+msgstr "वार्तालापहरू"
+
+#: plugins/win32/winprefs/winprefs.c:383
+msgid "_Flash Window when messages are received"
+msgstr "सन्देशहरू प्राप्त गरिसके पछि सञ्झ्याल फ्ल्यास गर्नुहोस्"
+
+#: plugins/win32/winprefs/winprefs.c:407
+msgid "WinGaim Options"
+msgstr "WinGaim विकल्पहरू"
+
+#: plugins/win32/winprefs/winprefs.c:409 plugins/win32/winprefs/winprefs.c:410
+msgid "Options specific to Windows Gaim."
+msgstr "सञ्झ्यालको गाइममा विशेष विकल्पहरू"
+
+#: src/account.c:298 src/protocols/jabber/jabber.c:1041
+msgid "New passwords do not match."
+msgstr "नयाँ पासवर्डहरू मेल खाएन ।"
+
+#: src/account.c:307
+msgid "Fill out all fields completely."
+msgstr "सबै फाँटहरू पूरै भरेर निष्कनुहोस् ।"
+
+#: src/account.c:332
+msgid "Original password"
+msgstr "मौलिक पासवर्ड"
+
+#: src/account.c:339
+msgid "New password"
+msgstr "नयाँ पासवर्ड"
+
+#: src/account.c:346
+msgid "New password (again)"
+msgstr "नयाँ पासवर्ड (फेरी)"
+
+#: src/account.c:352
+#, c-format
+msgid "Change password for %s"
+msgstr "%s का लागि पासवर्ड परिवर्तन गर्नुहोस्"
+
+#: src/account.c:360
+msgid "Please enter your current password and your new password."
+msgstr "कृपया तपाईँको हालको पासवर्ड र तपाईँको नयाँ पासवर्ड प्रविष्टि गर्नुहोस् ।"
+
+#. *
+#. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
+#.
+#: src/account.c:363 src/connection.c:198 src/gtkblist.c:2492
+#: src/gtkdialogs.c:507 src/gtkdialogs.c:649 src/gtkdialogs.c:703
+#: src/gtkrequest.c:243 src/protocols/jabber/jabber.c:1088
+#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:226
+#: src/protocols/msn/msn.c:241 src/protocols/msn/msn.c:256
+#: src/protocols/msn/msn.c:271 src/protocols/oscar/oscar.c:2852
+#: src/protocols/oscar/oscar.c:4347 src/protocols/oscar/oscar.c:4441
+#: src/protocols/oscar/oscar.c:7730 src/protocols/oscar/oscar.c:7822
+#: src/protocols/oscar/oscar.c:7874 src/protocols/oscar/oscar.c:7960
+#: src/protocols/silc/buddy.c:460 src/protocols/silc/buddy.c:1132
+#: src/protocols/silc/chat.c:421 src/protocols/silc/chat.c:459
+#: src/protocols/silc/chat.c:722 src/protocols/silc/ops.c:1081
+#: src/protocols/silc/ops.c:1699 src/protocols/silc/silc.c:711
+#: src/protocols/yahoo/yahoo.c:3021 src/protocols/yahoo/yahoo.c:3030
+#: src/request.h:1245
+msgid "OK"
+msgstr "ठीक छ"
+
+#: src/account.c:364 src/account.c:402 src/away.c:367 src/connection.c:199
+#: src/gtkaccount.c:2029 src/gtkaccount.c:2568 src/gtkaccount.c:2599
+#: src/gtkblist.c:2493 src/gtkblist.c:4572 src/gtkconn.c:169
+#: src/gtkdialogs.c:508 src/gtkdialogs.c:650 src/gtkdialogs.c:704
+#: src/gtkdialogs.c:802 src/gtkdialogs.c:824 src/gtkdialogs.c:844
+#: src/gtkdialogs.c:881 src/gtkdialogs.c:941 src/gtkdialogs.c:984
+#: src/gtkdialogs.c:1025 src/gtkimhtmltoolbar.c:437 src/gtkprivacy.c:597
+#: src/gtkprivacy.c:610 src/gtkprivacy.c:635 src/gtkprivacy.c:646
+#: src/gtkrequest.c:244 src/protocols/icq/gaim_icq.c:276
+#: src/protocols/jabber/buddy.c:515 src/protocols/jabber/chat.c:754
+#: src/protocols/jabber/jabber.c:678 src/protocols/jabber/jabber.c:1089
+#: src/protocols/jabber/presence.c:213 src/protocols/jabber/xdata.c:338
+#: src/protocols/msn/msn.c:227 src/protocols/msn/msn.c:242
+#: src/protocols/msn/msn.c:257 src/protocols/msn/msn.c:272
+#: src/protocols/msn/msn.c:289 src/protocols/oscar/oscar.c:1543
+#: src/protocols/oscar/oscar.c:2853 src/protocols/oscar/oscar.c:4305
+#: src/protocols/oscar/oscar.c:4348 src/protocols/oscar/oscar.c:4385
+#: src/protocols/oscar/oscar.c:4442 src/protocols/oscar/oscar.c:7731
+#: src/protocols/oscar/oscar.c:7823 src/protocols/oscar/oscar.c:7875
+#: src/protocols/oscar/oscar.c:7944 src/protocols/oscar/oscar.c:7961
+#: src/protocols/silc/buddy.c:461 src/protocols/silc/buddy.c:1037
+#: src/protocols/silc/buddy.c:1133 src/protocols/silc/chat.c:594
+#: src/protocols/silc/chat.c:723 src/protocols/silc/ops.c:1700
+#: src/protocols/silc/silc.c:712 src/protocols/trepia/trepia.c:348
+#: src/protocols/yahoo/yahoo.c:3022 src/protocols/yahoo/yahoo.c:3031
+#: src/request.h:1245 src/request.h:1255
+msgid "Cancel"
+msgstr "रद्द गर्नुहोस्"
+
+#: src/account.c:393
+#, c-format
+msgid "Change user information for %s"
+msgstr "%s का लागि प्रयोगकर्ता सूचना परिवर्तन गर्नुहोस्"
+
+#: src/account.c:401 src/gtkrequest.c:250 src/protocols/jabber/buddy.c:514
+#: src/protocols/trepia/trepia.c:347
+msgid "Save"
+msgstr "बचत गर्नुहोस्"
+
+#: src/account.c:760 src/gtkft.c:159 src/protocols/jabber/buddy.c:573
+#: src/protocols/novell/novell.c:2812
+msgid "Unknown"
+msgstr "अज्ञात"
+
+#: src/away.c:233
+msgid "Away!"
+msgstr "टाढा!"
+
+#: src/away.c:303
+msgid "Edit This Message"
+msgstr "यो सन्देश सम्पादन गर्नुहोस्"
+
+#: src/away.c:308
+msgid "I'm Back!"
+msgstr "म अहिले फर्केँ !"
+
+#: src/away.c:362
+#, c-format
+msgid "Are you sure you want to remove the away message \"%s\"?"
+msgstr "के तपाईँ टाढा सन्देश हटाउने कुरामा निश्चिन्त हुनुहुन्छ \"%s\"?"
+
+#: src/away.c:364 src/away.c:442
+msgid "Remove Away Message"
+msgstr "टाढा सन्देश हटाउनुहोस्"
+
+#. Remove button
+#: src/away.c:366 src/gtkconv.c:1535 src/gtkconv.c:3917 src/gtkconv.c:3988
+#: src/gtkrequest.c:249
+msgid "Remove"
+msgstr "हटाउनुहोस्"
+
+#: src/away.c:436
+msgid "New Away Message"
+msgstr "नयाँ टाढा सन्देश"
+
+#: src/away.c:663
+msgid "Set All Away"
+msgstr "सबैलाई टाढामा सेट गर्नुहोस्"
+
+#: src/away.c:770
+msgid "You cannot save an away message with a blank title"
+msgstr "तपाईँ खाली शीर्षक सँगै एउटा टाढा सन्देश बचत गर्न सक्नुहुन्न"
+
+#: src/away.c:772
+msgid "Please give the message a title, or choose \"Use\" to use without saving."
+msgstr "कृपया एउटा शीर्षकको सन्देश दिनुहोस्, वा बचत नगरी प्रयोग गर्न \"Use\" रोज्नुहोस् ।"
+
+#: src/away.c:782
+msgid "You cannot create an empty away message"
+msgstr "तपाईँले एउटा खाली टाढा सन्देश सिर्जना गर्न सक्नुहुन्न"
+
+#: src/away.c:847
+msgid "New away message"
+msgstr "नयाँ टाढा सन्देश"
+
+#: src/away.c:862
+msgid "Away title: "
+msgstr "टाढा शीर्षक: "
+
+#: src/away.c:910
+msgid "_Save"
+msgstr "बचत गर्नुहोस्"
+
+#: src/away.c:914
+msgid "Sa_ve & Use"
+msgstr "बचत गर्नुहोस् र प्रयोग गर्नुहोस्"
+
+#: src/away.c:918
+msgid "_Use"
+msgstr "प्रयोग गर्नुहोस्"
+
+#: src/blist.c:682
+msgid "Chats"
+msgstr "कुराकानीहरू"
+
+#: src/blist.c:1357
+#, c-format
+msgid ""
+"%d buddy from group %s was not removed because its account was not logged "
+"in.  This buddy and the group were not removed.\n"
+msgid_plural ""
+"%d buddies from group %s were not removed because their accounts were not "
+"logged in.  These buddies and the group were not removed.\n"
+msgstr[0] "%d साथी %s समूहबाट हटाउन सकिएन किनभने यसको खाता लगइन भएको थिएन ।  यो साथी र समूह हटाइएको थिएन ।\n"
+msgstr[1] ""
+"%d साथीहरू %s समूहबाट  हटाउन सकिएन किनभने उनीहरुको खाता लगइन भएको थिएन । "
+"  यी साथीहरू र समूहहरू हटाइएको थिएन ।\n"
+
+#: src/blist.c:1366
+msgid "Group not removed"
+msgstr "समूह हटेको छैन"
+
+#: src/blist.c:2069
+msgid ""
+"An error was encountered parsing your buddy list.  It has not been loaded, "
+"and the old file has moved to blist.xml~."
+msgstr "एउटा त्रुटि तपाईँको साथी सूची पद वर्णन गरेर देखा पर्यो । यो लोड भएको छैन, र पुरानो फाइल blist.xml~ मा सर्यो ।"
+
+#: src/blist.c:2072
+msgid "Buddy List Error"
+msgstr "साथी सूची त्रुटि"
+
+#: src/connection.c:118 src/connection.c:169
+#, c-format
+msgid "Missing protocol plugin for %s"
+msgstr "%s का लागि हराइरहेको प्रोटोकल प्लगइन"
+
+#: src/connection.c:123
+msgid "Registration Error"
+msgstr "दर्ता त्रुटि"
+
+#: src/connection.c:174
+msgid "Connection Error"
+msgstr "जडान त्रुटि"
+
+#: src/connection.c:195
+#, c-format
+msgid "Enter password for %s (%s)"
+msgstr "%s (%s) का लागि पासवर्ड प्रविष्टि गर्नुहोस्"
+
+#: src/conversation.c:233
+msgid "Unable to send message. The message is too large."
+msgstr "सन्देश पठाउन अक्षम भयो । सन्देश अति ठूलो छ ।"
+
+#: src/conversation.c:237 src/conversation.c:251
+#: src/protocols/oscar/oscar.c:4908
+#, c-format
+msgid "Unable to send message to %s:"
+msgstr "%s मा सन्देश पठाउन अक्षम:"
+
+#: src/conversation.c:239
+msgid "The message is too large."
+msgstr "सन्देश अति ठूलो छ ।"
+
+#: src/conversation.c:248
+msgid "Unable to send message."
+msgstr "सन्देश पठाउन अक्षम भयो ।"
+
+#: src/conversation.c:2070
+#, c-format
+msgid "%s entered the room."
+msgstr "%s कोठामा प्रवेश गरेको छ ।"
+
+#: src/conversation.c:2073
+#, c-format
+msgid "%s [<I>%s</I>] entered the room."
+msgstr "%s [<I>%s</I>] कोठा प्रवेश गरेको छ ।"
+
+#: src/conversation.c:2171
+#, c-format
+msgid "You are now known as %s"
+msgstr "तपाईँ अहिले %s को रुपमा चिनिनुहुन्छ"
+
+#: src/conversation.c:2174
+#, c-format
+msgid "%s is now known as %s"
+msgstr "%s अहिले %s को रुपमा चिनिन्छ"
+
+#: src/conversation.c:2216
+#, c-format
+msgid "%s left the room (%s)."
+msgstr "%s कोठा (%s) बाट बाहिरियो ।"
+
+#: src/conversation.c:2218
+#, c-format
+msgid "%s left the room."
+msgstr "%s कोठा बाट बाहिरियो ।"
+
+#: src/conversation.c:2291
+#, c-format
+msgid "(+%d more)"
+msgstr "(+%d धेरै)"
+
+#: src/conversation.c:2293
+#, c-format
+msgid " left the room (%s)."
+msgstr "कोठा (%s) बाट बाहिरियो ।"
+
+#: src/conversation.c:2698
+msgid "Last created window"
+msgstr "अन्तिम सिर्जित सञ्झ्याल"
+
+#: src/conversation.c:2700
+msgid "Separate IM and Chat windows"
+msgstr "IM र कुराकानी सञ्झ्यालहरू छुट्याउनुहोस्"
+
+#: src/conversation.c:2702 src/gtkprefs.c:1387
+msgid "New window"
+msgstr "नयाँ सञ्झ्याल"
+
+#: src/conversation.c:2704
+msgid "By group"
+msgstr "समूह द्वारा"
+
+#: src/conversation.c:2706
+msgid "By account"
+msgstr "खाता द्वारा"
+
+#: src/ft.c:148 src/protocols/msn/msn.c:369
+#, c-format
+msgid ""
+"Error reading %s: \n"
+"%s.\n"
+msgstr ""
+"%s पढ्दा त्रुटि: \n"
+"%s.\n"
+
+#: src/ft.c:152
+#, c-format
+msgid ""
+"Error writing %s: \n"
+"%s.\n"
+msgstr ""
+"%s लेख्दा त्रुटि: \n"
+"%s.\n"
+
+#: src/ft.c:156
+#, c-format
+msgid ""
+"Error accessing %s: \n"
+"%s.\n"
+msgstr ""
+"%s पहुँच गर्दा त्रुटि: \n"
+"%s.\n"
+
+#: src/ft.c:189
+msgid "Cannot send a file of 0 bytes."
+msgstr "० बाइटहरुको फाइल पठाउन सकिदैन ।"
+
+#: src/ft.c:199
+msgid "Cannot send a directory."
+msgstr "डाइरेक्टरी पठाउन सकिदैन ।"
+
+#: src/ft.c:208
+#, c-format
+msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
+msgstr "%s नियमित फाइल होइन । नीच तरिकाले यसमा अधिलेखन गर्न अस्विकार गरियो ।\n"
+
+#: src/ft.c:265
+#, c-format
+msgid "%s wants to send you %s (%s)"
+msgstr "%s ले तपाईँलाई %s पठाउन चाहन्छ (%s)"
+
+#: src/ft.c:273
+#, c-format
+msgid "%s wants to send you a file"
+msgstr "%s ले तपाईँ फाइल पठाउन चाहन्छ"
+
+#: src/ft.c:311
+#, c-format
+msgid "Accept file transfer request from %s?"
+msgstr "%s को फाइल स्थानान्तरण अनुरोध स्वीकार गर्नुहुन्छ ?"
+
+#: src/ft.c:315
+#, c-format
+msgid ""
+"A file is available for download from:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+"डाउनलोड गर्नका लागि एउटा फाइल उपलब्ध छ:\n"
+"टाढाको होस्ट:%s\n"
+"टाढाको पोर्ट:%d"
+
+#: src/ft.c:338
+#, c-format
+msgid "%s is offering to send file %s"
+msgstr "%s ले फाइल फठाउने प्रस्ताव गरिरहेको छ %s"
+
+#: src/ft.c:374
+#, c-format
+msgid "%s is not a valid filename.\n"
+msgstr "%s वैध फाइलनाम होइन ।\n"
+
+#: src/ft.c:395
+#, c-format
+msgid "Offering to send %s to %s"
+msgstr "%s मा %s पठाउन प्रस्ताव गरिदैछ"
+
+#: src/ft.c:890
+#, c-format
+msgid "Transfer of file %s complete"
+msgstr "%s फाइलको स्थानान्तरण  पूरा भयो"
+
+#: src/ft.c:893
+msgid "File transfer complete"
+msgstr "फाइल स्थानान्तरण पूरा भयो ।"
+
+#: src/ft.c:942
+#, c-format
+msgid "You canceled the transfer of %s"
+msgstr "तपाईँले %s को स्थानान्तण रद्द गर्नुभयो"
+
+#: src/ft.c:948
+msgid "File transfer cancelled"
+msgstr "फाइल स्थानान्तरण रद्द भयो"
+
+#: src/ft.c:1001
+#, c-format
+msgid "%s canceled the transfer of %s"
+msgstr "%s ले %s को स्थानान्तरण रद्द गर्यो"
+
+#: src/ft.c:1007
+#, c-format
+msgid "%s canceled the file transfer"
+msgstr "%s ले फाइल स्थानान्तरण रद्द गर्यो"
+
+#: src/ft.c:1056
+#, c-format
+msgid "File transfer to %s aborted.\n"
+msgstr "%s मा फाइल स्थानान्तरण परित्याग गरियो ।\n"
+
+#: src/ft.c:1058
+#, c-format
+msgid "File transfer from %s aborted.\n"
+msgstr "%s बाट गरिएको फाइल स्थानान्तरण परित्याग गरियो ।\n"
+
+#: src/gaim-disclosure.c:253
+msgid "Expander Size"
+msgstr "विस्तारक साइज"
+
+#: src/gaim-disclosure.c:254
+msgid "Size of the expander arrow"
+msgstr "विस्तारक बाँणको साइज"
+
+#: src/gaim-remote.c:108
+#, c-format
+msgid ""
+"Usage: %s command [OPTIONS] [URI]\n"
+"\n"
+"    COMMANDS:\n"
+"       uri                      Handle AIM: URI\n"
+"       away                     Popup the away dialog with the default "
+"message\n"
+"       back                     Remove the away dialog\n"
+"       quit                     Close running copy of Gaim\n"
+"\n"
+"    OPTIONS:\n"
+"       -h, --help [command]     Show help for command\n"
+msgstr ""
+"उपयोग: %s आदेश [OPTIONS] [URI]\n"
+"\n"
+"    COMMANDS:\n"
+"       uri                      Handle AIM: URI\n"
+"       away                     पूर्वनिर्धारित सँगै टाढा संवाद पपअप गर्नुहोस्\n"
+"       back                     टाढाको संवाद हटाउनुहोस्\n"
+"       quit                     गाइमको चलिरहेको प्रतिलिपि बन्द गर्नुहोस्\n"
+"\n"
+"    OPTIONS:\n"
+"       -h, --help [command]     आदेशका लागि मद्दत देखाउनुहोस्\n"
+
+#: src/gaim-remote.c:185 src/gaim-remote.c:203
+msgid ""
+"Gaim not running (on session 0)\n"
+"Is the \"Remote Control\" plugin loaded?\n"
+msgstr ""
+"(संस्करण ० मा) गाइम चलिरहेको छैन\n"
+"के \"Remote Control\" प्लगइन लोड भयो ?\n"
+
+#: src/gaim-remote.c:219
+msgid ""
+"\n"
+"Using AIM: URIs:\n"
+"Sending an IM to a screen name:\n"
+"\tgaim-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
+"In this case, 'Penguin' is the screen name we wish to IM, and 'hello world'\n"
+"is the message to be sent.  '+' must be used in place of spaces.\n"
+"Please note the quoting used above - if you run this from a shell the '&'\n"
+"needs to be escaped, or the command will stop at that point.\n"
+"Also,the following will just open a conversation window to a screen name,\n"
+"with no message:\n"
+"\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
+"\n"
+"Joining a chat:\n"
+"\tgaim-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
+"...joins the 'PenguinLounge' chat room.\n"
+"\n"
+"Adding a buddy to your buddy list:\n"
+"\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
+"...prompts you to add 'Penguin' to your buddy list.\n"
+msgstr ""
+"\n"
+"AIM प्रयोग गर्दै: URIs:\n"
+"पर्दा नाममा एउटा IM पठाउदै:\n"
+"\tgaim-remote uri 'aim:goim?screenname=Penguin&message=hello+world'\n"
+"यो केसमा, 'Penguin' हामीले IM मा चाहेको पर्दा नाम हो, र 'hello world'\n"
+"पठाउनुपर्ने सन्देश हो ।  '+' खाली ठाउँको सट्टामा प्रयोग हुनुपर्छ ।\n"
+"कृपया तल प्रयोग भएको उद्धरण याद गर्नुहोस् - यदि यो तपाईँले कक्षबाट चलाउनु भयो भने, '&'\n"
+"निस्कनुपर्छ, वा त्यो बिन्दुमा आदेश रोकिनेछ ।\n"
+"निम्न आदेशले पनि, कुनै सन्देश बिना पर्दानाममा एउटा वार्तालाप सञ्झ्याल खोल्दछ \n"
+":\n"
+"\tgaim-remote uri 'aim:goim?screenname=Penguin'\n"
+"\n"
+"कुराकानीमा भर्ना हुनुहोस्:\n"
+"\tgaim-remote uri 'aim:gochat?roomname=PenguinLounge'\n"
+"...'PenguinLounge' कुराकानी कोठामा भर्न हुनहोस् ।\n"
+"\n"
+"तपाईँको साथी सूचीमा एउटा साथी थप्नुहोस्:\n"
+"\tgaim-remote uri 'aim:addbuddy?screenname=Penguin'\n"
+"...तपाईँलाई तपाईँको साथी सूचीमा 'Penguin' थप्न तत्पर गर्दछ ।\n"
+
+#: src/gaim-remote.c:239
+msgid ""
+"\n"
+"Close running copy of Gaim\n"
+msgstr ""
+"\n"
+"गाइमको चलिरहेको प्रतिलिपि बन्द गर्नुहोस्\n"
+
+#: src/gaim-remote.c:243
+msgid ""
+"\n"
+"Mark all accounts as \"away\" with the default message.\n"
+msgstr ""
+"\n"
+"पूर्वनिर्धारित सन्देश सँगै \"away\" को रुपमा सबै खाताहरू चिनो लगाउनुहोस् ।\n"
+
+#: src/gaim-remote.c:247
+msgid ""
+"\n"
+"Set all accounts as not away.\n"
+msgstr ""
+"\n"
+"सबै खाताहरुलाई 'टाढा छैन' मा सेट गर्नुहोस् ।\n"
+
+#: src/gtkaccount.c:331
+#, c-format
+msgid ""
+"<b>File:</b> %s\n"
+"<b>File size:</b> %s\n"
+"<b>Image size:</b> %dx%d"
+msgstr ""
+"<b>फाइल:</b> %s\n"
+"<b>फाइल साइज:</b> %s\n"
+"<b>छवि साइज:</b> %dx%d"
+
+#. Build the login options frame.
+#: src/gtkaccount.c:638
+msgid "Login Options"
+msgstr "लगइन विकल्पहरू"
+
+#: src/gtkaccount.c:655 src/gtkft.c:585
+msgid "Protocol:"
+msgstr "प्रोटोकल:"
+
+#: src/gtkaccount.c:660 src/gtkblist.c:4158
+msgid "Screen Name:"
+msgstr "पर्दा नाम:"
+
+#: src/gtkaccount.c:733
+msgid "Password:"
+msgstr "पासवर्ड:"
+
+#: src/gtkaccount.c:738 src/gtkblist.c:4172 src/gtkblist.c:4519
+msgid "Alias:"
+msgstr "उपनाम:"
+
+#: src/gtkaccount.c:742
+msgid "Remember password"
+msgstr "पासवर्ड सम्झनुहोस्"
+
+#. Build the user options frame.
+#: src/gtkaccount.c:798
+msgid "User Options"
+msgstr "प्रयोगकर्ता विकल्पहरू"
+
+#: src/gtkaccount.c:811
+msgid "New mail notifications"
+msgstr "नयाँ प्रत्र सूचनाहरू"
+
+#: src/gtkaccount.c:820
+msgid "Buddy icon:"
+msgstr "साथी प्रतिमा:"
+
+#. Build the protocol options frame.
+#: src/gtkaccount.c:909
+#, c-format
+msgid "%s Options"
+msgstr "%s विकल्पहरू"
+
+#. Use Global Proxy Settings
+#: src/gtkaccount.c:1048 src/gtkaccount.c:1095
+msgid "Use Global Proxy Settings"
+msgstr "ग्लोवल प्रोक्सि सेटिङ्हरू प्रयोग गर्नुहोस्"
+
+#. No Proxy
+#: src/gtkaccount.c:1054 src/gtkaccount.c:1102
+msgid "No Proxy"
+msgstr "प्रोक्सि छैन"
+
+#. HTTP
+#: src/gtkaccount.c:1060 src/gtkaccount.c:1109
+msgid "HTTP"
+msgstr "एच टि टि पी"
+
+#. SOCKS 4
+#: src/gtkaccount.c:1066 src/gtkaccount.c:1116
+msgid "SOCKS 4"
+msgstr "SOCKS 4"
+
+#. SOCKS 5
+#: src/gtkaccount.c:1072 src/gtkaccount.c:1123
+msgid "SOCKS 5"
+msgstr "SOCKS 5"
+
+#. Use Environmental Settings
+#: src/gtkaccount.c:1078 src/gtkaccount.c:1130 src/gtkprefs.c:1190
+msgid "Use Environmental Settings"
+msgstr "परिवेष सेटिङ्हरू प्रयोग गर्नुहोस्"
+
+#: src/gtkaccount.c:1169
+msgid "you can see the butterflies mating"
+msgstr "तपाईँले पुतलीहरू जोडिएको हेर्नु सक्नुहुन्छ"
+
+#: src/gtkaccount.c:1173
+msgid "If you look real closely"
+msgstr "यदि तपाईँ वास्तविकता नजिकबाट देख्नुहुन्छ भने"
+
+#: src/gtkaccount.c:1189
+msgid "Proxy Options"
+msgstr "प्रोक्सि विकल्पहरू "
+
+#: src/gtkaccount.c:1207 src/gtkprefs.c:1184
+msgid "Proxy _type:"
+msgstr "प्रोक्सि प्रकार:"
+
+#: src/gtkaccount.c:1216 src/gtkprefs.c:1211
+msgid "_Host:"
+msgstr "होस्ट:"
+
+#: src/gtkaccount.c:1220 src/gtkprefs.c:1229
+msgid "_Port:"
+msgstr "पोर्ट:"
+
+#: src/gtkaccount.c:1228
+msgid "_Username:"
+msgstr "प्रयोगकर्ता नाम:"
+
+#: src/gtkaccount.c:1233 src/gtkprefs.c:1266
+msgid "Pa_ssword:"
+msgstr "पासवर्ड:"
+
+#: src/gtkaccount.c:1604
+msgid "Add Account"
+msgstr "खाता थप्नुहोस्"
+
+#: src/gtkaccount.c:1606
+msgid "Modify Account"
+msgstr "खाता परिमार्जन गर्नुहोस्"
+
+#. Add the disclosure
+#: src/gtkaccount.c:1630
+msgid "Show more options"
+msgstr "अरू धेरै विकल्पहरू देखाउनुहोस्"
+
+#: src/gtkaccount.c:1631
+msgid "Show fewer options"
+msgstr "कम विकल्पहरू देखाउनुहोस्"
+
+#. Register button
+#: src/gtkaccount.c:1658 src/protocols/jabber/jabber.c:677
+msgid "Register"
+msgstr "दर्ता"
+
+#: src/gtkaccount.c:2023
+#, c-format
+msgid "Are you sure you want to delete %s?"
+msgstr "के तपाईँ %s मेटाउन निश्चित रुपले चाहानुहुन्छ ?"
+
+#: src/gtkaccount.c:2028 src/gtkrequest.c:247
+msgid "Delete"
+msgstr "मेट्नुहोस्"
+
+#: src/gtkaccount.c:2142 src/protocols/oscar/oscar.c:4992
+msgid "Screen Name"
+msgstr "पर्दा नाम"
+
+#: src/gtkaccount.c:2166 src/protocols/jabber/jabber.c:998
+#: src/protocols/oscar/oscar.c:699 src/protocols/oscar/oscar.c:6460
+#: src/protocols/oscar/oscar.c:7658 src/protocols/silc/silc.c:45
+#: src/protocols/yahoo/yahoo.c:2784 src/protocols/zephyr/zephyr.c:2110
+#: src/protocols/zephyr/zephyr.c:2129
+msgid "Online"
+msgstr "अनलाइन"
+
+#: src/gtkaccount.c:2187
+msgid "Protocol"
+msgstr "प्रोटोकल"
+
+#. XXX: Tidy this up when not in string freeze
+#: src/gtkaccount.c:2521 src/protocols/jabber/presence.c:202
+#, c-format
+msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
+msgstr "%s%s%s%s ले %s को साथी%s%s%s बनायो"
+
+#: src/gtkaccount.c:2535 src/protocols/jabber/presence.c:208
+msgid ""
+"\n"
+"\n"
+"Do you wish to add him or her to your buddy list?"
+msgstr ""
+"\n"
+"\n"
+"के तपाईँ उसलाई वा उनलाई तपाईँको साथी सूचीमा थप्न चाहानुहुन्छ ?"
+
+#: src/gtkaccount.c:2561
+msgid "Information"
+msgstr "सूचना"
+
+#: src/gtkaccount.c:2565 src/gtkaccount.c:2596
+#: src/protocols/jabber/presence.c:210
+msgid "Add buddy to your list?"
+msgstr "तपाईँको सूचीमा साथी थप्नुहुन्छ?"
+
+#. Add button
+#: src/gtkaccount.c:2567 src/gtkaccount.c:2598 src/gtkblist.c:4571
+#: src/gtkconv.c:1537 src/gtkconv.c:3910 src/gtkconv.c:3981
+#: src/gtkrequest.c:248 src/protocols/icq/gaim_icq.c:276
+#: src/protocols/jabber/presence.c:212 src/protocols/oscar/oscar.c:4619
+#: src/protocols/silc/chat.c:593
+msgid "Add"
+msgstr "थप्नुहोस्"
+
+#: src/gtkblist.c:846
+msgid "Join a Chat"
+msgstr "एउटा कुराकानीमा भाग लिनुहोस्"
+
+#: src/gtkblist.c:867
+msgid ""
+"Please enter the appropriate information about the chat you would like to "
+"join.\n"
+msgstr "कृपया तपाईँले जडान गर्न चाहेको कुराकानीको बारेमा उचित जानकारीहरू प्रविष्टि गराउनुहोस् ।\n"
+
+#: src/gtkblist.c:878 src/gtkpounce.c:415 src/gtkroomlist.c:354
+msgid "_Account:"
+msgstr "खाता:"
+
+#: src/gtkblist.c:1173 src/gtkblist.c:3323
+msgid "Get _Info"
+msgstr "सूचना प्राप्त गर्नुहोस्"
+
+#: src/gtkblist.c:1176 src/gtkblist.c:3313
+msgid "I_M"
+msgstr "IM "
+
+#: src/gtkblist.c:1182
+msgid "_Send File"
+msgstr "फाइल पठाउनुहोस्"
+
+#: src/gtkblist.c:1188
+msgid "Add Buddy _Pounce"
+msgstr "साथी पाउन्स थप्नुहोस्"
+
+#: src/gtkblist.c:1190 src/gtkblist.c:1287
+msgid "View _Log"
+msgstr "लग हेर्नुहोस्"
+
+#: src/gtkblist.c:1200
+msgid "_Alias Buddy..."
+msgstr "साथी उपनामहरू..."
+
+#: src/gtkblist.c:1202
+msgid "_Remove Buddy"
+msgstr "साथी हटाउनुहोस्"
+
+#: src/gtkblist.c:1204
+msgid "Alias Contact..."
+msgstr "सम्पर्क उपनाम..."
+
+#: src/gtkblist.c:1207 src/gtkdialogs.c:878 src/gtkdialogs.c:880
+msgid "Remove Contact"
+msgstr "सम्पर्क हटाउनुहोस्"
+
+#: src/gtkblist.c:1211 src/gtkblist.c:1295 src/gtkblist.c:1309
+msgid "_Alias..."
+msgstr "उपनामहरू..."
+
+#: src/gtkblist.c:1213 src/gtkblist.c:1297 src/gtkblist.c:1314
+#: src/gtkconn.c:367
+msgid "_Remove"
+msgstr "हटाउनुहोस्"
+
+#: src/gtkblist.c:1259
+msgid "Add a _Buddy"
+msgstr "साथी थप्नुहोस्"
+
+#: src/gtkblist.c:1261
+msgid "Add a C_hat"
+msgstr "कुराकानी थप्नुहोस्"
+
+#: src/gtkblist.c:1263
+msgid "_Delete Group"
+msgstr "समूह मेट्नुहोस्"
+
+#: src/gtkblist.c:1265
+msgid "_Rename"
+msgstr "पुन:नामाकरण गर्नुहोस्"
+
+#. join button
+#: src/gtkblist.c:1283 src/gtkroomlist.c:264 src/gtkroomlist.c:409
+#: src/stock.c:88
+msgid "_Join"
+msgstr "जोड्नुहोस्"
+
+#: src/gtkblist.c:1285
+msgid "Auto-Join"
+msgstr "स्वत:जडान"
+
+#: src/gtkblist.c:1311 src/gtkblist.c:1336
+msgid "_Collapse"
+msgstr "नष्ट गर्नुहोस्"
+
+#: src/gtkblist.c:1341
+msgid "_Expand"
+msgstr "फैल्याउनुहोस्"
+
+#: src/gtkblist.c:2016 src/gtkconv.c:4553 src/gtkpounce.c:316
+msgid "You are not currently signed on with an account that can add that buddy."
+msgstr "तपाईँ हालसालै खातामा साइनअन हुनुहुन्न जसका कारण साथी थप्न सकिदैन ।"
+
+#. Buddies menu
+#: src/gtkblist.c:2437
+msgid "/_Buddies"
+msgstr "/साथीहरू"
+
+#: src/gtkblist.c:2438
+msgid "/Buddies/New Instant _Message..."
+msgstr "/साथीहरू/नयाँ आवश्यक सन्देश..."
+
+#: src/gtkblist.c:2439
+msgid "/Buddies/Join a _Chat..."
+msgstr "/साथीहरू/कुराकानीमा जडान गर्नुहोस्..."
+
+#: src/gtkblist.c:2440
+msgid "/Buddies/Get User _Info..."
+msgstr "/साथीहरू/ प्रयोगकर्ता जानकारी प्राप्त गर्नुहोस्..."
+
+#: src/gtkblist.c:2441
+msgid "/Buddies/View User _Log..."
+msgstr "/साथीहरू/ प्रयोगकर्ता लग हेर्नुहोस्..."
+
+#: src/gtkblist.c:2443
+msgid "/Buddies/Show _Offline Buddies"
+msgstr "/साथीहरू/अफलाइन साथीहरू देखाउनुहोस्"
+
+#: src/gtkblist.c:2444
+msgid "/Buddies/Show _Empty Groups"
+msgstr "/साथीहरू/खाली समूहहरू देखाउनुहोस्"
+
+#: src/gtkblist.c:2445
+msgid "/Buddies/_Add Buddy..."
+msgstr "/साथीहरू/साथी थप्नुहोस्..."
+
+#: src/gtkblist.c:2446
+msgid "/Buddies/Add C_hat..."
+msgstr "/साथीहरू/ कुराकानी थप्नुहोस्..."
+
+#: src/gtkblist.c:2447
+msgid "/Buddies/Add _Group..."
+msgstr "/साथीहरू/समूह थप्नुहोस्..."
+
+#: src/gtkblist.c:2449
+msgid "/Buddies/_Signoff"
+msgstr "/साथीहरू/साइनअफ गर्नुहोस्"
+
+#: src/gtkblist.c:2450
+msgid "/Buddies/_Quit"
+msgstr "/साथीहरू/अन्त्य गर्नुहोस्"
+
+#. Tools
+#: src/gtkblist.c:2453
+msgid "/_Tools"
+msgstr "/उपकरणहरू"
+
+#: src/gtkblist.c:2454
+msgid "/Tools/_Away"
+msgstr "/उपकरणहरू/ टाढा"
+
+#: src/gtkblist.c:2455
+msgid "/Tools/Buddy _Pounce"
+msgstr "/उपकरणहरू/साथी पाउन्स"
+
+#: src/gtkblist.c:2456
+msgid "/Tools/Account Ac_tions"
+msgstr "/उपकरणहरू/खाता कार्यहरू"
+
+#: src/gtkblist.c:2457
+msgid "/Tools/Pl_ugin Actions"
+msgstr "/उपकरणहरू/प्लगइन कार्यहरू"
+
+#: src/gtkblist.c:2459
+msgid "/Tools/A_ccounts"
+msgstr "/उपकरणहरू/खाताहरू"
+
+#: src/gtkblist.c:2460
+msgid "/Tools/_File Transfers"
+msgstr "/उपकरणहरू/फाइल स्थानान्तरणहरू"
+
+#: src/gtkblist.c:2461
+msgid "/Tools/R_oom List"
+msgstr "/उपकरणहरू/कोठा सूची"
+
+#: src/gtkblist.c:2462
+msgid "/Tools/Pr_eferences"
+msgstr "/उपकरणहरू/प्रथमिकताहरू"
+
+#: src/gtkblist.c:2463
+msgid "/Tools/Pr_ivacy"
+msgstr "/उपकरणहरू/गोपनीयता"
+
+#: src/gtkblist.c:2465
+msgid "/Tools/View System _Log"
+msgstr "/उपकरणहरू/प्रणाली लग हेर्नुहोस्"
+
+#. Help
+#: src/gtkblist.c:2468
+msgid "/_Help"
+msgstr "/मद्दत"
+
+#: src/gtkblist.c:2469
+msgid "/Help/Online _Help"
+msgstr "/मद्दत/अनलाइन मद्दत"
+
+#: src/gtkblist.c:2470
+msgid "/Help/_Debug Window"
+msgstr "/मद्दत/त्रुटि सच्याउने सञ्झ्याल"
+
+#: src/gtkblist.c:2471
+msgid "/Help/_About"
+msgstr "/मद्दत/बारेमा"
+
+#: src/gtkblist.c:2489
+msgid "Rename Group"
+msgstr "समूह पुन:नामाकरण गर्नुहोस्"
+
+#: src/gtkblist.c:2489
+msgid "New group name"
+msgstr "नयाँ समूह नाम"
+
+#: src/gtkblist.c:2490
+msgid "Please enter a new name for the selected group."
+msgstr "चयन गरिएको समूहका लागि एउटा नयाँ नाम प्रविष्टि गर्नुहोस् ।"
+
+#: src/gtkblist.c:2519
+#, c-format
+msgid ""
+"\n"
+"<b>Account:</b> %s"
+msgstr ""
+"\n"
+"<b>खाता:</b> %s"
+
+#: src/gtkblist.c:2585
+msgid ""
+"\n"
+"<b>Status:</b> Offline"
+msgstr ""
+"\n"
+"<b>वस्तुस्थिति:</b> अफलाइन"
+
+#: src/gtkblist.c:2600
+#, c-format
+msgid "%d%%"
+msgstr "%d%%"
+
+#: src/gtkblist.c:2616
+msgid ""
+"\n"
+"<b>Account:</b>"
+msgstr ""
+"\n"
+"<b> खाता:</b>"
+
+#: src/gtkblist.c:2617
+msgid ""
+"\n"
+"<b>Contact Alias:</b>"
+msgstr ""
+"\n"
+"<b> सम्पर्क उपनाम:</b>"
+
+#: src/gtkblist.c:2618
+msgid ""
+"\n"
+"<b>Alias:</b>"
+msgstr ""
+"\n"
+"<b>उपनाम:</b>"
+
+#: src/gtkblist.c:2619
+msgid ""
+"\n"
+"<b>Nickname:</b>"
+msgstr ""
+"\n"
+"<b>उपनाम:</b>"
+
+#: src/gtkblist.c:2620
+msgid ""
+"\n"
+"<b>Logged In:</b>"
+msgstr ""
+"\n"
+"<b>लगइन गरिसकिएको:</b>"
+
+#: src/gtkblist.c:2621
+msgid ""
+"\n"
+"<b>Idle:</b>"
+msgstr ""
+"\n"
+"<b>निस्क्रिय:</b>"
+
+#: src/gtkblist.c:2622
+msgid ""
+"\n"
+"<b>Warned:</b>"
+msgstr ""
+"\n"
+"<b>चेतावनी दिइयो:</b>"
+
+#: src/gtkblist.c:2624
+msgid ""
+"\n"
+"<b>Description:</b> Spooky"
+msgstr ""
+"\n"
+"<b>वर्णन:</b> स्पूकी"
+
+#: src/gtkblist.c:2625
+msgid ""
+"\n"
+"<b>Status</b>: Awesome"
+msgstr ""
+"\n"
+"<b> अवस्था</b>: प्रभावशाली"
+
+#: src/gtkblist.c:2626
+msgid ""
+"\n"
+"<b>Status</b>: Rockin'"
+msgstr ""
+"\n"
+"<b> अवस्था</b>: 'Rockin'"
+
+#: src/gtkblist.c:2908
+#, c-format
+msgid "Idle (%dh%02dm) "
+msgstr "निस्क्रिय (%dh%02dm) "
+
+#: src/gtkblist.c:2910
+#, c-format
+msgid "Idle (%dm) "
+msgstr "निष्क्रिय (%dm) "
+
+#: src/gtkblist.c:2915
+#, c-format
+msgid "Warned (%d%%) "
+msgstr "चेतावनी गरियो (%d%%) "
+
+#: src/gtkblist.c:2918
+msgid "Offline "
+msgstr "अफलाइन"
+
+#. Make menu items sensitive/insensitive where appropriate
+#: src/gtkblist.c:3036
+msgid "/Buddies/Join a Chat..."
+msgstr "/साथीहरू/एउटा कुराकानीमा भाग लिनुहोस्..."
+
+#: src/gtkblist.c:3039
+msgid "/Tools/Room List"
+msgstr "/उपकरणहरू/कोठा सूची"
+
+#: src/gtkblist.c:3042
+msgid "/Tools/Privacy"
+msgstr "/उपकरणहरू/गोपनीयता"
+
+#: src/gtkblist.c:3124
+msgid "Alphabetical"
+msgstr "वर्णानुक्रम अनुसार"
+
+#: src/gtkblist.c:3125
+msgid "By status"
+msgstr "वस्तुस्थिति द्वारा"
+
+#: src/gtkblist.c:3126
+msgid "By log size"
+msgstr "लग साइज द्वारा"
+
+#: src/gtkblist.c:3192
+msgid "/Tools/Away"
+msgstr "/उपकरणहरू/टाढा"
+
+#: src/gtkblist.c:3195
+msgid "/Tools/Buddy Pounce"
+msgstr "/उपकरणहरू/साथी पाउन्स"
+
+#: src/gtkblist.c:3198
+msgid "/Tools/Account Actions"
+msgstr "/उपकरणहरू/खाता कार्यहरू"
+
+#: src/gtkblist.c:3201
+msgid "/Tools/Plugin Actions"
+msgstr "/उपकरणहरू/प्लगइन कार्यहरू"
+
+#. set the Show Offline Buddies option. must be done
+#. * after the treeview or faceprint gets mad. -Robot101
+#.
+#: src/gtkblist.c:3292
+msgid "/Buddies/Show Offline Buddies"
+msgstr "/साथीहरू/अफलाइन साथीहरू देखाउनुहोस्"
+
+#: src/gtkblist.c:3294
+msgid "/Buddies/Show Empty Groups"
+msgstr "/साथीहरू/खाली समूहहरू देखाउनुहोस्"
+
+#: src/gtkblist.c:3319
+msgid "Send a message to the selected buddy"
+msgstr "चयन गरिएको साथीमा एउटा सन्देश पठाउनुहोस्"
+
+#: src/gtkblist.c:3329
+msgid "Get information on the selected buddy"
+msgstr "चयन गरिएको साथीमा जानकारी प्राप्त गर्नुहोस्"
+
+#: src/gtkblist.c:3333
+msgid "_Chat"
+msgstr "कुराकानी"
+
+#: src/gtkblist.c:3338
+msgid "Join a chat room"
+msgstr "एउटा कुराकानी कोठामा छिर्नुहोस्"
+
+#: src/gtkblist.c:3343
+msgid "_Away"
+msgstr "टाढा"
+
+#: src/gtkblist.c:3348
+msgid "Set an away message"
+msgstr "एउटा टाढा सन्देश सेट गर्नुहोस्"
+
+#: src/gtkblist.c:4112 src/protocols/silc/buddy.c:731
+#: src/protocols/silc/buddy.c:989 src/protocols/silc/buddy.c:1034
+#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2951
+msgid "Add Buddy"
+msgstr "साथी थप्नुहोस्"
+
+#: src/gtkblist.c:4136
+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. "
+"The alias will be displayed in place of the screen name whenever possible.\n"
+msgstr "कृपया तपाईँको साथी सूचीमा थप्न चाहानु भएको व्यक्तिको पर्दा नाम प्रविष्टि गर्नुहोस् । तपाईँ ऐच्छिक रुपमा साथीका लागि उपनाम वा चिनाउने कुनै नाम प्रविष्टि गर्न पनि सक्नुहुन्छ । उपनामहरू सम्भव भएको समयमा पर्दा नामको स्थानमा प्रदर्शन गर्नेछ ।\n"
+
+#. Set up stuff for the account box
+#: src/gtkblist.c:4196 src/gtkblist.c:4499
+msgid "Account:"
+msgstr "खाता:"
+
+#: src/gtkblist.c:4432
+msgid "This protocol does not support chat rooms."
+msgstr "यो प्रोटोकलले कुराकानी कोठाहरू समर्थन गर्दैन ।"
+
+#: src/gtkblist.c:4448
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"chat."
+msgstr "तपाईँ हालसालै कुनै पनि प्रोटोकल सहित साइनअन हुन सक्नुहुन्न जसमा कुराकानी गर्न सक्ने क्षमता होस् ।"
+
+#: src/gtkblist.c:4465
+msgid "Add Chat"
+msgstr "कुराकानी थप्नुहोस्"
+
+#: src/gtkblist.c:4489
+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:4568
+msgid "Add Group"
+msgstr "समूह थप्नुहोस्"
+
+#: src/gtkblist.c:4569
+msgid "Please enter the name of the group to be added."
+msgstr "कृपया थप्नुपर्ने समूहको नाम प्रविष्टि गर्नुहोस् ।"
+
+#: src/gtkblist.c:5138 src/gtkblist.c:5235
+msgid "No actions available"
+msgstr "कुनै कार्यहरू उपलब्ध छैन"
+
+#: src/gtkconn.c:79 src/gtkconn.c:250 src/gtkconn.c:261
+msgid "Done."
+msgstr "काम पूरा भयो ।"
+
+#: src/gtkconn.c:158
+msgid "Signon: "
+msgstr "साइनअन: "
+
+#: src/gtkconn.c:204
+msgid "Signon"
+msgstr "साइनअन"
+
+#: src/gtkconn.c:216
+msgid "Cancel All"
+msgstr "सबै रद्द गर्नुहोस्"
+
+#: src/gtkconn.c:367 src/gtkconn.c:600
+msgid "_Reconnect"
+msgstr "पुन:जडान गर्नुहोस्"
+
+#: src/gtkconn.c:564
+#, c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
+"\n"
+"%s\n"
+"%s"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">%s विच्छेदन भयो ।</span>\n"
+"\n"
+"%s\n"
+"%s"
+
+#: src/gtkconn.c:566
+msgid "Reason Unknown."
+msgstr "अज्ञात कारण"
+
+#: src/gtkconn.c:605
+msgid "Reconnect _All"
+msgstr "सबै पुन:जडान गर्नुहोस्"
+
+#: src/gtkconn.c:635
+msgid "Time"
+msgstr "समय"
+
+#: src/gtkconv.c:342
+#, c-format
+msgid "me is using Gaim v%s."
+msgstr "म गाइम v%s प्रयोग गरिरहेको छु ।"
+
+#: src/gtkconv.c:351
+msgid "Supported debug options are:  version"
+msgstr "समर्थित त्रुटि सच्याउने विकल्पहरू निम्न छन्:  संस्करण"
+
+#: src/gtkconv.c:390
+msgid "No such command (in this context)."
+msgstr "कुनै त्यस्तो आदेश छैन (यो प्रसंगमा)।"
+
+#: src/gtkconv.c:393
+msgid ""
+"Use \"/help &lt;command&gt;\" for help on a specific command.\n"
+"The following commands are available in this context:\n"
+msgstr ""
+"\"/मद्दत &lt;आदेश&gt;\" विशेष आदेशमा मद्दतका लागि प्रयोग गर्नुहोस्।\n"
+"दिएका आदेशहरू यो प्रसंगमा उपलब्ध हुन्छन्:\n"
+
+#: src/gtkconv.c:465
+msgid "No such command."
+msgstr "कुनै त्यस्तो आदेश हैन ।"
+
+#: src/gtkconv.c:472
+msgid "Syntax Error:  You typed the wrong number of arguments to that command."
+msgstr "वाक्य संरचना त्रुटि: तपाईँले त्यो आदेशमा तर्कहरुको गलत संख्या टाइप गर्नुभएको छ ।"
+
+#: src/gtkconv.c:477
+msgid "Your command failed for an unknown reason."
+msgstr "अज्ञात कारणका लागि तपाईँको आदेश असफल भयो ।"
+
+#: src/gtkconv.c:484
+msgid "That command only works in Chats, not IMs."
+msgstr "त्यो आदेशले मात्र कुराकानीहरुमा काम  ."
+
+#: src/gtkconv.c:487
+msgid "That command only works in IMs, not Chats."
+msgstr "त्यो आदेशले IMs मात्र काम गर्दछ, कुराकानीमा होइन ।"
+
+#: src/gtkconv.c:491
+msgid "That command doesn't work on this protocol."
+msgstr "त्यो आदेशले यो प्रोटोकलमा कार्य गर्न सक्तैन ।"
+
+#: src/gtkconv.c:734 src/gtkconv.c:760
+msgid "That buddy is not on the same protocol as this chat"
+msgstr "यो कुराकानीमा जस्तै त्यो साथी उही प्रोटोकलमा छैन"
+
+#: src/gtkconv.c:754
+msgid "You are not currently signed on with an account that can invite that buddy."
+msgstr "तपाईँ हालसालै खातामा साइनअन गर्न सक्नुहुन्न जसमा त्यो साथीलाई निमन्त्रणा गर्न सकियोस् ।"
+
+#: src/gtkconv.c:808
+msgid "Invite Buddy Into Chat Room"
+msgstr "कुराकानी कोठा भित्र साथीलाई निमन्त्रणा गर्नुहोस्"
+
+#. Put our happy label in it.
+#: src/gtkconv.c:838
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr "कृपया तपाईँले निमन्त्रणा गर्न चाहेको प्रयोगकर्ताको नाम प्रविष्टि गर्नुहोस्,एच्छिक निमन्त्रणा सन्देश बराबर हुन्छ ।"
+
+#: src/gtkconv.c:859
+msgid "_Buddy:"
+msgstr "साथी:"
+
+#: src/gtkconv.c:879
+msgid "_Message:"
+msgstr "सन्देश:"
+
+#: src/gtkconv.c:935 src/gtkconv.c:2660 src/gtkdebug.c:182
+msgid "Unable to open file."
+msgstr "फाइल खोल्न अक्षम ।"
+
+#: src/gtkconv.c:940
+#, c-format
+msgid "<h1>Conversation with %s</h1>\n"
+msgstr "<h1>वार्तालाप सहित %s</h1>\n"
+
+#: src/gtkconv.c:954
+msgid "Save Conversation"
+msgstr "वार्तालाप बचत गर्नुहोस्"
+
+#: src/gtkconv.c:1039 src/gtkdebug.c:131
+msgid "Find"
+msgstr "फेला पार्नुहोस्"
+
+#: src/gtkconv.c:1065 src/gtkdebug.c:159
+msgid "_Search for:"
+msgstr "खोज्नका लागि:"
+
+#: src/gtkconv.c:1481
+msgid "IM"
+msgstr "IM"
+
+#. Send File button
+#: src/gtkconv.c:1490 src/gtkconv.c:3903 src/protocols/oscar/oscar.c:614
+msgid "Send File"
+msgstr "फाइल पठाउनुहोस्"
+
+#: src/gtkconv.c:1499
+msgid "Un-Ignore"
+msgstr "उपेक्षा नगर्नुहोस्"
+
+#: src/gtkconv.c:1501 src/gtkprefs.c:831
+msgid "Ignore"
+msgstr "उपेक्षा गर्नुहोस्"
+
+#. Info button
+#: src/gtkconv.c:1510 src/gtkconv.c:3924
+msgid "Info"
+msgstr "सूचना"
+
+#: src/gtkconv.c:1519
+msgid "Get Away Msg"
+msgstr "सन्देश प्राप्त गर्नु टाढा"
+
+#: src/gtkconv.c:2668
+msgid "Unable to save icon file to disk."
+msgstr "डिस्कमा प्रतिमा फाइल बचत गर्न अक्षम छ ।"
+
+#: src/gtkconv.c:2690
+msgid "Save Icon"
+msgstr "प्रतिमा बचत गर्नुहोस्"
+
+#: src/gtkconv.c:2720
+msgid "Animate"
+msgstr "सचेत गराउनुहोस्"
+
+#: src/gtkconv.c:2725
+msgid "Hide Icon"
+msgstr "प्रतिमा लुकाउनुहोस्"
+
+#: src/gtkconv.c:2731
+msgid "Save Icon As..."
+msgstr "प्रतिमा यस रुपमा बचत गर्नुहोस्..."
+
+#: src/gtkconv.c:3108
+msgid "User is typing..."
+msgstr "प्रयोगकर्ता टाइप गर्दै हुनुहुन्छ..."
+
+#: src/gtkconv.c:3116
+msgid "User has typed something and paused"
+msgstr "प्रयोगकर्ताले केही टाइप गर्नुभयो र रोक्नुभयो"
+
+#. Build the Send As menu
+#: src/gtkconv.c:3219
+msgid "_Send As"
+msgstr "यस रुपमा पठाउनुहोस्"
+
+#. Conversation menu
+#: src/gtkconv.c:3673
+msgid "/_Conversation"
+msgstr "/वार्तालाप"
+
+#: src/gtkconv.c:3675
+msgid "/Conversation/New Instant _Message..."
+msgstr "/वार्तालाप/ नयाँ आवश्यकता सन्देश..."
+
+#: src/gtkconv.c:3680
+msgid "/Conversation/_Find..."
+msgstr "/वार्तालाप/फेला पार्नुहोस्..."
+
+#: src/gtkconv.c:3682
+msgid "/Conversation/View _Log"
+msgstr "/वार्तालाप/दृश्य लग"
+
+#: src/gtkconv.c:3683
+msgid "/Conversation/_Save As..."
+msgstr "/वार्तालाप/यस रुपमा बचत गर्नुहोस्..."
+
+#: src/gtkconv.c:3685
+msgid "/Conversation/Clear"
+msgstr "/वार्तालाप/सफा गर्नुहोस्"
+
+#: src/gtkconv.c:3689
+msgid "/Conversation/Se_nd File..."
+msgstr "/वार्तालाप/फाइल पठाउनुहोस्..."
+
+#: src/gtkconv.c:3690
+msgid "/Conversation/Add Buddy _Pounce..."
+msgstr "/वार्तालाप/ साथी पाउन्स थप्नुहोस्..."
+
+#: src/gtkconv.c:3692
+msgid "/Conversation/_Get Info"
+msgstr "/वार्तालाप/ जानकारी प्राप्त गर्नुहोस्"
+
+#: src/gtkconv.c:3694
+msgid "/Conversation/_Warn..."
+msgstr "/वार्तालाप/चेतावनी दिनुहोस्..."
+
+#: src/gtkconv.c:3696
+msgid "/Conversation/In_vite..."
+msgstr "/वार्तालाप/निमन्त्रणा..."
+
+#: src/gtkconv.c:3701
+msgid "/Conversation/Al_ias..."
+msgstr "/वार्तालाप/उपनाम राख्नुहोस्..."
+
+#: src/gtkconv.c:3703
+msgid "/Conversation/_Block..."
+msgstr "/वार्तालाप/रोक्नुहोस्..."
+
+#: src/gtkconv.c:3705
+msgid "/Conversation/_Add..."
+msgstr "/वार्तालाप/थप्नुहोस्..."
+
+#: src/gtkconv.c:3707
+msgid "/Conversation/_Remove..."
+msgstr "/वार्तालाप/हटाउनुहोस्..."
+
+#: src/gtkconv.c:3712
+msgid "/Conversation/Insert Lin_k..."
+msgstr "/वार्तालाप/लिङ्क घुसाउहोस्..."
+
+#: src/gtkconv.c:3714
+msgid "/Conversation/Insert Imag_e..."
+msgstr "/वार्तालाप/छवि घुसाउनुहोस्..."
+
+#: src/gtkconv.c:3719
+msgid "/Conversation/_Close"
+msgstr "/वार्तालाप/बन्द गर्नुहोस्"
+
+#. Options
+#: src/gtkconv.c:3723
+msgid "/_Options"
+msgstr "/विकल्पहरू"
+
+#: src/gtkconv.c:3724
+msgid "/Options/Enable _Logging"
+msgstr "/विकल्पहरू/लगिङ् सक्षम पार्नुहोस्"
+
+#: src/gtkconv.c:3725
+msgid "/Options/Enable _Sounds"
+msgstr "/विकल्पहरू/ध्वनीहरू सक्षम पार्नुहोस्"
+
+#: src/gtkconv.c:3726
+msgid "/Options/Show Formatting _Toolbar"
+msgstr "/विकल्पहरू /ढाँचाबद्ध उपकरणपट्टी देखाउनुहोस्"
+
+#: src/gtkconv.c:3727
+msgid "/Options/Show Ti_mestamps"
+msgstr "/विकल्पहरू/टाइमस्ट्याम्पहरू देखाउनुहोस्"
+
+#: src/gtkconv.c:3769
+msgid "/Conversation/View Log"
+msgstr "/वार्तालाप/लग हेर्नुहोस्"
+
+#: src/gtkconv.c:3774
+msgid "/Conversation/Send File..."
+msgstr "/वार्तालाप/फाइल पठाउनुहोस्..."
+
+#: src/gtkconv.c:3778
+msgid "/Conversation/Add Buddy Pounce..."
+msgstr "/वार्तालाप/साथी पाउन्स थप्नुहोस्..."
+
+#: src/gtkconv.c:3784
+msgid "/Conversation/Get Info"
+msgstr "/वार्तालाप/जानकारी प्राप्त गर्नुहोस्"
+
+#: src/gtkconv.c:3788
+msgid "/Conversation/Warn..."
+msgstr "/वार्तालाप/चेतावनी दिनुहोस्..."
+
+#: src/gtkconv.c:3792
+msgid "/Conversation/Invite..."
+msgstr "/वार्तालाप/निमन्त्रणा गर्नुहोस्..."
+
+#: src/gtkconv.c:3798
+msgid "/Conversation/Alias..."
+msgstr "/वार्तालाप/उपनामहरू..."
+
+#: src/gtkconv.c:3802
+msgid "/Conversation/Block..."
+msgstr "/वार्तालाप/रोक्नुहोस्..."
+
+#: src/gtkconv.c:3806
+msgid "/Conversation/Add..."
+msgstr "/वार्तालाप/थप्नुहोस्..."
+
+#: src/gtkconv.c:3810
+msgid "/Conversation/Remove..."
+msgstr "/वार्तालाप/हटाउनुहोस्..."
+
+#: src/gtkconv.c:3816
+msgid "/Conversation/Insert Link..."
+msgstr "/वार्तालाप/लिङ्क घुसाउनुहोस्..."
+
+#: src/gtkconv.c:3820
+msgid "/Conversation/Insert Image..."
+msgstr "/वार्तालाप/छवि घुसाउनुहोस्..."
+
+#: src/gtkconv.c:3826
+msgid "/Options/Enable Logging"
+msgstr "/विकल्पहरू/लगिङ् सक्षम पार्नुहोस्"
+
+#: src/gtkconv.c:3829
+msgid "/Options/Enable Sounds"
+msgstr "/विकल्पहरू/ध्वनीहरू सक्षम पार्नुहोस्"
+
+#: src/gtkconv.c:3832
+msgid "/Options/Show Formatting Toolbar"
+msgstr "/विकल्पहरू /ढाँचाबद्ध उपकरणपट्टी देखाउनुहोस्"
+
+#: src/gtkconv.c:3835
+msgid "/Options/Show Timestamps"
+msgstr "/विकल्पहरू/टाइमस्ट्यापहरू देखाउनुहोस्"
+
+#. The buttons, from left to right
+#. Warn button
+#: src/gtkconv.c:3889
+msgid "Warn"
+msgstr "चेतावनी दिनुहोस्"
+
+#: src/gtkconv.c:3890
+msgid "Warn the user"
+msgstr "प्रयोगकर्तालाई चेतावनी दिनुहोस्"
+
+#. Block button
+#: src/gtkconv.c:3896 src/gtkprivacy.c:634 src/gtkprivacy.c:645
+msgid "Block"
+msgstr "रोक्नुहोस्"
+
+#: src/gtkconv.c:3897
+msgid "Block the user"
+msgstr "प्रयोगकर्तालाई रोक्नुहोस्"
+
+#: src/gtkconv.c:3904
+msgid "Send a file to the user"
+msgstr "प्रयोगकर्तालाई फाइल पठाउनुहोस्"
+
+#: src/gtkconv.c:3911
+msgid "Add the user to your buddy list"
+msgstr "तपाईँको साथी सूचीमा प्रयोगकर्ता थप्नुहोस्"
+
+#: src/gtkconv.c:3918
+msgid "Remove the user from your buddy list"
+msgstr "तपाईँको साथी सूचीबाट प्रयोगकर्ता हटाउनुहोस्"
+
+#: src/gtkconv.c:3925 src/gtkconv.c:4260
+msgid "Get the user's information"
+msgstr "प्रयोगकर्ताको जानकारी प्राप्त गर्नुहोस्"
+
+#. Send button
+#: src/gtkconv.c:3931 src/gtkconv.c:3995
+msgid "Send"
+msgstr "पठाउनुहोस्"
+
+#: src/gtkconv.c:3932 src/gtkconv.c:3996
+msgid "Send message"
+msgstr "सन्देश पठाउनुहोस्"
+
+#. The buttons, from left to right
+#. Invite
+#: src/gtkconv.c:3974
+msgid "Invite"
+msgstr "आमन्त्रण गर्नुहोस्"
+
+#: src/gtkconv.c:3975
+msgid "Invite a user"
+msgstr "प्रयोगकर्तालाई आमन्त्रण गर्नुहोस्"
+
+#: src/gtkconv.c:3982
+msgid "Add the chat to your buddy list"
+msgstr "तपाईँको साथी सूचीमा कुराकानी थप्नुहोस्"
+
+#: src/gtkconv.c:3989
+msgid "Remove the chat from your buddy list"
+msgstr "तपाईँको साथी सूचीबाट कुराकानी हटाउनुहोस्"
+
+#: src/gtkconv.c:4113
+msgid "Topic:"
+msgstr "विषय:"
+
+#. Setup the label telling how many people are in the room.
+#: src/gtkconv.c:4176
+msgid "0 people in room"
+msgstr "कोठामा मानिस छैनन्"
+
+#: src/gtkconv.c:4237
+msgid "IM the user"
+msgstr "प्रयोगकर्तालाई IM गर्नुहोस्"
+
+#: src/gtkconv.c:4249
+msgid "Ignore the user"
+msgstr "प्रयोगकर्तालाई बेवास्ता गर्नुहोस्"
+
+#: src/gtkconv.c:4848
+msgid "Close conversation"
+msgstr "वार्तालाप बन्द गर्नुहोस्"
+
+#: src/gtkconv.c:5385 src/gtkconv.c:5414 src/gtkconv.c:5510 src/gtkconv.c:5568
+#, c-format
+msgid "%d person in room"
+msgid_plural "%d people in room"
+msgstr[0] "कोठामा %d व्यक्ति छन्"
+msgstr[1] "कोठामा %d व्यक्ति छन्"
+
+#: src/gtkconv.c:6145 src/gtkconv.c:6148
+msgid "<main>/Conversation/Close"
+msgstr "<main>/वार्तालाप/बन्द गर्नुहोस्"
+
+#: src/gtkconv.c:6520
+msgid ""
+"say &lt;message&gt;:  Send a message normally as if you weren't using a "
+"command."
+msgstr "&lt;सन्देश&gt;भन्नुहोस्:  साधारणतया तपाईँ आदेश प्रयोग नगरीकन सन्देश पठाउनुहोस् ।"
+
+#: src/gtkconv.c:6523
+msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
+msgstr "म &lt;कार्य&gt;: साथी वा कुराकानीमा IRC शैली कार्य पठाउनुहोस् ।"
+
+#: src/gtkconv.c:6526
+msgid ""
+"debug &lt;option&gt;:  Send various debug information to the current "
+"conversation."
+msgstr "त्रुटि सच्याउनुहोस् &lt;विकल्पहरू&gt;:  हालको संस्करणमा बिभिन्र त्रुटि सच्याउनुहोस् जानकारी पठाउनुहोस् ।"
+
+#: src/gtkconv.c:6529
+msgid "clear: Clears the conversation scrollback."
+msgstr "सफा गर्नुहोस्: स्क्रोल ब्याक वार्तालाप सफा गर्दछ ।"
+
+#: src/gtkconv.c:6532
+msgid "help &lt;command&gt;:  Help on a specific command."
+msgstr "मद्दत &lt;आदेश&gt;:  विशेष आदेशमा मद्दत गर्नुहोस् ।"
+
+#: src/gtkdebug.c:197
+msgid "Save Debug Log"
+msgstr "त्रुटि सच्याउने लग बचत गर्नुहोस्"
+
+#: src/gtkdebug.c:250
+msgid "Debug Window"
+msgstr "त्रुटि सच्याउने सञ्झ्याल"
+
+#: src/gtkdebug.c:288
+msgid "Pause"
+msgstr "पज गर्नुहोस्"
+
+#: src/gtkdebug.c:294
+msgid "Timestamps"
+msgstr "टाइमस्ट्यापहरू"
+
+#: src/gtkdialogs.c:63
+msgid "lead developer"
+msgstr "प्रमुख विकासकर्ता"
+
+#: src/gtkdialogs.c:64 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:75
+msgid "developer"
+msgstr "विकासकर्ता"
+
+#: src/gtkdialogs.c:65
+msgid "developer & webmaster"
+msgstr "विकासकर्ता र वेब मास्टर"
+
+#: src/gtkdialogs.c:66
+msgid "win32 port"
+msgstr "win32 पोर्ट"
+
+#: src/gtkdialogs.c:72
+msgid "support"
+msgstr "समर्थन"
+
+#: src/gtkdialogs.c:91
+msgid "maintainer"
+msgstr "सम्भारकर्ता"
+
+#: src/gtkdialogs.c:92
+msgid "former libfaim maintainer"
+msgstr "पूर्व लिवफेम सम्भारकर्ता"
+
+#: src/gtkdialogs.c:93
+msgid "former lead developer"
+msgstr "पूर्व प्रमुख विकासकर्ता"
+
+#: src/gtkdialogs.c:94
+msgid "former maintainer"
+msgstr "पूर्व सम्भारकर्ता"
+
+#: src/gtkdialogs.c:95
+msgid "former Jabber developer"
+msgstr "पूर्व जब्बार विकासकर्ता"
+
+#: src/gtkdialogs.c:96
+msgid "original author"
+msgstr "मौलिक लेखक"
+
+#: src/gtkdialogs.c:97
+msgid "hacker and designated driver [lazy bum]"
+msgstr "ह्याकर र डिजाइनेटेड ड्राइभर [लेजी बम]"
+
+#: src/gtkdialogs.c:102
+msgid "Azerbaijani"
+msgstr "अजरबैजानि"
+
+#: src/gtkdialogs.c:103 src/gtkdialogs.c:151
+msgid "Bulgarian"
+msgstr "बुल्गेरियन"
+
+#: src/gtkdialogs.c:103
+msgid "Vladimira Girginova and Vladimir (Kaladan) Petkov"
+msgstr "भ्ल्याडिमिरा गिर्गिनिभा र भ्ल्याडिमिर (कालाडन) पेटकोभ"
+
+#: src/gtkdialogs.c:104 src/gtkdialogs.c:152 src/gtkdialogs.c:153
+msgid "Catalan"
+msgstr "क्याटालन भाषा"
+
+#: src/gtkdialogs.c:105 src/gtkdialogs.c:154
+msgid "Czech"
+msgstr "चेक भाषा"
+
+#: src/gtkdialogs.c:106
+msgid "Danish"
+msgstr "डेनिस"
+
+#: src/gtkdialogs.c:107 src/gtkdialogs.c:155
+msgid "German"
+msgstr "जर्मन"
+
+#: src/gtkdialogs.c:108
+msgid "Australian English"
+msgstr "अष्ट्रेलीयन अंग्रेजी"
+
+#: src/gtkdialogs.c:109
+msgid "Canadian English"
+msgstr "क्यानेडियन अंग्रेजी"
+
+#: src/gtkdialogs.c:110
+msgid "British English"
+msgstr "ब्रिटीश अंग्रेजी"
+
+#: src/gtkdialogs.c:111 src/gtkdialogs.c:156
+msgid "Spanish"
+msgstr "स्पेनिस"
+
+#: src/gtkdialogs.c:112
+msgid "Estonian"
+msgstr "एस्टोनियन"
+
+#: src/gtkdialogs.c:113 src/gtkdialogs.c:157
+msgid "Finnish"
+msgstr "फिन्नीस"
+
+#: src/gtkdialogs.c:114 src/gtkdialogs.c:158
+msgid "French"
+msgstr "फ्रान्सेली"
+
+#: src/gtkdialogs.c:115
+msgid "Galician"
+msgstr "ग्यलिसियन"
+
+#: src/gtkdialogs.c:116
+msgid "Hebrew"
+msgstr "हिब्रु"
+
+#: src/gtkdialogs.c:117 src/gtkdialogs.c:159
+msgid "Hindi"
+msgstr "हिन्दी"
+
+#: src/gtkdialogs.c:118 src/gtkdialogs.c:160
+msgid "Hungarian"
+msgstr "हन्गेरियन"
+
+#: src/gtkdialogs.c:119 src/gtkdialogs.c:161
+msgid "Italian"
+msgstr "ईटालियन"
+
+#: src/gtkdialogs.c:120 src/gtkdialogs.c:162
+msgid "Japanese"
+msgstr "जापनिज"
+
+#: src/gtkdialogs.c:121
+msgid "Georgian"
+msgstr "जर्जीयन"
+
+#: src/gtkdialogs.c:122 src/gtkdialogs.c:163
+msgid "Korean"
+msgstr "कोरियाली"
+
+#: src/gtkdialogs.c:123
+msgid "Lithuanian"
+msgstr "लिथुवानियाली"
+
+#: src/gtkdialogs.c:124
+msgid "Macedonian"
+msgstr "म्यासिडोनियन"
+
+#: src/gtkdialogs.c:125
+msgid "Burmese"
+msgstr "बर्मेली"
+
+#: src/gtkdialogs.c:126 src/gtkdialogs.c:164
+msgid "Norwegian"
+msgstr "नर्वेयीयन"
+
+#: src/gtkdialogs.c:127
+msgid "Dutch; Flemish"
+msgstr "डच; फ्लेमिस"
+
+#: src/gtkdialogs.c:128
+msgid "Norwegian (Nynorsk)"
+msgstr "नर्वेजीयन (Nynorsk)"
+
+#: src/gtkdialogs.c:129
+msgid "Punjabi"
+msgstr "पन्जाबी"
+
+#: src/gtkdialogs.c:130 src/gtkdialogs.c:165
+msgid "Polish"
+msgstr "पोलिस"
+
+#: src/gtkdialogs.c:131
+msgid "Portuguese"
+msgstr "पोर्तुगाली"
+
+#: src/gtkdialogs.c:132
+msgid "Portuguese-Brazil"
+msgstr "प्रोचुगिज-ब्राजिल"
+
+#: src/gtkdialogs.c:133
+msgid "Romanian"
+msgstr "रोमानियन"
+
+#: src/gtkdialogs.c:134 src/gtkdialogs.c:166 src/gtkdialogs.c:167
+msgid "Russian"
+msgstr "रसियाली"
+
+#: src/gtkdialogs.c:135
+msgid "Slovenian"
+msgstr "स्लोभेनिया"
+
+#: src/gtkdialogs.c:136
+msgid "Albanian"
+msgstr "अल्वानियन"
+
+#: src/gtkdialogs.c:137
+msgid "Serbian"
+msgstr "सेर्वियन"
+
+#: src/gtkdialogs.c:138 src/gtkdialogs.c:169 src/gtkdialogs.c:170
+msgid "Swedish"
+msgstr "स्विडिस"
+
+#: src/gtkdialogs.c:139
+msgid "Turkish"
+msgstr "टर्कीस"
+
+#: src/gtkdialogs.c:140
+msgid "Ukrainian"
+msgstr "युक्रेनियन"
+
+#: src/gtkdialogs.c:141
+msgid "Vietnamese"
+msgstr "भियतनामिज"
+
+#: src/gtkdialogs.c:141
+msgid "T.M.Thanh and the Gnome-Vi Team"
+msgstr "T.M.थान्ह र जिनोम-Vi टीम"
+
+#: src/gtkdialogs.c:142
+msgid "Xhosa"
+msgstr "होजा"
+
+#: src/gtkdialogs.c:143
+msgid "Simplified Chinese"
+msgstr "सरलीकृत चिनियाँ"
+
+#: src/gtkdialogs.c:144
+msgid "Traditional Chinese"
+msgstr "परम्परागत चिनियाँ"
+
+#: src/gtkdialogs.c:150
+msgid "Amharic"
+msgstr "अम्हारिक"
+
+#: src/gtkdialogs.c:168
+msgid "Slovak"
+msgstr "स्लोभाक"
+
+#: src/gtkdialogs.c:171
+msgid "Chinese"
+msgstr "चिनियाँ"
+
+#: src/gtkdialogs.c:213
+msgid "About Gaim"
+msgstr "गाइमको बारेमा"
+
+#: src/gtkdialogs.c:228
+#, c-format
+msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
+
+#: src/gtkdialogs.c:250
+msgid ""
+"Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
+"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
+"at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
+msgstr ""
+"गाइम एकै पटक AIM, MSN, Yahoo!, "
+"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, र Gadu-Gadu सबै प्रयोग गरिने क्षमाता भएको एउटा मोड्युलर सन्देश ग्राहक हो ।  यो Gtk+ प्रयोग गरेर लेखिन्छ र GPL.<BR><BR> अन्तर्गत अनुमति प्राप्त हुन्छ"
+
+#: src/gtkdialogs.c:260
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
+
+#: src/gtkdialogs.c:263
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
+
+#: src/gtkdialogs.c:269
+msgid "Active Developers"
+msgstr "सक्रिय विकासकर्ताहरू"
+
+#: src/gtkdialogs.c:284
+msgid "Crazy Patch Writers"
+msgstr "क्रेजी प्याच राइटरहरू"
+
+#: src/gtkdialogs.c:299
+msgid "Retired Developers"
+msgstr "हटिसकेका विकासकर्ताहरू"
+
+#: src/gtkdialogs.c:314
+msgid "Current Translators"
+msgstr "हालका अनुवादकहरू"
+
+#: src/gtkdialogs.c:334
+msgid "Past Translators"
+msgstr "पूर्व अनुवादकहरू"
+
+#: src/gtkdialogs.c:489 src/gtkdialogs.c:631 src/gtkdialogs.c:684
+msgid "_Screen name"
+msgstr "पर्दा नाम"
+
+#: src/gtkdialogs.c:495 src/gtkdialogs.c:637 src/gtkdialogs.c:690
+msgid "_Account"
+msgstr "खाता"
+
+#: src/gtkdialogs.c:502
+msgid "New Instant Message"
+msgstr "नयाँ आवश्यक सन्देश"
+
+#: src/gtkdialogs.c:504
+msgid "Please enter the screen name of the person you would like to IM."
+msgstr "कृपया तपाईँले IM गर्न चाहानु भएको व्यक्तिको पर्दा नाम प्रविष्टि गर्नुहोस् ।"
+
+#: src/gtkdialogs.c:644
+msgid "Get User Info"
+msgstr "प्रयोगकर्ता जानकारी प्राप्त गर्नुहोस्"
+
+#: src/gtkdialogs.c:646
+msgid "Please enter the screen name of the person whose info you would like to view."
+msgstr "कृपया तपाईँले जानकारी प्राप्त गर्न चाहेको व्यक्तिको पर्दा नाम प्रविष्टि गर्नुहोस् ।"
+
+#: src/gtkdialogs.c:698
+msgid "Get User Log"
+msgstr "प्रयोगकर्ता लग प्राप्त गर्नुहोस्"
+
+#: src/gtkdialogs.c:700
+msgid "Please enter the screen name of the person whose log you would like to view."
+msgstr "कृपया व्यक्तिको पर्दा नाम प्रविष्टि गर्नुहोस् जसको लग बारे तपाईँ दृश्य गर्न चाहानुहुन्छ ।"
+
+#: src/gtkdialogs.c:740
+msgid "Warn User"
+msgstr "प्रयोगकर्तालाई चेतावनी दिनुहोस्"
+
+#: src/gtkdialogs.c:761
+#, c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
+"\n"
+"This will increase %s's warning level and he or she will be subject to "
+"harsher rate limiting.\n"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
+"\n"
+"यसले '%s' को चेतावनी स्तर वृद्वि गर्नेछ र उ वा उनीनै  अप्रिय दर सीमाका लागि विषय बन्नेछन् ।\n"
+
+#: src/gtkdialogs.c:770
+msgid "Warn _anonymously?"
+msgstr "अज्ञात तरिकाले चेतावनी दिनुहुन्छ ?"
+
+#: src/gtkdialogs.c:777
+msgid "<b>Anonymous warnings are less severe.</b>"
+msgstr "<b>अज्ञात चेतावनीहरू कम तीक्ष्ण हुन्छन् ।</b>"
+
+#: src/gtkdialogs.c:798
+msgid "Alias Contact"
+msgstr "सम्पर्क उपनाम"
+
+#: src/gtkdialogs.c:799
+msgid "Enter an alias for this contact."
+msgstr "यो सम्पर्कका लागि एउटा उपनाम प्रविष्ट गर्नुहोस् ।"
+
+#: src/gtkdialogs.c:801 src/gtkdialogs.c:823 src/gtkdialogs.c:843
+#: src/gtkrequest.c:251 src/protocols/silc/chat.c:584
+msgid "Alias"
+msgstr "उपनाम"
+
+#: src/gtkdialogs.c:819
+#, c-format
+msgid "Enter an alias for %s."
+msgstr "%s का लागि उपनामहरू प्रविष्टि गर्नुहोस् ।"
+
+#: src/gtkdialogs.c:821
+msgid "Alias Buddy"
+msgstr "साथी उपनाम"
+
+#: src/gtkdialogs.c:840
+msgid "Alias Chat"
+msgstr "कुराकानीलाई उपनाम दिनुहोस्"
+
+#: src/gtkdialogs.c:841
+msgid "Enter an alias for this chat."
+msgstr "यो कुराकानीका लागि उपनामहरू प्रविष्टि गर्नुहोस् ।"
+
+#: src/gtkdialogs.c:875
+#, c-format
+msgid ""
+"You are about to remove the contact containing %s and %d other buddies from "
+"your buddy list.  Do you want to continue?"
+msgstr "तपाईँ आफ्नो साथी सूचीबाट अन्य साथीहरू %s र %d समाविष्ट गरेको सम्पर्क हटाउदै हुनुहुन्छ ।  के तपाईँ यसलाई निरन्तरता दिनुहुन्छ ? "
+
+#: src/gtkdialogs.c:936
+#, 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:939 src/gtkdialogs.c:940
+msgid "Remove Group"
+msgstr "समूह हटाउनुहोस्"
+
+#: src/gtkdialogs.c:978
+#, 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:983
+msgid "Remove Buddy"
+msgstr "साथी हटाउनुहोस्"
+
+#: src/gtkdialogs.c:1020
+#, 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:1023 src/gtkdialogs.c:1024
+msgid "Remove Chat"
+msgstr "कुराकानी हटाउनुहोस्"
+
+#: src/gtkft.c:141
+#, c-format
+msgid "%.2f KB/s"
+msgstr "%.2f KB/s"
+
+#: src/gtkft.c:162 src/gtkft.c:1012
+msgid "Finished"
+msgstr "समाप्त भयो"
+
+#: src/gtkft.c:165 src/gtkft.c:963
+msgid "Canceled"
+msgstr "रद्द गरियो"
+
+#: src/gtkft.c:168 src/gtkft.c:882
+msgid "Waiting for transfer to begin"
+msgstr "स्थानान्तरण सुरू गर्नकोलागि पर्खिरहेको"
+
+#: src/gtkft.c:221
+msgid "<b>Receiving As:</b>"
+msgstr "<b>यस रुपमा प्राप्त गरिँदै छ:</b>"
+
+#: src/gtkft.c:223
+msgid "<b>Receiving From:</b>"
+msgstr "<b>यसबाट प्राप्त गरिँदै छ:</b>"
+
+#: src/gtkft.c:227
+msgid "<b>Sending To:</b>"
+msgstr "<b>यसलाई पठाउँदै:</b>"
+
+#: src/gtkft.c:229
+msgid "<b>Sending As:</b>"
+msgstr "<b>यस रुपमा पठाउँदै छ:</b>"
+
+#: src/gtkft.c:436
+msgid "There is no application configured to open this type of file."
+msgstr "त्यहाँ यो प्रकारको फाइल खोल्नका लागि कन्फिगर गरिएको अनुप्रयोग छैन ।"
+
+#: src/gtkft.c:441
+msgid "An error occurred while opening the file."
+msgstr "फाइल खोलिरहेको बेलामा त्रुटि उत्पन्न भयो ।"
+
+#: src/gtkft.c:533
+msgid "Progress"
+msgstr "प्रगति"
+
+#: src/gtkft.c:540
+msgid "Filename"
+msgstr "फाइलनाम"
+
+#: src/gtkft.c:547
+msgid "Size"
+msgstr "साइज"
+
+#: src/gtkft.c:554
+msgid "Remaining"
+msgstr "बाँकी"
+
+#: src/gtkft.c:586
+msgid "Filename:"
+msgstr "फाइलको नाम:"
+
+#: src/gtkft.c:587
+msgid "Local File:"
+msgstr "स्थानीय फाइल:"
+
+#: src/gtkft.c:588
+msgid "Status:"
+msgstr "स्थिति:"
+
+#: src/gtkft.c:589
+msgid "Speed:"
+msgstr "गति:"
+
+#: src/gtkft.c:590
+msgid "Time Elapsed:"
+msgstr "समय गुज्रीसकेको छ:"
+
+#: src/gtkft.c:591
+msgid "Time Remaining:"
+msgstr "बाँकी समय:"
+
+#: src/gtkft.c:683
+msgid "_Keep the dialog open"
+msgstr "संवाद खुल्ला राख्नुहोस्"
+
+#: src/gtkft.c:693
+msgid "_Clear finished transfers"
+msgstr "समाप्त भएको स्थान्तरणहरू खाली गर्नुहोस्"
+
+#. "Download Details" arrow
+#: src/gtkft.c:702
+msgid "Show transfer details"
+msgstr "स्थान्तरण विवरणहरू देखाउनुहोस्"
+
+#: src/gtkft.c:703
+msgid "Hide transfer details"
+msgstr "स्थान्तरण विवरणहरू लुकाउनुहोस्"
+
+#. Pause button
+#: src/gtkft.c:745 src/stock.c:92
+msgid "_Pause"
+msgstr "पज गर्नुहोस्"
+
+#. Resume button
+#: src/gtkft.c:755
+msgid "_Resume"
+msgstr "पुन:निरन्तरता दिनुहोस्"
+
+#: src/gtkft.c:965
+msgid "Failed"
+msgstr "असफल भयो"
+
+#: src/gtkimhtml.c:699
+msgid "Pa_ste As Text"
+msgstr "पाठको रुपमा टास्नुहोस्"
+
+#: src/gtkimhtml.c:1093
+msgid "Hyperlink color"
+msgstr "हाईपरलिंक रङ"
+
+#: src/gtkimhtml.c:1094
+msgid "Color to draw hyperlinks."
+msgstr "हाइपरलिङ्कहरू कोर्न रङ्"
+
+#: src/gtkimhtml.c:1303
+msgid "_Copy E-Mail Address"
+msgstr "इ-मेल ठेगाना प्रतिलिपि गर्नुहोस्"
+
+#: src/gtkimhtml.c:1315
+msgid "_Copy Link Location"
+msgstr "लिङ्क स्थान प्रतिलिपि बनाउनुहोस्"
+
+#: src/gtkimhtml.c:1325
+msgid "_Open Link in Browser"
+msgstr "ब्राउजरमा लिङ्क खोल्नुहोस्"
+
+#: src/gtkimhtml.c:2942
+msgid ""
+"<span size='larger' weight='bold'>Unrecognized file type</span>\n"
+"\n"
+"Defaulting to PNG."
+msgstr ""
+"<span size='larger' weight='bold'>अज्ञात फाइल प्रकार</span>\n"
+"\n"
+"PNG मा पूर्वनिर्धारित ।"
+
+#: src/gtkimhtml.c:2945
+msgid ""
+"Unrecognized file type\n"
+"\n"
+"Defaulting to PNG."
+msgstr ""
+"अज्ञात फाइल प्रकार\n"
+"\n"
+"PNGमा पूर्वनिर्धारण गर्दा ।"
+
+#: src/gtkimhtml.c:2958
+#, c-format
+msgid ""
+"<span size='larger' weight='bold'>Error saving image</span>\n"
+"\n"
+"%s"
+msgstr ""
+"<span size='larger' weight='bold'>छवि बचत गर्दा त्रुटि</span>\n"
+"\n"
+"%s"
+
+#: src/gtkimhtml.c:2961
+#, c-format
+msgid ""
+"Error saving image\n"
+"\n"
+"%s"
+msgstr ""
+"छवि बचत गर्दा त्रुटि\n"
+"\n"
+"%s"
+
+#: src/gtkimhtml.c:3041 src/gtkimhtml.c:3053
+msgid "Save Image"
+msgstr "छवि बचत गर्नुहोस्"
+
+#: src/gtkimhtml.c:3081
+msgid "_Save Image..."
+msgstr "छवि बचत गर्नुहोस्..."
+
+#: src/gtkimhtmltoolbar.c:176
+msgid "Select Font"
+msgstr "फन्ट चयन गर्नुहोस्"
+
+#: src/gtkimhtmltoolbar.c:254
+msgid "Select Text Color"
+msgstr "पाठ रङ चयन गर्नुहोस्"
+
+#: src/gtkimhtmltoolbar.c:328
+msgid "Select Background Color"
+msgstr "पृष्ठभूमि रङ् चयन गर्नुहोस्"
+
+#: src/gtkimhtmltoolbar.c:412
+msgid "_URL"
+msgstr "URL"
+
+#: src/gtkimhtmltoolbar.c:420
+msgid "_Description"
+msgstr "वर्णन"
+
+#: src/gtkimhtmltoolbar.c:423
+msgid ""
+"Please enter the URL and description of the link that you want to insert. "
+"The description is optional."
+msgstr "कृपया तपाईँले घुसाउन चाहानु भएको लिङ्कको वर्णन र URL प्रविष्टि गर्नुहोस् । यो वर्णन वैकल्पिक छ ।"
+
+#: src/gtkimhtmltoolbar.c:427
+msgid "Please enter the URL of the link that you want to insert."
+msgstr "कृपया तपाईँले घुसाउन चाहानु भएको लिङ्कको URL प्रविष्टि गर्नुहोस् ।"
+
+#: src/gtkimhtmltoolbar.c:432
+msgid "Insert Link"
+msgstr "लिङ्क घुसाउनुहोस्"
+
+#: src/gtkimhtmltoolbar.c:436
+msgid "_Insert"
+msgstr "घुसाउनुहोस्"
+
+#: src/gtkimhtmltoolbar.c:505
+#, c-format
+msgid "Failed to store image: %s\n"
+msgstr "छवि भण्डारण गर्न असफल भयो: %s\n"
+
+#: src/gtkimhtmltoolbar.c:531 src/gtkimhtmltoolbar.c:541
+msgid "Insert Image"
+msgstr "छवि घुसाउनुहोस्"
+
+#: src/gtkimhtmltoolbar.c:679
+msgid "This theme has no available smileys."
+msgstr "यो विषयवस्तुसँग  कुनै उपलब्ध स्माइली छैनन् ।"
+
+#. show everything
+#: src/gtkimhtmltoolbar.c:694
+msgid "Smile!"
+msgstr "मुस्कान!"
+
+#: src/gtkimhtmltoolbar.c:912
+msgid "Bold"
+msgstr "बाक्लो"
+
+#: src/gtkimhtmltoolbar.c:923
+msgid "Italic"
+msgstr "छड्के पार्नुहोस्"
+
+#: src/gtkimhtmltoolbar.c:934
+msgid "Underline"
+msgstr "कच गर्नुहोस्"
+
+#: src/gtkimhtmltoolbar.c:950
+msgid "Larger font size"
+msgstr "फन्ट साइज ठूलो पार्नुहोस्"
+
+#: src/gtkimhtmltoolbar.c:962
+msgid "Smaller font size"
+msgstr "फन्ट साइज सानो पार्नुहोस्"
+
+#: src/gtkimhtmltoolbar.c:979
+msgid "Font Face"
+msgstr "फन्ट मोहडा"
+
+#: src/gtkimhtmltoolbar.c:991
+msgid "Foreground font color"
+msgstr "अग्रभुमि फन्ट रङ"
+
+#: src/gtkimhtmltoolbar.c:1003
+msgid "Background color"
+msgstr "पृष्ठभूमि रङ"
+
+#: src/gtkimhtmltoolbar.c:1018
+msgid "Insert link"
+msgstr "लिङ्क घुसाउनुहोस्"
+
+#: src/gtkimhtmltoolbar.c:1028
+msgid "Insert image"
+msgstr "छवि घुसाउनुहोस्"
+
+#: src/gtkimhtmltoolbar.c:1039
+msgid "Insert smiley"
+msgstr "स्माइली घुसाउनुहोस्"
+
+#: src/gtklog.c:318
+#, c-format
+msgid "Conversations with %s"
+msgstr "%s सँग  वार्तालाप"
+
+#. Window **********
+#: src/gtklog.c:414 src/gtklog.c:431
+msgid "System Log"
+msgstr "प्रणाली लग"
+
+#. Descriptive label
+#: src/gtknotify.c:216
+#, 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:230
+#, c-format
+msgid "<span weight=\"bold\">From:</span> %s\n"
+msgstr "<span weight=\"bold\">बाट:</span> %s\n"
+
+#: src/gtknotify.c:239
+#, c-format
+msgid "<span weight=\"bold\">Subject:</span> %s\n"
+msgstr "<span weight=\"bold\">विषय:</span> %s\n"
+
+#: src/gtknotify.c:244
+#, c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
+"\n"
+"%s%s%s%s"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">तपाईँको मेल छ!</span>\n"
+"\n"
+"%s%s%s%s"
+
+#: src/gtknotify.c:260
+#, c-format
+msgid ""
+"<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
+"\n"
+"%s"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">तपाईँको मेल छ!</span>\n"
+"\n"
+"%s"
+
+#: src/gtknotify.c:430
+#, c-format
+msgid "The browser command <b>%s</b> is invalid."
+msgstr "ब्राउजर आदेश<b>%s</b>वैध छैन ।"
+
+#: src/gtknotify.c:432 src/gtknotify.c:444 src/gtknotify.c:457
+#: src/gtknotify.c:581
+msgid "Unable to open URL"
+msgstr "URL खोल्न अक्षम"
+
+#: src/gtknotify.c:442 src/gtknotify.c:455
+#, c-format
+msgid "Error launching <b>%s</b>: %s"
+msgstr "<b>%s</b> सुरुवात गर्दा त्रुटि: %s"
+
+#: src/gtknotify.c:582
+msgid "The 'Manual' browser command has been chosen, but no command has been set."
+msgstr "'म्यानुअल' ब्राउजर आदेश रोजिएको छ, तर कुनै आदेश सेट गरिएको छैन ।"
+
+#: src/gtkpounce.c:130
+msgid "Select a file"
+msgstr "एउटा फाइल चयन गर्नुहोस् "
+
+#: src/gtkpounce.c:161
+msgid "Please enter a buddy to pounce."
+msgstr "पाउन्स गर्न साथी प्रविष्टि गर्नुहोस्"
+
+#. "New Buddy Pounce"
+#: src/gtkpounce.c:391 src/gtkpounce.c:895
+msgid "New Buddy Pounce"
+msgstr "नयाँ साथी पाउन्स"
+
+#: src/gtkpounce.c:391
+msgid "Edit Buddy Pounce"
+msgstr "साथी पाउन्स सम्पादन गर्नुहोस्"
+
+#. Create the "Pounce Who" frame.
+#: src/gtkpounce.c:408
+msgid "Pounce Who"
+msgstr "कसलाई पाउन्स गर्नुहुन्छ"
+
+#: src/gtkpounce.c:435
+msgid "_Buddy name:"
+msgstr "साथी नाम:"
+
+#. Create the "Pounce When" frame.
+#: src/gtkpounce.c:459
+msgid "Pounce When"
+msgstr "कहिले पाउन्स गर्नुहुन्छ"
+
+#: src/gtkpounce.c:467
+msgid "Si_gn on"
+msgstr "साइनअन"
+
+#: src/gtkpounce.c:469
+msgid "Sign _off"
+msgstr "साइनअफ"
+
+#: src/gtkpounce.c:471
+msgid "A_way"
+msgstr "टाढा"
+
+#: src/gtkpounce.c:473
+msgid "_Return from away"
+msgstr "टाढा बाट फर्कनुहोस्"
+
+#: src/gtkpounce.c:475
+msgid "_Idle"
+msgstr "निष्क्रिय"
+
+#: src/gtkpounce.c:477
+msgid "Retur_n from idle"
+msgstr "निष्क्रिय बाट फर्कनुहोस्"
+
+#: src/gtkpounce.c:479
+msgid "Buddy starts _typing"
+msgstr "साथीले टाइप गर्न सुरू गर्दै हुनुहुन्छ"
+
+#: src/gtkpounce.c:481
+msgid "Buddy stops t_yping"
+msgstr "साथीले टाइप गर्न रोक्नुभयो"
+
+#. Create the "Pounce Action" frame.
+#: src/gtkpounce.c:510
+msgid "Pounce Action"
+msgstr "कार्य पाउन्स गर्नुहोस्"
+
+#: src/gtkpounce.c:518
+msgid "Op_en an IM window"
+msgstr "एउटा IM सञ्झ्याल खोल्नुहोस्"
+
+#: src/gtkpounce.c:520
+msgid "_Popup notification"
+msgstr "पपअप सूचना"
+
+#: src/gtkpounce.c:522
+msgid "Send a _message"
+msgstr "सन्देश पठाउनुहोस्"
+
+#: src/gtkpounce.c:524
+msgid "E_xecute a command"
+msgstr "आदेश कार्यान्वयन गर्नुहोस्"
+
+#: src/gtkpounce.c:526
+msgid "P_lay a sound"
+msgstr "ध्वनी प्ले गर्नुहोस्"
+
+#: src/gtkpounce.c:530
+msgid "B_rowse..."
+msgstr "ब्राउज गर्नुहोस्..."
+
+#: src/gtkpounce.c:532
+msgid "Bro_wse..."
+msgstr "ब्राउज गर्नुहोस्..."
+
+#: src/gtkpounce.c:533
+msgid "Pre_view"
+msgstr "पूर्वावलोकन"
+
+#: src/gtkpounce.c:616
+msgid "Sav_e this pounce after activation"
+msgstr " यो पाउन्स बचत गर्नुहोस्"
+
+#. "Remove Buddy Pounce"
+#: src/gtkpounce.c:902
+msgid "Remove Buddy Pounce"
+msgstr "साथी पाउन्स हटाउनुहोस्"
+
+#: src/gtkpounce.c:963
+#, c-format
+msgid "%s has started typing to you (%s)"
+msgstr " %sले तपाईँ (%s)लाई टाइप सुरू गरिसकेको छ ।"
+
+#: src/gtkpounce.c:965
+#, c-format
+msgid "%s has signed on (%s)"
+msgstr "%s मा साइनअन (%s) भएको छ"
+
+#: src/gtkpounce.c:967
+#, c-format
+msgid "%s has returned from being idle (%s)"
+msgstr "%s अहिले निष्क्रिय (%s)बाट फर्किसकेको छ ।"
+
+#: src/gtkpounce.c:969
+#, c-format
+msgid "%s has returned from being away (%s)"
+msgstr "%s अहिले टाढा(%s)बाट फर्किसकेको छ"
+
+#: src/gtkpounce.c:971
+#, c-format
+msgid "%s has stopped typing to you (%s)"
+msgstr "%s ले तपाईँ(%s)लाई टाइप गर्न रोक्यो ।"
+
+#: src/gtkpounce.c:973
+#, c-format
+msgid "%s has signed off (%s)"
+msgstr "%s ले साइनअफ (%s) गर्यो"
+
+#: src/gtkpounce.c:975
+#, c-format
+msgid "%s has become idle (%s)"
+msgstr "%s निष्क्रिय (%s) भएको छ"
+
+#: src/gtkpounce.c:977
+#, c-format
+msgid "%s has gone away. (%s)"
+msgstr "%s टाढा गइसकेको छ । (%s)"
+
+#: src/gtkpounce.c:978
+msgid "Unknown pounce event. Please report this!"
+msgstr "अज्ञात घटना पाउन्स गर्नुहोस् । कृपया यो प्रतिवेदन गर्नुहोस्!"
+
+#: src/gtkprefs.c:447
+msgid "Interface Options"
+msgstr "इन्टरफेस विकल्पहरू"
+
+#: src/gtkprefs.c:449
+msgid "D_isplay remote nicknames if no alias is set"
+msgstr "यदि कुनै उपनाम सेट गरिएको छैन भने हटाइएका उपनामहरू प्रदर्शन गर्नुहोस्"
+
+#: src/gtkprefs.c:681
+msgid ""
+"Select a smiley theme that you would like to use from the list below. New "
+"themes can be installed by dragging and dropping them onto the theme list."
+msgstr "तलको सूचीबाट तपाईँले प्रयोग गर्न चाहानु भएको स्माइली विषयवस्तु चयन गर्नुहोस् । नयाँ विषय वस्तुहरू विषय वस्तु सूची भित्रबाट तिनीहरू लाई तानदै र छाड्दै गर्दा स्थापित हुन सक्छन् ।"
+
+#: src/gtkprefs.c:721
+msgid "Icon"
+msgstr "प्रतिमा"
+
+#: src/gtkprefs.c:728 src/gtkprefs.c:2205 src/protocols/jabber/buddy.c:264
+#: src/protocols/jabber/buddy.c:757 src/protocols/jabber/chat.c:743
+msgid "Description"
+msgstr "वर्णन"
+
+#: src/gtkprefs.c:824
+msgid "Display"
+msgstr "प्रदर्शन"
+
+#: src/gtkprefs.c:825
+msgid "Show _timestamp on messages"
+msgstr "सन्देशमा टाइमस्ट्याम देखाउनुहोस्"
+
+#: src/gtkprefs.c:828
+msgid "_Highlight misspelled words"
+msgstr "गलत हिज्जे शब्दहरू हाइलाइट गर्नुहोस्"
+
+#: src/gtkprefs.c:832
+msgid "Ignore c_olors"
+msgstr "रङहरू उपेक्षा गर्नुहोस्"
+
+#: src/gtkprefs.c:834
+msgid "Ignore font _faces"
+msgstr "फन्ट फेसहरू उपेक्षा गर्नुहोस्"
+
+#: src/gtkprefs.c:836
+msgid "Ignore font si_zes"
+msgstr "फन्ट साइजहरू उपेक्षा गर्नुहोस्"
+
+#: src/gtkprefs.c:839
+msgid "Default Formatting"
+msgstr "पूर्वनिर्धारित ढाँचा"
+
+#: src/gtkprefs.c:841
+msgid "_Send default formatting with outgoing messages"
+msgstr "निर्गत सन्देशहरू सग पूर्वनिर्धारित ढाँचा पठाउनुहोस्"
+
+#: src/gtkprefs.c:873
+msgid ""
+"This is how your outgoing message text will appear when you use protocols "
+"that support formatting. :)"
+msgstr "यो तपाईँले ढाँचालाई समर्थन गर्ने प्रोटोकलहरू प्रयोग गर्दा निर्गत सन्देश पाठ कसरी देखा पर्दछ भन्ने हो । :)"
+
+#: src/gtkprefs.c:876
+msgid "_Clear Formatting"
+msgstr "ढाँचा खाली गर्नुहोस्"
+
+#: src/gtkprefs.c:913
+msgid "Send Message"
+msgstr "सन्देश पठाउनुहोस्"
+
+#: src/gtkprefs.c:914
+msgid "Enter _sends message"
+msgstr "पठाएको सन्देशहरू प्रविष्टि गर्नुहोस्"
+
+#: src/gtkprefs.c:916
+msgid "C_ontrol-Enter sends message"
+msgstr "पठाएको प्रविष्टि सन्देश नियन्त्रण गर्नुहोस्"
+
+#: src/gtkprefs.c:919
+msgid "Window Closing"
+msgstr "सञ्झ्याल बन्द भइरहेको छ"
+
+#: src/gtkprefs.c:920
+msgid "_Escape closes window"
+msgstr "बन्द गरिएका सन्झ्याल छोड्नुहोस्"
+
+#: src/gtkprefs.c:923
+msgid "Insertions"
+msgstr "निवेशन"
+
+#: src/gtkprefs.c:924
+msgid "Control-{B/I/U} changes _formatting"
+msgstr "नियन्त्रण-{B/I/U} ले _ढाँचा परिवर्तन गर्दछ"
+
+#: src/gtkprefs.c:926
+msgid "Control-(number) _inserts smileys"
+msgstr "नियन्त्रण-(number) _ले स्माइलीहरू घुसाउछ"
+
+#: src/gtkprefs.c:942
+msgid "Buddy List Sorting"
+msgstr "साथी सूची क्रमबद्धता"
+
+#: src/gtkprefs.c:951
+msgid "_Sorting:"
+msgstr "क्रमबद्धता:"
+
+#: src/gtkprefs.c:957 src/gtkprefs.c:1009
+msgid "Show _buttons as:"
+msgstr "यस रुपमा बटनहरू देखाउनुहोस्:"
+
+#: src/gtkprefs.c:959 src/gtkprefs.c:1011
+msgid "Pictures"
+msgstr "तस्वीरहरू"
+
+#: src/gtkprefs.c:960 src/gtkprefs.c:1012
+msgid "Text"
+msgstr "पाठ"
+
+#: src/gtkprefs.c:961 src/gtkprefs.c:1013
+msgid "Pictures and text"
+msgstr "तस्वीरहरू र पाठ"
+
+#: src/gtkprefs.c:964
+msgid "_Raise window on events"
+msgstr "घटनाहरुमा सञ्झ्याल बढाउनुहोस्"
+
+#: src/gtkprefs.c:967
+msgid "Buddy Display"
+msgstr "साथी प्रदर्शन"
+
+#: src/gtkprefs.c:968 src/gtkprefs.c:1030
+msgid "Show buddy _icons"
+msgstr "साथी प्रतिमाहरू देखाउनुहोस्"
+
+#: src/gtkprefs.c:970
+msgid "Show _warning levels"
+msgstr "चेतावनी तहहरू देखाउनुहोस्"
+
+#: src/gtkprefs.c:972
+msgid "Show idle _times"
+msgstr "निस्क्रिय समयहरू देखाउनुहोस्"
+
+#: src/gtkprefs.c:974
+msgid "Dim i_dle buddies"
+msgstr "निस्क्रिय साथीहरुलाई मधुरो पार्नुहोस्"
+
+#: src/gtkprefs.c:976
+msgid "_Automatically expand contacts"
+msgstr "स्वचालित रुपमा सम्पर्कहरू विस्तारित गर्नुहोस्"
+
+#: src/gtkprefs.c:1020
+msgid "Enable \"_slash\" commands"
+msgstr "\"स्ल्यास\" आदेशहरू सक्षम गर्नुहोस्"
+
+#: src/gtkprefs.c:1023
+msgid "Send unknown \"_slash\" commands as messages"
+msgstr "सन्देशको रुपमा अज्ञात \"स्ल्यास\" आदेशहरू पठाउनुहोस्"
+
+#: src/gtkprefs.c:1026
+msgid "Show _formatting toolbar"
+msgstr "ढाँचा गरिएको उपकरणपट्टी देखाउनुहोस्"
+
+#: src/gtkprefs.c:1028
+msgid "Show _aliases in tabs/titles"
+msgstr "ट्याबहरू/शीर्षकहरुमा उपनामहरू देखाउनुहोस्"
+
+#: src/gtkprefs.c:1032
+msgid "Enable buddy ic_on animation"
+msgstr "साथी प्रतिमा एनिमेसन सक्षम गर्नुहोस्"
+
+#: src/gtkprefs.c:1034
+msgid "_Notify buddies that you are typing to them"
+msgstr "साथीहरुलाई सूचना गर्नुहोस् जसलाई तपाईँ टाइप गर्दै हुनुहुन्छ"
+
+#: src/gtkprefs.c:1036
+msgid "_Raise IM window on events"
+msgstr "घटनाहरुमा IM सञ्झ्याल बढाउनुहोस्"
+
+#: src/gtkprefs.c:1039
+msgid "Raise chat _window on events"
+msgstr "घटनाहरुमा कुराकानी सञ्झ्याल बढाउनुहोस्"
+
+#: src/gtkprefs.c:1041
+msgid "Use _multi-colored screen names in chats"
+msgstr "कुराकानीहरुमा बहुविध-रङ समाहित पर्दा नामहरू प्रयोग गर्नुहोस्"
+
+#. All the tab options!
+#: src/gtkprefs.c:1045
+msgid "Tab Options"
+msgstr "ट्याब विकल्पहरू"
+
+#: src/gtkprefs.c:1047
+msgid "Show IMs and chats in _tabbed windows"
+msgstr "ट्याब गरेका सञ्झ्यालहरूमा IM र कुराकानीहरू देखाउनुहोस्"
+
+#: src/gtkprefs.c:1062
+msgid "Show close b_utton on tabs"
+msgstr "ट्याबहरूमा बन्द बटनहरू देखाउनुहोस्"
+
+#: src/gtkprefs.c:1065
+msgid "Tab p_lacement:"
+msgstr "ट्याब प्रतिस्थापन:"
+
+#: src/gtkprefs.c:1067
+msgid "Top"
+msgstr "माथि"
+
+#: src/gtkprefs.c:1068
+msgid "Bottom"
+msgstr "तल"
+
+#: src/gtkprefs.c:1069
+msgid "Left"
+msgstr "बायाँ"
+
+#: src/gtkprefs.c:1070
+msgid "Right"
+msgstr "दायाँ"
+
+#: src/gtkprefs.c:1076
+msgid "New conversation _placement:"
+msgstr "नयाँ वार्तालाप स्थापना:"
+
+#: src/gtkprefs.c:1127 src/protocols/oscar/oscar.c:757
+#: src/protocols/oscar/oscar.c:5859
+msgid "IP Address"
+msgstr "IP ठेगाना"
+
+#: src/gtkprefs.c:1129
+msgid "_Autodetect IP Address"
+msgstr "IP ठेगाना स्वत:पत्ता लागाउनुहोस्"
+
+#: src/gtkprefs.c:1138
+msgid "Public _IP:"
+msgstr "सार्वजनिक IP:"
+
+#: src/gtkprefs.c:1162
+msgid "Ports"
+msgstr "पोर्टहरू"
+
+#: src/gtkprefs.c:1165
+msgid "_Manually specify range of ports to listen on"
+msgstr "सुन्नलाई पोर्टहरुको दायरा म्यानुअल तरिकाले तोक्नुहोस्"
+
+#: src/gtkprefs.c:1168
+msgid "_Start Port:"
+msgstr "पोर्ट सुरू गर्नुहोस्:"
+
+#: src/gtkprefs.c:1175
+msgid "_End Port:"
+msgstr "पोर्ट अन्त्य गर्नुहोस्:"
+
+#: src/gtkprefs.c:1182
+msgid "Proxy Server"
+msgstr "प्रोक्सि सर्भर"
+
+#: src/gtkprefs.c:1186
+msgid "No proxy"
+msgstr "प्रोक्सि छैन"
+
+#: src/gtkprefs.c:1248
+msgid "_User:"
+msgstr "प्रयोगकर्ता:"
+
+#: src/gtkprefs.c:1304
+msgid "Epiphany"
+msgstr "इपिफ्यानी"
+
+#: src/gtkprefs.c:1305
+msgid "Firebird"
+msgstr "फाएरबर्ड"
+
+#: src/gtkprefs.c:1306
+msgid "Firefox"
+msgstr "फाएरफक्स"
+
+#: src/gtkprefs.c:1307
+msgid "Galeon"
+msgstr "गेलियन"
+
+#: src/gtkprefs.c:1308
+msgid "Gnome Default"
+msgstr "पूर्वनिर्धारित जिनोम"
+
+#: src/gtkprefs.c:1309
+msgid "Konqueror"
+msgstr "कन्क्वेरर्"
+
+#: src/gtkprefs.c:1310
+msgid "Mozilla"
+msgstr "मोजिल्ला"
+
+#: src/gtkprefs.c:1311
+msgid "Netscape"
+msgstr "नेटस्केप"
+
+#: src/gtkprefs.c:1312
+msgid "Opera"
+msgstr "ओपेरा"
+
+#: src/gtkprefs.c:1321
+msgid "Manual"
+msgstr "म्यानुअल"
+
+#: src/gtkprefs.c:1372
+msgid "Browser Selection"
+msgstr "ब्राउजर चयन"
+
+#: src/gtkprefs.c:1376
+msgid "_Browser:"
+msgstr "ब्राउजर:"
+
+#: src/gtkprefs.c:1383
+msgid "_Open link in:"
+msgstr "लिङ्क यसमा खोल्नुहोस्:"
+
+#: src/gtkprefs.c:1385
+msgid "Browser default"
+msgstr "पूर्वनिर्धारित ब्राउजर"
+
+#: src/gtkprefs.c:1386
+msgid "Existing window"
+msgstr "अवस्थित सञ्झ्याल"
+
+#: src/gtkprefs.c:1388
+msgid "New tab"
+msgstr "नयाँ ट्याब"
+
+#: src/gtkprefs.c:1402
+#, c-format
+msgid ""
+"_Manual:\n"
+"(%s for URL)"
+msgstr ""
+"म्यानुअल:\n"
+"(URLका लागि%s)"
+
+#: src/gtkprefs.c:1439
+msgid "Message Logs"
+msgstr "सन्देश लगहरू"
+
+#: src/gtkprefs.c:1442
+msgid "Log _Format:"
+msgstr "लग ढाँचा:"
+
+#: src/gtkprefs.c:1445
+msgid "_Log all instant messages"
+msgstr "सबै आवश्यक सन्देशहरू लग गर्नुहोस्"
+
+#: src/gtkprefs.c:1447
+msgid "Log all c_hats"
+msgstr "सबै कुराकानीहरू लग गर्नुहोस्"
+
+#: src/gtkprefs.c:1450
+msgid "System Logs"
+msgstr "प्रणाली लगहरू"
+
+#: src/gtkprefs.c:1452
+msgid "_Enable system log"
+msgstr "प्रणाली लग सक्षम पार्नुहोस्"
+
+#: src/gtkprefs.c:1455
+msgid "Log when buddies _sign on/sign off"
+msgstr "साथीहरू साइनअन/साइनअफ गर्दा लग गर्नुहोस्"
+
+#: src/gtkprefs.c:1461
+msgid "Log when buddies become _idle/un-idle"
+msgstr "साथीहरू निस्क्रिय/सक्रिय हुँदा लग गर्नुहोस्"
+
+#: src/gtkprefs.c:1467
+msgid "Log when buddies go away/come _back"
+msgstr "साथीहरू टाढा जाँदा/फर्केर आउँदा लग गर्नुहोस्"
+
+#: src/gtkprefs.c:1473
+msgid "Log your _own signons/idleness/awayness"
+msgstr "तपाईँको आफ्नै साइनअन/निस्क्रियपन/टाढापन लग गर्नुहोस्"
+
+#: src/gtkprefs.c:1600
+msgid "Sound Selection"
+msgstr "ध्वनि चयन"
+
+#: src/gtkprefs.c:1651
+msgid "Sound Options"
+msgstr "ध्वन विकल्पहरू"
+
+#: src/gtkprefs.c:1652
+msgid "Sounds when conversation has _focus"
+msgstr "वार्तालापहरू फोकस गरिँदा ध्वनि उत्पन्न गर्दछ"
+
+#: src/gtkprefs.c:1654
+msgid "_Sounds while away"
+msgstr "टाढा हुँदा ध्वनि उत्पन्न गर्दछ"
+
+#: src/gtkprefs.c:1658
+msgid "Sound Method"
+msgstr "ध्वनी विधि"
+
+#: src/gtkprefs.c:1659
+msgid "_Method:"
+msgstr "विधि:"
+
+#: src/gtkprefs.c:1661
+msgid "Console beep"
+msgstr "कन्सोल बीप"
+
+#: src/gtkprefs.c:1663
+msgid "Automatic"
+msgstr "स्वचालित"
+
+#: src/gtkprefs.c:1670
+msgid "Command"
+msgstr "आदेश"
+
+#: src/gtkprefs.c:1678
+#, c-format
+msgid ""
+"Sound c_ommand:\n"
+"(%s for filename)"
+msgstr ""
+"ध्वनी आदेश:\n"
+"(फाइल नामका लागि%s)"
+
+#: src/gtkprefs.c:1705
+msgid "Sound Events"
+msgstr "ध्वनि घटनाहरू "
+
+#: src/gtkprefs.c:1756
+msgid "Play"
+msgstr "प्ले गर्नुहोस्"
+
+#: src/gtkprefs.c:1763
+msgid "Event"
+msgstr "घटना"
+
+#: src/gtkprefs.c:1782
+msgid "Test"
+msgstr "परिक्षण"
+
+#: src/gtkprefs.c:1786
+msgid "Reset"
+msgstr "रिसेट गर्नुहोस्"
+
+#: src/gtkprefs.c:1790
+msgid "Choose..."
+msgstr "रोज्नुहोस्..."
+
+#: src/gtkprefs.c:1814
+msgid "_Queue new messages when away"
+msgstr "टाढा गएको बेलामा नयाँ सन्देशहरू लाम लाग्दछ"
+
+#: src/gtkprefs.c:1817
+msgid "_Auto-reply:"
+msgstr "स्वत:जवाफ:"
+
+#: src/gtkprefs.c:1819
+msgid "Never"
+msgstr "कहिल्यै पनि होइन"
+
+#: src/gtkprefs.c:1820
+msgid "When away"
+msgstr "टाढा गएको बेला"
+
+#: src/gtkprefs.c:1821
+msgid "When away and idle"
+msgstr "टाढा गएको बेला र निस्क्रिय बस्दा"
+
+#: src/gtkprefs.c:1824 src/protocols/msn/msn.c:1327
+#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2806
+#: src/protocols/oscar/oscar.c:5007 src/protocols/yahoo/yahoo.c:2780
+#: src/protocols/yahoo/yahoo_profile.c:664
+msgid "Idle"
+msgstr "निस्क्रिय"
+
+#: src/gtkprefs.c:1825
+msgid "Idle _time reporting:"
+msgstr "निस्क्रिय समय प्रतिवेदन:"
+
+#: src/gtkprefs.c:1828
+msgid "Gaim usage"
+msgstr "गाइम उपयोग"
+
+#: src/gtkprefs.c:1831
+msgid "X usage"
+msgstr "X उपयोग"
+
+#: src/gtkprefs.c:1833
+msgid "Windows usage"
+msgstr "सञ्झ्यालहरुको उपयोग"
+
+#: src/gtkprefs.c:1841
+msgid "Auto-away"
+msgstr "स्वत: टाढा"
+
+#: src/gtkprefs.c:1842
+msgid "Set away _when idle"
+msgstr "निस्क्रिय बस्दा 'टाढा' सेट गर्नुहोस्"
+
+#: src/gtkprefs.c:1846
+msgid "_Minutes before setting away:"
+msgstr " 'टाढा सेट' गर्नु अघि मिनेटहरू:"
+
+#: src/gtkprefs.c:1854
+msgid "Away m_essage:"
+msgstr "टाढा सन्देश"
+
+#: src/gtkprefs.c:1923
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"<span weight=\"bold\">Written by:</span>\t%s\n"
+"<span weight=\"bold\">Web site:</span>\t\t%s\n"
+"<span weight=\"bold\">File name:</span>\t%s"
+msgstr ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"<span weight=\"bold\">लेखक:</span>\t%s\n"
+"<span weight=\"bold\">वेब साइट:</span>\t\t%s\n"
+"<span weight=\"bold\">फाइल नाम:</span>\t%s"
+
+#: src/gtkprefs.c:1928
+#, c-format
+msgid ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"<span weight=\"bold\">Written by:</span>  %s\n"
+"<span weight=\"bold\">URL:</span>  %s\n"
+"<span weight=\"bold\">File name:</span>  %s"
+msgstr ""
+"<span size=\"larger\">%s %s</span>\n"
+"\n"
+"<span weight=\"bold\">लेखक:</span>  %s\n"
+"<span weight=\"bold\">URL:</span>  %s\n"
+"<span weight=\"bold\">फाइलनाम:</span>  %s"
+
+#: src/gtkprefs.c:2161
+msgid "Load"
+msgstr "लोड गर्नुहोस्"
+
+#: src/gtkprefs.c:2175
+msgid "Summary"
+msgstr "सारांश"
+
+#: src/gtkprefs.c:2223
+msgid "Details"
+msgstr "विवरणहरू"
+
+#: src/gtkprefs.c:2384
+msgid "_Edit"
+msgstr "सम्पादन"
+
+#: src/gtkprefs.c:2420
+msgid "Interface"
+msgstr "इन्टरफेस"
+
+#: src/gtkprefs.c:2423
+msgid "Message Text"
+msgstr "सन्देश पाठ"
+
+#: src/gtkprefs.c:2424
+msgid "Shortcuts"
+msgstr "सर्टकटहरू"
+
+#: src/gtkprefs.c:2425
+msgid "Smiley Themes"
+msgstr "स्माइली विषयवस्तुहरू"
+
+#: src/gtkprefs.c:2426
+msgid "Sounds"
+msgstr "ध्वनिहरू"
+
+#: src/gtkprefs.c:2427 src/protocols/silc/silc.c:1588
+msgid "Network"
+msgstr "सञ्जाल"
+
+#: src/gtkprefs.c:2432
+msgid "Browser"
+msgstr "ब्राउजर"
+
+#: src/gtkprefs.c:2435
+msgid "Logging"
+msgstr "लगइन"
+
+#: src/gtkprefs.c:2436
+msgid "Away / Idle"
+msgstr "टाढा / निष्क्रिय"
+
+#: src/gtkprefs.c:2437
+msgid "Away Messages"
+msgstr "टाढा सन्देशहरू"
+
+#: src/gtkprefs.c:2440
+msgid "Plugins"
+msgstr "प्लगइनहरू"
+
+#: src/gtkprivacy.c:79
+msgid "Allow all users to contact me"
+msgstr "सबै प्रयोगकर्ताहरुलाई म सँग  कुराकानी गर्न अनुमति दिनुहोस्"
+
+#: src/gtkprivacy.c:80
+msgid "Allow only the users on my buddy list"
+msgstr "मेरो सथी सूचीमा भएका प्रयोगकर्ताहरुलाई मात्र अनुमति दिनुहोस्"
+
+#: src/gtkprivacy.c:81
+msgid "Allow only the users below"
+msgstr "तलका प्रयोगकर्ताहरुलाई मात्र अनुमति दिनुहोस्"
+
+#: src/gtkprivacy.c:82
+msgid "Block all users"
+msgstr "सबै प्रयोगकर्ताहरुलाई रोक्नुहोस्"
+
+#: src/gtkprivacy.c:83
+msgid "Block only the users below"
+msgstr "तल दिएका प्रयोगकर्ता मात्र रोक्नुहोस्"
+
+#: src/gtkprivacy.c:397 src/protocols/jabber/jabber.c:1539
+msgid "Privacy"
+msgstr "गोपनीयता"
+
+#: src/gtkprivacy.c:410
+msgid "Changes to privacy settings take effect immediately."
+msgstr "तुरुन्तै प्रभाव पार्ने गरि गोपनियता सेटिङ्हरू परिवर्तन गर्नुहोस् ।"
+
+#. "Set privacy for:" label
+#: src/gtkprivacy.c:422
+msgid "Set privacy for:"
+msgstr "निम्नका लागि गोपनियता सेट गर्नुहोस्:"
+
+#: src/gtkprivacy.c:591 src/gtkprivacy.c:607
+msgid "Permit User"
+msgstr "प्रयोगकर्तालाई अनुमति दिनुहोस्"
+
+#: src/gtkprivacy.c:592
+msgid "Type a user you permit to contact you."
+msgstr "तपाईँले सम्पर्क गर्न अनुमति दिएका प्रयोगकर्ता टाइप गर्नुहोस् ।"
+
+#: src/gtkprivacy.c:593
+msgid "Please enter the name of the user you wish to be able to contact you."
+msgstr "कृपया तपाईँले सम्पर्क गर्न चाहेको गर्न सक्ने प्रयोगकर्ताको नाम प्रविष्टि गर्नुहोस् ।"
+
+#: src/gtkprivacy.c:596 src/gtkprivacy.c:609
+msgid "Permit"
+msgstr "अनुमति दिनुहोस्"
+
+#: src/gtkprivacy.c:601
+#, c-format
+msgid "Allow %s to contact you?"
+msgstr "%s ले तपाईँलाई सम्पर्क गर्न अनुमति दिनुहुन्छ ?"
+
+#: src/gtkprivacy.c:603
+#, c-format
+msgid "Are you sure you wish to allow %s to contact you?"
+msgstr "के तपाईँलाई सम्पर्क गर्न %s लाई अनुमति दिने कुरामा यकिन हुनुहुन्छ ?"
+
+#: src/gtkprivacy.c:630 src/gtkprivacy.c:643
+msgid "Block User"
+msgstr "प्रयोगकर्तालाई रोक्नुहोस्"
+
+#: src/gtkprivacy.c:631
+msgid "Type a user to block."
+msgstr "रोक्नका लागि एउटा प्रयोगकर्ता टाइप गर्नुहोस्"
+
+#: src/gtkprivacy.c:632
+msgid "Please enter the name of the user you wish to block."
+msgstr "कृपया तपाईँले रोक्न चाहेको प्रयोगकर्ताको नाम प्रविष्ट गर्नुहोस् ।"
+
+#: src/gtkprivacy.c:639
+#, c-format
+msgid "Block %s?"
+msgstr "%s लाई रोक्नुहुन्छ ?"
+
+#: src/gtkprivacy.c:641
+#, c-format
+msgid "Are you sure you want to block %s?"
+msgstr "के तपाईँ निश्चित रुपमा %s रोक्न चाहानुहुन्छ ?"
+
+#. *
+#. * A wrapper for gaim_request_action() that uses Yes and No buttons.
+#.
+#: src/gtkrequest.c:241 src/protocols/gg/gg.c:951
+#: src/protocols/msn/dialog.c:113 src/protocols/msn/msn.c:499
+#: src/protocols/msn/msn.c:502 src/protocols/novell/novell.c:1892
+#: src/protocols/silc/buddy.c:307 src/protocols/silc/pk.c:117
+#: src/request.h:1236
+msgid "Yes"
+msgstr "हो"
+
+#: src/gtkrequest.c:242 src/protocols/gg/gg.c:951
+#: src/protocols/msn/dialog.c:114 src/protocols/msn/msn.c:499
+#: src/protocols/msn/msn.c:502 src/protocols/novell/novell.c:1893
+#: src/protocols/silc/buddy.c:308 src/protocols/silc/pk.c:118
+#: src/request.h:1236
+msgid "No"
+msgstr "होइन"
+
+#: src/gtkrequest.c:245
+msgid "Apply"
+msgstr "लागू गर्नुहोस्"
+
+#: src/gtkrequest.c:246 src/protocols/msn/msn.c:314
+#: src/protocols/silc/util.c:335
+msgid "Close"
+msgstr "बन्द गर्नुहोस्"
+
+#: src/gtkrequest.c:1421
+msgid "That file already exists"
+msgstr "त्यो फाइल पहिलेनै अवस्थित छ"
+
+#: src/gtkrequest.c:1422
+msgid "Would you like to overwrite it?"
+msgstr "के तपाईँ यसलाई अधिलेखन गर्न चाहानुहुन्छ ?"
+
+#: src/gtkrequest.c:1460 src/gtkrequest.c:1481
+msgid "Save File..."
+msgstr "फाइल बचत गर्नुहोस्..."
+
+#: src/gtkrequest.c:1461 src/gtkrequest.c:1482
+msgid "Open File..."
+msgstr "फाइल खोल्नुहोस्..."
+
+#: src/gtkroomlist.c:331
+msgid "Room List"
+msgstr "कोठा सूची"
+
+#. list button
+#: src/gtkroomlist.c:402
+msgid "_Get List"
+msgstr "सूची प्राप्त गर्नुहोस्"
+
+#: src/gtksound.c:63
+msgid "Buddy logs in"
+msgstr "साथीले लगइन गर्दा"
+
+#: src/gtksound.c:64
+msgid "Buddy logs out"
+msgstr "साथीले लगआउट गर्दा"
+
+#: src/gtksound.c:65
+msgid "Message received"
+msgstr "सन्देश प्राप्त हुँदा"
+
+#: src/gtksound.c:66
+msgid "Message received begins conversation"
+msgstr "प्राप्त सन्देशले वार्तालाप सुरू गर्न"
+
+#: src/gtksound.c:67
+msgid "Message sent"
+msgstr "सन्देश पठाइँदा"
+
+#: src/gtksound.c:68
+msgid "Person enters chat"
+msgstr "व्यक्तिले कुराकानीमा प्रवेश गर्दा"
+
+#: src/gtksound.c:69
+msgid "Person leaves chat"
+msgstr "व्यक्तिले कुराकानी छोड्दा"
+
+#: src/gtksound.c:70
+msgid "You talk in chat"
+msgstr "तपाईँले कुराकानीमा गर्दा"
+
+#: src/gtksound.c:71
+msgid "Others talk in chat"
+msgstr "अरुले कुरा गर्दा"
+
+#: src/gtksound.c:74
+msgid "Someone says your name in chat"
+msgstr "कुराकानीमा तपाईँको नाम कसैले भन्दा"
+
+#: src/gtksound.c:173
+#, c-format
+msgid "Unable to play sound because the chosen file (%s) does not exist."
+msgstr "ध्वनि प्ले गर्न अक्षम भयो किनभने रोजेको फाइल (%s)अवस्थित छैन ।"
+
+#: src/gtksound.c:189
+msgid ""
+"Unable to play sound because the 'Command' sound method has been chosen, but "
+"no command has been set."
+msgstr "ध्वनि प्ले गर्न अक्षम भयो किनभने 'आदेश' ध्वनि विधि रोजेको छ, तर आदेश सेट गरेको छैन ।"
+
+#: src/gtksound.c:201
+#, c-format
+msgid ""
+"Unable to play sound because the configured sound command could not be "
+"launched: %s"
+msgstr "ध्वनि प्ले गर्न अक्षम भयो किनभने कन्फिगर गरेको ध्वनि आदेश सुरुवात गर्न सकिएको छैन: %s"
+
+#: src/log.c:104
+msgid "<b><font color=\"red\">The logger has no read function</font></b>"
+msgstr "<b><font color=\"red\">लगकर्ता सँग  पढ्ने प्रकार्य छैन</font></b>"
+
+#: src/log.c:545
+msgid "XML"
+msgstr "एक्स एम एल"
+
+#: src/log.c:609
+#, c-format
+msgid ""
+"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
+msgstr ""
+"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
+
+#: src/log.c:611
+#, c-format
+msgid ""
+"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
+msgstr ""
+"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
+
+#: src/log.c:662 src/log.c:792
+msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
+msgstr "<font color=\"red\"><b>लग बाटो फेला पार्न अक्षम!</b></font>"
+
+#: src/log.c:672 src/log.c:804
+#, 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:676
+msgid "HTML"
+msgstr "एच टि एम एल"
+
+#: src/log.c:737
+#, c-format
+msgid "(%s) %s <AUTO-REPLY>: %s\n"
+msgstr "(%s) %s <AUTO-REPLY>: %s\n"
+
+#: src/log.c:808
+msgid "Plain text"
+msgstr "सादा पाठ"
+
+#: src/main.c:150
+msgid "Please create an account."
+msgstr "कृपया एउटा खाता खोल्नुहोस् ।"
+
+#: src/main.c:232
+msgid "Login"
+msgstr "लगइन"
+
+#: src/main.c:248
+msgid "<b>_Account:</b>"
+msgstr "<b>खाता:</b>"
+
+#: src/main.c:262
+msgid "<b>_Password:</b>"
+msgstr "<b>पासवर्ड:</b>"
+
+#. And now for the buttons
+#: src/main.c:279
+msgid "A_ccounts"
+msgstr "खाताहरू"
+
+#: src/main.c:285
+msgid "P_references"
+msgstr "प्राथमिकताहरू"
+
+#: src/main.c:291
+msgid "_Sign on"
+msgstr "साइनअन"
+
+#. full help text
+#: src/main.c:513
+#, c-format
+msgid ""
+"Gaim %s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -a, --acct          display account editor window\n"
+"  -w, --away[=MESG]   make away on signon (optional argument MESG specifies\n"
+"                      name of away message to use)\n"
+"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
+"                      account(s) to use, seperated by commas)\n"
+"  -n, --loginwin      don't automatically login; show login window\n"
+"  -u, --user=NAME     use account NAME\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -v, --version       display the current version and exit\n"
+"  -h, --help          display this help and exit\n"
+msgstr ""
+"गाइम %s\n"
+"उपयोग: %s [OPTION]...\n"
+"\n"
+"  -a, --acct          खाता सम्पादक सञ्झ्याल प्रदर्शन गर्दछ\n"
+"  -w, --away[=MESG]   साइनअन टाढा बनाउनुहोस् (वैकल्पिक तर्क  MESG ले\n"
+"                      प्रयोग गर्नका लागि टाढा सन्देशको नाम निर्दिष्ट गर्दछ)\n"
+"  -l, --login[=NAME]  स्वचालित लगइन गर्नुहोस् (वैकल्पिक तर्क NAME ले\n"
+"                      अल्पविरामले विभाजन गरेको, खाताहरू प्रयोग गर्न निर्दिष्ट गर्दछ)\n"
+"  -n, --loginwin      स्वाचालित लगइन नगर्नुहोस्; लगइन सञ्झ्याल देखाउनुहोस्\n"
+"  -u, --user=NAME     खाता NAME प्रयोग गर्नुहोस्\n"
+"  -c, --config=DIR    कनफिगर फाइलहरुका लागि DIR प्रयोग गर्नुहोस्\n"
+"  -d, --debug         मा त्रुटि सच्याउने सन्देशहरू मुद्रण गर्नुहोस्\n"
+"  -v, --version       हालको संस्करण प्रदर्शन गर्नुहोस् र अन्त्य गर्नुहोस्\n"
+"  -h, --help          यो मद्दत प्रदर्शन गर्नुहोस् र अन्त्य गर्नुहोस्\n"
+
+#. short message
+#: src/main.c:528
+#, c-format
+msgid "Gaim %s. Try `%s -h' for more information.\n"
+msgstr "गाइम %s । अरु धेरै जानकारीका लागि `%s -h' प्रयास गर्नुहोस् ।\n"
+
+#: src/main.c:895
+msgid "Unable to load preferences"
+msgstr "प्राथमिकताहरुलाई लोड गर्न अक्षम"
+
+#: src/main.c:895
+msgid ""
+"Gaim was not able to load your preferences because they are stored in an old "
+"format that is no longer used.  Please reconfigure your settings using the "
+"Preferences window."
+msgstr "गाइम तपाईँको प्राथमिकताहरू लोड गर्न सक्षम भएन किनभने तिनीहरू पुरानो ढाँचामा भण्डारण भएका छन् जुन त्यति लामो प्रयोग भएको छैन ।  कृपया प्राथमिकता सञ्झ्याल प्रयोग गरेर तपाईँको सेटिङ्हरू पुन:कन्फिगर गर्नुहोस् ।"
+
+#: src/plugin.c:295
+#, c-format
+msgid ""
+"The required plugin %s was not found. Please install this plugin and try "
+"again."
+msgstr "आवश्यक प्लगइन %s फेला परेन । कृपया यो प्लगइन स्थापना गर्नुहोस् र फेरि प्रयास गर्नुहोस् ।"
+
+#: src/plugin.c:300 src/plugin.c:328
+msgid "Gaim was unable to load your plugin."
+msgstr "गाइम तपाईँको प्लगइन लोड गर्न अक्षम थियो ।"
+
+#: src/plugin.c:324
+#, c-format
+msgid "The required plugin %s was unable to load."
+msgstr "आवश्यक प्लगइन %s लोड गर्न अक्षम भयो ।"
+
+#: src/prefs.c:113 src/status.c:273
+msgid "Slightly less boring default"
+msgstr "हल्का कम झन्झटिलो पूर्वनिर्धारण"
+
+#: src/protocols/gg/gg.c:50 src/protocols/jabber/jutil.c:44
+#: src/protocols/msn/msn.c:513 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:2797
+#: src/protocols/novell/novell.c:2916 src/protocols/novell/novell.c:2967
+#: src/protocols/oscar/oscar.c:779 src/protocols/yahoo/yahoo.c:3125
+#: src/protocols/yahoo/yahoo.c:3241
+msgid "Available"
+msgstr "उपलब्ध छ"
+
+#: src/protocols/gg/gg.c:51
+msgid "Available for friends only"
+msgstr "साथीहरुका लागि मात्र उपलब्ध छ"
+
+#: src/protocols/gg/gg.c:53
+msgid "Away for friends only"
+msgstr "साथीहरुका लागि मात्र टाढा "
+
+#: src/protocols/gg/gg.c:54 src/protocols/jabber/jabber.c:1004
+#: src/protocols/jabber/presence.c:139 src/protocols/oscar/oscar.c:697
+#: src/protocols/oscar/oscar.c:6375 src/protocols/oscar/oscar.c:6453
+#: src/protocols/oscar/oscar.c:6477 src/protocols/oscar/oscar.c:7664
+#: src/protocols/oscar/oscar.c:7669 src/protocols/yahoo/yahoo.c:2778
+#: src/protocols/yahoo/yahoo.c:3145 src/protocols/yahoo/yahoo.c:3253
+msgid "Invisible"
+msgstr "अदृश्य"
+
+#: src/protocols/gg/gg.c:55
+msgid "Invisible for friends only"
+msgstr "साथीहरुका लागि मात्र अदृश्य"
+
+#: src/protocols/gg/gg.c:56
+msgid "Unavailable"
+msgstr "उपलब्ध छैन"
+
+#: src/protocols/gg/gg.c:137
+msgid "Unable to resolve hostname."
+msgstr "होस्टनाम निश्चय गर्न अक्षम भयो ।"
+
+#: src/protocols/gg/gg.c:140 src/protocols/novell/novell.c:1711
+msgid "Unable to connect to server."
+msgstr "सर्भरमा जडान गर्न अक्षम ।"
+
+#: src/protocols/gg/gg.c:143 src/protocols/jabber/auth.c:134
+#: src/protocols/jabber/auth.c:208 src/protocols/jabber/auth.c:369
+#: src/protocols/jabber/auth.c:467 src/protocols/jabber/auth.c:479
+#: src/protocols/jabber/jabber.c:108
+msgid "Invalid response from server."
+msgstr "सर्भरबाट अवैध जवाफ ।"
+
+#: src/protocols/gg/gg.c:146
+msgid "Error while reading from socket."
+msgstr "सकेटबाट पढ्दा त्रुटि ।"
+
+#: src/protocols/gg/gg.c:149
+msgid "Error while writing to socket."
+msgstr "सकेटमा लेख्दा त्रुटि ।"
+
+#: src/protocols/gg/gg.c:152
+msgid "Authentication failed."
+msgstr "प्रमाणीकरण असफल भयो ।"
+
+#: src/protocols/gg/gg.c:155
+msgid "Unknown Error Code."
+msgstr "अज्ञात त्रुटि कोड ।"
+
+#: src/protocols/gg/gg.c:243 src/protocols/oscar/oscar.c:4808
+#, 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"
+
+#. res[0] == username
+#. XXX this should use gaim_notify_userinfo, but it is unclear to me what should be passed for 'who'
+#: src/protocols/gg/gg.c:244 src/protocols/gg/gg.c:1013
+#: src/protocols/napster/napster.c:404 src/protocols/oscar/oscar.c:4812
+#: src/protocols/oscar/oscar.c:5036 src/protocols/silc/ops.c:1086
+#: src/protocols/silc/ops.c:1148 src/protocols/toc/toc.c:468
+#: src/protocols/zephyr/zephyr.c:726 src/protocols/zephyr/zephyr.c:1136
+msgid "Buddy Information"
+msgstr "साथी जानकारी"
+
+#: src/protocols/gg/gg.c:294
+#, c-format
+msgid "Status: %s"
+msgstr "वस्तुस्थिति: %s"
+
+#: src/protocols/gg/gg.c:447
+msgid "Could not connect"
+msgstr "जडान गर्न सकिएन"
+
+#: src/protocols/gg/gg.c:454
+msgid "Unable to read socket"
+msgstr "सकेट पढ्न अक्षम भयो"
+
+#. we didn't successfully connect. tdt->toc_fd is valid here
+#: src/protocols/gg/gg.c:674 src/protocols/icq/gaim_icq.c:343
+#: src/protocols/napster/napster.c:486 src/protocols/napster/napster.c:517
+#: src/protocols/toc/toc.c:170 src/protocols/yahoo/yahoo.c:2407
+#: src/protocols/yahoo/yahoo.c:2436 src/protocols/yahoo/yahoo.c:2499
+#: src/protocols/yahoo/yahoo_filexfer.c:68
+#: src/protocols/yahoo/yahoo_filexfer.c:111 src/protocols/yahoo/ycht.c:482
+msgid "Unable to connect."
+msgstr "जडान गर्न अक्षम ।"
+
+#: src/protocols/gg/gg.c:690
+msgid "Reading data"
+msgstr "डेटा पढ्दै"
+
+#: src/protocols/gg/gg.c:693
+msgid "Balancer handshake"
+msgstr "ब्यालेन्सर ह्यान्डसेक"
+
+#: src/protocols/gg/gg.c:696
+msgid "Reading server key"
+msgstr "सर्भर कुञ्जी पढ्दै"
+
+#: src/protocols/gg/gg.c:699
+msgid "Exchanging key hash"
+msgstr "कुञ्जी ह्यास विनिमय गर्दै"
+
+#: src/protocols/gg/gg.c:709
+msgid "Critical error in GG library\n"
+msgstr "GG लाइब्रेरिमा संवेदनशील त्रुटि\n"
+
+#: src/protocols/gg/gg.c:727 src/protocols/gg/gg.c:818
+#: src/protocols/toc/toc.c:146
+#, c-format
+msgid "Connect to %s failed"
+msgstr "%s जडान गर्न असफल"
+
+#: src/protocols/gg/gg.c:775
+msgid "Unable to ping server"
+msgstr "सर्भर पिङ्ग गर्न अक्षम"
+
+#: src/protocols/gg/gg.c:787
+msgid "Send as message"
+msgstr "सन्देशको रुपमा पठाउनुहोस्"
+
+#: src/protocols/gg/gg.c:792
+msgid "Looking up GG server"
+msgstr "GG सर्भरलाई हेर्दै"
+
+#: src/protocols/gg/gg.c:795
+msgid "Invalid Gadu-Gadu UIN specified"
+msgstr "निर्दिष्ट गरिएको अवैध Gadu-Gadu UIN"
+
+#: src/protocols/gg/gg.c:841
+msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
+msgstr "तपाईँ अवैध Gadu-Gadu UIN मा सन्देश पठाउन प्रयास गरिरहनु भएको छ ।"
+
+#: src/protocols/gg/gg.c:919
+msgid "Couldn't get search results"
+msgstr "खोजी गरिएको नतिजाहरू प्राप्त गर्न सकिएन"
+
+#: src/protocols/gg/gg.c:924
+msgid "Gadu-Gadu Search Engine"
+msgstr "Gadu-Gadu खोजी इन्जिन"
+
+#: src/protocols/gg/gg.c:950
+msgid "Active"
+msgstr "सक्रिय पार्नुहोस्"
+
+#: src/protocols/gg/gg.c:955 src/protocols/oscar/oscar.c:5851
+msgid "UIN"
+msgstr "UIN"
+
+#. First Name
+#: src/protocols/gg/gg.c:959 src/protocols/jabber/jabber.c:624
+#: src/protocols/oscar/oscar.c:5862 src/protocols/silc/ops.c:808
+#: src/protocols/trepia/trepia.c:268
+msgid "First Name"
+msgstr "पहिलो नाम"
+
+#. Last Name
+#: src/protocols/gg/gg.c:964 src/protocols/jabber/jabber.c:629
+#: src/protocols/oscar/oscar.c:5863 src/protocols/trepia/trepia.c:275
+msgid "Last Name"
+msgstr "अन्तिम नाम"
+
+#: src/protocols/gg/gg.c:968 src/protocols/gg/gg.c:1712
+#: src/protocols/irc/msgs.c:219 src/protocols/oscar/oscar.c:5852
+#: src/protocols/silc/ops.c:1204
+msgid "Nick"
+msgstr "निक"
+
+#: src/protocols/gg/gg.c:975 src/protocols/gg/gg.c:978
+msgid "Birth Year"
+msgstr "जन्म वर्ष"
+
+#: src/protocols/gg/gg.c:984 src/protocols/gg/gg.c:986
+#: src/protocols/gg/gg.c:988
+msgid "Sex"
+msgstr "लिङ्ग"
+
+#. City
+#: src/protocols/gg/gg.c:992 src/protocols/jabber/jabber.c:639
+#: src/protocols/oscar/oscar.c:5906 src/protocols/oscar/oscar.c:5914
+#: src/protocols/trepia/trepia.c:332 src/protocols/trepia/trepia.c:411
+msgid "City"
+msgstr "शहर"
+
+#: src/protocols/gg/gg.c:1035
+msgid "There is no Buddy List stored on the Gadu-Gadu server."
+msgstr "त्यहाँ Gadu-Gadu सर्भरमा कुनै साथी सूची भण्डारण गरिएको छैन ।"
+
+#: src/protocols/gg/gg.c:1043
+msgid "Couldn't Import Buddy List from Server"
+msgstr "सर्भरबाट साथी सूची आयत गर्न सकिएन"
+
+#: src/protocols/gg/gg.c:1105
+msgid "Buddy List successfully transferred to Gadu-Gadu server"
+msgstr "साथी सूची सफलतापूर्वक Gadu-Gadu सर्भरमा स्थान्तरण गरियो"
+
+#: src/protocols/gg/gg.c:1113
+msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
+msgstr "Gadu-Gadu सर्भरमा साथी सूची स्थान्तरण गर्न सकिएन"
+
+#: src/protocols/gg/gg.c:1121
+msgid "Buddy List successfully deleted from Gadu-Gadu server"
+msgstr "Gadu-Gadu सर्भरबाट साथी सूची सफलतापूर्वक मेटियो"
+
+#: src/protocols/gg/gg.c:1129
+msgid "Couldn't delete Buddy List from Gadu-Gadu server"
+msgstr "Gadu-Gadu सर्भरबाट साथी सूची मेट्न सकिएन"
+
+#: src/protocols/gg/gg.c:1138
+msgid "Password changed successfully"
+msgstr "पासवर्ड सफलतापूर्वक परिवर्तन गरियो"
+
+#: src/protocols/gg/gg.c:1145
+msgid "Password couldn't be changed"
+msgstr "पासवर्ड परिवर्तन गर्न सकिएन"
+
+#: src/protocols/gg/gg.c:1264
+msgid "Error communicating with Gadu-Gadu server"
+msgstr "Gadu-Gadu सर्भर सँगै सञ्चार गर्दा त्रुटि"
+
+#: src/protocols/gg/gg.c:1265
+msgid ""
+"Gaim was unable to complete your request due to a problem communicating with "
+"the Gadu-Gadu HTTP server.  Please try again later."
+msgstr "Gadu-Gadu HTTP सर्भर संगको सञ्चार समस्याको कारणले गर्दा गाइमले तपाईँको अनुरोध पूरा गर्न सकेन । कृपया फेरी प्रयास गर्नुहोस् ।"
+
+#: src/protocols/gg/gg.c:1294
+msgid "Unable to import Gadu-Gadu buddy list"
+msgstr "Gadu-Gadu साथी सूचीमा आयात गर्न अक्षम"
+
+#: src/protocols/gg/gg.c:1295
+msgid ""
+"Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
+"again later."
+msgstr "गाइम Gadu-Gadu  साथी सूची सर्भरमा जडान गर्न अक्षम थियो । कृपया फेरी प्रयास गर्नुहोस् । "
+
+#: src/protocols/gg/gg.c:1368
+msgid "Couldn't export buddy list"
+msgstr "साथी सूची निर्यात गर्न सकेन"
+
+#: src/protocols/gg/gg.c:1369 src/protocols/gg/gg.c:1392
+msgid "Gaim was unable to connect to the buddy list server.  Please try again later."
+msgstr "गाइम साथी सूची सर्भरमा जडान गर्न अक्षम थियो । कृपया फेरी प्रयास गर्नुहोस् ।"
+
+#: src/protocols/gg/gg.c:1391
+msgid "Unable to delete Gadu-Gadu buddy list"
+msgstr "Gadu-Gadu साथी सूची मेट्न अक्षम भयो"
+
+#: src/protocols/gg/gg.c:1442
+msgid "Unable to access directory"
+msgstr "डाइरेक्टरी पहुँच गर्न अक्षम भयो"
+
+#: src/protocols/gg/gg.c:1443
+msgid ""
+"Gaim was unable to search the Directory because it was unable to connect to "
+"the directory server.  Please try again later."
+msgstr "गाइम डाइरेक्टरी खोजी गर्न अक्षम थियो किनभने यो डाइरेक्टरी सर्भरमा जडान हुन सकेको थिएन । कृपया फेरी प्रयास गर्नुहोस् ।"
+
+#: src/protocols/gg/gg.c:1477
+msgid "Unable to change Gadu-Gadu password"
+msgstr "Gadu-Gadu पासवर्ड परिवर्तन गर्न अक्षम"
+
+#: src/protocols/gg/gg.c:1478
+msgid ""
+"Gaim was unable to change your password due to an error connecting to the "
+"Gadu-Gadu server.  Please try again later."
+msgstr "गाइम Gadu-Gadu सर्भरमा एउटा त्रुटि जडान भएको कारणले गर्दा तपाईँको पासवर्ड परिवर्तन गर्न सक्षम भएन ।  कृपया पछि फेरी प्रयास गर्नुहोस् ।"
+
+#: src/protocols/gg/gg.c:1494
+msgid "Directory Search"
+msgstr "डाइरेक्टरी खोजी"
+
+#. if (js->protocol_options & CHANGE_PASSWORD) {
+#: src/protocols/gg/gg.c:1499 src/protocols/jabber/jabber.c:1102
+#: src/protocols/toc/toc.c:1591
+msgid "Change Password"
+msgstr "पासवर्ड परिवर्तन गर्नुहोस्"
+
+#: src/protocols/gg/gg.c:1503
+msgid "Import Buddy List from Server"
+msgstr "सर्भरबाट साथी सूची आयात गर्नहोस्"
+
+#: src/protocols/gg/gg.c:1507
+msgid "Export Buddy List to Server"
+msgstr "सर्भरमा साथी सूची निर्यात गर्नुहोस्"
+
+#: src/protocols/gg/gg.c:1511
+msgid "Delete Buddy List from Server"
+msgstr "सर्भरबाट साथी सूची मेट्नुहोस्"
+
+#: src/protocols/gg/gg.c:1544
+msgid "Unable to access user profile."
+msgstr "प्रयोगकर्ता प्रोफाइल पहुँच गर्न अक्षम भयो ।"
+
+#: src/protocols/gg/gg.c:1545
+msgid ""
+"Gaim was unable to access this user's profile due to an error connecting to "
+"the directory server.  Please try again later."
+msgstr "डाइरेक्टरी सर्भरमा एउटा त्रुटि जडान भएको कारणले गर्दा यो प्रयोगकर्ताको फाइल गाइमले पहुँच गर्न सकेन । कृपया पछि फेरी प्रयास गर्नुहोस् । "
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: src/protocols/gg/gg.c:1691 src/protocols/gg/gg.c:1693
+msgid "Gadu-Gadu Protocol Plugin"
+msgstr "Gadu-Gadu प्रोटोकल प्लगइन"
+
+#: src/protocols/icq/gaim_icq.c:223
+msgid "Gaim encountered an error communicating with the ICQ server."
+msgstr "गाइमले ICQ सर्भर सँग  सञ्चार गर्दा एउटा त्रुटि रह्यो ।"
+
+#: src/protocols/icq/gaim_icq.c:293
+#, c-format
+msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
+msgstr "प्रयोगकर्ता %s (%s%s%s%s%s) ले तिनीहरुलाई प्रमाणीकरण गर्न चाहान्छ ।"
+
+#: src/protocols/icq/gaim_icq.c:296 src/protocols/jabber/presence.c:300
+#: src/protocols/msn/userlist.c:103 src/protocols/oscar/oscar.c:4547
+#: src/protocols/oscar/oscar.c:7112 src/protocols/yahoo/yahoo.c:1080
+msgid "Authorize"
+msgstr "प्रमाणीकरण गर्नुहोस् "
+
+#: src/protocols/icq/gaim_icq.c:296 src/protocols/jabber/presence.c:301
+#: src/protocols/msn/userlist.c:104 src/protocols/oscar/oscar.c:4549
+#: src/protocols/oscar/oscar.c:7113 src/protocols/yahoo/yahoo.c:1082
+msgid "Deny"
+msgstr "अस्वीकार गर्नुहोस्"
+
+#: src/protocols/icq/gaim_icq.c:309
+msgid "Send message through server"
+msgstr "सर्भर मार्फत सन्देश पठाउनुहोस्"
+
+#: src/protocols/icq/gaim_icq.c:351
+msgid "Connecting..."
+msgstr "जडान गरिदैछ..."
+
+#: src/protocols/icq/gaim_icq.c:497
+msgid "Nick:"
+msgstr "उपनाम:"
+
+#: src/protocols/icq/gaim_icq.c:498
+msgid "Gaim User"
+msgstr "गाइम प्रयोगकर्ता"
+
+#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1311
+#, c-format
+msgid "Unknown command: %s"
+msgstr "अज्ञात आदेश: %s"
+
+#: src/protocols/irc/cmds.c:464 src/protocols/jabber/chat.c:576
+#: src/protocols/silc/silc.c:1019
+#, c-format
+msgid "current topic is: %s"
+msgstr "हालको विषय हो: %s"
+
+#: src/protocols/irc/cmds.c:468 src/protocols/jabber/chat.c:580
+#: src/protocols/silc/silc.c:1023
+msgid "No topic is set"
+msgstr "विषय सेट गरेको छैन"
+
+#: src/protocols/irc/dcc_send.c:272 src/protocols/yahoo/yahoo_filexfer.c:176
+#: src/protocols/yahoo/yahoo_filexfer.c:185
+#: src/protocols/yahoo/yahoo_filexfer.c:194
+msgid "File Transfer Aborted"
+msgstr "फाइल स्थानान्तर परित्याग गरियो"
+
+#: src/protocols/irc/dcc_send.c:273
+msgid "Gaim could not open a listening port."
+msgstr "गाइमले सुन्ने पोर्ट खोल्न सकेन ।"
+
+#: src/protocols/irc/irc.c:76
+msgid "Error displaying MOTD"
+msgstr "MOTD प्रदर्शन गर्दा त्रुटि"
+
+#: src/protocols/irc/irc.c:76
+msgid "No MOTD available"
+msgstr "MOTD उपलब्ध छैन"
+
+#: src/protocols/irc/irc.c:77
+msgid "There is no MOTD associated with this connection."
+msgstr "त्यहाँ यो जडान सँग  MOTD संगठित भएको छैन ।"
+
+#: src/protocols/irc/irc.c:80
+#, c-format
+msgid "MOTD for %s"
+msgstr "%s का लागि MOTD"
+
+#: src/protocols/irc/irc.c:94 src/protocols/irc/irc.c:406
+msgid "Server has disconnected"
+msgstr "सर्भर विच्छेद भएको छ"
+
+#: src/protocols/irc/irc.c:159
+msgid "View MOTD"
+msgstr "MOTD हेर्नुहोस्"
+
+#: src/protocols/irc/irc.c:181 src/protocols/silc/chat.c:32
+msgid "_Channel:"
+msgstr "च्यानल:"
+
+#: src/protocols/irc/irc.c:186 src/protocols/jabber/chat.c:56
+msgid "_Password:"
+msgstr "पासवर्ड:"
+
+#: src/protocols/irc/irc.c:218
+msgid "IRC nicks may not contain whitespace"
+msgstr "IRC उपनामहरुले सेतो खाली ठाउँ समाविष्ट नगर्न सक्छ"
+
+#. connect to the server
+#: src/protocols/irc/irc.c:238 src/protocols/jabber/jabber.c:800
+#: src/protocols/msn/session.c:364 src/protocols/napster/napster.c:510
+#: src/protocols/novell/novell.c:2152 src/protocols/oscar/oscar.c:1768
+#: src/protocols/trepia/trepia.c:1065 src/protocols/yahoo/yahoo.c:2641
+#: src/protocols/zephyr/zephyr.c:1458
+msgid "Connecting"
+msgstr "जडान"
+
+#: src/protocols/irc/irc.c:245
+msgid "Couldn't create socket"
+msgstr "सकेट सिर्जना गर्न सकिएन"
+
+#: src/protocols/irc/irc.c:260 src/protocols/jabber/jabber.c:304
+#: src/protocols/oscar/oscar.c:1699 src/protocols/oscar/oscar.c:1764
+msgid "Couldn't connect to host"
+msgstr "होस्टमा जडान गर्न सकिएन"
+
+#: src/protocols/irc/irc.c:403 src/protocols/trepia/trepia.c:927
+msgid "Read error"
+msgstr "त्रुटि पढ्नुहोस्"
+
+#: src/protocols/irc/irc.c:568 src/protocols/silc/chat.c:1373
+#: src/protocols/yahoo/yahoochat.c:1444
+msgid "Users"
+msgstr "प्रयोगकर्ताहरू"
+
+#: src/protocols/irc/irc.c:571 src/protocols/silc/chat.c:1376
+#: src/protocols/silc/ops.c:1166 src/protocols/yahoo/yahoochat.c:1453
+msgid "Topic"
+msgstr "विषय"
+
+#: src/protocols/irc/irc.c:608
+msgid "IRC"
+msgstr "IRC"
+
+#: src/protocols/irc/irc.c:612
+msgid "Quit message"
+msgstr "सन्देश अन्त्य गर्नुहोस्"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: src/protocols/irc/irc.c:699
+msgid "IRC Protocol Plugin"
+msgstr "IRC प्रोटोकल प्लगइन"
+
+#. *  summary
+#: src/protocols/irc/irc.c:700
+msgid "The IRC Protocol Plugin that Sucks Less"
+msgstr "कम अप्रिय IRC प्रोटोकल प्लगइन"
+
+#: src/protocols/irc/irc.c:719 src/protocols/irc/msgs.c:239
+#: src/protocols/jabber/jabber.c:1652 src/protocols/napster/napster.c:672
+#: src/protocols/silc/ops.c:1026 src/protocols/silc/ops.c:1129
+msgid "Server"
+msgstr "सर्भर"
+
+#: src/protocols/irc/irc.c:722 src/protocols/jabber/jabber.c:1673
+#: src/protocols/msn/msn.c:1906 src/protocols/napster/napster.c:677
+#: src/protocols/silc/silc.c:1596 src/protocols/trepia/trepia.c:1301
+msgid "Port"
+msgstr "पोर्ट"
+
+#: src/protocols/irc/irc.c:725
+msgid "Encodings"
+msgstr "सङ्केतनहरू"
+
+#: src/protocols/irc/irc.c:728 src/protocols/irc/msgs.c:233
+#: src/protocols/jabber/jabber.c:599 src/protocols/silc/buddy.c:1454
+#: src/protocols/silc/ops.c:973 src/protocols/silc/ops.c:975
+#: src/protocols/silc/ops.c:1123 src/protocols/silc/ops.c:1125
+msgid "Username"
+msgstr "प्रयोगकर्ता नाम"
+
+#: src/protocols/irc/irc.c:731
+msgid "Real name"
+msgstr "वास्तविक नाम"
+
+#: src/protocols/irc/msgs.c:107
+msgid "Bad mode"
+msgstr "खराव मोड"
+
+#: src/protocols/irc/msgs.c:120
+#, c-format
+msgid "You are banned from %s."
+msgstr "तपाईँ %s बाट निषेधित हुनु भएको छ ।"
+
+#: src/protocols/irc/msgs.c:121
+msgid "Banned"
+msgstr "निषेधित गरियो"
+
+#: src/protocols/irc/msgs.c:139
+#, c-format
+msgid "Cannot ban %s: banlist is full"
+msgstr "%s लाई निषेधित गर्न सकिदैन: निषेधित सूची पूरा भएको छ"
+
+#: src/protocols/irc/msgs.c:219 src/protocols/irc/msgs.c:239
+#: src/protocols/irc/msgs.c:252
+#, c-format
+msgid "<b>%s:</b> %s"
+msgstr "<b>%s:</b> %s"
+
+#: src/protocols/irc/msgs.c:222
+msgid " <i>(ircop)</i>"
+msgstr " <i>(ircop)</i>"
+
+#: src/protocols/irc/msgs.c:223
+msgid " <i>(identified)</i>"
+msgstr " <i>(परिचित)</i>"
+
+#: src/protocols/irc/msgs.c:227 src/protocols/irc/msgs.c:233
+#: src/protocols/irc/msgs.c:234 src/protocols/irc/msgs.c:245
+#: src/protocols/msn/msn.c:1327 src/protocols/yahoo/yahoo_profile.c:664
+#, c-format
+msgid "<b>%s:</b> %s<br>"
+msgstr "<b>%s:</b> %s<br>"
+
+#: src/protocols/irc/msgs.c:234 src/protocols/silc/ops.c:967
+#: src/protocols/silc/ops.c:1117 src/protocols/yahoo/yahoo_profile.c:1012
+msgid "Realname"
+msgstr "वास्तविक नाम"
+
+#: src/protocols/irc/msgs.c:245 src/protocols/silc/ops.c:1039
+msgid "Currently on"
+msgstr "हालसालै"
+
+#: src/protocols/irc/msgs.c:250
+#, c-format
+msgid "<b>Idle for:</b> %s<br>"
+msgstr "<b>यसका लागि निष्क्रिय:</b> %s<br>"
+
+#: src/protocols/irc/msgs.c:252
+msgid "Online since"
+msgstr "देखि अनलाइन"
+
+#: src/protocols/irc/msgs.c:255
+msgid "<br><b>Defining adjective:</b> Glorious<br>"
+msgstr "<br><b>विशेषण परिभाषा गर्दैछ:</b> Glorious<br>"
+
+#: src/protocols/irc/msgs.c:262
+#, c-format
+msgid "Buddy Information for %s"
+msgstr "%s का लागि साथी सूचना"
+
+#: src/protocols/irc/msgs.c:325
+#, c-format
+msgid "%s has changed the topic to: %s"
+msgstr "%s विषयमा परिवर्तन भएको छ:%s"
+
+#: src/protocols/irc/msgs.c:330
+#, c-format
+msgid "The topic for %s is: %s"
+msgstr "%s का लागि विषय:%s"
+
+#: src/protocols/irc/msgs.c:348
+#, c-format
+msgid "Unknown message '%s'"
+msgstr "अज्ञात सन्देश '%s'"
+
+#: src/protocols/irc/msgs.c:349
+msgid "Unknown message"
+msgstr "अज्ञात सन्देश"
+
+#: src/protocols/irc/msgs.c:349
+msgid "Gaim has sent a message the IRC server did not understand."
+msgstr "गाइमले पठाइसकेको सन्देश IRC सर्भरले बुझेको छैन ।"
+
+#: src/protocols/irc/msgs.c:373
+#, c-format
+msgid "Users on %s: %s"
+msgstr "%s मा प्रयोगकर्ताहरू: %s"
+
+#: src/protocols/irc/msgs.c:473
+msgid "Time Response"
+msgstr "समय प्रतिक्रिया"
+
+#: src/protocols/irc/msgs.c:474
+msgid "The IRC server's local time is:"
+msgstr "IRC सर्भरको स्थानीय समय:"
+
+#: src/protocols/irc/msgs.c:488
+msgid "No such channel"
+msgstr "त्यस्तो कुनै च्यानल छैन"
+
+#. does this happen?
+#: src/protocols/irc/msgs.c:501
+msgid "no such channel"
+msgstr "त्यस्तो कुनै च्यानल छैन"
+
+#: src/protocols/irc/msgs.c:504
+msgid "User is not logged in"
+msgstr "प्रयोगकर्ता लगइन भएको छैन"
+
+#: src/protocols/irc/msgs.c:510
+msgid "No such nick or channel"
+msgstr "त्यस्तो कुनै उपनाम वा च्यानल छैन"
+
+#: src/protocols/irc/msgs.c:531
+msgid "Could not send"
+msgstr "पठाउन सकिएन"
+
+#: src/protocols/irc/msgs.c:587
+#, c-format
+msgid "Joining %s requires an invitation."
+msgstr "%s जडान गर्दा एउटा निमन्त्रणाको आवश्यकता पर्दछ ।"
+
+#: src/protocols/irc/msgs.c:588
+msgid "Invitation only"
+msgstr "निमन्त्रणा मात्र"
+
+#: src/protocols/irc/msgs.c:692
+#, c-format
+msgid "You have been kicked by %s: (%s)"
+msgstr "तपाईँ %s द्वारा बाहिरिनु भएको छ : (%s)"
+
+#: src/protocols/irc/msgs.c:697
+#, c-format
+msgid "Kicked by %s (%s)"
+msgstr "%s द्वारा फ्याँकिएको (%s)छ"
+
+#: src/protocols/irc/msgs.c:721
+#, c-format
+msgid "mode (%s %s) by %s"
+msgstr "%s द्वारा मोड (%s %s)"
+
+#: src/protocols/irc/msgs.c:808
+#, c-format
+msgid "Invalid nickname '%s'"
+msgstr "अवैध उपनाम '%s'"
+
+#: src/protocols/irc/msgs.c:809
+msgid "Invalid nickname"
+msgstr "अवैध उपनाम"
+
+#: src/protocols/irc/msgs.c:811 src/protocols/irc/msgs.c:816
+msgid ""
+"Your selected account name was rejected by the server.  It probably contains "
+"invalid characters."
+msgstr "तपाईँले सर्भरद्वारा अस्विकार गरिएको खाता मान चयन गर्नु भएको छ । यसमा सम्भवत अवैध क्यारेक्टरहरू समावेश छन् ।"
+
+#: src/protocols/irc/msgs.c:858
+msgid "Cannot change nick"
+msgstr "उपनाम परिवर्तन गर्न सकिदैन"
+
+#: src/protocols/irc/msgs.c:858
+msgid "Could not change nick"
+msgstr "उपनाम परिवर्तन भएन"
+
+#: src/protocols/irc/msgs.c:880
+#, c-format
+msgid "You have parted the channel%s%s"
+msgstr "तपाईँले च्यानल %s%s विभाजन गर्नुभयो"
+
+#: src/protocols/irc/msgs.c:922
+msgid "Error: invalid PONG from server"
+msgstr "त्रुटि:सर्भरबाट अवैध PONG"
+
+#: src/protocols/irc/msgs.c:924
+#, c-format
+msgid "PING reply -- Lag: %lu seconds"
+msgstr "PING जवाफ -- लग: %lu सेकन्ड"
+
+#: src/protocols/irc/msgs.c:999
+#, c-format
+msgid "Cannot join %s:"
+msgstr "%s जडान गर्न सकिदैन:"
+
+#: src/protocols/irc/msgs.c:1001 src/protocols/silc/ops.c:912
+msgid "Cannot join channel"
+msgstr "च्यानल जडान गर्न सकिदैन"
+
+#: src/protocols/irc/msgs.c:1038
+#, c-format
+msgid "Wallops from %s"
+msgstr "%s बाट वालपहरू"
+
+#: src/protocols/irc/parse.c:113
+msgid "action &lt;action to perform&gt;:  Perform an action."
+msgstr "कार्य &lt;सम्पादन गर्न कार्य&gt;:  एउटा कार्य सम्पादन गर्नुहोस् ।"
+
+#: src/protocols/irc/parse.c:114
+msgid ""
+"away [message]:  Set an away message, or use no message to return from being "
+"away."
+msgstr "टाढा [सन्देश]:  टाढा सन्देश सेट गर्नुहोस्, वा हालै टाढा बाट फर्किएको सन्देश प्रयोग नगर्नुहोस् ।"
+
+#: src/protocols/irc/parse.c:115
+msgid ""
+"deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
+"someone. You must be a channel operator to do this."
+msgstr "deop &lt;nick1&gt; [nick2]] ...:  कसैबाट वस्तुस्थिति सञ्चान कर्ता च्यानल हटाउनुहोस् । यो गर्न तपाईँ च्यानल सञ्चालन कर्ता हुन जरुरी छ ।"
+
+#: src/protocols/irc/parse.c:116
+msgid ""
+"devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
+"someone, preventing them from speaking if the channel is moderated (+m). You "
+"must be a channel operator to do this."
+msgstr "devoice &lt;nick1&gt; [nick2] ...:  कसैबाट कर्ता आवाज वस्तुस्थिति च्यानल हटाउनुहोस्, च्यानेल मोडेरेटेड (+m) भएको खण्डमा तिनीहरुलाई बोल्न बाट रोक लाग्छ । यो काम गर्न तपाईँ च्यानल सञ्चालन कर्ता हुन जरुरी छ ।"
+
+#: src/protocols/irc/parse.c:117
+msgid ""
+"invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
+"channel, or the current channel."
+msgstr "invite &lt;nick&gt; [room]:  निर्दिष्ट च्यानलमा वा हालको च्यानलमा जडान गर्न तपाईँलाई कसैले निमन्त्रणा गरेको छ ।"
+
+#: src/protocols/irc/parse.c:118
+msgid ""
+"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
+msgstr "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  एक वा एक भन्दा च्यानलहरू प्रविष्टि गर्नुहोस्, यदि आवश्यकता भएको खण्डमा प्रत्येकका लागि च्यानल कुञ्जी एच्छिक रुपमा उपलब्ध हुन्छ ।"
+
+#: src/protocols/irc/parse.c:119
+msgid ""
+"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
+msgstr "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  एक वा एक भन्दा च्यानलहरू प्रविष्टि गर्नुहोस्, यदि आवश्यकता भएको खण्डमा प्रत्येकका लागि च्यानल कुञ्जी एच्छिक रुपमा उपलब्ध हुन्छ ।"
+
+#: src/protocols/irc/parse.c:120
+msgid ""
+"kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
+"channel operator to do this."
+msgstr "kick &lt;nick&gt; [message]:  च्यानलबाट कसैलाई हटाउनुहोस् । यो कार्य गर्न च्यानल सञ्चालनकर्ता हुन जरुरी हुन्छ ।"
+
+#: src/protocols/irc/parse.c:121
+msgid ""
+"list:  Display a list of chat rooms on the network. <i>Warning, some servers "
+"may disconnect you upon doing this.</i>"
+msgstr "सूची:  सञ्जालमा कुराकानी कोठाहरुको सूची प्रदर्शन गर्नुहोस् । <i>चेतावनी, केही सर्भरहरू तपाईँले कार्य गर्दा गर्दै बिच्छेदन हुन पनि सक्छन् ।</i>"
+
+#: src/protocols/irc/parse.c:122
+msgid "me &lt;action to perform&gt;:  Perform an action."
+msgstr "म &lt;सम्पादन गर्न कार्य&gt;:  कार्य सम्पादन गर्नुहोस् ।"
+
+#: src/protocols/irc/parse.c:123
+msgid ""
+"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
+"or user mode."
+msgstr "मोड &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  च्यानल वा प्रयोगकर्ता मोडमा सेट गर्नुहोस् या नगर्नुहोस् ।"
+
+#: src/protocols/irc/parse.c:124
+msgid ""
+"msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr "msg &lt;निक&gt; &lt;सन्देश&gt;:  प्रयोगकर्तामा व्यक्तिगत सन्देश पठाउनुहोस् (च्यानलमा रोकिएको रुपमा) ।"
+
+#: src/protocols/irc/parse.c:125
+msgid "names [channel]:  List the users currently in a channel."
+msgstr "नामहरू [च्यानल]:  च्यानलमा हालको प्रयोगकर्ता सूची बनाउनुहोस् ।"
+
+#: src/protocols/irc/parse.c:126 src/protocols/jabber/jabber.c:1477
+msgid "nick &lt;new nickname&gt;:  Change your nickname."
+msgstr "निक &lt;नयाँ उपनाम&gt;:  तपाईँको उपनाम परिवर्तन गर्नुहोस् ।"
+
+#: src/protocols/irc/parse.c:127
+msgid ""
+"op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
+"must be a channel operator to do this."
+msgstr "op &lt;nick1&gt; [nick2] ...:   कसैमा च्यानल सञ्चालनकर्ता वस्तुस्थिति स्विकार गर्नुहोस् । यो कार्य गर्न तपाईँ च्यानल सञ्चालन कर्ता हुन जरुरी छ ।"
+
+#: src/protocols/irc/parse.c:128
+msgid ""
+"operwall &lt;message&gt;:  If you don't know what this is, you probably "
+"can't use it."
+msgstr "अपरवाल &lt;सन्देश&gt;:  यदि तपाईँलाई यो के हो भन्ने थाहा छैन भने,तपाईँ सम्भवत:यो प्रयोग गर्न सक्नुहुन्न ।"
+
+#: src/protocols/irc/parse.c:129
+msgid ""
+"part [room] [message]:  Leave the current channel, or a specified channel, "
+"with an optional message."
+msgstr "भाग [कोठा] [सन्देश]:  हालको च्यानल ,वा निर्दिष्ट च्यानल, एच्छिक सन्देश सहित छाड्नुहोस् ।"
+
+#: src/protocols/irc/parse.c:130
+msgid ""
+"ping [nick]:  Asks how much lag a user (or the server if no user specified) "
+"has."
+msgstr "पिङ्ग [उपनाम]:  प्रयोगकर्ता (वा यदि प्रयोगकर्ता निर्दिष्ट नगरिएको खण्डमा सर्भर) सँग  कतिसम्म ढिला हुन्छ सोध्नुहोस् ।"
+
+#: src/protocols/irc/parse.c:131
+msgid ""
+"query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr "क्वेरी &lt;उपनाम&gt; &lt;सन्देश&gt;:  प्रयोगकर्तालाई व्यक्तिगत सन्देश पठाउनुहोस्(च्यानल रोकिएको रुपमा)।"
+
+#: src/protocols/irc/parse.c:132
+msgid "quit [message]:  Disconnect from the server, with an optional message."
+msgstr "अन्त्य गर्नुहोस् [सन्देश]:  एच्छिक सन्देश सहित, सर्भरबाट विच्छेदन भयो ।"
+
+#: src/protocols/irc/parse.c:133
+msgid "quote [...]:  Send a raw command to the server."
+msgstr "उद्धृत गर्नुहोस् [...]:  सर्भरमा कच्चा आदेश पठाउनुहोस् ।"
+
+#: src/protocols/irc/parse.c:134
+msgid ""
+"remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
+"channel operator to do this."
+msgstr "हटाउनुहोस् &lt;उपनाम&gt; [सन्देश]:  कोठाबाट कसैलाई हटाउनुहोस् । यो कार्य गर्न तपाईँ च्यानल सञ्चालन कर्ता हुन जरुरी हुन्छ ।"
+
+#: src/protocols/irc/parse.c:135
+msgid "time: Displays the current local time at the IRC server."
+msgstr "समय: IRC सर्भरमा हालको स्थानीय समय प्रदर्शन गर्दछ ।"
+
+#: src/protocols/irc/parse.c:136
+msgid "topic [new topic]:  View or change the channel topic."
+msgstr "विषय[नयाँ विषय]:च्यानल विषय दृश्य वा परिवर्तन गर्नुहोस् ।"
+
+#: src/protocols/irc/parse.c:137
+msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
+msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  प्रयोगकर्ता मोड सेट गर्नुहोस् वा नगर्नुहोस् ।"
+
+#: src/protocols/irc/parse.c:138
+msgid ""
+"voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
+"must be a channel operator to do this."
+msgstr "आवाज &lt;nick1&gt; [nick2] ...:  कसैमा च्यानल आवाज वस्तुस्थिति स्विकार गर्नुहोस् । यो कार्य गर्न तपाईँ च्यानल सञ्चालनकर्ता हुन जरुरी हुन्छ ।"
+
+#: src/protocols/irc/parse.c:139
+msgid ""
+"wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
+"use it."
+msgstr "वालपस &lt;सन्देश&gt;: यदि तपाईँलाई यो के हो भन्ने थाहा नभएको खण्डमा सम्भवत तपाईँले यो प्रयोग गर्न सक्नुहुन्न ।"
+
+#: src/protocols/irc/parse.c:140
+msgid "whois [server] &lt;nick&gt;:  Get information on a user."
+msgstr "को हो [सर्भर] &lt;निक&gt;:  प्रयोगकर्तामा जानकारी प्राप्त गर्नुहोस् ।"
+
+#: src/protocols/irc/parse.c:433
+#, c-format
+msgid "Reply time from %s: %lu seconds"
+msgstr "%s बाट जवाफ फर्काउने समय: %lu सेकन्ड"
+
+#: src/protocols/irc/parse.c:434
+msgid "PONG"
+msgstr "PONG"
+
+#: src/protocols/irc/parse.c:434
+msgid "CTCP PING reply"
+msgstr "CTCP PING जवाफ"
+
+#: src/protocols/irc/parse.c:537 src/protocols/irc/parse.c:541
+#: src/protocols/oscar/oscar.c:1596 src/protocols/toc/toc.c:188
+#: src/protocols/toc/toc.c:596 src/protocols/toc/toc.c:612
+#: src/protocols/toc/toc.c:689
+msgid "Disconnected."
+msgstr "विच्छेदन गरियो ।"
+
+#: src/protocols/jabber/auth.c:52
+msgid ""
+"Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
+"account properties"
+msgstr "सर्भरलाई लगइन का लागि TLS/SSL आवश्यकता पर्छ । \"Use TLS if available\" खाता गुणहरू चयन गर्नुहोस्"
+
+#: src/protocols/jabber/auth.c:54
+msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+msgstr "सर्भर लगइनका लागि TLS/SSL आवश्यकता पर्दछ । TLS/SSL समर्थन फेला परेन ।"
+
+#: src/protocols/jabber/auth.c:115
+msgid "Server requires plaintext authentication over an unencrypted stream"
+msgstr "एउटा गुप्तीकरण नभएको स्ट्रिममा सर्भरले सादा पाठ प्रमाणीकरण आवश्यक गर्दछ"
+
+#: src/protocols/jabber/auth.c:164 src/protocols/jabber/auth.c:165
+#: src/protocols/jabber/auth.c:242 src/protocols/jabber/auth.c:243
+msgid "Plaintext Authentication"
+msgstr "खाली पाठ प्रमाणीकरण"
+
+#: src/protocols/jabber/auth.c:166 src/protocols/jabber/auth.c:244
+msgid ""
+"This server requires plaintext authentication over an unencrypted "
+"connection.  Allow this and continue authentication?"
+msgstr "यो सर्भरलाई गुप्तिकृत नभएको जडान माथि खाली पाठ प्रमाणीकरणको आवश्यकता पर्दछ । यसलाई अनुमति दिनुहुन्छ र प्रमाणीकरण गर्न निरन्तरता दिनुहुन्छ ?"
+
+#: src/protocols/jabber/auth.c:174 src/protocols/jabber/auth.c:252
+msgid "Server does not use any supported authentication method"
+msgstr "सर्भरले कुनै पनि समर्थित प्रमाणीकरण विधी प्रयोग गर्दैन"
+
+#: src/protocols/jabber/auth.c:390
+msgid "Invalid challenge from server"
+msgstr "सर्भर बाट अवैध चुनौती"
+
+#: src/protocols/jabber/buddy.c:246 src/protocols/jabber/buddy.c:613
+#: src/protocols/silc/ops.c:804
+msgid "Full Name"
+msgstr "पूरा नाम"
+
+#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:626
+#: src/protocols/silc/ops.c:816
+msgid "Family Name"
+msgstr "पारिवारिक नाम"
+
+#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:630
+msgid "Given Name"
+msgstr "दिइएको नाम"
+
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:644
+#: src/protocols/jabber/jabber.c:619 src/protocols/msn/msn.c:1317
+#: src/protocols/silc/buddy.c:1451 src/protocols/silc/ops.c:820
+#: src/protocols/silc/ops.c:963 src/protocols/silc/ops.c:1113
+#: src/protocols/yahoo/yahoo_profile.c:1007
+msgid "Nickname"
+msgstr "उपनाम"
+
+#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/jabber.c:659
+msgid "URL"
+msgstr "URL"
+
+#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:672
+msgid "Street Address"
+msgstr "सडक ठेगाना"
+
+#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:668
+msgid "Extended Address"
+msgstr "विस्तृत ठेगाना"
+
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:676
+msgid "Locality"
+msgstr "स्थानीयता"
+
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:680
+msgid "Region"
+msgstr "क्षेत्र"
+
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:684
+#: src/protocols/jabber/jabber.c:649
+msgid "Postal Code"
+msgstr "हुलाकी संकेत"
+
+#. Country
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:689
+#: src/protocols/trepia/trepia.c:340 src/protocols/trepia/trepia.c:417
+msgid "Country"
+msgstr "देश"
+
+#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:700
+#: src/protocols/jabber/buddy.c:707
+msgid "Telephone"
+msgstr "टेलिफोन"
+
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:718
+#: src/protocols/jabber/buddy.c:726 src/protocols/silc/silc.c:656
+#: src/protocols/silc/util.c:511 src/protocols/yahoo/yahoo_profile.c:1002
+msgid "Email"
+msgstr "इमेल"
+
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:741
+msgid "Organization Name"
+msgstr "संगठन नाम"
+
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:745
+msgid "Organization Unit"
+msgstr "संगठन एकाई"
+
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:751
+#: src/protocols/novell/novell.c:1451
+msgid "Title"
+msgstr "शीर्षक"
+
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:754
+msgid "Role"
+msgstr "भूमिका"
+
+#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:647
+#: src/protocols/oscar/oscar.c:5887
+msgid "Birthday"
+msgstr "जन्मदिन"
+
+#: src/protocols/jabber/buddy.c:509 src/protocols/jabber/buddy.c:510
+msgid "Edit Jabber vCard"
+msgstr "ज्याबर vCard सम्पादन गर्नुहोस्"
+
+#: src/protocols/jabber/buddy.c:511
+msgid ""
+"All items below are optional. Enter only the information with which you feel "
+"comfortable."
+msgstr "तल दिइएका सबै वस्तुहरू एेच्छिक हुन् । त्यस्तो जानकारीहरू मात्र प्रविष्टि गराउनुहोस् जुन चाहि तपाईँको विचारमा उपयुक्त हुन्छ ।"
+
+#: src/protocols/jabber/buddy.c:556
+msgid "Jabber ID"
+msgstr "ज्याबर ID"
+
+#: src/protocols/jabber/buddy.c:566 src/protocols/jabber/buddy.c:573
+#: src/protocols/jabber/buddy.c:586 src/protocols/jabber/jabber.c:973
+#: src/protocols/msn/msn.c:489 src/protocols/novell/novell.c:2819
+#: src/protocols/novell/novell.c:2823 src/protocols/oscar/oscar.c:739
+#: src/protocols/oscar/oscar.c:745 src/protocols/oscar/oscar.c:747
+#: src/protocols/yahoo/yahoo.c:2903
+msgid "Status"
+msgstr "वस्तुस्थिति"
+
+#: src/protocols/jabber/buddy.c:634 src/protocols/silc/ops.c:812
+msgid "Middle Name"
+msgstr "बिचको नाम"
+
+#: src/protocols/jabber/buddy.c:652 src/protocols/jabber/jabber.c:634
+#: src/protocols/oscar/oscar.c:5905 src/protocols/oscar/oscar.c:5913
+#: src/protocols/silc/ops.c:848
+msgid "Address"
+msgstr "ठेगाना"
+
+#: src/protocols/jabber/buddy.c:664
+msgid "P.O. Box"
+msgstr "पोष्ट बक्स"
+
+#: src/protocols/jabber/buddy.c:770
+msgid "Photo"
+msgstr "फोटो"
+
+#: src/protocols/jabber/buddy.c:770
+msgid "Logo"
+msgstr "लोगो"
+
+#: src/protocols/jabber/buddy.c:786
+msgid "Jabber Profile"
+msgstr "ज्याबर प्रोफाइल"
+
+#: src/protocols/jabber/buddy.c:941
+msgid "Un-hide From"
+msgstr "बाट नलुकाउनुहोस्"
+
+#: src/protocols/jabber/buddy.c:944
+msgid "Temporarily Hide From"
+msgstr "अस्थायी रुपमा लुकाउनुहोस्"
+
+#. && NOT ME
+#: src/protocols/jabber/buddy.c:951
+msgid "Cancel Presence Notification"
+msgstr "सूचना उपस्थिति रद्द गर्नुहोस्"
+
+#: src/protocols/jabber/buddy.c:957
+msgid "(Re-)Request authorization"
+msgstr "(पुन:-)प्रमाणीकरण अनुरोध गर्नुहोस्"
+
+#. if(NOT ME)
+#. shouldn't this just happen automatically when the buddy is
+#. removed?
+#: src/protocols/jabber/buddy.c:965
+msgid "Unsubscribe"
+msgstr "सदस्यता हटाउनुहोस्"
+
+#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:7183
+#: src/protocols/yahoo/yahoochat.c:1040
+msgid "_Room:"
+msgstr "कोठा"
+
+#: src/protocols/jabber/chat.c:46
+msgid "_Server:"
+msgstr "सर्भर:"
+
+#: src/protocols/jabber/chat.c:51
+msgid "_Handle:"
+msgstr "ह्यान्डल:"
+
+#: src/protocols/jabber/chat.c:212
+#, c-format
+msgid "%s is not a valid room name"
+msgstr "%s वैध कोठा नाम होइन"
+
+#: src/protocols/jabber/chat.c:213
+msgid "Invalid Room Name"
+msgstr "अवैध कोठा नाम"
+
+#: src/protocols/jabber/chat.c:218
+#, c-format
+msgid "%s is not a valid server name"
+msgstr "%s वैध सर्भर नाम होइन"
+
+#: src/protocols/jabber/chat.c:219 src/protocols/jabber/chat.c:220
+msgid "Invalid Server Name"
+msgstr "अवैध सर्भर नाम"
+
+#: src/protocols/jabber/chat.c:224
+#, c-format
+msgid "%s is not a valid room handle"
+msgstr "%s वैध कोठा ह्यान्डल होइन"
+
+#: src/protocols/jabber/chat.c:225 src/protocols/jabber/chat.c:226
+msgid "Invalid Room Handle"
+msgstr "अवैध कोठा ह्यानडल"
+
+#: src/protocols/jabber/chat.c:379
+msgid "Configuration error"
+msgstr "कन्फिगरेसन त्रुटि"
+
+#: src/protocols/jabber/chat.c:388 src/protocols/jabber/chat.c:533
+msgid "Unable to configure"
+msgstr "कन्फिगरेसन गर्न अक्षम"
+
+#: src/protocols/jabber/chat.c:404
+msgid "Room Configuration Error"
+msgstr "कोठा कन्फिगरेसन त्रुटि"
+
+#: src/protocols/jabber/chat.c:405
+msgid "This room is not capable of being configured"
+msgstr "यो कोठा कन्फिगर गरेको अवस्था उपयुक्त छैन ।"
+
+#: src/protocols/jabber/chat.c:455 src/protocols/jabber/chat.c:524
+msgid "Registration error"
+msgstr "दर्ता त्रुटि"
+
+#: src/protocols/jabber/chat.c:607
+msgid "Nick changing not supported in non-MUC chatrooms"
+msgstr "उपनाम परिवर्तन गर्दा non-MUC कुराकानी कोठाहरुमा समर्थन गर्दैनन्"
+
+#: src/protocols/jabber/chat.c:651 src/protocols/jabber/chat.c:662
+msgid "Roomlist Error"
+msgstr "कोठा सूची त्रुटि"
+
+#: src/protocols/jabber/chat.c:652 src/protocols/jabber/chat.c:663
+msgid "Error retreiving roomlist"
+msgstr "कोठा सूची पुन:प्राप्त गर्दा त्रुटि"
+
+#: src/protocols/jabber/chat.c:711
+msgid "Invalid Server"
+msgstr "अवैध सर्भर"
+
+#: src/protocols/jabber/chat.c:749
+msgid "Enter a Conference Server"
+msgstr "एउटा सम्मेलन सर्भर प्रविष्ट गर्नुहोस्"
+
+#: src/protocols/jabber/chat.c:750
+msgid "Select a conference server to query"
+msgstr "क्वेरीमा सम्मेलन सर्भर चयन गर्नुहोस्"
+
+#: src/protocols/jabber/chat.c:753
+msgid "Find Rooms"
+msgstr "कोठाहरू फेला पार्नुहोस्"
+
+#: src/protocols/jabber/jabber.c:77
+msgid "Error initializing session"
+msgstr "सत्र सुरुवात गर्दा त्रुटि"
+
+#: src/protocols/jabber/jabber.c:213 src/protocols/trepia/trepia.c:248
+#: src/protocols/trepia/trepia.c:699 src/protocols/trepia/trepia.c:988
+#: src/protocols/trepia/trepia.c:1032 src/protocols/trepia/trepia.c:1131
+#: src/protocols/trepia/trepia.c:1177
+msgid "Write error"
+msgstr "त्रुटि लेख्नुहोस्"
+
+#: src/protocols/jabber/jabber.c:251 src/protocols/jabber/jabber.c:271
+msgid "Read Error"
+msgstr "त्रुटि पढ्नुहोस्"
+
+#: src/protocols/jabber/jabber.c:331
+msgid "Connection Failed"
+msgstr "जडान असफल भयो"
+
+#: src/protocols/jabber/jabber.c:334
+msgid "SSL Handshake Failed"
+msgstr "SSL ह्यान्डसेक असफल भयो"
+
+#: src/protocols/jabber/jabber.c:378 src/protocols/jabber/jabber.c:711
+msgid "Invalid Jabber ID"
+msgstr "अवैध ज्याबर ID"
+
+#: src/protocols/jabber/jabber.c:409 src/protocols/jabber/jabber.c:741
+msgid "SSL support unavailable"
+msgstr "SSL समर्थन उपलब्ध छैन"
+
+#: src/protocols/jabber/jabber.c:419 src/protocols/jabber/jabber.c:751
+#: src/protocols/trepia/trepia.c:1071
+msgid "Unable to create socket"
+msgstr "सकेट सिर्जना गर्न अक्षम भयो"
+
+#: src/protocols/jabber/jabber.c:444
+#, c-format
+msgid "Registration of %s@%s successful"
+msgstr "%s@%s को दर्ता सफल भयो"
+
+#: src/protocols/jabber/jabber.c:446 src/protocols/jabber/jabber.c:447
+msgid "Registration Successful"
+msgstr "दर्ता सफल भयो"
+
+#: src/protocols/jabber/jabber.c:453 src/protocols/jabber/jabber.c:1221
+msgid "Unknown Error"
+msgstr "अज्ञात त्रुटि"
+
+#: src/protocols/jabber/jabber.c:455 src/protocols/jabber/jabber.c:456
+msgid "Registration Failed"
+msgstr "दर्ता असफल भयो"
+
+#: src/protocols/jabber/jabber.c:567 src/protocols/jabber/jabber.c:568
+msgid "Already Registered"
+msgstr "पहिल्यै रजिष्टार भएको छ"
+
+#: src/protocols/jabber/jabber.c:603 src/protocols/jabber/jabber.c:1076
+msgid "Password"
+msgstr "पासवर्ड"
+
+#: src/protocols/jabber/jabber.c:614
+msgid "E-Mail"
+msgstr "इमेल"
+
+#. State
+#: src/protocols/jabber/jabber.c:644 src/protocols/oscar/oscar.c:5907
+#: src/protocols/oscar/oscar.c:5915 src/protocols/trepia/trepia.c:336
+#: src/protocols/trepia/trepia.c:414
+msgid "State"
+msgstr "स्थिति"
+
+#: src/protocols/jabber/jabber.c:654 src/protocols/silc/ops.c:853
+#: src/protocols/silc/silc.c:658 src/protocols/silc/util.c:513
+msgid "Phone"
+msgstr "फोन"
+
+#: src/protocols/jabber/jabber.c:664
+msgid "Date"
+msgstr "मिति"
+
+#: src/protocols/jabber/jabber.c:672
+msgid "Please fill out the information below to register your new account."
+msgstr "कृपया तपाईँको नयाँ खातामा रजिष्टार गर्न तलको जानकारी भन्दा बाहिर भर्नुहोस् ।"
+
+#: src/protocols/jabber/jabber.c:675 src/protocols/jabber/jabber.c:676
+msgid "Register New Jabber Account"
+msgstr "नयाँ ज्याबर खाता रजिष्टार गर्नुहोस्"
+
+#: src/protocols/jabber/jabber.c:759
+msgid "Logged out"
+msgstr "लग बाहिरियो"
+
+#: src/protocols/jabber/jabber.c:804
+msgid "Initializing Stream"
+msgstr "स्ट्रीम सुरू गर्दा"
+
+#: src/protocols/jabber/jabber.c:810 src/protocols/msn/session.c:370
+msgid "Authenticating"
+msgstr "प्रमाणित गर्दा"
+
+#: src/protocols/jabber/jabber.c:819
+msgid "Re-initializing Stream"
+msgstr "स्ट्रीम पुन: सुरू गर्दा"
+
+#: src/protocols/jabber/jabber.c:899 src/protocols/jabber/jabber.c:1199
+#: src/protocols/jabber/jabber.c:1240 src/protocols/jabber/jabber.c:1273
+#: src/protocols/oscar/oscar.c:745 src/protocols/oscar/oscar.c:7467
+msgid "Not Authorized"
+msgstr "अधिकार प्राप्त छैन"
+
+#: src/protocols/jabber/jabber.c:940
+msgid "Both"
+msgstr "दुवै"
+
+#: src/protocols/jabber/jabber.c:942
+msgid "From (To pending)"
+msgstr "बाट (अनिर्णीत गर्न)"
+
+#: src/protocols/jabber/jabber.c:944
+msgid "From"
+msgstr "बाट"
+
+#: src/protocols/jabber/jabber.c:947
+msgid "To"
+msgstr "लाई"
+
+#: src/protocols/jabber/jabber.c:949
+msgid "None (To pending)"
+msgstr "कुनै पनि होइन (अनिर्णीत गर्न)"
+
+#: src/protocols/jabber/jabber.c:953
+msgid "Subscription"
+msgstr "सदस्यता"
+
+#: src/protocols/jabber/jabber.c:986
+msgid "Error"
+msgstr "त्रुटि"
+
+#: src/protocols/jabber/jabber.c:999 src/protocols/jabber/jutil.c:35
+#: src/protocols/jabber/presence.c:72 src/protocols/jabber/presence.c:130
+msgid "Chatty"
+msgstr "कुरौटे"
+
+#: src/protocols/jabber/jabber.c:1001 src/protocols/jabber/jutil.c:38
+#: src/protocols/jabber/presence.c:74 src/protocols/jabber/presence.c:135
+msgid "Extended Away"
+msgstr "टाढा फैल्याउनुहोस्"
+
+#: src/protocols/jabber/jabber.c:1002 src/protocols/jabber/jutil.c:41
+#: src/protocols/jabber/presence.c:76 src/protocols/jabber/presence.c:137
+#: src/protocols/oscar/oscar.c:687 src/protocols/oscar/oscar.c:6465
+#: src/protocols/oscar/oscar.c:7660
+msgid "Do Not Disturb"
+msgstr "कृपया अवरोध नगर्नुहोस्"
+
+#: src/protocols/jabber/jabber.c:1019
+msgid "Password Changed"
+msgstr "पासवर्ड परिवर्तन गरियो"
+
+#: src/protocols/jabber/jabber.c:1020
+msgid "Your password has been changed."
+msgstr "तपाईँको पासवर्ड परिवर्तन भइसकेको छ ।"
+
+#: src/protocols/jabber/jabber.c:1024 src/protocols/jabber/jabber.c:1025
+msgid "Error changing password"
+msgstr "पासवर्ड परिवर्तन गर्दा त्रुटि"
+
+#: src/protocols/jabber/jabber.c:1081
+msgid "Password (again)"
+msgstr "पासवर्ड(फेरि)"
+
+#: src/protocols/jabber/jabber.c:1086 src/protocols/jabber/jabber.c:1087
+msgid "Change Jabber Password"
+msgstr "ज्याबर पासवर्ड परिवर्तन गर्नुहोस्"
+
+#: src/protocols/jabber/jabber.c:1087
+msgid "Please enter your new password"
+msgstr "कृपया तपाईँको नयाँ पासवर्ड प्रविष्टि गराउनुहोस्"
+
+#: src/protocols/jabber/jabber.c:1097 src/protocols/toc/toc.c:1581
+msgid "Set User Info"
+msgstr "प्रयोगकर्ता जानकारी सेट गर्नुहोस्"
+
+#: src/protocols/jabber/jabber.c:1179
+msgid "Bad Request"
+msgstr "खराव अनुरोध"
+
+#: src/protocols/jabber/jabber.c:1181
+msgid "Conflict"
+msgstr "द्वन्द"
+
+#: src/protocols/jabber/jabber.c:1183
+msgid "Feature Not Implemented"
+msgstr "विशेषता कार्यान्वयन हुन सकेको छैन"
+
+#: src/protocols/jabber/jabber.c:1185
+msgid "Forbidden"
+msgstr "निषेधित"
+
+#: src/protocols/jabber/jabber.c:1187
+msgid "Gone"
+msgstr "गइसकेको छ"
+
+#: src/protocols/jabber/jabber.c:1189 src/protocols/jabber/jabber.c:1263
+msgid "Internal Server Error"
+msgstr "आन्तरिक सर्भर त्रुटि"
+
+#: src/protocols/jabber/jabber.c:1191
+msgid "Item Not Found"
+msgstr "वस्तु फेला परेन"
+
+#: src/protocols/jabber/jabber.c:1193
+msgid "Malformed Jabber ID"
+msgstr "मेलफर्मड ज्याबर ID"
+
+#: src/protocols/jabber/jabber.c:1195
+msgid "Not Acceptable"
+msgstr "स्वीकारयोग्य छैन"
+
+#: src/protocols/jabber/jabber.c:1197
+msgid "Not Allowed"
+msgstr "अनुमति दिएको छैन"
+
+#: src/protocols/jabber/jabber.c:1201
+msgid "Payment Required"
+msgstr "आवश्यकता भुक्तानी"
+
+#: src/protocols/jabber/jabber.c:1203
+msgid "Recipient Unavailable"
+msgstr "उपलब्ध नभएको प्रापक"
+
+#: src/protocols/jabber/jabber.c:1207
+msgid "Registration Required"
+msgstr "आवश्यक दर्ता "
+
+#: src/protocols/jabber/jabber.c:1209
+msgid "Remote Server Not Found"
+msgstr "रिमोट सर्भर फेला परेन"
+
+#: src/protocols/jabber/jabber.c:1211
+msgid "Remote Server Timeout"
+msgstr "रिमोट सर्भर टाइम आउट भयो"
+
+#: src/protocols/jabber/jabber.c:1213
+msgid "Server Overloaded"
+msgstr "सर्भर ओभर लोड भयो"
+
+#: src/protocols/jabber/jabber.c:1215
+msgid "Service Unavailable"
+msgstr "सेवा उपलब्ध छैन"
+
+#: src/protocols/jabber/jabber.c:1217
+msgid "Subscription Required"
+msgstr "सदस्यता आवश्यक छ"
+
+#: src/protocols/jabber/jabber.c:1219
+msgid "Unexpected Request"
+msgstr "अनपेक्षित अनुरोध"
+
+#: src/protocols/jabber/jabber.c:1226
+msgid "Authorization Aborted"
+msgstr "प्रमाणीकरण परित्याग गरियो"
+
+#: src/protocols/jabber/jabber.c:1228
+msgid "Incorrect encoding in authorization"
+msgstr "प्रमाणीकरणमा गलत सङ्केतन"
+
+#: src/protocols/jabber/jabber.c:1231
+msgid "Invalid authzid"
+msgstr "अवैध प्रमाणीकरण"
+
+#: src/protocols/jabber/jabber.c:1234
+msgid "Invalid Authorization Mechanism"
+msgstr "अवैध प्रमाणीकरण किर्यावली"
+
+#: src/protocols/jabber/jabber.c:1237
+msgid "Authorization mechanism too weak"
+msgstr "प्रमाणीकरण किर्यावली अति कमजोर छ"
+
+#: src/protocols/jabber/jabber.c:1242
+msgid "Temporary Authentication Failure"
+msgstr "अस्थायी प्रमाणीकरण असफलता"
+
+#: src/protocols/jabber/jabber.c:1244
+msgid "Authentication Failure"
+msgstr "प्रमाणीकरण असफलता"
+
+#: src/protocols/jabber/jabber.c:1248
+msgid "Bad Format"
+msgstr "खराब ढाँचा"
+
+#: src/protocols/jabber/jabber.c:1250
+msgid "Bad Namespace Prefix"
+msgstr "खराब नेमस्पेस उपसर्ग"
+
+#: src/protocols/jabber/jabber.c:1253
+msgid "Resource Conflict"
+msgstr "संसाधन द्वन्द"
+
+#: src/protocols/jabber/jabber.c:1255 src/protocols/silc/ops.c:1519
+msgid "Connection Timeout"
+msgstr "जडान टाइम आउट भयो"
+
+#: src/protocols/jabber/jabber.c:1257
+msgid "Host Gone"
+msgstr "गइसकेको होस्ट"
+
+#: src/protocols/jabber/jabber.c:1259
+msgid "Host Unknown"
+msgstr "अज्ञात होस्ट"
+
+#: src/protocols/jabber/jabber.c:1261
+msgid "Improper Addressing"
+msgstr "अनुचित परिचय"
+
+#: src/protocols/jabber/jabber.c:1265
+msgid "Invalid ID"
+msgstr "अवैध ID"
+
+#: src/protocols/jabber/jabber.c:1267
+msgid "Invalid Namespace"
+msgstr "अवैध नामस्पेस"
+
+#: src/protocols/jabber/jabber.c:1269
+msgid "Invalid XML"
+msgstr "अवैध XML"
+
+#: src/protocols/jabber/jabber.c:1271
+msgid "Non-matching Hosts"
+msgstr "अमिल्दा होस्टहरू"
+
+#: src/protocols/jabber/jabber.c:1275
+msgid "Policy Violation"
+msgstr "नीति उल्ङ्घन"
+
+#: src/protocols/jabber/jabber.c:1277
+msgid "Remote Connection Failed"
+msgstr "टाढा जडान असफल भयो"
+
+#: src/protocols/jabber/jabber.c:1279
+msgid "Resource Constraint"
+msgstr "अपवाद संसाधान"
+
+#: src/protocols/jabber/jabber.c:1281
+msgid "Restricted XML"
+msgstr "निषेधित गरिएको XML"
+
+#: src/protocols/jabber/jabber.c:1283
+msgid "See Other Host"
+msgstr "अन्य होस्ट हेर्नुहोस्"
+
+#: src/protocols/jabber/jabber.c:1285
+msgid "System Shutdown"
+msgstr "प्रणाली बन्द भयो"
+
+#: src/protocols/jabber/jabber.c:1287
+msgid "Undefined Condition"
+msgstr "अपरिभाषित सर्तहरू"
+
+#: src/protocols/jabber/jabber.c:1289
+msgid "Unsupported Encoding"
+msgstr "असमर्थित सङ्केतन"
+
+#: src/protocols/jabber/jabber.c:1291
+msgid "Unsupported Stanza Type"
+msgstr "असमर्थित स्टान्जा प्रकार"
+
+#: src/protocols/jabber/jabber.c:1293
+msgid "Unsupported Version"
+msgstr "असमर्थित संस्करण"
+
+#: src/protocols/jabber/jabber.c:1295
+msgid "XML Not Well Formed"
+msgstr "XML कुशल ढाँचा गरिएको छैन"
+
+#: src/protocols/jabber/jabber.c:1297
+msgid "Stream Error"
+msgstr "स्ट्रिम त्रुटि"
+
+#: src/protocols/jabber/jabber.c:1364
+#, c-format
+msgid "Unable to ban user %s"
+msgstr "%s प्रयोगकर्तालाई रोक्न अक्षम भयो"
+
+#: src/protocols/jabber/jabber.c:1386
+#, c-format
+msgid "Unknown affiliation: \"%s\""
+msgstr "अज्ञात सम्बद्धता: \"%s\""
+
+#: src/protocols/jabber/jabber.c:1391
+#, c-format
+msgid "Unable to affiliate user %s as \"%s\""
+msgstr "\"%s\"को रुपमा %s प्रयोगकर्ता सम्बद्ध गर्न अक्षम"
+
+#: src/protocols/jabber/jabber.c:1443
+#, c-format
+msgid "Unable to kick user %s"
+msgstr "%s प्रयोगकर्ता हुत्याउन असफल"
+
+#: src/protocols/jabber/jabber.c:1469
+msgid "config:  Configure a chat room."
+msgstr "कन्फिग:कुराकानी कोठा कन्फिगर गर्नुहोस् ।"
+
+#: src/protocols/jabber/jabber.c:1473
+msgid "configure:  Configure a chat room."
+msgstr "कन्फिगर: एउटा कुराकानी कोठा कन्फिगर गर्नुहोस् ।"
+
+#: src/protocols/jabber/jabber.c:1482
+msgid "part [room]:  Leave the room."
+msgstr "भाग [कोठा]: कोठा छोड्नुहोस् ।"
+
+#: src/protocols/jabber/jabber.c:1487
+msgid "register:  Register with a chat room."
+msgstr "रजिस्टर:  कुराकानी कोठासहित रजिस्टर गर्नुहोस् ।"
+
+#: src/protocols/jabber/jabber.c:1493
+msgid "topic [new topic]:  View or change the topic."
+msgstr "विषय [नयाँ विषय]:  विषय दृश्य वा परिवर्तन गर्नुहोस् ।"
+
+#: src/protocols/jabber/jabber.c:1499
+msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
+msgstr "रोक्नुहोस् &lt;प्रयोगकर्ता&gt; [कोठा]:कोठाबाट प्रयोगकर्ता रोक्नुहोस् ।"
+
+#: src/protocols/jabber/jabber.c:1505
+msgid ""
+"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
+"affiliation with the room."
+msgstr "सम्बद्धन &lt;प्रयोगकर्ता&gt; &lt;मालिक|प्रशासन|सद्स्य|अन्तरजात|कुनै पनि हैन &gt;: कोठासहित प्रयोगकर्ताको सम्बद्धन सेट गर्नुहोस् ।"
+
+#: src/protocols/jabber/jabber.c:1511
+msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
+msgstr "निमन्त्रणा &lt;प्रयोगकर्ता&gt; [सन्देश]:  कोठामा प्रयोगकर्तालाई निमन्त्रणा गर्नुहोस् ।"
+
+#: src/protocols/jabber/jabber.c:1517
+msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
+msgstr "जडान:&lt;कोठा&gt; [सर्भर]:यो सर्भरमा कुराकानी जडान गर्नुहोस् ।"
+
+#: src/protocols/jabber/jabber.c:1523
+msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
+msgstr "हुत्याउनुहोस् &lt;प्रयोगकर्ता&gt; [कोठा]:  कोठाबाट प्रयोगकर्ता हुत्याउनुहोस् ।"
+
+#: src/protocols/jabber/jabber.c:1528
+msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
+msgstr "msg &lt;प्रयोगकर्ता&gt; &lt;सन्देश&gt;:  अर्को प्रयोगकर्तामा व्यक्तिगत सन्देश पठाउनुहोस् ।"
+
+#: src/protocols/jabber/jabber.c:1543
+msgid "Hide Operating System"
+msgstr "सञ्चालन प्रणाली लुकाउनुहोस्"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: src/protocols/jabber/jabber.c:1630 src/protocols/jabber/jabber.c:1632
+msgid "Jabber Protocol Plugin"
+msgstr "ज्याबर प्रोटोकल प्लगइन"
+
+#: src/protocols/jabber/jabber.c:1655
+msgid "Resource"
+msgstr "संसाधन"
+
+#: src/protocols/jabber/jabber.c:1658
+msgid "Use TLS if available"
+msgstr "यदि उपलब्ध भएको खण्डमा TLS प्रयोग गर्नुहोस्"
+
+#: src/protocols/jabber/jabber.c:1663
+msgid "Force old SSL"
+msgstr "पुरानो SSL लाई जोड गर्नुहोस्"
+
+#: src/protocols/jabber/jabber.c:1668
+msgid "Allow plaintext auth over unencrypted streams"
+msgstr "गुप्तिकृत नभएको स्ट्रीमहरू माथि खाली पाठ प्रमाणीकरण अनुमति दिनुहोस्"
+
+#. Account options
+#: src/protocols/jabber/jabber.c:1677 src/protocols/silc/silc.c:1592
+msgid "Connect server"
+msgstr "सर्भर जडान गर्नुहोस्"
+
+#: src/protocols/jabber/message.c:111
+#, c-format
+msgid "Message from %s"
+msgstr "%s बाट सन्देश"
+
+#: src/protocols/jabber/message.c:175
+#, c-format
+msgid "%s has set the topic to: %s"
+msgstr "%s ले विषय यसमा सेट गर्यो: %s"
+
+#: src/protocols/jabber/message.c:177
+#, c-format
+msgid "The topic is: %s"
+msgstr "विषय: %s"
+
+#: src/protocols/jabber/message.c:230
+#, c-format
+msgid "Message delivery to %s failed: %s"
+msgstr "%s मा सन्देश हस्तान्तरण असफल भयो:%s"
+
+#: src/protocols/jabber/message.c:233
+msgid "Jabber Message Error"
+msgstr "ज्याबर सन्देश त्रुटि"
+
+#: src/protocols/jabber/message.c:297
+#, c-format
+msgid " (Code %s)"
+msgstr " (कोड %s)"
+
+#: src/protocols/jabber/parser.c:131
+msgid "XML Parse error"
+msgstr "XML पद वर्णन त्रुटि"
+
+#: src/protocols/jabber/presence.c:290
+msgid "Unknown Error in presence"
+msgstr "उपस्थितिमा अज्ञात त्रुटि"
+
+#: src/protocols/jabber/presence.c:293
+#, c-format
+msgid "The user %s wants to add you to their buddy list."
+msgstr "प्रयोगकर्ता %s ले तपाईँलाई तिनीहरुको साथी सूचीमा थप्न चाहान्छ ।"
+
+#: src/protocols/jabber/presence.c:348 src/protocols/jabber/presence.c:349
+msgid "Create New Room"
+msgstr "नयाँ कोठा सिर्जना गर्नुहोस्"
+
+#: src/protocols/jabber/presence.c:350
+msgid ""
+"You are creating a new room.  Would you like to configure it, or accept the "
+"default settings?"
+msgstr "तपाईँ नयाँ कोठा सिर्जना गर्दै हुनुहुन्छ । के तपाईँ यो कन्फिगर गर्न चाहानुहुन्छ, वा पूर्वनिर्धारित सेटिङ्हरू स्वीकार गर्नुहुन्छ ?"
+
+#: src/protocols/jabber/presence.c:352
+msgid "Configure Room"
+msgstr "कोठा कन्फिगर गर्नुहोस्"
+
+#: src/protocols/jabber/presence.c:354
+msgid "Accept Defaults"
+msgstr "पूर्वनिर्धारणहरू स्विकार गर्नुहोस्"
+
+#: src/protocols/jabber/presence.c:384
+#, c-format
+msgid "Error in chat %s"
+msgstr "%s कुराकानीमा त्रुटि"
+
+#: src/protocols/jabber/presence.c:387
+#, c-format
+msgid "Error joining chat %s"
+msgstr "%s कुराकानी जडान गर्दा त्रुटि"
+
+#: src/protocols/jabber/si.c:594
+#, c-format
+msgid "Unable to send file to %s, user does not support file transfers"
+msgstr "%s मा फाइल पठाउन अक्षम भयो,प्रयोगकर्ताले फाइल स्थानान्तरणहरू समर्थन गर्दैन"
+
+#: src/protocols/jabber/si.c:595 src/protocols/jabber/si.c:596
+msgid "File Send Failed"
+msgstr "फाइल पठाउन असफल भयो"
+
+#: src/protocols/msn/dialog.c:91
+#, c-format
+msgid "Buddy list synchronization issue in %s (%s)"
+msgstr "%s (%s)मा साथी सूची गुप्तिकरण निस्कासन्"
+
+#: src/protocols/msn/dialog.c:97
+#, c-format
+msgid ""
+"%s on the local list is inside the group \"%s\" but not on the server list. "
+"Do you want this buddy to be added?"
+msgstr "स्थानीय सूचीमा %s समूह\"%s\"को भित्र पटि छ तर सर्भर सूचीमा हैन । के तपाईँ यो साथीमा थप्न चाहानुहुन्छ?"
+
+#: src/protocols/msn/dialog.c:105
+#, c-format
+msgid ""
+"%s is on the local list but not on the server list. Do you want this buddy "
+"to be added?"
+msgstr "स्थानीय सूचीमा %s छ तर सर्भर सूचीमा हैन । के तपाईँ यो साथीमा थप्न चाहानुहुन्छ?"
+
+#: src/protocols/msn/error.c:35
+msgid "Unable to parse message"
+msgstr "यो सन्देश पद वर्णन गर्न अक्षम छ"
+
+#: src/protocols/msn/error.c:38
+msgid "Syntax Error (probably a Gaim bug)"
+msgstr "वाक्या संरचना त्रुटि (सम्भवत गाइम त्रुटि)"
+
+#: src/protocols/msn/error.c:42
+msgid "Invalid email address"
+msgstr "अवैध इमेल ठेगाना"
+
+#: src/protocols/msn/error.c:45
+msgid "User does not exist"
+msgstr "प्रयोगकर्ता अवस्थित छैन"
+
+#: src/protocols/msn/error.c:49
+msgid "Fully Qualified Domain Name missing"
+msgstr "पूर्ण रुपमा सक्षम डोमेन नाम हराइरहेको छ"
+
+#: src/protocols/msn/error.c:52
+msgid "Already Logged In"
+msgstr "पहिलेनै लगइन भइसकेको छ"
+
+#: src/protocols/msn/error.c:55
+msgid "Invalid Username"
+msgstr "अवैध प्रयोगकर्तानाम"
+
+#: src/protocols/msn/error.c:58
+msgid "Invalid Friendly Name"
+msgstr "अवैध मित्रता नाम"
+
+#: src/protocols/msn/error.c:61
+msgid "List Full"
+msgstr "सूची भरिएको छ"
+
+#: src/protocols/msn/error.c:64
+msgid "Already there"
+msgstr "तिनीहरू पहिलेकै हुन्"
+
+#: src/protocols/msn/error.c:67
+msgid "Not on list"
+msgstr "सूचीमा छैन"
+
+#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:686
+msgid "User is offline"
+msgstr "प्रयोगकर्ता अफलाइन छ"
+
+#: src/protocols/msn/error.c:73
+msgid "Already in the mode"
+msgstr "पहिलेनै मोडमा छ"
+
+#: src/protocols/msn/error.c:76
+msgid "Already in opposite list"
+msgstr "पहिलेनै विपक्ष सूचीमा छ"
+
+#: src/protocols/msn/error.c:79
+msgid "Too many groups"
+msgstr "अति धेरै समूहहरू"
+
+#: src/protocols/msn/error.c:82
+msgid "Invalid group"
+msgstr "अवैध समूह"
+
+#: src/protocols/msn/error.c:85
+msgid "User not in group"
+msgstr "समूहमा प्रयोगकर्ता छैन"
+
+#: src/protocols/msn/error.c:88
+msgid "Group name too long"
+msgstr "समूह नाम अति लामो भयो"
+
+#: src/protocols/msn/error.c:91
+msgid "Cannot remove group zero"
+msgstr "समूह शून्य हटाउन सकिदैन"
+
+#: src/protocols/msn/error.c:95
+msgid "Tried to add a contact to a group that doesn't exist"
+msgstr "त्यो अवस्थित नरहेको समूहमा सम्पर्क थप्न कोशिश गरेको थियो"
+
+#: src/protocols/msn/error.c:99
+msgid "Switchboard failed"
+msgstr "स्विच बोर्ड असफल भयो"
+
+#: src/protocols/msn/error.c:102
+msgid "Notify Transfer failed"
+msgstr "सूचना हस्तान्तरण असफल भयो"
+
+#: src/protocols/msn/error.c:106
+msgid "Required fields missing"
+msgstr "आवश्यक फाँटहरू हराइरहेका छन्"
+
+#: src/protocols/msn/error.c:109
+msgid "Too many hits to a FND"
+msgstr "FNDमा धेरै हिटहरू छन्"
+
+#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:200
+msgid "Not logged in"
+msgstr "लगइन छैन"
+
+#: src/protocols/msn/error.c:116
+msgid "Service Temporarily Unavailable"
+msgstr "सेवा अस्थायी रुपमा उपलब्ध छैन"
+
+#: src/protocols/msn/error.c:119
+msgid "Database server error"
+msgstr "डेटावे सर्भर त्रुटि"
+
+#: src/protocols/msn/error.c:122
+msgid "Command disabled"
+msgstr "आदेश निस्क्रिय भयो"
+
+#: src/protocols/msn/error.c:125
+msgid "File operation error"
+msgstr "फाइल सञ्चालन त्रुटि"
+
+#: src/protocols/msn/error.c:128
+msgid "Memory allocation error"
+msgstr "स्मृति बाँडफाडमा त्रुटि"
+
+#: src/protocols/msn/error.c:131
+msgid "Wrong CHL value sent to server"
+msgstr "गलत CHLमान सर्भरमा पठाइयो"
+
+#: src/protocols/msn/error.c:135
+msgid "Server busy"
+msgstr "सर्भर ब्यस्त छ"
+
+#: src/protocols/msn/error.c:138 src/protocols/msn/error.c:151
+#: src/protocols/msn/error.c:206
+msgid "Server unavailable"
+msgstr "सर्भर उपलब्ध छैन"
+
+#: src/protocols/msn/error.c:141
+msgid "Peer Notification server down"
+msgstr "समान सूचनाहरू सर्भर डाउन"
+
+#: src/protocols/msn/error.c:144
+msgid "Database connect error"
+msgstr "डाटावेस जडान त्रुटि"
+
+#: src/protocols/msn/error.c:148
+msgid "Server is going down (abandon ship)"
+msgstr "सर्भर बन्द भैरहेको छ (अबान्दन सीप)"
+
+#: src/protocols/msn/error.c:155
+msgid "Error creating connection"
+msgstr "जडान सिर्जना गर्दा त्रुटि"
+
+#: src/protocols/msn/error.c:159
+msgid "CVR parameters are either unknown or not allowed"
+msgstr "CVR पारामितिहरू कित अज्ञात छन् या त अनुमति दिएको छैन"
+
+#: src/protocols/msn/error.c:162
+msgid "Unable to write"
+msgstr "लेख्न अक्षम छ"
+
+#: src/protocols/msn/error.c:165
+msgid "Session overload"
+msgstr "सत्र ओभरलोड भयो"
+
+#: src/protocols/msn/error.c:168
+msgid "User is too active"
+msgstr "प्रयोगकर्ता अति सक्रिय छ"
+
+#: src/protocols/msn/error.c:171
+msgid "Too many sessions"
+msgstr "अति धेरै सत्रहरू"
+
+#: src/protocols/msn/error.c:174
+msgid "Passport not verified"
+msgstr "पासपोर्ट प्रमाणीत भएको छैन"
+
+#: src/protocols/msn/error.c:177
+msgid "Bad friend file"
+msgstr "खराव मित्र फाइल"
+
+#: src/protocols/msn/error.c:180
+msgid "Not expected"
+msgstr "अपेक्षा गरिएको छैन"
+
+#: src/protocols/msn/error.c:185
+msgid "Friendly name changes too rapidly"
+msgstr "उस्तै नाम धेरै चाडो परिवर्तन हुन्छन्"
+
+#: src/protocols/msn/error.c:194
+msgid "Server too busy"
+msgstr "सर्भर धेरै ब्यस्त छ"
+
+#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2711
+#: src/protocols/silc/ops.c:1508 src/protocols/toc/toc.c:630
+msgid "Authentication failed"
+msgstr "प्रमाणीकरण असफल भयो"
+
+#: src/protocols/msn/error.c:201
+msgid "Not allowed when offline"
+msgstr "जब अफ लाइन मा हुन्छ अनुमति दिइदैन"
+
+#: src/protocols/msn/error.c:209
+msgid "Not accepting new users"
+msgstr "नयाँ प्रयोगकर्ताहरू स्विकारिदैन"
+
+#: src/protocols/msn/error.c:213
+msgid "Kids Passport without parental consent"
+msgstr "पैत्रिक सहमति बिनाका किड्को पासपोर्ट"
+
+#: src/protocols/msn/error.c:217
+msgid "Passport account not yet verified"
+msgstr "पासवर्ड खाता अहिले सम्म प्रमाणीत भएको छैन"
+
+#: src/protocols/msn/error.c:220
+msgid "Bad ticket"
+msgstr "खराव टिकेट"
+
+#: src/protocols/msn/error.c:224
+#, c-format
+msgid "Unknown Error Code %d"
+msgstr "अज्ञात त्रुटि कोड %d"
+
+#: src/protocols/msn/error.c:236
+#, c-format
+msgid "MSN Error: %s\n"
+msgstr "MSN त्रुटि: %s\n"
+
+#: src/protocols/msn/msn.c:114
+msgid "Your new MSN friendly name is too long."
+msgstr "तपाईँको नयाँ MSN मित्रता नाम धेरै लामो भयो ।"
+
+#: src/protocols/msn/msn.c:222
+msgid "Set your friendly name."
+msgstr "तपाईँका उस्तै नाम सेट गर्नुहोस् ।"
+
+#: src/protocols/msn/msn.c:223
+msgid "This is the name that other MSN buddies will see you as."
+msgstr "यो त्यो नाम हो जसमा MSN साथीहरू तपाईँले देख्न सक्नुहुन्छ ।"
+
+#: src/protocols/msn/msn.c:239
+msgid "Set your home phone number."
+msgstr "तपाईँको घरको फोन नम्बर सेट गर्नुहोस् ।"
+
+#: src/protocols/msn/msn.c:254
+msgid "Set your work phone number."
+msgstr "तपाईँको कार्यस्थलको फोन नम्बर सेट गर्नुहोस् ।"
+
+#: src/protocols/msn/msn.c:269
+msgid "Set your mobile phone number."
+msgstr "तपाईँको मोवाइल नम्बर सेट गर्नुहोस् ।"
+
+#: src/protocols/msn/msn.c:282
+msgid "Allow MSN Mobile pages?"
+msgstr "MSN मोवाइल पृष्ठहरू अनुमति दिनुहुन्छ?"
+
+#: src/protocols/msn/msn.c:283
+msgid ""
+"Do you want to allow or disallow people on your buddy list to send you MSN "
+"Mobile pages to your cell phone or other mobile device?"
+msgstr "के तापई आफ्नो साथी सूचीमा भएका मानिसलाई MSN मोबाइल पृष्ठहरू तपाईँको सेल फोन वा अरु मोवाइल यन्त्रमा अनुमति दिन वा नदिन चाहानुहुन्छ ?"
+
+#: src/protocols/msn/msn.c:287
+msgid "Allow"
+msgstr "अनुमति दिनुहोस्"
+
+#: src/protocols/msn/msn.c:288
+msgid "Disallow"
+msgstr "अनुमति नदिनुहोस्"
+
+#: src/protocols/msn/msn.c:311
+msgid "Send a mobile message."
+msgstr "मोवाइल सन्देश पठाउनुहोस् ।"
+
+#: src/protocols/msn/msn.c:313
+msgid "Page"
+msgstr "पृष्ठ"
+
+#: src/protocols/msn/msn.c:489 src/protocols/msn/msn.c:497
+#: src/protocols/msn/msn.c:500 src/protocols/yahoo/yahoo.c:2903
+#, c-format
+msgid ""
+"\n"
+"<b>%s:</b> %s"
+msgstr ""
+"\n"
+"<b>%s:</b> %s"
+
+#: src/protocols/msn/msn.c:497
+msgid "Has you"
+msgstr "तपाईँ सँग  छ"
+
+#: src/protocols/msn/msn.c:500
+msgid "Blocked"
+msgstr "रोकिएको छ"
+
+#: src/protocols/msn/msn.c:514 src/protocols/msn/msn.c:801
+#: src/protocols/msn/state.c:34
+msgid "Away From Computer"
+msgstr "कम्प्युटरबाट टाढा छ"
+
+#: src/protocols/msn/msn.c:515 src/protocols/msn/msn.c:803
+#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2760
+#: src/protocols/yahoo/yahoo.c:3127 src/protocols/yahoo/yahoo.c:3243
+msgid "Be Right Back"
+msgstr "पछाडि छु"
+
+#: src/protocols/msn/msn.c:516 src/protocols/msn/msn.c:805
+#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2803
+#: src/protocols/novell/novell.c:2918 src/protocols/novell/novell.c:2972
+#: src/protocols/silc/buddy.c:1392 src/protocols/silc/silc.c:48
+#: src/protocols/silc/silc.c:83 src/protocols/yahoo/yahoo.c:2762
+#: src/protocols/yahoo/yahoo.c:3129 src/protocols/yahoo/yahoo.c:3244
+msgid "Busy"
+msgstr "व्यस्त छु"
+
+#: src/protocols/msn/msn.c:517 src/protocols/msn/msn.c:807
+#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2770
+#: src/protocols/yahoo/yahoo.c:3137 src/protocols/yahoo/yahoo.c:3248
+msgid "On The Phone"
+msgstr "फोनमा छु"
+
+#: src/protocols/msn/msn.c:518 src/protocols/msn/msn.c:809
+#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2774
+#: src/protocols/yahoo/yahoo.c:3141 src/protocols/yahoo/yahoo.c:3250
+msgid "Out To Lunch"
+msgstr "खानाका लागि बाहिर "
+
+#: src/protocols/msn/msn.c:519 src/protocols/msn/msn.c:811
+#: src/protocols/zephyr/zephyr.c:2099 src/protocols/zephyr/zephyr.c:2131
+msgid "Hidden"
+msgstr "लुकाइएको"
+
+#: src/protocols/msn/msn.c:530
+msgid "Set Friendly Name"
+msgstr "सहज नाम सेट गर्नुहोस्"
+
+#: src/protocols/msn/msn.c:535
+msgid "Set Home Phone Number"
+msgstr "घरको फोन नम्बर सेट गर्नुहोस्"
+
+#: src/protocols/msn/msn.c:539
+msgid "Set Work Phone Number"
+msgstr "कार्यस्थलको फोन नम्बर सेट गर्नुहोस्"
+
+#: src/protocols/msn/msn.c:543
+msgid "Set Mobile Phone Number"
+msgstr "मोवाइल नम्बर सेट गर्नुहोस्"
+
+#: src/protocols/msn/msn.c:549
+msgid "Enable/Disable Mobile Devices"
+msgstr "मोवाइल यन्त्रहरू सक्षम/अक्षम बनाउनुहोस्"
+
+#: src/protocols/msn/msn.c:554
+msgid "Allow/Disallow Mobile Pages"
+msgstr "मोवाइल पृष्ठहरू अनुमति दिनुहोस् / नदिनुहोस्"
+
+#: src/protocols/msn/msn.c:577
+msgid "Send to Mobile"
+msgstr "मोबाइलमा पठाउनुहोस्"
+
+#: src/protocols/msn/msn.c:586 src/protocols/novell/novell.c:3369
+msgid "Initiate _Chat"
+msgstr "कुराकानी सुरू गर्नुहोस्"
+
+#: src/protocols/msn/msn.c:623
+msgid ""
+"SSL support is needed for MSN. Please install a supported SSL library. See "
+"http://gaim.sf.net/faq-ssl.php for more information."
+msgstr "MSNका लागि SSL समर्थन आवश्यक पर्दछ । कृपया, SSL समर्थित लाइब्रेरि स्थापना गर्नुहोस् । धेरै जानकारीका लागि http://gaim.sf.net/faq-ssl.php हेर्नुहोस् ।"
+
+#: src/protocols/msn/msn.c:651
+msgid "Failed to connect to server."
+msgstr "सर्भरमा जडान गर्न असफल भयो ।"
+
+#: src/protocols/msn/msn.c:1309 src/protocols/yahoo/yahoo_profile.c:659
+#: src/protocols/zephyr/zephyr.c:717 src/protocols/zephyr/zephyr.c:1126
+#, 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:1317 src/protocols/msn/msn.c:1675
+#: src/protocols/yahoo/yahoo_profile.c:1174 src/util.c:796
+#, c-format
+msgid "<b>%s:</b> "
+msgstr "<b>%s:</b> "
+
+#: src/protocols/msn/msn.c:1405
+msgid "MSN Profile"
+msgstr "MSN प्रोफाइल"
+
+#: src/protocols/msn/msn.c:1410 src/protocols/msn/msn.c:1662
+#: src/protocols/yahoo/yahoo_profile.c:763
+msgid "Error retrieving profile"
+msgstr "प्रोफाइल पुन: प्राप्त गर्दा त्रुटि"
+
+#. Age
+#: src/protocols/msn/msn.c:1481 src/protocols/oscar/oscar.c:5892
+#: src/protocols/trepia/trepia.c:286 src/protocols/trepia/trepia.c:405
+#: src/protocols/yahoo/yahoo_profile.c:1022
+msgid "Age"
+msgstr "उमेर"
+
+#. Gender
+#: src/protocols/msn/msn.c:1488 src/protocols/oscar/oscar.c:5878
+#: src/protocols/trepia/trepia.c:280 src/protocols/trepia/trepia.c:407
+#: src/protocols/yahoo/yahoo_profile.c:1032
+msgid "Gender"
+msgstr "लिङ्ग"
+
+#: src/protocols/msn/msn.c:1497 src/protocols/yahoo/yahoo_profile.c:1027
+msgid "Marital Status"
+msgstr "बैवाहिक स्थिति"
+
+#: src/protocols/msn/msn.c:1504 src/protocols/novell/novell.c:1445
+#: src/protocols/yahoo/yahoo_profile.c:1017
+msgid "Location"
+msgstr "स्थान"
+
+#: src/protocols/msn/msn.c:1512 src/protocols/yahoo/yahoo_profile.c:1037
+msgid "Occupation"
+msgstr "पेशा"
+
+#: src/protocols/msn/msn.c:1529 src/protocols/msn/msn.c:1535
+#: src/protocols/msn/msn.c:1542 src/protocols/msn/msn.c:1550
+#: src/protocols/msn/msn.c:1557
+msgid "A Little About Me"
+msgstr "मेरो बारेमा छोटो जानकारी"
+
+#: src/protocols/msn/msn.c:1566 src/protocols/msn/msn.c:1572
+#: src/protocols/msn/msn.c:1579 src/protocols/msn/msn.c:1586
+msgid "Favorite Things"
+msgstr "मनपर्ने चीजहरू"
+
+#: src/protocols/msn/msn.c:1595 src/protocols/msn/msn.c:1601
+#: src/protocols/msn/msn.c:1608
+msgid "Hobbies and Interests"
+msgstr "सोखहरू र रुचिहरू"
+
+#: src/protocols/msn/msn.c:1617 src/protocols/msn/msn.c:1623
+#: src/protocols/yahoo/yahoo_profile.c:1079
+msgid "Favorite Quote"
+msgstr "मनपरेको उद्दरण चिन्ह"
+
+#: src/protocols/msn/msn.c:1631
+msgid "Last Updated"
+msgstr "अन्तिम अद्यावधिक"
+
+#. Homepage
+#: src/protocols/msn/msn.c:1642 src/protocols/silc/ops.c:844
+#: src/protocols/trepia/trepia.c:290 src/protocols/trepia/trepia.c:420
+msgid "Homepage"
+msgstr "गृहपृष्ठ"
+
+#: src/protocols/msn/msn.c:1664
+msgid "The user has not created a public profile."
+msgstr "प्रयोगकर्ताले सार्वजनिक प्रोफाइल सिर्जना गरेको छैन ।"
+
+#: src/protocols/msn/msn.c:1665
+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 "
+"public profile."
+msgstr "MSN प्रतिवेदनले प्रयोगकर्ताको प्रोफाइल हालसालै भेटाउन अक्षम छ । यसको अर्थ कि त त्यो प्रयोगकर्ता अवस्थित छैन या त्यो प्रयोगकर्ता अवस्थित छ तर सार्वजनिक प्रोफाइलमा सिर्जना गरेको छैन ।"
+
+#: src/protocols/msn/msn.c:1669
+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:1675 src/protocols/yahoo/yahoo_profile.c:1174
+msgid "Profile URL"
+msgstr "प्रोफाइल URL"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: src/protocols/msn/msn.c:1880 src/protocols/msn/msn.c:1882
+msgid "MSN Protocol Plugin"
+msgstr "MSN प्रोटोकल प्लगइन"
+
+#: src/protocols/msn/msn.c:1901 src/protocols/trepia/trepia.c:1296
+msgid "Login server"
+msgstr "लगइन सर्भर"
+
+#: src/protocols/msn/msn.c:1910
+msgid "Use HTTP Method"
+msgstr "HTTP विधि प्रयोग गर्नुहोस्"
+
+#: src/protocols/msn/nexus.c:103 src/protocols/msn/servconn.c:127
+#: src/protocols/yahoo/yahoochat.c:1394
+msgid "Unable to connect"
+msgstr "जडान गर्न अक्षम छ"
+
+#: src/protocols/msn/notification.c:178
+#, c-format
+msgid "%s is not a valid group."
+msgstr "%s वैध समूह हैन ।"
+
+#: src/protocols/msn/notification.c:184 src/protocols/msn/notification.c:523
+#: src/protocols/msn/session.c:349
+msgid "Unknown error."
+msgstr "अज्ञात त्रुटि"
+
+#: src/protocols/msn/notification.c:187
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s (%s)मा%s"
+
+#: src/protocols/msn/notification.c:493
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "%s (%s)मा प्रयोगकर्ता थप्न अक्षम छ ।"
+
+#: src/protocols/msn/notification.c:497
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "%s (%s)मा प्रयोगकर्ता रोक्न अक्षम छ"
+
+#: src/protocols/msn/notification.c:501
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "%s (%s)मा प्रयोगकर्ता अनुमति दिन अक्षम छ"
+
+#: src/protocols/msn/notification.c:509
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "%s थप्न सकिएन किनभने तपाईँको साथी सूची भरिएको छ ।"
+
+#: src/protocols/msn/notification.c:518
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s वैध खाता पासपोर्ट होइन ।"
+
+#: src/protocols/msn/notification.c:805
+msgid "Unable to rename group"
+msgstr "समूहको नाम पुन:नामकरण गर्न अक्षम छ"
+
+#: src/protocols/msn/notification.c:860
+msgid "Unable to delete group"
+msgstr "समूह मेटाउन अक्षम छ"
+
+#: src/protocols/msn/notification.c:1287
+#, c-format
+msgid ""
+"The MSN server will shut down for maintenance in %d minute. You will "
+"automatically be signed out at that time.  Please finish any conversations "
+"in progress.\n"
+"\n"
+"After the maintenance has been completed, you will be able to successfully "
+"sign in."
+msgid_plural ""
+"The MSN server will shut down for maintenance in %d minutes. You will "
+"automatically be signed out at that time.  Please finish any conversations "
+"in progress.\n"
+"\n"
+"After the maintenance has been completed, you will be able to successfully "
+"sign in."
+msgstr[0] ""
+"%d मिनेटमा मर्मतका लागि MSN सर्भर  बन्द गरिने छ । त्यो समयमा तपाईँ स्वचालित रुपले साइन आउट हुनुहुने छ । कृपया, कुनै बार्तालापहरू भइरहेको छ भने सकाउनुहोस् ।\n"
+
+"\n"
+"मर्मत समाप्त भएपछि तपाईँ सफलतापूर्वक साइनइन गर्न सक्नुहुन्छ ।"
+msgstr[1] ""
+
+"%d मिनेटमा मर्मतका लागि MSN सर्भर  बन्द गरिने छ । त्यो समयमा तपाईँ स्वचालित रुपले साइन आउट हुनुहुने छ । कृपया, कुनै बार्तालापहरू भइरहेको छ भने समाप्त गर्नुहोस् ।\n"
+
+"\n"
+"मर्मत समाप्त भएपछि तपाईँ सफलतापूर्वक साइनइन गर्न सक्नुहुन्छ ।"
+
+#: src/protocols/msn/servconn.c:129
+msgid "Writing error"
+msgstr "लेखन त्रुटि"
+
+#: src/protocols/msn/servconn.c:131
+msgid "Reading error"
+msgstr "पढाइ त्रुटि"
+
+#: src/protocols/msn/servconn.c:133 src/protocols/msn/session.c:341
+#: src/protocols/oscar/oscar.c:4870
+msgid "Unknown error"
+msgstr "अज्ञात त्रुटि"
+
+#: src/protocols/msn/servconn.c:136
+#, c-format
+msgid ""
+"Connection error from %s server (%s):\n"
+"%s"
+msgstr ""
+"%s बाट (%s) सर्भरमा जडान त्रुटि:\n"
+"%s"
+
+#: src/protocols/msn/session.c:319
+msgid "Our protocol is not supported by the server."
+msgstr "सर्भरद्वारा हाम्रो प्रोटोकल समर्थन हुदैन ।"
+
+#: src/protocols/msn/session.c:323
+msgid "Error parsing HTTP."
+msgstr "HTTP पद वर्णन गर्दा त्रुटि ।"
+
+#: src/protocols/msn/session.c:327
+msgid "You have signed on from another location."
+msgstr "तपाईँले अर्को स्थानबाट साइनअन गर्नुभएको छ।"
+
+#: src/protocols/msn/session.c:330
+msgid "The MSN servers are temporarily unavailable. Please wait and try again."
+msgstr "MSN सर्भरहरू अस्थायी रुपमा उपलब्ध छैनन् । कृपया प्रतिक्षा गर्नुहोस् र फेरी प्रयास गर्नुहोस् ।"
+
+#: src/protocols/msn/session.c:335
+msgid "The MSN servers are going down temporarily."
+msgstr "MSN सर्भरहरू अस्थायी रुपमा बन्द हुन लाग्दैछन् ।"
+
+#: src/protocols/msn/session.c:339
+#, c-format
+msgid "Unable to authenticate: %s"
+msgstr "प्रमाणित गर्न अक्षम भयो: %s"
+
+#: src/protocols/msn/session.c:344
+msgid "Your MSN buddy list is temporarily unavailable. Please wait and try again."
+msgstr "तपाईँको MSN साथी सूची अस्थायी रुपमा उपलब्ध छैन । कृपया, प्रतिक्षा गर्नुहोस् र फेरी प्रयास गर्नुहोस् ।"
+
+#: src/protocols/msn/session.c:365 src/protocols/msn/session.c:367
+msgid "Handshaking"
+msgstr "ह्यान्डसेक गर्दैछ"
+
+#: src/protocols/msn/session.c:366
+msgid "Transferring"
+msgstr "स्थानान्तरण हुँर्दैछ"
+
+#: src/protocols/msn/session.c:368
+msgid "Starting authentication"
+msgstr "प्रमाणीकरण सुरू हुँदैछ"
+
+#: src/protocols/msn/session.c:369
+msgid "Getting cookie"
+msgstr "कुकी प्राप्त गर्दैछ"
+
+#: src/protocols/msn/session.c:371
+msgid "Sending cookie"
+msgstr "कुकी पठाउँदैछ"
+
+#: src/protocols/msn/session.c:372 src/protocols/trepia/trepia.c:636
+msgid "Retrieving buddy list"
+msgstr "साथी सूची पुन:प्राप्ति गर्दैछ"
+
+#: src/protocols/msn/switchboard.c:401
+msgid "Message may have not been sent because a timeout occurred:"
+msgstr "सम्भवत समय समाप्ति भइसकेकाले सन्देश पठाउन सकिएन:"
+
+#: src/protocols/msn/switchboard.c:409
+msgid "Message could not be sent, not allowed while invisible:"
+msgstr "अदृश्य भएको बेलामा अनुमति नभएकाले गर्दा सन्देश पठाउन सकिदैन:"
+
+#: src/protocols/msn/switchboard.c:413
+msgid "Message could not be sent because the user is offline:"
+msgstr "प्रयोगकर्ता अफलाइन भएका कारण सन्देश पठाउन सकिएन:"
+
+#: src/protocols/msn/switchboard.c:417
+msgid "Message could not be sent because a connection error occurred:"
+msgstr "जडानमा त्रुटि आएकाले सन्देश पठाउन सकिएन:"
+
+#: src/protocols/msn/switchboard.c:421
+msgid "Message could not be sent because an error with the switchboard occurred:"
+msgstr "स्विचबोर्डमा त्रुटि आएकाले सन्देश पठाउन सकिएन ।"
+
+#: src/protocols/msn/switchboard.c:429
+msgid "Message may have not been sent because an unknown error occurred:"
+msgstr "सन्देश नगएको पनि हुनसक्छ किनभने अज्ञात त्रुटि आएको छ :"
+
+#: src/protocols/msn/userlist.c:87
+#, c-format
+msgid "The user %s (%s) wants to add %s to his or her buddy list."
+msgstr "%s (%s) प्रयोगकर्ताले आफ्नो साथी सूचीमा %s थप्न चाहन्छ ।"
+
+#: src/protocols/msn/userlist.c:96
+#, c-format
+msgid "The user %s wants to add %s to his or her buddy list."
+msgstr "%s प्रयोगकर्ताले आफ्नो साथी सूचीमा %s थप्न चाहन्छ।"
+
+#: src/protocols/msn/userlist.c:627
+#, c-format
+msgid "Unable to add \"%s\"."
+msgstr "\"%s\" लाई थप गर्न अक्षम छ ।"
+
+#: src/protocols/msn/userlist.c:629
+msgid "The screen name specified is invalid."
+msgstr "निर्दिष्ट गरिएको पर्दा नाम अवैध हो।"
+
+#: src/protocols/napster/napster.c:241
+msgid "Unable to read header from server"
+msgstr "सर्भरबाट हेडर पढ्न सकिएन"
+
+#: src/protocols/napster/napster.c:255
+#, c-format
+msgid "Unable to read message from server: %s.  Command is %hd, length is %hd."
+msgstr "सर्भरबाट सन्देश पढ्न अक्षम भयो: %s.  %hdआदेश हो, %hd लम्वाई हो ।"
+
+#: src/protocols/napster/napster.c:318
+#, c-format
+msgid "users: %s, files: %s, size: %sGB"
+msgstr "प्रयोगकर्ता: %s,फाइलहरू: %s, साइज: %sGB"
+
+#. MSG_SERVER_HOTLIST_ERROR
+#: src/protocols/napster/napster.c:329
+#, c-format
+msgid "Unable to add \"%s\" to your Napster hotlist"
+msgstr "तपाईँको न्यापस्टार हट सूचीमा \"%s\" थप्न असफल भयो"
+
+#: src/protocols/napster/napster.c:337
+msgid "You were disconnected from the server."
+msgstr "तपाईँ सर्भरबाट बिच्छेदन हुनुभयो ।"
+
+#. MSG_CLIENT_WHOIS
+#: src/protocols/napster/napster.c:395
+#, c-format
+msgid "%s requested your information"
+msgstr "%s ले तपाईँको जानकारी अनुरोध गरेको छ"
+
+#: src/protocols/napster/napster.c:433
+msgid ""
+"You were disconnected from the server, because you logged on from a "
+"different location"
+msgstr "तपाईँ सर्भरबाट विच्छेदन हुनुभयो, किनभने तपाईँ विभिन्न स्थानबाट लगअन गर्नुभयो"
+
+#. MSG_CLIENT_PING
+#: src/protocols/napster/napster.c:439
+#, c-format
+msgid "%s requested a PING"
+msgstr "%s ले PING अनुरोध गरेको छ"
+
+#: src/protocols/napster/napster.c:554 src/protocols/toc/toc.c:1268
+msgid "_Group:"
+msgstr "समूह:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: src/protocols/napster/napster.c:652 src/protocols/napster/napster.c:654
+msgid "NAPSTER Protocol Plugin"
+msgstr "NAPSTER प्रोटोकल प्लगइन"
+
+#: src/protocols/novell/nmuser.c:1868
+msgid "Required parameters not passed in"
+msgstr "आवश्यकता परामितिहरू पास भएसकेका छैनन्"
+
+#: src/protocols/novell/nmuser.c:1871
+msgid "Unable to write to network"
+msgstr "सञ्जालमा लेख्न अक्षम छ"
+
+#: src/protocols/novell/nmuser.c:1874
+msgid "Unable to read from network"
+msgstr "सञ्जालबाट पढ्न अक्षम छ"
+
+#: src/protocols/novell/nmuser.c:1877
+msgid "Error communicating with server"
+msgstr "सर्भर सँग  संचार आदान प्रदानमा त्रुटि"
+
+#: src/protocols/novell/nmuser.c:1881
+msgid "Conference not found"
+msgstr "सम्मेलन फेला परेन"
+
+#: src/protocols/novell/nmuser.c:1884
+msgid "Conference does not exist"
+msgstr "सम्मेलन अवस्थित छैन"
+
+#: src/protocols/novell/nmuser.c:1888
+msgid "A folder with that name already exists"
+msgstr "त्यो नाम सहितको फोल्डर पहिल्यै अवस्थित छ"
+
+#: src/protocols/novell/nmuser.c:1891
+msgid "Not supported"
+msgstr "समर्थित छैन "
+
+#: src/protocols/novell/nmuser.c:1895
+msgid "Password has expired"
+msgstr "पासवर्डकोसमय सकिएको छ"
+
+#: src/protocols/novell/nmuser.c:1898
+msgid "Invalid password"
+msgstr "अवैध पासवर्ड"
+
+#: src/protocols/novell/nmuser.c:1901
+msgid "User not found"
+msgstr "प्रयोकर्ता फेला परेन"
+
+#: src/protocols/novell/nmuser.c:1904
+msgid "Account has been disabled"
+msgstr "खाता निस्क्रिय भइसेको छ"
+
+#: src/protocols/novell/nmuser.c:1907
+msgid "The server could not access the directory"
+msgstr "सर्भरले डाइरेक्टरी पहुँच गर्न सकेन"
+
+#: src/protocols/novell/nmuser.c:1910
+msgid "Your system administrator has disabled this operation"
+msgstr "तपाईँको प्रणाली प्रशासकले यो सञ्चालन निस्क्रिय बनाएको छ"
+
+#: src/protocols/novell/nmuser.c:1913
+msgid "The server is unavailable; try again later"
+msgstr "सर्भर उपलब्ध छैन, पछि फेरि प्रयास गर्नुहोस्"
+
+#: src/protocols/novell/nmuser.c:1916
+msgid "Cannot add a contact to the same folder twice"
+msgstr "उही फोल्डरमा दुई पटक सम्पर्क थप्न सकिदैन"
+
+#: src/protocols/novell/nmuser.c:1919
+msgid "Cannot add yourself"
+msgstr "तपाईँ आफैँ थप्न सक्नुहुन्न"
+
+#: src/protocols/novell/nmuser.c:1922
+msgid "Master archive is misconfigured"
+msgstr "मास्टर संग्रह अनियमित कन्फिगर भएको छ"
+
+#: src/protocols/novell/nmuser.c:1926
+msgid "Invalid username or password"
+msgstr "अवैध प्रयोगकर्तानाम वा पासवर्ड"
+
+#: src/protocols/novell/nmuser.c:1929
+msgid "Could not recognize the host of the username you entered"
+msgstr "तपाईँले प्रविष्टि गराउनुभएको प्रयोगकर्तानाम होस्टले संगठित गर्न सकेन"
+
+#: src/protocols/novell/nmuser.c:1932
+msgid ""
+"Your account has been disabled because too many invalid passwords were "
+"entered"
+msgstr "तपाईँको खाता निस्क्रिय भएको छ किनभने धेरै अवैध पासवर्डहरू प्रविष्टि भएका छन्"
+
+#: src/protocols/novell/nmuser.c:1935
+msgid "You cannot add the same person twice to a conversation"
+msgstr "तपाईँले वार्तालापमा एउटै व्यक्ति दुई पटक थप्न सक्नुहुन्न ।"
+
+#: src/protocols/novell/nmuser.c:1939
+msgid "You have reached your limit for the number of contacts allowed"
+msgstr "तपाईँको अनुमति प्राप्त सम्पर्कहरुको संख्याका लागि आफ्नो सिमा बढेको छ ।"
+
+
+#: src/protocols/novell/nmuser.c:1942
+msgid "You have entered an invalid username"
+msgstr "तपाईँले एउटा अवैध प्रयोगकर्तानाम प्रविष्टि गर्नु भएको छ"
+
+#: src/protocols/novell/nmuser.c:1945
+msgid "An error occurred while updating the directory"
+msgstr "डाइरेक्टरी अद्यावधिक गरेको बेलामा एउटा त्रुटि आएको छ"
+
+#: src/protocols/novell/nmuser.c:1948
+msgid "Incompatible protocol version"
+msgstr "नमिल्दो प्रोटोकल संस्करण"
+
+#: src/protocols/novell/nmuser.c:1951
+msgid "The user has blocked you"
+msgstr "प्रयोगकर्ताले तपाईँलाई रोकेको छ"
+
+#: src/protocols/novell/nmuser.c:1954
+msgid ""
+"This evaluation version does not allow more than ten users to log in at one "
+"time"
+msgstr "यो मूल्यांकन संस्करणले एकपटकमा दशजना भन्दा बढी प्रयोगकर्ताहरुलाई लग गर्न अनुमति दिदैन"
+
+#: src/protocols/novell/nmuser.c:1957
+msgid "The user is either offline or you are blocked"
+msgstr "या त प्रयोगकर्ता अफलाइनमा छ वा तपाईँलाई रोकेको छ ।"
+
+#: src/protocols/novell/nmuser.c:1960
+#, c-format
+msgid "Unknown error: 0x%X"
+msgstr "अज्ञात त्रुटि:0x%X"
+
+#: src/protocols/novell/novell.c:117
+#, c-format
+msgid "Login failed (%s)."
+msgstr "(%s)लगइन असफल भयो ।"
+
+#: src/protocols/novell/novell.c:230
+#, c-format
+msgid "Unable to send message. Could not get details for user (%s)."
+msgstr "सन्देश पठाउन अक्षम भयो । (%s) प्रयोगकर्ताको विवरणहरू पाउन सकिएन ।"
+
+#: src/protocols/novell/novell.c:379
+#, c-format
+msgid "Unable to add %s to your buddy list (%s)."
+msgstr "तपाईँको साथी सूचीमा %s थप्न अक्षम (%s) ।"
+
+#. TODO: Improve this! message to who or for what conference?
+#: src/protocols/novell/novell.c:405
+#, c-format
+msgid "Unable to send message (%s)."
+msgstr "सन्देश (%s) पठाउन अक्षम ।"
+
+#: src/protocols/novell/novell.c:476 src/protocols/novell/novell.c:970
+#, c-format
+msgid "Unable to invite user (%s)."
+msgstr "प्रयोगकर्ता (%s) लाई निमन्त्रणा गर्न अक्षम ।"
+
+#: src/protocols/novell/novell.c:515
+#, c-format
+msgid "Unable to send message to %s. Could not create the conference (%s)."
+msgstr "%s मा सन्देश पठाउन अक्षम । सम्मेलन (%s) सिर्जना गर्न सकिदैन ।"
+
+#: src/protocols/novell/novell.c:520
+#, c-format
+msgid "Unable to send message. Could not create the conference (%s)."
+msgstr "सन्देश पठाउन अक्षम । सम्मेलन (%s) सिर्जना गर्न सकिदैन ।"
+
+#: src/protocols/novell/novell.c:567
+#, c-format
+msgid ""
+"Unable to move user %s to folder %s in the server side list. Error while "
+"creating folder (%s)."
+msgstr "सर्भर साइड सूचीमा %s फोल्डरलाई %s प्रयोगकर्तामा सार्न अक्षम छ । फोल्डर (%s) सिर्जना गर्दा त्रुटि ।"
+
+
+#: src/protocols/novell/novell.c:615
+#, c-format
+msgid ""
+"Unable to add %s to your buddy list. Error creating folder in server side "
+"list (%s)."
+msgstr "तपाईँको साथी सूचीमा %s थप्न अक्षम । सर्भर साइड सूचीमा फोल्डर सिर्जना गर्दा त्रुटि (%s) ।"
+
+#: src/protocols/novell/novell.c:688
+#, c-format
+msgid "Could not get details for user %s (%s)."
+msgstr "%s (%s)प्रयोगकर्ताका लागि विबरणहरू प्राप्त गर्न सकेन ।"
+
+#: src/protocols/novell/novell.c:734 src/protocols/novell/novell.c:880
+#, c-format
+msgid "Unable to add user to privacy list (%s)."
+msgstr "गोपनियता (%s) सूचीमा प्रयोगकर्ता थप्न अक्षम छ ।"
+
+#: src/protocols/novell/novell.c:781
+#, c-format
+msgid "Unable to add %s to deny list (%s)."
+msgstr "अस्विकार सूची (%s) मा %s थप्न अक्षम छ ।"
+
+#: src/protocols/novell/novell.c:834
+#, c-format
+msgid "Unable to add %s to permit list (%s)."
+msgstr "अनुमति सूची (%s) मा %s थप्न अक्षम छ ।"
+
+#: src/protocols/novell/novell.c:902
+#, c-format
+msgid "Unable to remove %s from privacy list (%s)."
+msgstr "गोपनियता सूची (%s) बाट %s हटाउन अक्षम छ ।"
+
+#: src/protocols/novell/novell.c:925 src/protocols/novell/novell.c:1620
+#, c-format
+msgid "Unable to change server side privacy settings (%s)."
+msgstr "(%s) सर्भर साइड गोपनियता सेटिङ्हरू परिवर्तन गर्न अक्षम छ ।"
+
+#: src/protocols/novell/novell.c:997
+#, c-format
+msgid "Unable to create conference (%s)."
+msgstr "(%s) सम्मेलन सिर्जना गर्न अक्षम छ ।"
+
+#: src/protocols/novell/novell.c:1108 src/protocols/novell/novell.c:1659
+msgid "Error communicating with server. Closing connection."
+msgstr "सर्भर सँग  संचार आदान प्रदान गर्दा त्रुटि । जडान बन्द गरिदैछ ।"
+
+#: src/protocols/novell/novell.c:1443
+msgid "Telephone Number"
+msgstr "टेलिफोन नम्बर"
+
+#: src/protocols/novell/novell.c:1447
+msgid "Department"
+msgstr "विभाग"
+
+#: src/protocols/novell/novell.c:1449
+msgid "Personal Title"
+msgstr "व्यक्तिगत शीर्षकहरू"
+
+#: src/protocols/novell/novell.c:1453
+msgid "Mailstop"
+msgstr "मेलस्टप"
+
+#: src/protocols/novell/novell.c:1455 src/protocols/oscar/oscar.c:5865
+#: src/protocols/oscar/oscar.c:5872
+msgid "Email Address"
+msgstr "इमेल ठेगाना"
+
+#: src/protocols/novell/novell.c:1471
+msgid "User ID"
+msgstr "प्रयोगकर्ता परिचय"
+
+#. tag = _("DN");
+#. value = nm_user_record_get_dn(user_record);
+#. if (value) {
+#. g_string_append_printf(info_text, "<b>%s:</b> %s<br>",
+#. tag, value);
+#. }
+#.
+#: src/protocols/novell/novell.c:1485
+msgid "Full name"
+msgstr "पूरा नाम "
+
+#: src/protocols/novell/novell.c:1506
+msgid "User Properties"
+msgstr "प्रयोगकर्ताको गुणहरू"
+
+#: src/protocols/novell/novell.c:1610
+#, c-format
+msgid "GroupWise Conference %d"
+msgstr "समूहगत सम्मेलन %d"
+
+#: src/protocols/novell/novell.c:1635
+msgid "Unable to make SSL connection to server."
+msgstr "सर्भरमा SSL जडान बनाउन अक्षम छ ।"
+
+#: src/protocols/novell/novell.c:1665
+#, c-format
+msgid "Error processing event or response (%s)."
+msgstr "घटना वा प्रतिउत्तर (%s) प्रक्रियामा त्रुटि ।"
+
+#: src/protocols/novell/novell.c:1699
+msgid "Authenticating..."
+msgstr "प्रमाणीकरण गर्दैछ..."
+
+#: src/protocols/novell/novell.c:1714
+msgid "Waiting for response..."
+msgstr "प्रतिक्रियाका लागि पर्खिदैछ..."
+
+#: src/protocols/novell/novell.c:1849
+#, c-format
+msgid "%s has been invited to this conversation."
+msgstr "%s लाई यो वार्तालापमा निमन्त्रणा गरिसकेको छ ।"
+
+#: src/protocols/novell/novell.c:1876
+msgid "Invitation to Conversation"
+msgstr "वार्तालापमा निमन्त्रणा"
+
+#: src/protocols/novell/novell.c:1877
+#, c-format
+msgid ""
+"Invitation from: %s\n"
+"\n"
+"Sent: %s"
+msgstr ""
+"...बाट निमन्त्रणा: %s\n"
+"\n"
+"पठाउनुहोस्: %s"
+
+#: src/protocols/novell/novell.c:1879
+msgid "Would you like to join the conversation?"
+msgstr "के तपाईँ वार्तालाप जडान गर्न चाहानुहुन्छ ?"
+
+#: src/protocols/novell/novell.c:1985
+msgid "You have been logged out because you logged in at another workstation."
+msgstr "तपाईँ लगआउट भइसक्नु भएको छ किनभने तपाईँले अर्को कार्यक्षेत्रमा लगइन गरिसक्नु भएको छ ।"
+
+#: src/protocols/novell/novell.c:2039
+#, c-format
+msgid "%s appears to be offline and did not receive the message that you just sent."
+msgstr "%s अफलाइन भएको देखिन्छ र तपाईँले पठाएको सन्देश प्राप्त गरेन ।"
+
+#. TODO: Would be nice to prompt if not set!
+#. *  gaim_request_fields(gc, _("Server Address"),...);
+#.
+#. ...but for now just error out with a nice message.
+#: src/protocols/novell/novell.c:2137
+msgid ""
+"Unable to connect to server. Please enter the address of the server you wish "
+"to connect to."
+msgstr "सर्भरमा जडान गर्न अक्षम भयो । कृपया तपाईँले जडान गर्न चाहानु भएको सर्भरको ठेगाना प्रविष्टि गर्नुहोस् ।"
+
+#: src/protocols/novell/novell.c:2159
+msgid "Error. SSL support is not installed."
+msgstr "त्रुटि. SSL समर्थन स्थापित छैन ।"
+
+#: src/protocols/novell/novell.c:2463
+msgid "This conference has been closed. No more messages can be sent."
+msgstr "यो सम्मेलन बन्द भयो । कुनै सन्देशहरू पठाउन सकिदैन ।"
+
+#: src/protocols/novell/novell.c:2809 src/protocols/oscar/oscar.c:747
+#: src/protocols/oscar/oscar.c:7469 src/protocols/yahoo/yahoo.c:2782
+msgid "Offline"
+msgstr "अफलाइन"
+
+#: src/protocols/novell/novell.c:2820
+msgid "Message"
+msgstr "सन्देश"
+
+#: src/protocols/novell/novell.c:2919 src/protocols/novell/novell.c:2975
+msgid "Appear Offline"
+msgstr "अफलाइन हुनुहोस्"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: src/protocols/novell/novell.c:3468 src/protocols/novell/novell.c:3470
+msgid "Novell GroupWise Messenger Protocol Plugin"
+msgstr "नोबेल समूहगत मेसेन्जर प्रोटोगल प्लगइन"
+
+#: src/protocols/novell/novell.c:3489
+msgid "Server address"
+msgstr "सर्भर ठेगाना"
+
+#: src/protocols/novell/novell.c:3493
+msgid "Server port"
+msgstr "सर्भर पोर्ट"
+
+#: src/protocols/oscar/oscar.c:196
+msgid "Invalid error"
+msgstr "अवैध त्रुटि"
+
+#: src/protocols/oscar/oscar.c:197
+msgid "Invalid SNAC"
+msgstr "अवैध SNAC"
+
+#: src/protocols/oscar/oscar.c:198
+msgid "Rate to host"
+msgstr "होस्टलाई दर"
+
+#: src/protocols/oscar/oscar.c:199
+msgid "Rate to client"
+msgstr "ग्राहकलाई दर"
+
+#: src/protocols/oscar/oscar.c:201
+msgid "Service unavailable"
+msgstr "सेवा उपलब्ध छैन"
+
+#: src/protocols/oscar/oscar.c:202
+msgid "Service not defined"
+msgstr "सेवा परिभाषित छैन"
+
+#: src/protocols/oscar/oscar.c:203
+msgid "Obsolete SNAC"
+msgstr "अप्रचलित SNAC"
+
+#: src/protocols/oscar/oscar.c:204
+msgid "Not supported by host"
+msgstr "होस्टद्वारा समर्थित भएन"
+
+#: src/protocols/oscar/oscar.c:205
+msgid "Not supported by client"
+msgstr "ग्राहकद्वारा समर्थित भएन"
+
+#: src/protocols/oscar/oscar.c:206
+msgid "Refused by client"
+msgstr "ग्राहकद्वारा अस्वीकृत भयो"
+
+#: src/protocols/oscar/oscar.c:207
+msgid "Reply too big"
+msgstr "जवाफ अति लामो भयो"
+
+#: src/protocols/oscar/oscar.c:208
+msgid "Responses lost"
+msgstr "प्रतिक्रियाहरू हराए"
+
+#: src/protocols/oscar/oscar.c:209
+msgid "Request denied"
+msgstr "अनुरोध अस्वीकृत गरियो"
+
+#: src/protocols/oscar/oscar.c:210
+msgid "Busted SNAC payload"
+msgstr "बस्ट गरिएको SNAC प्ले लोड"
+
+#: src/protocols/oscar/oscar.c:211
+msgid "Insufficient rights"
+msgstr "अपर्याप्त अधिकारहरू"
+
+#: src/protocols/oscar/oscar.c:212
+msgid "In local permit/deny"
+msgstr "स्थानीयतामा स्विकार / अस्विकार गर्नुहोस्"
+
+#: src/protocols/oscar/oscar.c:213
+msgid "Too evil (sender)"
+msgstr "अति दुष्ट (प्रेसक)"
+
+#: src/protocols/oscar/oscar.c:214
+msgid "Too evil (receiver)"
+msgstr "अति दुष्ट (प्रापक)"
+
+#: src/protocols/oscar/oscar.c:215
+msgid "User temporarily unavailable"
+msgstr "प्रयोगकर्ता अस्थायी रुपमा उपलब्ध छैन"
+
+#: src/protocols/oscar/oscar.c:216
+msgid "No match"
+msgstr "मिल्दो छैन"
+
+#: src/protocols/oscar/oscar.c:217
+msgid "List overflow"
+msgstr "सूची अधिप्रवाह"
+
+#: src/protocols/oscar/oscar.c:218
+msgid "Request ambiguous"
+msgstr "अनुरोध अस्पष्ट"
+
+#: src/protocols/oscar/oscar.c:219
+msgid "Queue full"
+msgstr "भरिएको लाम"
+
+#: src/protocols/oscar/oscar.c:220
+msgid "Not while on AOL"
+msgstr "AOL मा क्षण छैन"
+
+#: src/protocols/oscar/oscar.c:417 src/protocols/oscar/oscar.c:500
+msgid ""
+"(There was an error receiving this message.  The buddy you are speaking to "
+"most likely has a buggy client.)"
+msgstr "(यो सन्देश प्राप्त गर्दा एउटा त्रुटि भएको थियो ।  तपाईँ कुरा गरिरहनुभएको साथी सँग  एउटा बगी ग्राहक छ जस्तो छ ।)"
+
+#: src/protocols/oscar/oscar.c:602
+msgid "Voice"
+msgstr "स्वर"
+
+#: src/protocols/oscar/oscar.c:605
+msgid "AIM Direct IM"
+msgstr "AIM प्रत्यक्ष IM"
+
+#: src/protocols/oscar/oscar.c:608 src/protocols/silc/silc.c:654
+#: src/protocols/silc/util.c:509
+msgid "Chat"
+msgstr "कुराकानी"
+
+#: src/protocols/oscar/oscar.c:611 src/protocols/oscar/oscar.c:7771
+msgid "Get File"
+msgstr "फाइल प्राप्त गर्नुहोस्"
+
+#: src/protocols/oscar/oscar.c:618
+msgid "Games"
+msgstr "खेलहरू"
+
+#: src/protocols/oscar/oscar.c:621
+msgid "Add-Ins"
+msgstr "Ins-थप्नुहोस्"
+
+#: src/protocols/oscar/oscar.c:624
+msgid "Send Buddy List"
+msgstr "साथी सूची पठाउनुहोस्"
+
+#: src/protocols/oscar/oscar.c:627
+msgid "ICQ Direct Connect"
+msgstr "ICQ सिधा जडान"
+
+#: src/protocols/oscar/oscar.c:630
+msgid "AP User"
+msgstr "AP प्रयोगकर्ता"
+
+#: src/protocols/oscar/oscar.c:633
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+#: src/protocols/oscar/oscar.c:636
+msgid "Nihilist"
+msgstr "निहिलिस्ट"
+
+#: src/protocols/oscar/oscar.c:639
+msgid "ICQ Server Relay"
+msgstr "ICQ सर्भर रिले"
+
+#: src/protocols/oscar/oscar.c:642
+msgid "Old ICQ UTF8"
+msgstr "पुरानो ICQ UTF8"
+
+#: src/protocols/oscar/oscar.c:645
+msgid "Trillian Encryption"
+msgstr "ट्रिलियन गुप्तिकरण"
+
+#: src/protocols/oscar/oscar.c:648
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+#: src/protocols/oscar/oscar.c:651
+msgid "Hiptop"
+msgstr "हिपटप"
+
+#: src/protocols/oscar/oscar.c:654
+msgid "Security Enabled"
+msgstr "सुरक्षा सक्षम गरियो"
+
+#: src/protocols/oscar/oscar.c:657
+msgid "Video Chat"
+msgstr "भिडियो कुराकानी"
+
+#: src/protocols/oscar/oscar.c:661
+msgid "iChat AV"
+msgstr "iकुराकानी AV"
+
+#: src/protocols/oscar/oscar.c:664
+msgid "Live Video"
+msgstr "प्रत्यक्ष भिडियो"
+
+#: src/protocols/oscar/oscar.c:667
+msgid "Camera"
+msgstr "क्यामेरा"
+
+#: src/protocols/oscar/oscar.c:685 src/protocols/oscar/oscar.c:6474
+#: src/protocols/oscar/oscar.c:7663
+msgid "Free For Chat"
+msgstr "कुराकानी गर्न स्वतन्त्र"
+
+#: src/protocols/oscar/oscar.c:689 src/protocols/oscar/oscar.c:6468
+#: src/protocols/oscar/oscar.c:7661
+msgid "Not Available"
+msgstr "उपलब्ध छैन"
+
+#: src/protocols/oscar/oscar.c:691 src/protocols/oscar/oscar.c:6471
+#: src/protocols/oscar/oscar.c:7662
+msgid "Occupied"
+msgstr "आविष्ट"
+
+#: src/protocols/oscar/oscar.c:695
+msgid "Web Aware"
+msgstr "वेब सावधान"
+
+#: src/protocols/oscar/oscar.c:763
+msgid "Capabilities"
+msgstr "क्षमताहरू"
+
+#: src/protocols/oscar/oscar.c:772
+msgid "Buddy Comment"
+msgstr "साथी टिप्पणी"
+
+#: src/protocols/oscar/oscar.c:907
+#, c-format
+msgid "Direct IM with %s closed"
+msgstr "%s संगको IM सिधै बन्द गरियो"
+
+#: src/protocols/oscar/oscar.c:909
+#, c-format
+msgid "Direct IM with %s failed"
+msgstr "%s संगको IM सिधै असफल भयो"
+
+#: src/protocols/oscar/oscar.c:916
+msgid "Direct Connect failed"
+msgstr "सिधा जडान असफल भयो"
+
+#: src/protocols/oscar/oscar.c:993 src/protocols/oscar/oscar.c:1124
+#, c-format
+msgid "Direct IM with %s established"
+msgstr "%s संगको IM सिधै स्थापना भयो"
+
+#: src/protocols/oscar/oscar.c:1074
+#, c-format
+msgid "Attempting to connect to %s at %s:%hu for Direct IM."
+msgstr "प्रत्यक्ष IM का लागि %s सँग  %s:%hu मा जडान गर्न प्रयास गर्दैछ।"
+
+#: src/protocols/oscar/oscar.c:1494
+#, c-format
+msgid "Asking %s to connect to us at %s:%hu for Direct IM."
+msgstr "प्रत्यक्ष IM का लागि %s सँग  %s:%hu मा हामी सँग  जडान गर्न अनुमति माग्दैछ ।"
+
+
+#: src/protocols/oscar/oscar.c:1499
+msgid "Unable to open Direct IM"
+msgstr "प्रत्यक्ष IM खोल्न अक्षम"
+
+#: src/protocols/oscar/oscar.c:1534
+#, c-format
+msgid "You have selected to open a Direct IM connection with %s."
+msgstr "तपाईँंले %s सँग  एउटा प्रत्यक्ष जडान खोल्न चयन गर्नुभएको छ ।"
+
+#: src/protocols/oscar/oscar.c:1538
+msgid ""
+"Because this reveals your IP address, it may be considered a privacy risk.  "
+"Do you wish to continue?"
+msgstr "यसले तपाईँंको IP ठेगाना प्रकट गरिदिने हुनाले, यो एउटा गोपनीयता जोखिम सोच्न सकिन्छ ।  के तपाईँं जारी राख्न चाहानुहुन्छ?"
+
+#: src/protocols/oscar/oscar.c:1542 src/protocols/oscar/oscar.c:4304
+msgid "Connect"
+msgstr "जडान गर्नुहोस्"
+
+#: src/protocols/oscar/oscar.c:1609 src/protocols/toc/toc.c:874
+#, c-format
+msgid "You have been disconnected from chat room %s."
+msgstr "तपाईँ कुराकानी कोठाबाट विच्छेदन हुनुभयो %s ।"
+
+#: src/protocols/oscar/oscar.c:1628
+msgid "Chat is currently unavailable"
+msgstr "कुराकानी हाल उपलब्ध छैन"
+
+#: src/protocols/oscar/oscar.c:1709
+msgid "Screen name sent"
+msgstr "पठाइएको पर्दा नाम"
+
+#: src/protocols/oscar/oscar.c:1723
+#, c-format
+msgid ""
+"Unable to login: Could not sign on as %s because the screen name is "
+"invalid.  Screen names must either start with a letter and contain only "
+"letters, numbers and spaces, or contain only numbers."
+msgstr "लगइन गर्न अक्षम: %s को रुपमा साइनअन गर्न सकेन किनभने पर्दा नाम अवैध छ ।  पर्दा नामहरू एउटा अक्षरबाट सुरू हुनुपर्दछ र अक्षरहरू, संख्याहरू र खाली स्थानहरू समाहित गर्न सक्दछ, वा केवल संख्याहरू मात्र समाहित गर्न सक्दछ ।"
+
+#: src/protocols/oscar/oscar.c:1751
+msgid "Unable to login to AIM"
+msgstr "AIM मा लगइन गर्न अक्षम"
+
+#: src/protocols/oscar/oscar.c:1853 src/protocols/oscar/oscar.c:2804
+msgid "Could Not Connect"
+msgstr "जडान गर्न सकेन"
+
+#: src/protocols/oscar/oscar.c:1861
+msgid "Connection established, cookie sent"
+msgstr "जडान स्थापित भयो, कुकी पठाइयो"
+
+#. clientip & verifiedip failed, request a redirect
+#. * that is, we want the sender to connect to us
+#. Let the user not to lose hope quite yet
+#: src/protocols/oscar/oscar.c:2013
+msgid "Attempting connection redirect..."
+msgstr "जडान पुनर्निर्देशित गर्न प्रयत्न गरिदैछ..."
+
+#. proxyip timed out
+#. * 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/2 proxied transfer might work when a stage 3 will not.
+#: src/protocols/oscar/oscar.c:2058
+#, c-format
+msgid ""
+"Transfer of file %s timed out.\n"
+" Try enabling proxy servers for file transfers in Tools->Preferences->AIM/"
+"ICQ."
+msgstr ""
+"फाइल %s को स्थानान्तरण समय सकियो ।\n"
+" उपकरणहरू->प्राथमिकताहरू->AIM/ICQ मा फाइल स्थानान्तरणका लागि प्रोक्सी सर्भरहरू सक्षम पार्न प्रयास गर्नुहोस् ।"
+
+
+#: src/protocols/oscar/oscar.c:2156 src/protocols/yahoo/yahoo_filexfer.c:177
+#: src/protocols/yahoo/yahoo_filexfer.c:186
+#: src/protocols/yahoo/yahoo_filexfer.c:195
+msgid "Unable to establish file descriptor."
+msgstr "फाइल वर्णनकर्ता स्थापना गर्न अक्षम ।"
+
+#: src/protocols/oscar/oscar.c:2161
+msgid "Unable to create new connection."
+msgstr "नयाँ जडान सिर्जना गर्न अक्षम ।"
+
+#: src/protocols/oscar/oscar.c:2396 src/protocols/oscar/oscar.c:2405
+#: src/protocols/oscar/oscar.c:2419 src/protocols/oscar/oscar.c:2429
+msgid "Unable to log into file transfer proxy."
+msgstr "फाइल स्थानान्तर प्रोक्सीमा लग गर्न अक्षम ।"
+
+#: src/protocols/oscar/oscar.c:2482
+msgid "Unable to establish listener socket or no AOL proxy connection present."
+msgstr "श्रोता सकेट स्थापना गर्न अक्षम वा कुनै AOL प्रोक्सी जडान उपस्थित छैन ।"
+
+#: src/protocols/oscar/oscar.c:2688 src/protocols/toc/toc.c:541
+msgid "Incorrect nickname or password."
+msgstr "गलत उपनाम वा पासवर्ड ।"
+
+#: src/protocols/oscar/oscar.c:2693
+msgid "Your account is currently suspended."
+msgstr "तपाईँको खाता हाल बन्द गरिएको छ ।"
+
+#. service temporarily unavailable
+#: src/protocols/oscar/oscar.c:2697
+msgid "The AOL Instant Messenger service is temporarily unavailable."
+msgstr "AOL तयारी मेसेन्जर सेवा अस्थायी रुपमा उपलब्ध छैन ।"
+
+#: src/protocols/oscar/oscar.c:2702
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr "तपाईँले बारम्बार जडान र जडान विच्छेद गर्दै हुनुहुन्छ । दश मिनेट प्रतिक्षा गर्नुहोस् र फेरि प्रयास गर्नुहोस् । यदि तपाईँंले प्रयास गर्न जारी राख्नुभयो भने, तपाईँले झन बढी प्रतिक्षा गर्नुपर्ने हुन्छ ।"
+
+#: src/protocols/oscar/oscar.c:2707
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "तपाईँले प्रयोग गरिरहनु भएको ग्राहक संस्करण अति पुरानो छ । कृपया %s मा स्तरवृद्धि गर्नुहोस्"
+
+#: src/protocols/oscar/oscar.c:2739
+msgid "Internal Error"
+msgstr "आन्तरिक त्रुटि"
+
+#: src/protocols/oscar/oscar.c:2811
+msgid "Received authorization"
+msgstr "प्राप्त प्रमाणीकरण"
+
+#: src/protocols/oscar/oscar.c:2835
+msgid "The SecurID key entered is invalid."
+msgstr "प्रविष्ट गरिएको सुरक्षित ID कुञ्जी अवैध छ ।"
+
+#: src/protocols/oscar/oscar.c:2849
+msgid "Enter SecurID"
+msgstr "सुरक्षित ID प्रविष्ट गर्नुहोस्"
+
+#: src/protocols/oscar/oscar.c:2850
+msgid "Enter the 6 digit number from the digital display."
+msgstr "डिजिटल प्रदर्शन बाट ६ अङ्क संख्या प्रविष्ट गर्नुहोस् ।"
+
+#: src/protocols/oscar/oscar.c:2890 src/protocols/oscar/oscar.c:2920
+#: src/protocols/oscar/oscar.c:3009
+#, c-format
+msgid ""
+"You may be disconnected shortly.  You may want to use TOC until this is "
+"fixed.  Check %s for updates."
+msgstr "तपाईँले क्रमबद्धरूपले जडान विच्छेद गर्न सक्नुहुन्छ ।  तपाईँं यो स्थिर TOC इकाइ प्रयोग गर्न चाहानुहुन्छ ।   अद्यावधिकका लागि %s जाँच गर्नुहोस् ।"
+
+
+#: src/protocols/oscar/oscar.c:2893 src/protocols/oscar/oscar.c:2923
+msgid "Gaim was unable to get a valid AIM login hash."
+msgstr "गाइम एउटा वैध AIM लगइन ह्यास प्राप्त गर्न अक्षम भयो ।"
+
+#: src/protocols/oscar/oscar.c:3012
+msgid "Gaim was unable to get a valid login hash."
+msgstr "गाइम एउटा वैध लगइन ह्यास प्राप्त गर्न अक्षम भयो ।"
+
+#: src/protocols/oscar/oscar.c:3044
+msgid "Password sent"
+msgstr "पासवर्ड पठाइयो"
+
+#: src/protocols/oscar/oscar.c:4296
+#, c-format
+msgid "%s has just asked to directly connect to %s"
+msgstr "%s ले %s मा सिधै जडान गर्नका लागि सोध्यो"
+
+#: src/protocols/oscar/oscar.c:4299
+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 "
+"considered a privacy risk."
+msgstr "यसलाई दुई कम्प्युटरहरू बीचको प्रत्यक्ष जडानको आवश्यक पर्दछ र IM छविहरुका लागि आवश्यक पर्दछ ।  तपाईँको IP ठेगाना प्रकाट हुने भएकोले, यसलाई गोपनीय जोखिमको रुपमा सोचिनेछ ।"
+
+#: src/protocols/oscar/oscar.c:4337
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr "कृपया मलाईं अधिकार दिनुहोस् ताकी म तपाईँंलाई मेरो साथी सूचीमा थप्न सकूँ।"
+
+#: src/protocols/oscar/oscar.c:4345
+msgid "Authorization Request Message:"
+msgstr "प्रमाणीकरण अनुरोध सन्देश:"
+
+#: src/protocols/oscar/oscar.c:4346
+msgid "Please authorize me!"
+msgstr "कृपया मलाई अधिकार दिनुहोस्!"
+
+#: src/protocols/oscar/oscar.c:4376
+#, c-format
+msgid ""
+"The user %s requires authorization before being added to a buddy list.  Do "
+"you want to send an authorization request?"
+msgstr "साथी सूचीमा थपिनु अगाडि प्रयोगकर्ता %s लाई प्रमाणीकरणको आवश्यक्ता  पर्दछ ।  के तपाईँ एउटा प्रमाणीकरण अनुरोध पठाउन चाहानुहुन्छ ?"
+
+#: src/protocols/oscar/oscar.c:4381 src/protocols/oscar/oscar.c:4383
+msgid "Request Authorization"
+msgstr "प्रमाणीकरण अनुरोध गर्नुहोस्"
+
+#: src/protocols/oscar/oscar.c:4431 src/protocols/oscar/oscar.c:4433
+#: src/protocols/oscar/oscar.c:4440 src/protocols/oscar/oscar.c:4537
+#: src/protocols/oscar/oscar.c:4557 src/protocols/oscar/oscar.c:7104
+#: src/protocols/oscar/oscar.c:7150
+msgid "No reason given."
+msgstr "कारण दिइएको छैन ।"
+
+#: src/protocols/oscar/oscar.c:4439
+msgid "Authorization Denied Message:"
+msgstr "प्रमाणीकरण अस्विकृत सन्देश:"
+
+#: src/protocols/oscar/oscar.c:4537
+#, c-format
+msgid ""
+"The user %u wants to add you to their buddy list for the following reason:\n"
+"%s"
+msgstr ""
+"निम्न कारणहरुका लागि तिनीहरुको साथी सूचीमा तपाईँलाई प्रयोगकर्ता %u ले थप्न चाहन्छ:\n"
+"%s"
+
+
+#: src/protocols/oscar/oscar.c:4545 src/protocols/oscar/oscar.c:7110
+msgid "Authorization Request"
+msgstr "प्रमाणीकरण अनुरोध"
+
+#: src/protocols/oscar/oscar.c:4557
+#, c-format
+msgid ""
+"The user %u has denied your request to add them to your buddy list for the "
+"following reason:\n"
+"%s"
+msgstr ""
+"निम्न कारणहरुका लागि तपाईँको साथी सूचीमा तिनीहरुलाई थप्न प्रयोगकर्ता %u ले तपाईँको अनुरोधलाई अस्वीकार गर्यो:\n"
+"%s"
+
+#: src/protocols/oscar/oscar.c:4558
+msgid "ICQ authorization denied."
+msgstr "ICQ प्रमाणीकरण अस्विकार गरियो ।"
+
+#. Someone has granted you authorization
+#: src/protocols/oscar/oscar.c:4565
+#, c-format
+msgid "The user %u has granted your request to add them to your buddy list."
+msgstr "प्रयोगकर्ता %u ले तपाईँको साथी सूचीमा तिनीहरुलाई थप्न गरिएको तपाईँको अनुरोध स्विकृत गर्यो ।"
+
+#: src/protocols/oscar/oscar.c:4573
+#, c-format
+msgid ""
+"You have received a special message\n"
+"\n"
+"From: %s [%s]\n"
+"%s"
+msgstr ""
+"तपाईँले विशेष सन्देश प्राप्त गर्नुभयो\n"
+"\n"
+"बाट: %s [%s]\n"
+"%s"
+
+#: src/protocols/oscar/oscar.c:4581
+#, c-format
+msgid ""
+"You have received an ICQ page\n"
+"\n"
+"From: %s [%s]\n"
+"%s"
+msgstr ""
+"तपाईँले एउटा ICQ पृष्ठ प्राप्त गर्नुभयो\n"
+"\n"
+"बाट: %s [%s]\n"
+"%s"
+
+#: src/protocols/oscar/oscar.c:4589
+#, c-format
+msgid ""
+"You have received an ICQ email from %s [%s]\n"
+"\n"
+"Message is:\n"
+"%s"
+msgstr ""
+"तपाईँले %s [%s] बाट एउटा ICQ इमेल प्राप्त गर्नुभयो\n"
+"\n"
+"सन्देश यसप्रकार छ:\n"
+"%s"
+
+#: src/protocols/oscar/oscar.c:4610
+#, c-format
+msgid "ICQ user %u has sent you a buddy: %s (%s)"
+msgstr "ICQ प्रयोगकर्ता %u ले तपाईँलाई एउटा साथी पठाएको छ: %s (%s)"
+
+#: src/protocols/oscar/oscar.c:4616
+msgid "Do you want to add this buddy to your buddy list?"
+msgstr "के तपाईँं आफ्नो साथी सूचीमा यो साथी थप्न चाहानुहुन्छ?"
+
+#: src/protocols/oscar/oscar.c:4620
+msgid "Decline"
+msgstr "घटाउनुहोस्"
+
+#: src/protocols/oscar/oscar.c:4704
+#, 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."
+msgstr[0] "तपाईँले %hu सन्देशहरू %s बाट हराउनु भयो किनभने तिनीहरू अवैध थिए ।"
+msgstr[1] "तपाईँले %hu सन्देशहरू %s बाट हराउनु भयो किनभने तिनीहरू अवैध थिए ।"
+
+#: src/protocols/oscar/oscar.c:4713
+#, 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."
+msgstr[0] "तपाईँले %hu सन्देश %s बाट हराउनु भयो किनभने यो अति ठूलो थियो । "
+msgstr[1] "तपाईँले %hu सन्देश %s बाट हराउनु भयो किनभने यो अति ठूळो थियो ।"
+
+#: src/protocols/oscar/oscar.c:4722
+#, 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."
+msgstr[0] "तपाईँले %hu सन्देश %s बाट हराउनु भयो किनभने दर सिमा बढेको छ ।"
+msgstr[1] "तपाईँले %hu सन्देश %s बाट हराउनु भयो कि भने दर सिमा बढेको छ ।"
+
+#: src/protocols/oscar/oscar.c:4731
+#, 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."
+msgstr[0] "तपाईँले %hu सन्देश %s बाट हराउनु भयो किनभने ऊ/ उनी अति दुष्ट थिए ।"
+msgstr[1] "तपाईँले %hu सन्देश %s बाट हराउनु भयो किनभने ऊ/उनी अति दुष्ट थिए । "
+
+#: src/protocols/oscar/oscar.c:4740
+#, 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."
+msgstr[0] "तपाईँले %hu सन्देश %s बाट हराउनु भयो किनभने तपाईँ अति दुष्ट हुनुहुन्थ्यो ।"
+msgstr[1] "तपाईँले %hu सन्देशहरू %s बाट हराउनु भयो किनभने तपाईँ अति दुष्ट हुनुहुन्थ्यो ।"
+
+#: src/protocols/oscar/oscar.c:4749
+#, 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."
+msgstr[0] "तपाईँले एउटा अज्ञात कारणका लागि %hu सन्देश %s बाट हराउनु भयो ।"
+msgstr[1] "तपाईँले एउटा अज्ञात कारणका लागि %hu सन्देश %s बाट हराउनु भयो ।"
+
+#: src/protocols/oscar/oscar.c:4803 src/protocols/oscar/oscar.c:5035
+#, c-format
+msgid "Info for %s"
+msgstr "%sका लागि जानकारी"
+
+#: src/protocols/oscar/oscar.c:4869
+#, 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:4905
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "सन्देश पठाउन अक्षम: %s"
+
+#: src/protocols/oscar/oscar.c:4905 src/protocols/oscar/oscar.c:4910
+#: src/protocols/oscar/oscar.c:4968 src/protocols/oscar/oscar.c:4972
+msgid "Unknown reason."
+msgstr "अज्ञात कारण ।"
+
+#: src/protocols/oscar/oscar.c:4968
+#, c-format
+msgid "User information not available: %s"
+msgstr "प्रयोगकर्ता सूचना उपलब्ध छैन: %s"
+
+#: src/protocols/oscar/oscar.c:4971
+#, c-format
+msgid "User information for %s unavailable:"
+msgstr "%s का लागि प्रयोगकर्ता सूचना उपलब्ध छैन:"
+
+
+#: src/protocols/oscar/oscar.c:4993
+msgid "Warning Level"
+msgstr "चेतावनी स्तर"
+
+#: src/protocols/oscar/oscar.c:4997
+msgid "Online Since"
+msgstr "अनलाइन अवधि"
+
+#: src/protocols/oscar/oscar.c:5002 src/protocols/yahoo/yahoo_profile.c:1125
+msgid "Member Since"
+msgstr "सदस्य अवधि"
+
+#: src/protocols/oscar/oscar.c:5086
+msgid "Your AIM connection may be lost."
+msgstr "तपाईँंको AIM जडान हराएको हुनुपर्छ ।"
+
+#. The conversion failed!
+#: src/protocols/oscar/oscar.c:5272
+msgid ""
+"[Unable to display a message from this user because it contained invalid "
+"characters.]"
+msgstr "[यो प्रयोगकर्ताबाट एउटा सन्देश प्रदर्शन गर्न अक्षम छ किनभने यसले अवैध क्यारेक्टरहरू समाविष्ट गर्दछ ।]"
+
+#: src/protocols/oscar/oscar.c:5497
+msgid "Rate limiting error."
+msgstr "दर सीमा गर्दा त्रुटि ।"
+
+#: src/protocols/oscar/oscar.c:5498
+msgid ""
+"The last action you attempted could not be performed because you are over "
+"the rate limit. Please wait 10 seconds and try again."
+msgstr "तपाईँले प्रयास गर्नु भएको अन्तिम कार्य सम्पादन हुन सकेन किनभने तपाईँ दर सीमा न्दा माथि हुनुहुन्छ । कृपया १० सेकेन्ड प्रतिक्षा गर्नुहोस् र फेरी प्रयास गर्नुहोस् ।"
+
+#: src/protocols/oscar/oscar.c:5561
+msgid ""
+"You have been disconnected because you have signed on with this screen name "
+"at another location."
+msgstr "तपाईँ विच्छेदन हुनुभयो कि भने तपाईँले यो पर्दानामले अर्को स्थानमा साइनअन गर्नुभयो । "
+
+#: src/protocols/oscar/oscar.c:5563
+msgid "You have been signed off for an unknown reason."
+msgstr "एउटा अज्ञात कारणका लागि तपाईँले साइनअफ गर्नुभयो ।"
+
+
+#: src/protocols/oscar/oscar.c:5594
+msgid "Finalizing connection"
+msgstr "जडानलाई अन्तिम रुप दिँदै"
+
+#: src/protocols/oscar/oscar.c:5877 src/protocols/silc/util.c:541
+msgid "Mobile Phone"
+msgstr "मोबाइल फोन"
+
+#: src/protocols/oscar/oscar.c:5878
+msgid "Not specified"
+msgstr "निर्दिष्ट गरिएको छैन"
+
+#: src/protocols/oscar/oscar.c:5879 src/protocols/trepia/trepia.c:282
+#: src/protocols/trepia/trepia.c:408
+msgid "Female"
+msgstr "महिला"
+
+#: src/protocols/oscar/oscar.c:5879 src/protocols/trepia/trepia.c:281
+#: src/protocols/trepia/trepia.c:408
+msgid "Male"
+msgstr "पुरुष"
+
+#: src/protocols/oscar/oscar.c:5895
+msgid "Personal Web Page"
+msgstr "व्यक्तिगत वेब पृष्ठ"
+
+#: src/protocols/oscar/oscar.c:5899
+msgid "Additional Information"
+msgstr "थप सूचना"
+
+#: src/protocols/oscar/oscar.c:5904
+msgid "Home Address"
+msgstr "गृह ठेगाना"
+
+#: src/protocols/oscar/oscar.c:5908 src/protocols/oscar/oscar.c:5916
+msgid "Zip Code"
+msgstr "जिप कोड"
+
+#: src/protocols/oscar/oscar.c:5912
+msgid "Work Address"
+msgstr "कार्य ठेगाना"
+
+#: src/protocols/oscar/oscar.c:5920
+msgid "Work Information"
+msgstr "कार्य सूचना"
+
+#: src/protocols/oscar/oscar.c:5921
+msgid "Company"
+msgstr "कम्पनी"
+
+#: src/protocols/oscar/oscar.c:5922
+msgid "Division"
+msgstr "विभाजन"
+
+#: src/protocols/oscar/oscar.c:5923
+msgid "Position"
+msgstr "अवस्था"
+
+#: src/protocols/oscar/oscar.c:5925
+msgid "Web Page"
+msgstr "वेब पृष्ठ"
+
+#: src/protocols/oscar/oscar.c:5935
+#, c-format
+msgid "ICQ Info for %s"
+msgstr "%s का लागि ICQ सूचना"
+
+
+#: src/protocols/oscar/oscar.c:5984
+msgid "Pop-Up Message"
+msgstr "पप-अप सन्देश"
+
+#: src/protocols/oscar/oscar.c:6005
+#, c-format
+msgid "The following screen names are associated with %s"
+msgstr "निम्न पर्दा नामहरू  %s सँग  सम्बन्धित छन्"
+
+#: src/protocols/oscar/oscar.c:6009
+msgid "Search Results"
+msgstr "खोजी नतिजाहरू"
+
+#: src/protocols/oscar/oscar.c:6026
+#, c-format
+msgid "No results found for email address %s"
+msgstr "इमेल ठेगानाका लागि परिणाम फेला परेन %s"
+
+#: src/protocols/oscar/oscar.c:6047
+#, c-format
+msgid "You should receive an email asking to confirm %s."
+msgstr "तपाईँले %s यकिन गर्न सोधेर एउटा इमेल प्राप्त गर्नुपर्दछ।"
+
+#: src/protocols/oscar/oscar.c:6049
+msgid "Account Confirmation Requested"
+msgstr "खाता यकिन गर्न अनुरोध गरिएको छ"
+
+#: src/protocols/oscar/oscar.c:6080
+msgid "Error Changing Account Info"
+msgstr "खाता सूचना परिवर्तन गर्दा त्रुटि"
+
+#: src/protocols/oscar/oscar.c:6083
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"differs from the original."
+msgstr "त्रुटि 0x%04x: पर्दा नाम ढाँचाबद्ध गर्न अक्षम भयो किनभने अनुरोध गरिएको पर्दा नाम मौलिक भन्दा फरक छ ।"
+
+#: src/protocols/oscar/oscar.c:6086
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"ends in a space."
+msgstr "त्रुटि 0x%04x: पर्दा नाम ढाँचाबद्ध गर्न अक्षम भयो किनभने अनुरोध गरिएको पर्दा नाम खाली स्थानमा समाप्त हुन्छ ।"
+
+#: src/protocols/oscar/oscar.c:6089
+#, 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:6092
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because there is already a "
+"request pending for this screen name."
+msgstr "त्रुटि 0x%04x: इमेल ठेगाना परिवर्तन गर्न अक्षम भयो किनभने त्यहाँ पहिल्यै यो पर्दा नामका लागि विचारधिन अनुरोध गरिएको छ ।"
+
+#: src/protocols/oscar/oscar.c:6095
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address has "
+"too many screen names associated with it."
+msgstr "त्रुटि 0x%04x: इमेल ठेगाना परिवर्तन गर्न अक्षम भयो किनभने दिएको ठेगानामा यो सँग  सम्बन्धित अति धेरै पर्दा नामहरू छन् ।"
+
+#: src/protocols/oscar/oscar.c:6098
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address is "
+"invalid."
+msgstr "त्रुटि 0x%04x: इमेल ठेगाना परिवर्तन गर्न अक्षम भयो किनभने दिएको ठेगाना अवैध छ ।"
+
+#: src/protocols/oscar/oscar.c:6101
+#, c-format
+msgid "Error 0x%04x: Unknown error."
+msgstr "त्रुटि 0x%04x: अज्ञात त्रुटि ।"
+
+#: src/protocols/oscar/oscar.c:6111
+#, c-format
+msgid ""
+"Your screen name is currently formatted as follows:\n"
+"%s"
+msgstr ""
+"तपाईँको पर्दा नाम हालै निम्न बमोजिम ढाँचाबद्धता गरिएको छ:\n"
+"%s"
+
+#: src/protocols/oscar/oscar.c:6112 src/protocols/oscar/oscar.c:6119
+msgid "Account Info"
+msgstr "खाता सूचना"
+
+#: src/protocols/oscar/oscar.c:6117
+#, c-format
+msgid "The email address for %s is %s"
+msgstr "%s का लागि इमेल ठेगाना %s हो"
+
+#: src/protocols/oscar/oscar.c:6182
+msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images."
+msgstr "तपाईँको IM छवि पुगेन । तपाईँले IM छविहरू पठाउन सिधै जडान हुनुपर्छ ।"
+
+#: src/protocols/oscar/oscar.c:6323
+msgid "Unable to set AIM profile."
+msgstr "AIM प्रोफाइल सेट गर्न अक्षम ।"
+
+#: src/protocols/oscar/oscar.c:6324
+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 "
+"fully connected."
+msgstr "तपाईँलाई सम्भवत लगइन प्रक्रिया समाप्त हुनु अघि तपाईँको प्रोफाइल सेट गर्न अनुरोध गरिन्छ ।  तपाईँँको प्रोफाइल सेट हुन बाँकी छ, जब तपाईँ पूर्ण रुपमा जडान हुनुहुन्छ भने यसलाई फेरी सेट गर्ने प्रयास गर्नुहोस् ।"
+
+#: src/protocols/oscar/oscar.c:6351
+#, c-format
+msgid ""
+"The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
+"it for you."
+msgid_plural ""
+"The maximum profile length of %d bytes has been exceeded.  Gaim has "
+"truncated it for you."
+msgstr[0] "%d बाइटको अधिक्तम प्रोफाइल लम्बाई बढेको छ ।  गाइमले यसलाई तपाईँका लागि छोडेको हो ।"
+msgstr[1] "%d बाइटको अधिक्तम प्रोफाइल लम्बाई बढेको छ ।  गाइमले यसलाई तपाईँका लागि छोडेको हो ।"
+
+#: src/protocols/oscar/oscar.c:6356
+msgid "Profile too long."
+msgstr "अति लामो प्रोफाइल"
+
+#: src/protocols/oscar/oscar.c:6372 src/protocols/oscar/oscar.c:7668
+msgid "Visible"
+msgstr "दृश्यात्मक"
+
+#: src/protocols/oscar/oscar.c:6390
+msgid "Unable to set AIM away message."
+msgstr "AIM टाढा सन्देश सेट गर्न अक्षम ।"
+
+#: src/protocols/oscar/oscar.c:6391
+msgid ""
+"You have probably requested to set your away message before the login "
+"procedure completed.  You remain in a \"present\" state; try setting it "
+"again when you are fully connected."
+msgstr "तपाईँलाई सम्भवत लगइन प्रक्रिया समाप्त हुन अघि तपाईँको टाढा सन्देश सेट गर्न अनुरोध गरिन्छ ।  तपाईँ \"present\" अवास्थामा रहनु भएको छ; जब तपाईँ पूर्न रुपले जडानमा हुनुहुन्छ भने यसलाई फेरी सेट गर्ने प्रयास गर्नुहोस् ।"
+
+#: src/protocols/oscar/oscar.c:6431
+#, c-format
+msgid ""
+"The maximum away message length of %d byte has been exceeded.  Gaim has "
+"truncated it for you."
+msgid_plural ""
+"The maximum away message length of %d bytes has been exceeded.  Gaim has "
+"truncated it for you."
+msgstr[0] "%d बाइटको अधिक्तम टाढा सन्देश लम्बाई बढेको छ ।  गाइमले यो तपाईँका लागि छोडेको हो ।"
+msgstr[1] "%d बाइटको अधिक्तम टाढा सन्देश लम्बाई बढेको छ ।  गाइमले यो तपाईँका लागि छोडेको हो ।"
+
+#: src/protocols/oscar/oscar.c:6436
+msgid "Away message too long."
+msgstr "टाढा सन्देश अति लामो भयो।"
+
+#: src/protocols/oscar/oscar.c:6513
+#, c-format
+msgid ""
+"Could not add the buddy %s because the screen name is invalid.  Screen names "
+"must either start with a letter and contain only letters, numbers and "
+"spaces, or contain only numbers."
+msgstr "साथी %s थप्न सकिएन किनभने पर्दा नाम अवैध छ ।  पर्दा नामहरू या त एउटा अक्षरबाट सुरू हुनुपर्छ र अक्षरहरू, संख्याहरू र खाली स्थानहरू समाविष्ट गर्नुपर्छ वा संख्याहरु मात्र समाविष्ट गर्नु पर्दछ ।"
+
+#: src/protocols/oscar/oscar.c:6515 src/protocols/oscar/oscar.c:6970
+#: src/protocols/oscar/oscar.c:6984
+msgid "Unable To Add"
+msgstr "थप्न अक्षम"
+
+#: src/protocols/oscar/oscar.c:6682
+msgid "Unable To Retrieve Buddy List"
+msgstr "साथी सूची पुन:प्राप्त गर्न अक्षम भयो"
+
+#: src/protocols/oscar/oscar.c:6683
+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 "
+"a few hours."
+msgstr "गाइम AIM सर्भरबाट तपाईँको साथी सूची पुन:प्राप्त गर्न अस्थायी रुपमा अक्षम थियो ।  तपाईँको साथी सूची हराएको छैन, र सम्भवत केही घण्टामा उपलब्ध हुनेछ ।"
+
+#: src/protocols/oscar/oscar.c:6865 src/protocols/oscar/oscar.c:6866
+#: src/protocols/oscar/oscar.c:6871 src/protocols/oscar/oscar.c:7028
+#: src/protocols/oscar/oscar.c:7029 src/protocols/oscar/oscar.c:7034
+msgid "Orphans"
+msgstr "अर्फन"
+
+#: src/protocols/oscar/oscar.c:6968
+#, c-format
+msgid ""
+"Could not add the buddy %s because you have too many buddies in your buddy "
+"list.  Please remove one and try again."
+msgstr "साथी %s थप्न सकिएन किनभने तपाईँ सँग  साथी सूचिमा अति धेरै साथीहरू छन् । कृपया एउटा हटाउनुहोस् र फेरी प्रयास गर्नुहोस् ।"
+
+#: src/protocols/oscar/oscar.c:6968 src/protocols/oscar/oscar.c:6982
+msgid "(no name)"
+msgstr "(नाम छैन)"
+
+#: src/protocols/oscar/oscar.c:6982
+#, c-format
+msgid ""
+"Could not add the buddy %s for an unknown reason.  The most common reason "
+"for this is that you have the maximum number of allowed buddies in your "
+"buddy list."
+msgstr "एउटा अज्ञात कारणका लागि साथी %s थप्न सकिएन । एउटा साझा कारण यो हो कि तपाईँको साथी सूचीमा अनुमति गरिएको साथीहरुको संख्या अति धेरै छ ।"
+
+#: src/protocols/oscar/oscar.c:7065
+#, c-format
+msgid ""
+"The user %s has given you permission to add you to their buddy list.  Do you "
+"want to add them?"
+msgstr "प्रयोगकर्ता %s ले तिनीहरुको साथी सूचीमा तपाईँलाई थप्न अनुमति दिएको छ ।  के तपाईँ तिनीहरुलाई थप्न चाहानुहुन्छ ?"
+
+#: src/protocols/oscar/oscar.c:7071
+msgid "Authorization Given"
+msgstr "दिइएको प्रमाणीकरण"
+
+#: src/protocols/oscar/oscar.c:7104
+#, c-format
+msgid ""
+"The user %s wants to add you to their buddy list for the following reason:\n"
+"%s"
+msgstr ""
+"प्रयोगकर्ता %s ले निम्नम कारणका लागि तपाईँलाई तिनीहरुको सूचीमा थप्न चाहन्छ:\n"
+"%s"
+
+#. Granted
+#: src/protocols/oscar/oscar.c:7146
+#, c-format
+msgid "The user %s has granted your request to add them to your buddy list."
+msgstr "प्रयोगकर्ता %s ले तपाईँको साथी सूचीमा तिनीहरुलाई थप्न गरिएको अनुरोध स्वीकार गरेको छ ।"
+
+#: src/protocols/oscar/oscar.c:7147
+msgid "Authorization Granted"
+msgstr "प्रमाणीकरण स्वीकार गरियो"
+
+#. Denied
+#: src/protocols/oscar/oscar.c:7150
+#, c-format
+msgid ""
+"The user %s has denied your request to add them to your buddy list for the "
+"following reason:\n"
+"%s"
+msgstr ""
+"प्रयोगकर्ता %s ले निम्न कारणका लागि तपाईँको साथि सूचीमा तिनीहरुलाई थप्न गरिएको तपाईँवको अनुरोध अस्वीकार गरेको छ:\n"
+"%s"
+
+#: src/protocols/oscar/oscar.c:7151
+msgid "Authorization Denied"
+msgstr "प्रमाणीकरण अस्वीकार गरियो"
+
+#: src/protocols/oscar/oscar.c:7188 src/protocols/toc/toc.c:1273
+msgid "_Exchange:"
+msgstr "साटासाट गर्नुहोस्:"
+
+#: src/protocols/oscar/oscar.c:7223
+msgid "Invalid chat name specified."
+msgstr "अवैध कुराकानी नाम निर्दिष्ट गरियो।"
+
+#: src/protocols/oscar/oscar.c:7315
+msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
+msgstr "तपाईँंको IM छवि पुगेन । तपाईँंले AIM कुराकानीहरूमा IM छविहरू पठाउन सक्नुहुन्न ।"
+
+#: src/protocols/oscar/oscar.c:7441
+msgid "Away Message"
+msgstr "टाढा सन्देश"
+
+#: src/protocols/oscar/oscar.c:7727
+#, c-format
+msgid "Buddy Comment for %s"
+msgstr " %s का लागि साथी टिप्पणी"
+
+#: src/protocols/oscar/oscar.c:7728
+msgid "Buddy Comment:"
+msgstr "साथी टिप्पणी:"
+
+#: src/protocols/oscar/oscar.c:7747
+msgid "Edit Buddy Comment"
+msgstr "साथी टिप्पणी सम्पादन गर्नुहोस्"
+
+#: src/protocols/oscar/oscar.c:7753
+msgid "Get Status Msg"
+msgstr "वस्तु स्थिति सन्देश प्राप्त गर्नुहोस्"
+
+#: src/protocols/oscar/oscar.c:7765
+msgid "Direct IM"
+msgstr "प्रत्यक्ष IM"
+
+#: src/protocols/oscar/oscar.c:7782
+msgid "Re-request Authorization"
+msgstr "प्रमाणीकरण पुन-अनुरोध गर्नुहोस्"
+
+#: src/protocols/oscar/oscar.c:7812
+msgid "The new formatting is invalid."
+msgstr "नयाँ ढाँचा अवैध छ ।"
+
+#: src/protocols/oscar/oscar.c:7813
+msgid "Screen name formatting can change only capitalization and whitespace."
+msgstr "पर्दा नाम ढाँचाले मात्र ठूलो अक्षर र सेतो खाली स्थान परिवर्तन गर्न सक्छ ।"
+
+#: src/protocols/oscar/oscar.c:7820
+msgid "New screen name formatting:"
+msgstr "नयाँ पर्दाको नाम ढाँचा:"
+
+#: src/protocols/oscar/oscar.c:7872
+msgid "Change Address To:"
+msgstr "ठेगाना परिवर्तन गर्नुहोस्:"
+
+#: src/protocols/oscar/oscar.c:7917
+msgid "<i>you are not waiting for authorization</i>"
+msgstr "<i>तपाईँ प्रमाणीकरणका लागि पर्खिरहेको होइन</i>"
+
+#: src/protocols/oscar/oscar.c:7920
+msgid "You are awaiting authorization from the following buddies"
+msgstr "तपाईँ निम्न साथीहरुका लागि प्रमाणीकरण प्रतिक्षा गरिरहनु भएको छ"
+
+#: src/protocols/oscar/oscar.c:7921
+msgid ""
+"You can re-request authorization from these buddies by right-clicking on "
+"them and selecting \"Re-request Authorization.\""
+msgstr "तपाईँ तिनीहरुलाई दायाँ क्लिक गरेर र \"Re-request Authorization.\" चयन गरेर यी साथीहरु बाट प्रमाणीकरण पुन-अनुरोध गर्न सक्नुहुन्छ"
+
+#: src/protocols/oscar/oscar.c:7938
+msgid "Find Buddy by E-mail"
+msgstr "इमेल द्वारा साथी फेला पार्नुहोस्"
+
+#: src/protocols/oscar/oscar.c:7939
+msgid "Search for a buddy by e-mail address"
+msgstr "इमेल ठेगाना द्वारा एउटा साथी खोजी गर्नुहोस्"
+
+#: src/protocols/oscar/oscar.c:7940
+msgid "Type the e-mail address of the buddy you are searching for."
+msgstr "तपाईँले खोजी रहनु भएको साथिको इमेल ठेगाना टाइप गर्नुहोस् ।"
+
+#: src/protocols/oscar/oscar.c:7957
+msgid "Available Message:"
+msgstr "उपलब्ध सन्देश:"
+
+#: src/protocols/oscar/oscar.c:7958
+msgid "I'm doing work and hoping for a distraction--IM me!"
+msgstr "म काम गरिरहेको छु र --मलाई IM नगर्नका लागि आशा गरिरहेको छु!"
+
+
+#: src/protocols/oscar/oscar.c:8039 src/protocols/silc/silc.c:812
+msgid "Set User Info..."
+msgstr "प्रयोगकर्ता सूचना सेट गर्नुहोस्..."
+
+#: src/protocols/oscar/oscar.c:8044
+msgid "Set User Info (URL)..."
+msgstr "(URL)प्रयोगकर्ता सूचना सेट गर्नुहोस्..."
+
+#: src/protocols/oscar/oscar.c:8050
+msgid "Set Available Message..."
+msgstr "उपलब्ध सन्देश सेट गर्नुहोस्..."
+
+#: src/protocols/oscar/oscar.c:8055 src/protocols/silc/silc.c:808
+msgid "Change Password..."
+msgstr "पासवर्ड परिवर्तन गर्नुहोस्..."
+
+#: src/protocols/oscar/oscar.c:8060
+msgid "Change Password (URL)"
+msgstr "पासवर्ड (URL) परिवर्तन गर्नुहोस्"
+
+#: src/protocols/oscar/oscar.c:8064
+msgid "Configure IM Forwarding (URL)"
+msgstr "IM को फर्वाड (URL) कन्फिगर गर्नुहोस्"
+
+#: src/protocols/oscar/oscar.c:8073
+msgid "Format Screen Name..."
+msgstr "पर्दा नाम ढाँचाबद्ध गर्नुहोस्..."
+
+#: src/protocols/oscar/oscar.c:8077
+msgid "Confirm Account"
+msgstr "खाता यकिन गर्नुहोस्"
+
+#: src/protocols/oscar/oscar.c:8081
+msgid "Display Currently Registered Address"
+msgstr "हालै दर्ता गरेको ठेगाना प्रदर्शन गर्नुहोस्"
+
+#: src/protocols/oscar/oscar.c:8085
+msgid "Change Currently Registered Address..."
+msgstr "हालै दर्ता गरेको ठेगाना परिवर्तन गर्नुहोस्..."
+
+#: src/protocols/oscar/oscar.c:8092
+msgid "Show Buddies Awaiting Authorization"
+msgstr "प्रमाणीकरण प्रतिक्षा गरिरहेका साथीहरू देखाउनुहोस्"
+
+#: src/protocols/oscar/oscar.c:8098
+msgid "Search for Buddy by Email..."
+msgstr "इमेल द्वारा साथीको खोजी गर्नुहोस्..."
+
+#: src/protocols/oscar/oscar.c:8103
+msgid "Search for Buddy by Information"
+msgstr "सूचना द्वारा साथीको खोजी गर्नुहोस्"
+
+
+#: src/protocols/oscar/oscar.c:8181
+msgid "Use AIM/ICQ proxy server (Slower/More Secure/Usually Works)"
+msgstr "AIM/ICQ प्रोक्सी सर्भर प्रयोग गर्नुहोस् (ढिलो/सधै सुरक्षित /प्राय कार्य गर्ने)"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: src/protocols/oscar/oscar.c:8275 src/protocols/oscar/oscar.c:8277
+msgid "AIM/ICQ Protocol Plugin"
+msgstr "AIM/ICQ प्रोटोकल प्लगइन"
+
+#: src/protocols/oscar/oscar.c:8296
+msgid "Auth host"
+msgstr "आधिकारिक होस्ट"
+
+#: src/protocols/oscar/oscar.c:8299
+msgid "Auth port"
+msgstr "आधिकारिक पोर्ट"
+
+#: src/protocols/oscar/oscar.c:8302 src/protocols/zephyr/zephyr.c:2748
+msgid "Encoding"
+msgstr "सङ्केतन"
+
+#: src/protocols/silc/buddy.c:51 src/protocols/silc/buddy.c:414
+#: src/protocols/silc/buddy.c:539 src/protocols/silc/buddy.c:706
+#: src/protocols/silc/ft.c:338
+#, c-format
+msgid "User %s is not present in the network"
+msgstr "प्रयोगकर्ता %s सञ्जालमा प्रस्तुत भएको छैन"
+
+#: src/protocols/silc/buddy.c:52 src/protocols/silc/buddy.c:109
+#: src/protocols/silc/buddy.c:114 src/protocols/silc/buddy.c:118
+#: src/protocols/silc/buddy.c:123 src/protocols/silc/buddy.c:128
+#: src/protocols/silc/buddy.c:133 src/protocols/silc/buddy.c:251
+msgid "Key Agreement"
+msgstr "सम्झौता व्याख्या"
+
+#: src/protocols/silc/buddy.c:53
+msgid "Cannot perform the key agreement"
+msgstr "सम्झौता व्याख्या सम्पादन गर्न सकिदैन"
+
+#: src/protocols/silc/buddy.c:110
+msgid "Error occurred during key agreement"
+msgstr "सम्झौता व्याख्या गर्दा त्रुटि उत्पन्न भयो"
+
+#: src/protocols/silc/buddy.c:114
+msgid "Key Agreement failed"
+msgstr "सम्झौता व्याख्या असफल भयो"
+
+#: src/protocols/silc/buddy.c:119
+msgid "Timeout during key agreement"
+msgstr "सम्झौता व्याख्या गर्दा समय समाप्त भयो"
+
+#: src/protocols/silc/buddy.c:124
+msgid "Key agreement was aborted"
+msgstr "सम्झौता व्याख्या परित्याग गरियो"
+
+#: src/protocols/silc/buddy.c:129
+msgid "Key agreement is already started"
+msgstr "सम्झौता व्याख्या पहिल्यै सुरू भयो"
+
+#: src/protocols/silc/buddy.c:134
+msgid "Key agreement cannot be started with yourself"
+msgstr "सम्झौता व्याख्या तपाईँबाट सुरू हुन सक्दैन"
+
+#: src/protocols/silc/buddy.c:252 src/protocols/silc/buddy.c:382
+#: src/protocols/silc/buddy.c:507
+msgid "The remote user is not present in the network any more"
+msgstr "टाढा प्रयोगकर्ता कुनै पनि सञ्जालमा उपस्थित छैन"
+
+#: src/protocols/silc/buddy.c:288
+#, c-format
+msgid ""
+"Key agreement request received from %s. Would you like to perform the key "
+"agreement?"
+msgstr "सम्झौता व्याख्या अनुरोध %s बाट प्राप्त भयो । के तपाईँ सम्झौता व्याख्या सम्पादन गर्न चाहानुहुन्छ ?"
+
+#: src/protocols/silc/buddy.c:292
+#, c-format
+msgid ""
+"The remote user is waiting key agreement on:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+"टाढाको प्रयोगकर्ता कुञ्जी सम्झौतामा प्रतिक्षा गरिरहेको छ:\n"
+"टाढाको होस्ट: %s\n"
+"टाढाको पोर्ट: %d"
+
+#: src/protocols/silc/buddy.c:305
+msgid "Key Agreement Request"
+msgstr "कुञ्जी सम्झौता अनुरोध"
+
+#: src/protocols/silc/buddy.c:381 src/protocols/silc/buddy.c:416
+#: src/protocols/silc/buddy.c:458
+msgid "IM With Password"
+msgstr "पासवर्ड सँगै IM"
+
+#: src/protocols/silc/buddy.c:417
+msgid "Cannot set IM key"
+msgstr "IM कुञ्जी सेट गर्न सकिएन"
+
+#: src/protocols/silc/buddy.c:459
+msgid "Set IM Password"
+msgstr "IM पासवर्ड सेट गर्नुहोस्"
+
+#: src/protocols/silc/buddy.c:506 src/protocols/silc/buddy.c:541
+#: src/protocols/silc/ops.c:1284 src/protocols/silc/ops.c:1295
+msgid "Get Public Key"
+msgstr "सार्वजनिक कुञ्जी प्राप्त गर्नुहोस्"
+
+#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1285
+#: src/protocols/silc/ops.c:1296
+msgid "Cannot fetch the public key"
+msgstr "सार्वजनिक कुञ्जी तान्न सकिएन"
+
+#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1553
+msgid "Show Public Key"
+msgstr "सार्वजनिक कुञ्जी देखाउनुहोस्"
+
+#: src/protocols/silc/buddy.c:630 src/protocols/silc/buddy.c:989
+#: src/protocols/silc/chat.c:234
+msgid "Could not load public key"
+msgstr "सार्वजनिक कुञ्जी लोड गर्न सकिएन"
+
+#: src/protocols/silc/buddy.c:707 src/protocols/silc/ops.c:871
+#: src/protocols/silc/ops.c:943 src/protocols/silc/ops.c:1078
+#: src/protocols/silc/ops.c:1079 src/protocols/silc/ops.c:1098
+msgid "User Information"
+msgstr "प्रयोगकर्ता सूचना"
+
+#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:944
+#: src/protocols/silc/ops.c:1099
+msgid "Cannot get user information"
+msgstr "प्रयोगकर्ता जानकारी प्राप्त गर्न सक्दैन"
+
+#: src/protocols/silc/buddy.c:729
+#, c-format
+msgid "The %s buddy is not trusted"
+msgstr "%s साथी विश्वासिलो छैन"
+
+#: src/protocols/silc/buddy.c:732
+msgid ""
+"You cannot receive buddy notifications until you import his/her public key.  "
+"You can use the Get Public Key command to get the public key."
+msgstr ""
+"उसको/उनीको सार्वजनिक कुञ्जी आयात नगरे सम्म तपाईँले साथीको जानकारीहरू प्राप्त गर्न सक्नुहुन्न ।  "
+"सार्वजनिक कुञ्जी प्राप्त गर्न तपाईँले प्राप्त भएको सार्वजनिक कुञ्जी आदेश प्रयोग गर्न सक्नुहुन्छ ।"
+
+#. Open file selector to select the public key.
+#: src/protocols/silc/buddy.c:1023
+msgid "Open..."
+msgstr "खोल्नुहोस्..."
+
+#: src/protocols/silc/buddy.c:1032
+#, c-format
+msgid "The %s buddy is not present in the network"
+msgstr "%s साथी सञ्जालमा उपस्थित छैन"
+
+#: src/protocols/silc/buddy.c:1035
+msgid ""
+"To add the buddy you must import his/her public key. Press Import to import "
+"a public key."
+msgstr "साथी थप्न तपाईँले उसको/उनको सार्वजनिक कुञ्जी आयात गर्नुपर्छ । एउटा सार्वजनिक कुञ्जी आयात गर्न 'आयात गर्नुहोस्' थिच्नुहोस् ।"
+
+#: src/protocols/silc/buddy.c:1038
+msgid "Import..."
+msgstr "आयात गर्नुहोस्..."
+
+#: src/protocols/silc/buddy.c:1125
+msgid "Select correct user"
+msgstr "सही प्रयोगकर्ता चयन गर्नुहोस्"
+
+#: src/protocols/silc/buddy.c:1127
+msgid ""
+"More than one user was found with the same public key. Select the correct "
+"user from the list to add to the buddy list."
+msgstr "उस्तै सार्वजनिक कुञ्जी सँग  एक भन्दा बढी प्रयोगकर्ता फेला पर्यो । तपाईँको साथी सूचीमा थप्न सूचीबाट सही प्रयोगकर्ता चयन गर्नुहोस् ।"
+
+#: src/protocols/silc/buddy.c:1129
+msgid ""
+"More than one user was found with the same name. Select the correct user "
+"from the list to add to the buddy list."
+msgstr "उस्तै नाम सँग  एक भन्दा बढी प्रयोगकर्ता फेला पर्यो । तपाईँको साथी सूचीमा थप्न सूचीबाट सही प्रयोगकर्ता चयन गर्नुहोस् ।"
+
+#: src/protocols/silc/buddy.c:1386
+msgid "Detached"
+msgstr "असंलग्न गराउनुहोस्"
+
+#: src/protocols/silc/buddy.c:1390 src/protocols/silc/silc.c:49
+#: src/protocols/silc/silc.c:85
+msgid "Indisposed"
+msgstr "विकृत गरिएको"
+
+#: src/protocols/silc/buddy.c:1394 src/protocols/silc/silc.c:50
+#: src/protocols/silc/silc.c:87
+msgid "Wake Me Up"
+msgstr "मलाई जगाउनुहोस्"
+
+#: src/protocols/silc/buddy.c:1396 src/protocols/silc/silc.c:46
+#: src/protocols/silc/silc.c:79
+msgid "Hyper Active"
+msgstr "सक्रिय हाइपर"
+
+#: src/protocols/silc/buddy.c:1398
+msgid "Robot"
+msgstr "रोबोट"
+
+#: src/protocols/silc/buddy.c:1405 src/protocols/silc/silc.c:629
+#: src/protocols/silc/util.c:472
+msgid "Happy"
+msgstr "खुशी"
+
+#: src/protocols/silc/buddy.c:1407 src/protocols/silc/silc.c:631
+#: src/protocols/silc/util.c:474
+msgid "Sad"
+msgstr "उदास"
+
+#: src/protocols/silc/buddy.c:1409 src/protocols/silc/silc.c:633
+#: src/protocols/silc/util.c:476
+msgid "Angry"
+msgstr "रिसाएको"
+
+#: src/protocols/silc/buddy.c:1411 src/protocols/silc/silc.c:635
+#: src/protocols/silc/util.c:478
+msgid "Jealous"
+msgstr "इर्ष्यालु"
+
+#: src/protocols/silc/buddy.c:1413 src/protocols/silc/silc.c:637
+#: src/protocols/silc/util.c:480
+msgid "Ashamed"
+msgstr "लज्जित"
+
+#: src/protocols/silc/buddy.c:1415 src/protocols/silc/silc.c:639
+#: src/protocols/silc/util.c:482
+msgid "Invincible"
+msgstr "अजेय"
+
+#: src/protocols/silc/buddy.c:1417 src/protocols/silc/silc.c:641
+#: src/protocols/silc/util.c:484
+msgid "In Love"
+msgstr "मायामा"
+
+#: src/protocols/silc/buddy.c:1419 src/protocols/silc/silc.c:643
+#: src/protocols/silc/util.c:486
+msgid "Sleepy"
+msgstr "निद्रालु"
+
+#: src/protocols/silc/buddy.c:1421 src/protocols/silc/silc.c:645
+#: src/protocols/silc/util.c:488
+msgid "Bored"
+msgstr "नरमाइलो महशुस"
+
+#: src/protocols/silc/buddy.c:1423 src/protocols/silc/silc.c:647
+#: src/protocols/silc/util.c:490
+msgid "Excited"
+msgstr "उत्तेजित"
+
+#: src/protocols/silc/buddy.c:1425 src/protocols/silc/silc.c:649
+#: src/protocols/silc/util.c:492
+msgid "Anxious"
+msgstr "चिन्तित"
+
+#: src/protocols/silc/buddy.c:1457 src/protocols/silc/ops.c:980
+msgid "User Modes"
+msgstr "प्रयोगकर्ता मोडहरू"
+
+#: src/protocols/silc/buddy.c:1466 src/protocols/silc/ops.c:989
+msgid "Mood"
+msgstr "मुड"
+
+#: src/protocols/silc/buddy.c:1470 src/protocols/silc/ops.c:995
+msgid "Status Text"
+msgstr "वस्तुस्थिति पाठ"
+
+#: src/protocols/silc/buddy.c:1475 src/protocols/silc/ops.c:1001
+msgid "Preferred Contact"
+msgstr "रुचाइएको सम्पर्क"
+
+#: src/protocols/silc/buddy.c:1480 src/protocols/silc/ops.c:1006
+msgid "Preferred Language"
+msgstr "रुचाइएको भाषा"
+
+#: src/protocols/silc/buddy.c:1485 src/protocols/silc/ops.c:1011
+msgid "Device"
+msgstr "यन्त्र"
+
+#: src/protocols/silc/buddy.c:1490 src/protocols/silc/ops.c:1016
+#: src/protocols/silc/silc.c:697 src/protocols/silc/silc.c:699
+msgid "Timezone"
+msgstr "टाइमजोन"
+
+#: src/protocols/silc/buddy.c:1495 src/protocols/silc/ops.c:1021
+msgid "Geolocation"
+msgstr "भौगोलिक स्थान"
+
+#: src/protocols/silc/buddy.c:1538
+msgid "Reset IM Key"
+msgstr "IM कुञ्जी रिसेट गर्नुहोस्"
+
+#: src/protocols/silc/buddy.c:1543
+msgid "IM with Key Exchange"
+msgstr "कुञ्जी साटासाटमा IM गर्नुहोस् "
+
+#: src/protocols/silc/buddy.c:1547
+msgid "IM with Password"
+msgstr "पासवर्ड सँग  IM"
+
+#: src/protocols/silc/buddy.c:1558
+msgid "Get Public Key..."
+msgstr "सार्वजनिक कुञ्जी प्राप्त गर्नुहोस् ..."
+
+#: src/protocols/silc/buddy.c:1564 src/protocols/silc/ops.c:1417
+msgid "Kill User"
+msgstr "प्रयोगकर्ता नष्ट गर्नुहोस्"
+
+#: src/protocols/silc/chat.c:37
+msgid "_Passphrase:"
+msgstr "पासफ्रेज:"
+
+#: src/protocols/silc/chat.c:78
+#, c-format
+msgid "Channel %s does not exist in the network"
+msgstr "च्यानल %s सञ्जालमा अवस्थित छैन"
+
+#: src/protocols/silc/chat.c:79 src/protocols/silc/chat.c:171
+msgid "Channel Information"
+msgstr "च्यानल जानकारी"
+
+#: src/protocols/silc/chat.c:80
+msgid "Cannot get channel information"
+msgstr "च्यानल जानकारी प्राप्त गर्न सकिएन"
+
+#: src/protocols/silc/chat.c:117
+#, c-format
+msgid "<b>Channel Name:</b> %s"
+msgstr "<b>च्यानल नाम:</b> %s"
+
+#: src/protocols/silc/chat.c:120
+#, c-format
+msgid "<br><b>User Count:</b> %d"
+msgstr "<br><b>प्रयोगकर्ता गन्ति:</b> %d"
+
+#: src/protocols/silc/chat.c:127
+#, c-format
+msgid "<br><b>Channel Founder:</b> %s"
+msgstr "<br><b>च्यानल संस्थापक:</b> %s"
+
+#: src/protocols/silc/chat.c:136
+#, c-format
+msgid "<br><b>Channel Cipher:</b> %s"
+msgstr "<br><b>शून्य च्यानल:</b> %s"
+
+#: src/protocols/silc/chat.c:139
+#, c-format
+msgid "<br><b>Channel HMAC:</b> %s"
+msgstr "<br><b>च्यानल HMAC:</b> %s"
+
+#: src/protocols/silc/chat.c:144
+#, c-format
+msgid "<br><b>Channel Topic:</b><br>%s"
+msgstr "<br><b>च्यानल विषय:</b><br>%s"
+
+#: src/protocols/silc/chat.c:149
+msgid "<br><b>Channel Modes:</b> "
+msgstr "<br><b>च्यानल मोडहरू:</b> "
+
+#: src/protocols/silc/chat.c:162
+#, c-format
+msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
+msgstr "<br><b>संस्थापकको कुञ्जी औठाछाप:</b><br>%s"
+
+#: src/protocols/silc/chat.c:163
+#, c-format
+msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
+msgstr "<br><b>ब्याबलप्रिन्ट संस्थापक कुञ्जी:</b><br>%s"
+
+#: src/protocols/silc/chat.c:233
+msgid "Add Channel Public Key"
+msgstr "च्यानल सार्वजनिक कुञ्जी थप्नुहोस्"
+
+#. Add new public key
+#: src/protocols/silc/chat.c:288
+msgid "Open Public Key..."
+msgstr "सार्वजनिक कुञ्जी खोल्नुहोस्..."
+
+#: src/protocols/silc/chat.c:397
+msgid "Channel Passphrase"
+msgstr "च्यानल पासफ्रेज"
+
+#: src/protocols/silc/chat.c:404
+msgid "Channel Public Keys List"
+msgstr "च्यानल सार्वजनिक कुञ्जीहरुको सूची"
+
+#: src/protocols/silc/chat.c:409
+msgid ""
+"Channel authentication is used to secure the channel from unauthorized "
+"access. The authentication may be based on passphrase and digital "
+"signatures. If passphrase is set, it is required to be able to join. If "
+"channel public keys are set then only users whose public keys are listed are "
+"able to join."
+msgstr "च्यानल प्रमाणीकरण अधिकार प्राप्त नभएको पहुँचबाट च्यानललाई सुरक्षित गर्न प्रयोग गरिन्छ । प्रमाणीकरण पासफ्रेज र डिजिटल हस्ताक्षरहरुमा आधारित हुन सक्छ । यदि पासफ्रेज सेट भयो भने, यसलाई जडान गर्न आवश्यक छ । यदि च्यानल सार्वजनिक कुञ्जीहरू सेट भएका छन् भने सार्वजनिक कुञ्जी सूचीबद्ध भएको प्रयोगकर्ता मात्र जडान हुन सक्छन् ।"
+
+#: src/protocols/silc/chat.c:418 src/protocols/silc/chat.c:419
+#: src/protocols/silc/chat.c:456 src/protocols/silc/chat.c:457
+#: src/protocols/silc/chat.c:886
+msgid "Channel Authentication"
+msgstr "च्यानल प्रमाणीकरण"
+
+#: src/protocols/silc/chat.c:420 src/protocols/silc/chat.c:458
+msgid "Add / Remove"
+msgstr "थप्नुहोस् / हटाउनुहोस्"
+
+#: src/protocols/silc/chat.c:575
+msgid "Group Name"
+msgstr "समूह नाम"
+
+#: src/protocols/silc/chat.c:579 src/protocols/silc/ops.c:1697
+msgid "Passphrase"
+msgstr "पासफ्रेज"
+
+#: src/protocols/silc/chat.c:590
+#, c-format
+msgid "Please enter the %s channel private group name and passphrase."
+msgstr "कृपया %s च्यानल व्यक्तिगत समूह नाम र पासफ्रेज प्रविष्टि गर्नुहोस् ।"
+
+#: src/protocols/silc/chat.c:592
+msgid "Add Channel Private Group"
+msgstr "च्यानल व्यक्तिगत समूह थप्नुहोस्"
+
+#: src/protocols/silc/chat.c:719
+msgid "User Limit"
+msgstr "प्रयोगकर्ता सीमा"
+
+#: src/protocols/silc/chat.c:720
+msgid "Set user limit on channel. Set to zero to reset user limit."
+msgstr "च्यानलमा प्रयोगकर्ता सीमा सेट गर्नुहोस् । प्रयोगकर्ता सीमा रिसेट गर्न शून्य सेट गउर्नुहोस् ।"
+
+#: src/protocols/silc/chat.c:862
+msgid "Get Info"
+msgstr "जानकारी प्राप्त गर्नुहोस्"
+
+#: src/protocols/silc/chat.c:869
+msgid "Invite List"
+msgstr "निमन्त्रणा सूची"
+
+#: src/protocols/silc/chat.c:873
+msgid "Ban List"
+msgstr "निषेध सूची"
+
+#: src/protocols/silc/chat.c:880
+msgid "Add Private Group"
+msgstr "व्यक्तिगत समूह थप्नुहोस्"
+
+#: src/protocols/silc/chat.c:891
+msgid "Reset Permanent"
+msgstr "स्थायी रिसेट गर्नुहोस्"
+
+#: src/protocols/silc/chat.c:895
+msgid "Set Permanent"
+msgstr "स्थायी सेट गर्नुहोस्"
+
+#: src/protocols/silc/chat.c:902
+msgid "Set User Limit"
+msgstr "प्रयोगकर्ता सीमा सेट गर्नुहोस्"
+
+#: src/protocols/silc/chat.c:907
+msgid "Reset Topic Restriction"
+msgstr "विषय सीमा बन्धन रिसेट गर्नुहोस्"
+
+#: src/protocols/silc/chat.c:911
+msgid "Set Topic Restriction"
+msgstr "विषय सीमा बन्धन सेट गर्नुहोस्"
+
+#: src/protocols/silc/chat.c:917
+msgid "Reset Private Channel"
+msgstr "व्यक्तिगत च्यानल रिसेट गर्नुहोस्"
+
+#: src/protocols/silc/chat.c:921
+msgid "Set Private Channel"
+msgstr "व्यक्तिगत च्यानल सेट गर्नुहोस्"
+
+#: src/protocols/silc/chat.c:927
+msgid "Reset Secret Channel"
+msgstr "गोप्य च्यानल रिसेट गर्नुहोस्"
+
+#: src/protocols/silc/chat.c:931
+msgid "Set Secret Channel"
+msgstr "गोप्य च्यानल सेट गर्नुहोस्"
+
+#: src/protocols/silc/chat.c:993
+#, c-format
+msgid "You are channel founder on <I>%s</I>"
+msgstr "तपाईँ <I>%s</I> मा च्यानल संस्थापक हुनुहुन्छ"
+
+#: src/protocols/silc/chat.c:997
+#, c-format
+msgid "Channel founder on <I>%s</I> is <I>%s</I>"
+msgstr "<I>%s</I> मा च्यानल संस्थापक <I>%s</I> हो"
+
+#: src/protocols/silc/chat.c:1056
+#, c-format
+msgid "You have to join the %s channel before you are able to join the private group"
+msgstr "तपाईँ व्यक्तिगत समूहमा जडान हुनु पहिले %s च्यानलमा जडान हुनुपर्छ"
+
+#: src/protocols/silc/chat.c:1058
+msgid "Join Private Group"
+msgstr "व्यक्तिगत समूह जडान गर्नुहोस्"
+
+#: src/protocols/silc/chat.c:1059
+msgid "Cannot join private group"
+msgstr "व्यक्तिगत समूह जडान गर्न सकिएन"
+
+#: src/protocols/silc/chat.c:1252 src/protocols/silc/silc.c:911
+msgid "Cannot call command"
+msgstr "आदेश बोलाउन सकिएन"
+
+#: src/protocols/silc/chat.c:1253 src/protocols/silc/silc.c:912
+msgid "Unknown command"
+msgstr "अज्ञात आदेश"
+
+#: src/protocols/silc/ft.c:89 src/protocols/silc/ft.c:92
+#: src/protocols/silc/ft.c:96 src/protocols/silc/ft.c:100
+#: src/protocols/silc/ft.c:104 src/protocols/silc/ft.c:205
+#: src/protocols/silc/ft.c:210 src/protocols/silc/ft.c:215
+#: src/protocols/silc/ft.c:221 src/protocols/silc/ft.c:340
+msgid "Secure File Transfer"
+msgstr "सुरक्षित फाइल स्थान्तरण"
+
+#: src/protocols/silc/ft.c:90 src/protocols/silc/ft.c:93
+#: src/protocols/silc/ft.c:97 src/protocols/silc/ft.c:101
+#: src/protocols/silc/ft.c:105
+msgid "Error during file transfer"
+msgstr "फाइल स्थान्तरण गर्दा त्रुटि"
+
+#: src/protocols/silc/ft.c:94
+msgid "Permission denied"
+msgstr "अनुमति अस्वीकार गरियो"
+
+#: src/protocols/silc/ft.c:98
+msgid "Key agreement failed"
+msgstr "कुञ्जी सम्झौता असफल भयो"
+
+#: src/protocols/silc/ft.c:102
+msgid "File transfer sessions does not exist"
+msgstr "फाइल स्थान्तरण सत्रहरू अवस्थित छैन"
+
+#: src/protocols/silc/ft.c:206
+msgid "No file transfer session active"
+msgstr "फाइल स्थान्तरण सत्र सक्रिय छैन"
+
+#: src/protocols/silc/ft.c:211
+msgid "File transfer already started"
+msgstr "फाइल स्थान्तरण पहिल्यै सुरू भइसकेको छ"
+
+#: src/protocols/silc/ft.c:216
+msgid "Could not perform key agreement for file transfer"
+msgstr "फाइल स्थान्तरणका लागि कुञ्जी सम्झौता सम्पादन गर्न सकिएन"
+
+#: src/protocols/silc/ft.c:222
+msgid "Could not start the file transfer"
+msgstr "फाइल स्थान्तरण सुरू गर्न सकिएन"
+
+#: src/protocols/silc/ft.c:341
+msgid "Cannot send file"
+msgstr "फाइल पठाउन सकिएन"
+
+#: src/protocols/silc/ops.c:339 src/protocols/silc/ops.c:348
+#: src/protocols/silc/ops.c:357
+#, c-format
+msgid "%s has changed the topic of <I>%s</I> to: %s"
+msgstr "%s ले <I>%s</I> को विषय यसमा परिवर्तन गर्यो: %s"
+
+#: src/protocols/silc/ops.c:423
+#, c-format
+msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
+msgstr "<I>%s</I> ले <I>%s</I> मोडमा च्यानल सेट गर्दछ: %s"
+
+#: src/protocols/silc/ops.c:427
+#, c-format
+msgid "<I>%s</I> removed all channel <I>%s</I> modes"
+msgstr "<I>%s</I> ले सबै च्यानल <I>%s</I> मोडहरू हटायो"
+
+#: src/protocols/silc/ops.c:460
+#, c-format
+msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
+msgstr "<I>%s</I> ले <I>%s </I>  को मोडहरु यसमा सेट गर्यो : %s "
+
+#: src/protocols/silc/ops.c:468
+#, c-format
+msgid "<I>%s</I> removed all <I>%s's</I> modes"
+msgstr "<I>%s</I> ले सबै <I>%s को </I> मोडहरू हटायो"
+
+#: src/protocols/silc/ops.c:497
+#, c-format
+msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
+msgstr "तपाईँ<I>%s</I> मा <I>%s</I> (%s) द्वारा फ्याकिनु भयो"
+
+#: src/protocols/silc/ops.c:527 src/protocols/silc/ops.c:532
+#: src/protocols/silc/ops.c:537
+#, c-format
+msgid "You have been killed by %s (%s)"
+msgstr "%s (%s) द्वारा तपाईँ नष्ट गरिनु भएको छ"
+
+#: src/protocols/silc/ops.c:558 src/protocols/silc/ops.c:563
+#: src/protocols/silc/ops.c:568
+#, c-format
+msgid "Killed by %s (%s)"
+msgstr " %s (%s) द्वारा नष्ट गरिएको"
+
+#: src/protocols/silc/ops.c:614
+msgid "Server signoff"
+msgstr "सर्भर साइनअफ"
+
+#: src/protocols/silc/ops.c:801
+msgid "Personal Information"
+msgstr "व्यक्तिगत जानकारी"
+
+#: src/protocols/silc/ops.c:824
+msgid "Birth Day"
+msgstr "जन्म दिन"
+
+#: src/protocols/silc/ops.c:828
+msgid "Job Title"
+msgstr "कार्य शीर्षक"
+
+#: src/protocols/silc/ops.c:832
+msgid "Job Role"
+msgstr "कार्य भूमिका"
+
+#: src/protocols/silc/ops.c:836
+msgid "Organization"
+msgstr "संस्था"
+
+#: src/protocols/silc/ops.c:840
+msgid "Unit"
+msgstr "एकाइ"
+
+#: src/protocols/silc/ops.c:859
+msgid "EMail"
+msgstr "इमेल"
+
+#: src/protocols/silc/ops.c:864
+msgid "Note"
+msgstr "द्रष्टव्य"
+
+#: src/protocols/silc/ops.c:912
+msgid "Join Chat"
+msgstr "कुराकानीमा जडान गर्नुहोस्"
+
+#: src/protocols/silc/ops.c:1068 src/protocols/silc/ops.c:1139
+msgid "Public Key Fingerprint"
+msgstr "सार्वजनिक कुञ्जी औठाछाप"
+
+#: src/protocols/silc/ops.c:1069 src/protocols/silc/ops.c:1140
+msgid "Public Key Babbleprint"
+msgstr "सार्वजनिक कुञ्जी ब्याबलप्रिन्ट"
+
+#: src/protocols/silc/ops.c:1082
+msgid "More..."
+msgstr "अझै धेरै..."
+
+#: src/protocols/silc/ops.c:1155 src/protocols/silc/silc.c:800
+msgid "Detach From Server"
+msgstr "सर्भर बाट असंलग्न गर्नुहोस्"
+
+#: src/protocols/silc/ops.c:1155
+msgid "Cannot detach"
+msgstr "असंलग्न गर्न सकिएन"
+
+#: src/protocols/silc/ops.c:1166
+msgid "Cannot set topic"
+msgstr "विषय सेट गर्न सक्दैन"
+
+#: src/protocols/silc/ops.c:1204
+msgid "Failed to change nickname"
+msgstr "उपनाम परिवर्तन गर्न असफल"
+
+#: src/protocols/silc/ops.c:1241 src/protocols/silc/ops.c:1252
+msgid "Roomlist"
+msgstr "कोठा सूची"
+
+#: src/protocols/silc/ops.c:1241 src/protocols/silc/ops.c:1252
+msgid "Cannot get room list"
+msgstr "कोठा सूची प्राप्त गर्न सक्दैन"
+
+#: src/protocols/silc/ops.c:1297
+msgid "No public key was received"
+msgstr "कुनै सार्वजनिक कुञ्जी प्राप्त छैन"
+
+#: src/protocols/silc/ops.c:1310 src/protocols/silc/ops.c:1324
+msgid "Server Information"
+msgstr "सर्भर सूचना "
+
+#: src/protocols/silc/ops.c:1311
+msgid "Cannot get server information"
+msgstr "सर्भर सूचना प्राप्त गर्न सक्दैन"
+
+#: src/protocols/silc/ops.c:1342 src/protocols/silc/ops.c:1351
+msgid "Server Statistics"
+msgstr "सर्भर तथ्याङ्क"
+
+#: src/protocols/silc/ops.c:1343
+msgid "Cannot get server statistics"
+msgstr "सर्भर तथ्याङ्क प्राप्त गर्न सक्दैन"
+
+#: src/protocols/silc/ops.c:1352
+msgid "No server statistics available"
+msgstr "सर्भर तथ्याङ्क उपलब्ध छैन"
+
+#: src/protocols/silc/ops.c:1374
+#, c-format
+msgid ""
+"Local server start time: %s\n"
+"Local server uptime: %s\n"
+"Local server clients: %d\n"
+"Local server channels: %d\n"
+"Local server operators: %d\n"
+"Local router operators: %d\n"
+"Local cell clients: %d\n"
+"Local cell channels: %d\n"
+"Local cell servers: %d\n"
+"Total clients: %d\n"
+"Total channels: %d\n"
+"Total servers: %d\n"
+"Total routers: %d\n"
+"Total server operators: %d\n"
+"Total router operators: %d\n"
+msgstr ""
+"स्थानीय सर्भर सुरू समय: %s\n"
+"स्थानीय सर्भर अपटाइम: %s\n"
+"स्थानीय सर्भर ग्राहकहरू: %d\n"
+"स्थानीय सर्भर च्यानलहरू: %d\n"
+"स्थानीय सर्भर सञ्चालकहरू: %d\n"
+"स्थानीय राउटरहरू सञ्चालकहरू: %d\n"
+"स्थानीय कक्ष ग्राहकहरू: %d\n"
+"स्थानीय कक्ष च्यानलहरू: %d\n"
+"स्थानीयl कक्ष सर्भरहरू: %d\n"
+"कूल ग्राहकहरू: %d\n"
+"कूल च्यानलहरू: %d\n"
+"कूल सर्भरहरू: %d\n"
+"कूल राउटरहरू: %d\n"
+"कूल सर्भर सञ्चालकहरू: %d\n"
+"कूल राउटर सञ्चालकहरू: %d\n"
+
+#: src/protocols/silc/ops.c:1397
+msgid "Network Statistics"
+msgstr "सञ्जाल तथ्याङ्क"
+
+#: src/protocols/silc/ops.c:1405 src/protocols/silc/ops.c:1410
+msgid "Ping"
+msgstr "पिङ्ग गर्नुहोस्"
+
+#: src/protocols/silc/ops.c:1405
+msgid "Ping failed"
+msgstr "पिङ्ग असफल भयो"
+
+#: src/protocols/silc/ops.c:1410
+msgid "Ping reply received from server"
+msgstr "सर्भर बाट प्राप्त पिङ्ग जवाफ "
+
+#: src/protocols/silc/ops.c:1418
+msgid "Could not kill user"
+msgstr "प्रयोगकर्ता नष्ट गर्न सकिएन"
+
+#: src/protocols/silc/ops.c:1499
+msgid "Error during connecting to SILC Server"
+msgstr "SILC सर्भरमा जडान गर्दा त्रुटि"
+
+#: src/protocols/silc/ops.c:1504
+msgid "Key Exchange failed"
+msgstr "कुञ्जी साटासाट असफल भयो"
+
+#: src/protocols/silc/ops.c:1513
+msgid "Resuming detached session failed. Press Reconnect to create new connection."
+msgstr "असंलग्न सत्रको पुन: निरन्तरता असफल भयो । नयाँ जडान सिर्जना गर्न 'पुन:जडान' थिच्नुहोस् ।"
+
+#: src/protocols/silc/ops.c:1548
+msgid "Disconnected by server"
+msgstr "सर्भर बाट जडान विच्छेदन गरियो"
+
+#: src/protocols/silc/ops.c:1608 src/protocols/silc/ops.c:1655
+#: src/protocols/silc/silc.c:178
+msgid "Resuming session"
+msgstr "सत्र पुन:निरन्तरता"
+
+#: src/protocols/silc/ops.c:1610
+msgid "Authenticating connection"
+msgstr "जडान प्रमाणीकरण"
+
+#: src/protocols/silc/ops.c:1657
+msgid "Verifying server public key"
+msgstr "सार्वजनिक कुञ्जी सर्भर रूजू"
+
+#: src/protocols/silc/ops.c:1698
+msgid "Passphrase required"
+msgstr "पासफ्रेज आवश्यक भयो"
+
+#: src/protocols/silc/ops.c:1727
+msgid "Failure: Version mismatch, upgrade your client"
+msgstr "असफल:संस्करण मेल खाएन,तपाईँंको ग्राहक स्तरबृद्धि गर्नुहोस्"
+
+#: src/protocols/silc/ops.c:1730
+msgid "Failure: Remote does not trust/support your public key"
+msgstr "असफल: टाढाकोले तपाईँको सार्वजनिक कुञ्जी विश्वास/समर्थन गर्न सकेन"
+
+#: src/protocols/silc/ops.c:1733
+msgid "Failure: Remote does not support proposed KE group"
+msgstr "असफल:टाढाकोले प्रस्तावित KE समूह समर्थन गर्दैन"
+
+#: src/protocols/silc/ops.c:1736
+msgid "Failure: Remote does not support proposed cipher"
+msgstr "असफल:टाढाकोले प्रस्तावित शून्य समर्थन गर्दैन"
+
+#: src/protocols/silc/ops.c:1739
+msgid "Failure: Remote does not support proposed PKCS"
+msgstr "असफल: टाढाकोले प्रस्तावित PKCS समर्थन गर्दैन"
+
+#: src/protocols/silc/ops.c:1742
+msgid "Failure: Remote does not support proposed hash function"
+msgstr "असफल:टाढाकोले प्रस्तावित ह्यास प्रकार्य समर्थन गर्दैन"
+
+#: src/protocols/silc/ops.c:1745
+msgid "Failure: Remote does not support proposed HMAC"
+msgstr "असफल:टाढाकोले प्रस्तावित HMAC समर्थन गर्दैन"
+
+#: src/protocols/silc/ops.c:1747
+msgid "Failure: Incorrect signature"
+msgstr "असफल:गलत हस्ताक्षर"
+
+#: src/protocols/silc/ops.c:1749
+msgid "Failure: Invalid cookie"
+msgstr "असफल: अवैध कुकी"
+
+#: src/protocols/silc/ops.c:1760
+msgid "Failure: Authentication failed"
+msgstr "असफल: प्रमाणीकरण असफल भयो"
+
+#: src/protocols/silc/pk.c:103
+#, c-format
+msgid ""
+"Received %s's public key. Your local copy does not match this key. Would you "
+"still like to accept this public key?"
+msgstr "%s को सार्वजनिक कुञ्जी प्राप्त भयो । तपाईँंको स्थानीय प्रतिलिपि यो कुञ्जीसँग  मेल खादैन । के तपाईँं अहिले यो कुञ्जी स्वीकार गर्न चाहानुहुन्छ?"
+
+#: src/protocols/silc/pk.c:108
+#, c-format
+msgid "Received %s's public key. Would you like to accept this public key?"
+msgstr "%s को सार्वजनिक कुञ्जी प्राप्त भयो । के तपाईँं यो सार्वजनिक कुञ्जी स्वीकार गर्न चाहानुहुन्छ?"
+
+#: src/protocols/silc/pk.c:112
+#, c-format
+msgid ""
+"Fingerprint and babbleprint for the %s key are:\n"
+"\n"
+"%s\n"
+"%s\n"
+msgstr ""
+"%s कुञ्जीका लागि औठाछाप र ब्याबलप्रिन्ट निम्न हुन्:\n"
+"\n"
+"%s\n"
+"%s\n"
+
+#: src/protocols/silc/pk.c:115 src/protocols/silc/pk.c:140
+msgid "Verify Public Key"
+msgstr "सार्वजनिक कुञ्जी रूजू गर्नुहोस्"
+
+#: src/protocols/silc/pk.c:119
+msgid "View..."
+msgstr "हेर्नुहोस्..."
+
+#: src/protocols/silc/pk.c:141
+msgid "Unsupported public key type"
+msgstr "असमर्थित सार्वजनिक कुञ्जी प्रकार"
+
+#: src/protocols/silc/silc.c:138
+msgid "Connection failed"
+msgstr "जडान असफल भयो"
+
+#: src/protocols/silc/silc.c:170
+msgid "Cannot initialize SILC Client connection"
+msgstr "SILC ग्राहक जडान सुरू गर्न सक्दैन"
+
+#: src/protocols/silc/silc.c:181
+msgid "Performing key exchange"
+msgstr "कुञ्जी साटासाट सम्पादन"
+
+#: src/protocols/silc/silc.c:254
+msgid "Out of memory"
+msgstr "स्मृती बाहिर"
+
+#. Progress
+#: src/protocols/silc/silc.c:293
+msgid "Connecting to SILC Server"
+msgstr "SILC सर्भरमा जडान हुँदैछ"
+
+#: src/protocols/silc/silc.c:625
+msgid "Your Current Mood"
+msgstr "तपाईँंको हालको स्वाभाव"
+
+#: src/protocols/silc/silc.c:627
+msgid "Normal"
+msgstr "सामान्य"
+
+#: src/protocols/silc/silc.c:652
+msgid ""
+"\n"
+"Your Preferred Contact Methods"
+msgstr ""
+"\n"
+"तपाईँंका रूचाइएका जडान विधिहरू"
+
+#: src/protocols/silc/silc.c:660 src/protocols/silc/util.c:517
+msgid "SMS"
+msgstr "SMS"
+
+#: src/protocols/silc/silc.c:662 src/protocols/silc/util.c:519
+msgid "MMS"
+msgstr "MMS"
+
+#: src/protocols/silc/silc.c:664 src/protocols/silc/util.c:521
+msgid "Video Conferencing"
+msgstr "भिडियो सम्मेलन"
+
+#: src/protocols/silc/silc.c:669
+msgid "Your Current Status"
+msgstr "तपाईँंको हालको वस्तु स्थिति"
+
+#: src/protocols/silc/silc.c:676
+msgid "Online Services"
+msgstr "अनलाइन सेवाहरू"
+
+#: src/protocols/silc/silc.c:679
+msgid "Let others see what services you are using"
+msgstr "तपाईँले प्रयोग गरिरहनु भएको सेवाहरू अरुलाई हेर्न दिनुहोस्"
+
+#: src/protocols/silc/silc.c:685
+msgid "Let others see what computer you are using"
+msgstr "तपाईँले प्रयोग गरिरहनु भएको कम्प्युटर अरुलाई हेर्न दिनुहोस्"
+
+#: src/protocols/silc/silc.c:692
+msgid "Your VCard File"
+msgstr "तपाईँंको भिकार्ड फाइल"
+
+#: src/protocols/silc/silc.c:705 src/protocols/silc/silc.c:706
+msgid "User Online Status Attributes"
+msgstr "प्रयोगकर्ता अनलाइन वस्तु स्थिति विशेषताहरू"
+
+#: src/protocols/silc/silc.c:707
+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 "
+"about yourself."
+msgstr "तपाईँंको व्यक्तिगत सूचना र तपाईँंको अनलाइन वस्तु स्थिति सूचना अन्य प्रयोगकर्तालाई हेर्न अनुमति दिन सक्नुहुन्छ । कृपया तपाईँंले चाहानु भएको प्रयोगकर्तालाई तपाईँंको बारेमा हेर्न सूचना भर्नुहोस् ।"
+
+#: src/protocols/silc/silc.c:747 src/protocols/silc/silc.c:753
+#: src/protocols/silc/silc.c:1160
+msgid "Message of the Day"
+msgstr "दिनको सन्देश"
+
+#: src/protocols/silc/silc.c:747
+msgid "No Message of the Day available"
+msgstr "दैनिकी सन्देश उपलब्ध छैन"
+
+#: src/protocols/silc/silc.c:748 src/protocols/silc/silc.c:1155
+msgid "There is no Message of the Day associated with this connection"
+msgstr "यो जडान सँग  सम्बन्धित दिनको सन्देश छैन"
+
+#: src/protocols/silc/silc.c:795
+msgid "Online Status"
+msgstr "अनलाइन वस्तु स्थिति"
+
+#: src/protocols/silc/silc.c:804
+msgid "View Message of the Day"
+msgstr "दैनिकी सन्देश हेर्नुहोस्"
+
+#: src/protocols/silc/silc.c:876
+#, c-format
+msgid "User <I>%s</I> is not present in the network"
+msgstr "प्रयोगकर्ता <I>%s</I> सञ्जालमा उपस्थित छैन"
+
+#: src/protocols/silc/silc.c:985
+msgid "Failed to leave channel"
+msgstr "च्यानल छोड्न असफल"
+
+#: src/protocols/silc/silc.c:1031
+msgid "Topic too long"
+msgstr "विषय अति लामो छ"
+
+#: src/protocols/silc/silc.c:1112
+msgid "You must specify a nick"
+msgstr "तपाईँंले एउटा सानो चिन्ह निर्दिष्ट गर्नुहोस्"
+
+#: src/protocols/silc/silc.c:1214
+#, c-format
+msgid "channel %s not found"
+msgstr "च्यानल %s फेला परेन"
+
+#: src/protocols/silc/silc.c:1219
+#, c-format
+msgid "channel modes for %s: %s"
+msgstr " %s: %s का लागि च्यानल मोडहरू"
+
+#: src/protocols/silc/silc.c:1221
+#, c-format
+msgid "no channel modes are set on %s"
+msgstr "%s मा कुनै च्यानलहरू सेट छैनन"
+
+#: src/protocols/silc/silc.c:1234
+#, c-format
+msgid "Failed to set cmodes for %s"
+msgstr "%s का लागि सिमोडहरू सेट गर्न असफल"
+
+
+#: src/protocols/silc/silc.c:1264
+#, c-format
+msgid "Unknown command: %s, (may be a Gaim bug)"
+msgstr "अज्ञात आदेश: %s, (गाइम बग हुन सक्छ)"
+
+#: src/protocols/silc/silc.c:1327
+msgid "part [channel]:  Leave the chat"
+msgstr "भाग [channel]:  कुराकानी छोडनुहोस्"
+
+#: src/protocols/silc/silc.c:1331
+msgid "leave [channel]:  Leave the chat"
+msgstr "छोडनुहोस् [channel]:  कुराकानी छोडनुहोस्"
+
+#: src/protocols/silc/silc.c:1335
+msgid "topic [&lt;new topic&gt;]:  View or change the topic"
+msgstr "विषय [&lt;new topic&gt;]:  विषय हेर्नुहोस् वा परिवर्तन गर्नुहोस्"
+
+#: src/protocols/silc/silc.c:1340
+msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
+msgstr "join &lt;channel&gt; [&lt;password&gt;]:  यो सञ्जालमा कुराकानी जडान गर्नुहोस्"
+
+#: src/protocols/silc/silc.c:1344
+msgid "list:  List channels on this network"
+msgstr "सूची:  यो सञ्जालमा च्यानलहरू सूचीबद्ध गर्नुहोस्"
+
+#: src/protocols/silc/silc.c:1348
+msgid "whois &lt;nick&gt;:  View nick's information"
+msgstr "whois &lt;nick&gt;:  निकको सूचना हेर्नुहोस्"
+
+#: src/protocols/silc/silc.c:1352 src/protocols/zephyr/zephyr.c:2466
+msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
+msgstr "msg &lt;nick&gt; &lt;message&gt;:  प्रयोगकर्तालाई एउटा व्यक्तिगत सन्देश पठाउनुहोस्"
+
+#: src/protocols/silc/silc.c:1356
+msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
+msgstr "query &lt;nick&gt; [&lt;message&gt;]:  प्रयोगकर्तालाई एउटा व्यक्तिगत सन्देश पठाउनुहोस्"
+
+#: src/protocols/silc/silc.c:1360
+msgid "motd:  View the server's Message Of The Day"
+msgstr "motd:  दिनको सर्भरको सन्देश हेर्नुहोस्"
+
+#: src/protocols/silc/silc.c:1364
+msgid "detach:  Detach this session"
+msgstr "असंलग्न गर्नुहोस्:  यो सत्र असंलग्न गर्नुहोस्"
+
+#: src/protocols/silc/silc.c:1368
+msgid "quit [message]:  Disconnect from the server, with an optional message"
+msgstr "अन्त्य गर्नुहोस् [message]:  एउटा ऐच्छिक सन्देश सहित सर्भर बाट जडान विच्छेद गर्नुहोस्"
+
+#: src/protocols/silc/silc.c:1372
+msgid "call &lt;command&gt;:  Call any silc client command"
+msgstr "call &lt;command&gt;:  कुनै सिल्क ग्राहक आदेश बोलाउनुहोस्"
+
+#: src/protocols/silc/silc.c:1378
+msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
+msgstr "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  निक नष्ट गर्नुहोस्"
+
+#: src/protocols/silc/silc.c:1382
+msgid "nick &lt;newnick&gt;:  Change your nickname"
+msgstr "nick &lt;newnick&gt;:  तपाईँंको उपनाम परिवर्तन गर्नुहोस्"
+
+#: src/protocols/silc/silc.c:1386
+msgid "whowas &lt;nick&gt;:  View nick's information"
+msgstr "whowas &lt;nick&gt;:  निकको सूचना हेर्नुहोस्"
+
+#: src/protocols/silc/silc.c:1390
+msgid ""
+"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
+"channel modes"
+msgstr "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  च्यानल मोडहरू परिवर्तन गर्नुहोस् वा प्रदर्शन गर्नुहोस्"
+
+#: src/protocols/silc/silc.c:1394
+msgid ""
+"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
+"on channel"
+msgstr "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  च्यानलमा निकको मोडहरू परिवर्तन गर्नुहोस्"
+
+#: src/protocols/silc/silc.c:1398
+msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
+msgstr "umode &lt;usermodes&gt;:  सञ्जालमा तपाईँंको मोडहरू सेट गर्नुहोस्"
+
+#: src/protocols/silc/silc.c:1402
+msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
+msgstr "oper &lt;nick&gt; [-pubkey]:  सर्भर सञ्चालक अधिकार प्राप्त गर्नुहोस्"
+
+#: src/protocols/silc/silc.c:1406
+msgid ""
+"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
+"channel invite list"
+msgstr "निमन्त्रणा &lt;channel&gt; [-|+]&lt;nick&gt;: च्यानल निमन्त्रण सूची बाट थप्नुहोस्/हटाउनुहोस् वा निकलाई निमन्त्रणा गर्नुहोस्"
+
+#: src/protocols/silc/silc.c:1410
+msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
+msgstr "Kick &lt;channel&gt; &lt;nick&gt; [comment]:  च्यानल बाट ग्राहक फाल्नुहोस्"
+
+#: src/protocols/silc/silc.c:1414
+msgid "info [server]:  View server administrative details"
+msgstr "सूचना [server]:  सर्भर प्रसाशकिय विवरणहरू हेर्नुहोस्"
+
+#: src/protocols/silc/silc.c:1418
+msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
+msgstr "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  च्यानल बाट ग्राहक निषेध गर्नुहोस्"
+
+#: src/protocols/silc/silc.c:1422
+msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
+msgstr "getkey &lt;nick|server&gt;:  ग्राहकको वा सर्भरको सार्वजनिक कुञ्जी पुन:प्राप्त गर्नुहोस्"
+
+#: src/protocols/silc/silc.c:1426
+msgid "stats:  View server and network statistics"
+msgstr "वस्तुस्थिति:  सर्भर र सञ्जाल तथ्याङ्क हेर्नुहोस्"
+
+#: src/protocols/silc/silc.c:1430
+msgid "ping:  Send PING to the connected server"
+msgstr "पिङ्ग:  जडान भएको सर्भरमा PING पठाउनुहोस्"
+
+#: src/protocols/silc/silc.c:1435
+msgid "users &lt;channel&gt;:  List users in channel"
+msgstr "users &lt;channel&gt;:  च्यानलमा प्रयोगकर्ताको सूची"
+
+#: src/protocols/silc/silc.c:1439
+msgid ""
+"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
+"specific users in channel(s)"
+msgstr "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  च्यानल(हरू) मा निर्दिष्ट प्रयोगकर्ताहरू सूचीबद्ध गर्नुहोस्"
+
+#: src/protocols/silc/silc.c:1451
+msgid "Instant Messages"
+msgstr "आवश्यक सन्देश"
+
+#: src/protocols/silc/silc.c:1456
+msgid "Digitally sign all IM messages"
+msgstr "सबै IM सन्देशहरू डिजिटलरूपले साइन गर्नुहोस्"
+
+#: src/protocols/silc/silc.c:1461
+msgid "Verify all IM message signatures"
+msgstr "सबै IM सन्देश हस्ताक्षरहरू रूजू गर्नुहोस्"
+
+#: src/protocols/silc/silc.c:1464
+msgid "Channel Messages"
+msgstr "च्यानल सन्देशहरू"
+
+#: src/protocols/silc/silc.c:1469
+msgid "Digitally sign all channel messages"
+msgstr "सबै च्यानल सन्देशहरू डिजिटलरूपले साइन गर्नुहोस्"
+
+#: src/protocols/silc/silc.c:1474
+msgid "Verify all channel message signatures"
+msgstr "सबै च्यानल सन्देश हस्ताक्षरहरू रूजू गर्नुहोस्"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#: src/protocols/silc/silc.c:1563
+msgid "SILC Protocol Plugin"
+msgstr "SILC प्रोटोकोल प्लगइन"
+
+#. *  description
+#: src/protocols/silc/silc.c:1565
+msgid "Secure Internet Live Conferencing (SILC) Protocol"
+msgstr "सुरक्षित इन्टरनेट लाइभ सम्मेलन प्रोटोकल"
+
+#: src/protocols/silc/silc.c:1599
+msgid "Public Key file"
+msgstr "सार्वजनिक कुञ्जी फाइल"
+
+#: src/protocols/silc/silc.c:1603
+msgid "Private Key file"
+msgstr "व्यक्तिगत कुञ्जी फाइल"
+
+#: src/protocols/silc/silc.c:1606
+msgid "Public key authentication"
+msgstr "सार्वजनिक कुञ्जी प्रमाणीकरण"
+
+#: src/protocols/silc/silc.c:1610
+msgid "Reject watching by other users"
+msgstr "अर्को प्रयोगकर्ताले हेर्नलाई अस्विकार गर्नुहोस्"
+
+#: src/protocols/silc/silc.c:1613
+msgid "Block invites"
+msgstr "निमन्त्रणाहरू बन्द गर्नुहोस्"
+
+#: src/protocols/silc/silc.c:1616
+msgid "Block IMs without Key Exchange"
+msgstr "कुञ्जी साटासाट बिना IM रोक्नुहोस्"
+
+#: src/protocols/silc/silc.c:1619
+msgid "Reject online status attribute requests"
+msgstr "अनलाइन वस्तुस्थिति विशेषता अनुरोधहरू अस्विकार गर्नुहोस्"
+
+#: src/protocols/silc/util.c:205 src/protocols/silc/util.c:230
+msgid "Creating SILC key pair..."
+msgstr "SILC कुञ्जी जोडी सिर्जना गर्दैछ..."
+
+#. Hint for translators: Please check the tabulator width here and in
+#. the next strings (short strings: 2 tabs, longer strings 1 tab,
+#. sum: 3 tabs or 24 characters)
+#: src/protocols/silc/util.c:313
+#, c-format
+msgid "Real Name: \t%s\n"
+msgstr "वास्तविक नाम: \t%s\n"
+
+#: src/protocols/silc/util.c:315
+#, c-format
+msgid "User Name: \t%s\n"
+msgstr "प्रयोगकर्ता नाम: \t%s\n"
+
+#: src/protocols/silc/util.c:317
+#, c-format
+msgid "EMail: \t\t%s\n"
+msgstr "इमेल: \t\t%s\n"
+
+#: src/protocols/silc/util.c:319
+#, c-format
+msgid "Host Name: \t%s\n"
+msgstr "होस्ट नाम: \t%s\n"
+
+#: src/protocols/silc/util.c:321
+#, c-format
+msgid "Organization: \t%s\n"
+msgstr "संगठन: \t%s\n"
+
+#: src/protocols/silc/util.c:323
+#, c-format
+msgid "Country: \t%s\n"
+msgstr "देश: \t%s\n"
+
+#: src/protocols/silc/util.c:324
+#, c-format
+msgid "Algorithm: \t%s\n"
+msgstr "अल्गोरिदम: \t%s\n"
+
+#: src/protocols/silc/util.c:325
+#, c-format
+msgid "Key Length: \t%d bits\n"
+msgstr "कुञ्जी लम्बाई: \t%d bits\n"
+
+#: src/protocols/silc/util.c:327
+#, c-format
+msgid ""
+"Public Key Fingerprint:\n"
+"%s\n"
+"\n"
+msgstr ""
+"सार्वजनिक कुञ्जी औठाछाप:\n"
+"%s\n"
+"\n"
+
+#: src/protocols/silc/util.c:328
+#, c-format
+msgid ""
+"Public Key Babbleprint:\n"
+"%s"
+msgstr ""
+"सार्वजनिक कुञ्जी ब्याबलप्रिन्ट:\n"
+"%s"
+
+#: src/protocols/silc/util.c:332 src/protocols/silc/util.c:333
+msgid "Public Key Information"
+msgstr "सार्वजनिक कुञ्जी सूचना"
+
+#: src/protocols/silc/util.c:515
+msgid "Paging"
+msgstr "पेगिङ्ग"
+
+#: src/protocols/silc/util.c:539
+msgid "Computer"
+msgstr "कम्प्युटर"
+
+#: src/protocols/silc/util.c:543
+msgid "PDA"
+msgstr "PDA"
+
+#: src/protocols/silc/util.c:545
+msgid "Terminal"
+msgstr "टर्मिनल"
+
+#: src/protocols/toc/toc.c:137
+#, c-format
+msgid "Looking up %s"
+msgstr "%s को खोजी"
+
+#: src/protocols/toc/toc.c:198
+#, c-format
+msgid "Signon: %s"
+msgstr "साइनअन: %s"
+
+#: src/protocols/toc/toc.c:480
+#, c-format
+msgid "Unable to write file %s."
+msgstr "फाइल %s लेख्नका लागि अक्षम ।"
+
+#: src/protocols/toc/toc.c:483
+#, c-format
+msgid "Unable to read file %s."
+msgstr "फाइल %s पढ्नका लागि अक्षम ।"
+
+#: src/protocols/toc/toc.c:486
+#, c-format
+msgid "Message too long, last %s bytes truncated."
+msgstr "सन्देश धेरै लामो भयो, अन्तिम %s बाइटहरू पतन भयो ।"
+
+#: src/protocols/toc/toc.c:489
+#, c-format
+msgid "%s not currently logged in."
+msgstr "%s अहिले लगइन छैन ।"
+
+#: src/protocols/toc/toc.c:492
+#, c-format
+msgid "Warning of %s not allowed."
+msgstr "%s को चेतावनी अनुमति छैन ।"
+
+#: src/protocols/toc/toc.c:495
+msgid "A message has been dropped, you are exceeding the server speed limit."
+msgstr "एउटा सन्देश छोडिएको छ, तपाईँ सर्भरलाई सिमित गतिमा बढाई रहनुभएको छ ।"
+
+#: src/protocols/toc/toc.c:498
+#, c-format
+msgid "Chat in %s is not available."
+msgstr "%s मा कुराकानी उपलब्ध छैन ।"
+
+#: src/protocols/toc/toc.c:501
+#, c-format
+msgid "You are sending messages too fast to %s."
+msgstr "तपाईँले %s मा सन्देशहरू धेरै छिटो पठाई रहनु भएको छ ।"
+
+#: src/protocols/toc/toc.c:504
+#, c-format
+msgid "You missed an IM from %s because it was too big."
+msgstr "तपाईँले %s बाट IM हराउनु भयो किनभने यो धेरै ठूलो थियो ।"
+
+#: src/protocols/toc/toc.c:507
+#, c-format
+msgid "You missed an IM from %s because it was sent too fast."
+msgstr "तपाईँले %s बाट IM हराउनु भयो किनभने यो पठउने कार्य धेरै छिटो भयो ।"
+
+#: src/protocols/toc/toc.c:510
+msgid "Failure."
+msgstr "असफलता ।"
+
+#: src/protocols/toc/toc.c:513
+msgid "Too many matches."
+msgstr "अति धेरै जोडीहरू ।"
+
+#: src/protocols/toc/toc.c:516
+msgid "Need more qualifiers."
+msgstr "अरू धेरै क्वालिफायरहरुको आवश्यकता ।"
+
+#: src/protocols/toc/toc.c:519
+msgid "Dir service temporarily unavailable."
+msgstr "डाइरेक्टरी सेवा अस्थायी रुपमा उपलब्ध छैन ।"
+
+#: src/protocols/toc/toc.c:522
+msgid "Email lookup restricted."
+msgstr "इमेल खोजी प्रतिबन्धित भयो ।"
+
+#: src/protocols/toc/toc.c:525
+msgid "Keyword ignored."
+msgstr "कुञ्जीशब्द बेवास्ता गरियो।"
+
+#: src/protocols/toc/toc.c:528
+msgid "No keywords."
+msgstr "कुञ्जीशब्द्वहरू छैनन् ।"
+
+#: src/protocols/toc/toc.c:531
+msgid "User has no directory information."
+msgstr "प्रयोगकर्ता सँग  डाइरेक्टरी सूचना छैन ।"
+
+#: src/protocols/toc/toc.c:535
+msgid "Country not supported."
+msgstr "देश समर्थन गरिदैन "
+
+#: src/protocols/toc/toc.c:538
+#, c-format
+msgid "Failure unknown: %s."
+msgstr "अज्ञात असफलता: %s ।"
+
+#: src/protocols/toc/toc.c:544
+msgid "The service is temporarily unavailable."
+msgstr "सेवा अस्थायी रुपमा उपलब्ध छैन ।"
+
+#: src/protocols/toc/toc.c:547
+msgid "Your warning level is currently too high to log in."
+msgstr "लगइन गर्न तपाईँको चेतावनी स्तर एकदमै उच्च छ ।"
+
+#: src/protocols/toc/toc.c:550
+msgid ""
+"You have been connecting and disconnecting too frequently.  Wait ten minutes "
+"and try again.  If you continue to try, you will need to wait even longer."
+msgstr ""
+"तपाईँ लगातार जडान गर्दै र बिच्छेदन गर्दै हुनुहुन्छ । दस मिनेट प्रतिक्षा गर्नुहोस् र फेरि प्रयास गर्नुहोस् ।  यदि तपाईँले "
+"प्रयास गर्न निरन्तरता दिनु भयो भने, तपाईँले लामो समय सम्म प्रतिक्ष गर्नु पर्नेछ ।"
+
+#: src/protocols/toc/toc.c:552
+#, c-format
+msgid "An unknown signon error has occurred: %s."
+msgstr "एउटा अज्ञात साइनअन त्रुटि देखा पर्यो: %s ।"
+
+#: src/protocols/toc/toc.c:555
+#, c-format
+msgid "An unknown error, %d, has occurred.  Info: %s"
+msgstr "एउटा अज्ञात त्रुटि, %d, देखापर्यो ।  सूचना: %s"
+
+#: src/protocols/toc/toc.c:576
+msgid "Connection Closed"
+msgstr "जडान बन्द भयो"
+
+#: src/protocols/toc/toc.c:616
+msgid "Waiting for reply..."
+msgstr "जवाफका लागि प्रतिक्षा गर्दैछ..."
+
+
+#: src/protocols/toc/toc.c:695
+msgid "TOC has come back from its pause. You may now send messages again."
+msgstr "TOC यसको पजबाट फर्कियो । तपाईँ अब फेरि सन्देश पठाउन सक्नुहुन्छ ।"
+
+#: src/protocols/toc/toc.c:892
+msgid "Password Change Successful"
+msgstr "पासवर्ड सफलतापूर्वक परिवर्तन भयो"
+
+#: src/protocols/toc/toc.c:896
+msgid "TOC has sent a PAUSE command."
+msgstr "TOC ले PAUSE आदेश पठायो ।"
+
+#: src/protocols/toc/toc.c:897
+msgid ""
+"When this happens, TOC ignores any messages sent to it, and may kick you off "
+"if you send a message. Gaim will prevent anything from going through. This "
+"is only temporary, please be patient."
+msgstr ""
+"जब यो हुन्छ, TOC ले यसमा पठाइएको कुनै सन्देशहरुलाई उपेक्षा गर्दछ, र तपाईँले सन्देश पठाउनु भयो भने फालिदिन्छ ।"
+"गाइमले कुनै पनि मार्फत गएकोलाई रोक्छ । यो मात्र अस्थायी हो, कृपया धैर्य रहनुहोस् ।"
+
+#: src/protocols/toc/toc.c:1450
+msgid "Get Dir Info"
+msgstr "डाइरेक्टरी सूचना प्राप्त गर्नुहोस्"
+
+#: src/protocols/toc/toc.c:1586
+msgid "Set Dir Info"
+msgstr "डाइरेक्टरी सूचना सेट गर्नुहोस्"
+
+#: src/protocols/toc/toc.c:1708
+#, c-format
+msgid "Could not open %s for writing!"
+msgstr "लेख्नका लागि %s खोल्न सकिदैन!"
+
+#: src/protocols/toc/toc.c:1744
+msgid "File transfer failed; other side probably canceled."
+msgstr "फाइल स्थान्तरणमा असफल; अन्य साइड सम्भवत: रद्द गरियो ।"
+
+#: src/protocols/toc/toc.c:1789 src/protocols/toc/toc.c:1829
+#: src/protocols/toc/toc.c:1953 src/protocols/toc/toc.c:2041
+msgid "Could not connect for transfer."
+msgstr "स्थान्तरणका लागि जडान गर्न सकिएन"
+
+#: src/protocols/toc/toc.c:1986
+msgid "Could not write file header.  The file will not be transferred."
+msgstr "फाइल हेडर लेख्न सकिएन ।  फाइल स्थान्तरण हुँदैन ।"
+
+#: src/protocols/toc/toc.c:2086
+msgid "Gaim - Save As..."
+msgstr "गाइम- यस रुपमा बचत गर्नुहोस्..."
+
+#: src/protocols/toc/toc.c:2120
+#, c-format
+msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
+msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
+msgstr[0] "%s ले %s लाई %d फाइल स्विकार गर्न अनुरोध गर्यो: %s (%.2f %s)%s%s"
+msgstr[1] "%s ले %s लाई %d फाइल स्विकार गर्न अनुरोध गर्यो: %s (%.2f %s)%s%s"
+
+#: src/protocols/toc/toc.c:2127
+#, c-format
+msgid "%s requests you to send them a file"
+msgstr "%s ले तपाईँलाई तिनीहरुलाई फाइल पठाउन अनुरोध गर्दछ"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: src/protocols/toc/toc.c:2214 src/protocols/toc/toc.c:2216
+msgid "TOC Protocol Plugin"
+msgstr "TOC प्रोटोकल प्लगइन"
+
+#: src/protocols/toc/toc.c:2235
+msgid "TOC host"
+msgstr "TOC होस्ट"
+
+#: src/protocols/toc/toc.c:2239
+msgid "TOC port"
+msgstr "TOC पोर्ट"
+
+#. Basic Profile group.
+#: src/protocols/trepia/trepia.c:264
+msgid "Basic Profile"
+msgstr "आधारभूत प्रोफाइल"
+
+#. E-Mail Address
+#: src/protocols/trepia/trepia.c:295
+msgid "E-Mail Address"
+msgstr "इमेल ठेगाना"
+
+#: src/protocols/trepia/trepia.c:301
+msgid "Profile Information"
+msgstr "प्रोफाइल सूचना"
+
+#. Instant Messagers
+#: src/protocols/trepia/trepia.c:307
+msgid "Instant Messagers"
+msgstr "तात्कालिक मेसेन्जरहरू"
+
+#. AIM
+#: src/protocols/trepia/trepia.c:311
+msgid "AIM"
+msgstr "ए आई एम"
+
+#. ICQ
+#: src/protocols/trepia/trepia.c:315
+msgid "ICQ UIN"
+msgstr "ICQ UIN"
+
+#. MSN
+#: src/protocols/trepia/trepia.c:319
+msgid "MSN"
+msgstr "एम एस एन"
+
+#. Yahoo
+#: src/protocols/trepia/trepia.c:323
+msgid "Yahoo"
+msgstr "याहू"
+
+#. I'm From
+#: src/protocols/trepia/trepia.c:328
+msgid "I'm From"
+msgstr "म यहाँ बाट"
+
+#. Call the dialog.
+#: src/protocols/trepia/trepia.c:345
+msgid "Set your Trepia profile data."
+msgstr "तपाईँको त्रिपिया प्रोफाइल डेटा सेट गर्नुहोस् ।"
+
+#: src/protocols/trepia/trepia.c:425
+msgid "Profile"
+msgstr "प्रोफाइल"
+
+#: src/protocols/trepia/trepia.c:439
+msgid "Set Profile"
+msgstr "प्रोफाइल सेट गर्नुहोस्"
+
+#: src/protocols/trepia/trepia.c:476
+msgid "Visit Homepage"
+msgstr "गृह पृष्ठ हेर्नुहोस्"
+
+#: src/protocols/trepia/trepia.c:822 src/protocols/trepia/trepia.c:825
+msgid "Local Users"
+msgstr "स्थानीय प्रयोगकर्ताहरू"
+
+#: src/protocols/trepia/trepia.c:1028
+msgid "Logging in"
+msgstr "लगइन प्रक्रिया"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: src/protocols/trepia/trepia.c:1275 src/protocols/trepia/trepia.c:1277
+msgid "Trepia Protocol Plugin"
+msgstr "त्रिपिया प्रोटोकल प्लगइन"
+
+#: src/protocols/yahoo/yahoo.c:419
+msgid ""
+"You have been logged off as you have logged in on a different machine or "
+"device."
+msgstr "तपाईँले विभिन्न मेशिन वा यन्त्रमा लग गरे जस्तै तपाईँ लग हुनुभयो ।"
+
+#: src/protocols/yahoo/yahoo.c:912
+msgid "Your Yahoo! message did not get sent."
+msgstr "तपाईँको याहू! सन्देश पठाउन पठाइएन ।"
+
+#: src/protocols/yahoo/yahoo.c:936 src/protocols/yahoo/yahoo.c:3520
+msgid "Buzz!!"
+msgstr "बज्!!"
+
+#: src/protocols/yahoo/yahoo.c:981
+#, c-format
+msgid "Yahoo! system message for %s:"
+msgstr "याहू! %s का लागि प्रणालीाली सन्देश :"
+
+
+#. TODO: this is almost exactly the same as what MSN does,
+#. * this should probably be moved to the core.
+#. *
+#: src/protocols/yahoo/yahoo.c:1072
+#, 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:1078
+msgid "Message (optional) :"
+msgstr "सन्देश (वैकल्पिक) :"
+
+#: src/protocols/yahoo/yahoo.c:1120
+#, c-format
+msgid "%s has (retroactively) denied your request to add them to your list."
+msgstr "तपाईँको सूचीमा जोड्न %s ले (रिट्रोएक्टिभ्ली) तरिकाले तपाईँको अनुरोधलाई अस्विकार गरेको छ ।"
+
+#: src/protocols/yahoo/yahoo.c:1123
+#, c-format
+msgid ""
+"%s has (retroactively) denied your request to add them to your list for the "
+"following reason: %s."
+msgstr "%s ले (रिट्रोएक्टिभ्ली) तरिकाले तपाईँको सूचीमा जोड्न तलका निम्न कारण का लागि तपाईँको अनुरोधलाई अस्विकार गरिएको छ: %s ।"
+
+#: src/protocols/yahoo/yahoo.c:1126
+msgid "Add buddy rejected"
+msgstr "साथी थप्न अस्वीकार गरियो"
+
+#: src/protocols/yahoo/yahoo.c:1887
+#, c-format
+msgid ""
+"The Yahoo server has requested the use of an unrecognized authentication "
+"method.  This version of Gaim will likely not be able to successfully sign "
+"on to Yahoo.  Check %s for updates."
+msgstr ""
+"याहू सर्भरले अमान्य प्रमाणीकरण तरिकाको प्रयोगलाई अनुरोध गर्यो ।  गाइमको  यो संस्करणले याहूमा "
+"सफलतापूर्वक साइनअन गर्न अयोग्य छ । अद्यावधिकका लागि %s जाँच गर्नुहोस् ।"
+
+#: src/protocols/yahoo/yahoo.c:1890
+msgid "Failed Yahoo! Authentication"
+msgstr "याहू! प्रमाणीकरण असफल"
+
+#: src/protocols/yahoo/yahoo.c:1962
+#, c-format
+msgid ""
+"You have tried to ignore %s, but the user is on your buddy list.  Clicking "
+"\"Yes\" will remove and ignore the buddy."
+msgstr "तपाईँले %s लाई उपेक्षा गर्ने प्रयास गर्नुभयो, तर प्रयोगकर्ता तपाईँको साथी सूचीमा छ ।  \"Yes\" क्लिक गर्नाले साथी हटाउँछ र उपेक्षा गर्दछ ।"
+
+#: src/protocols/yahoo/yahoo.c:1965
+msgid "Ignore buddy?"
+msgstr "साथीलाई उपेक्षा गर्नुहुन्छ ?"
+
+#: src/protocols/yahoo/yahoo.c:1999
+msgid "Invalid username."
+msgstr "अवैध प्रयोगकर्तानाम ।"
+
+#: src/protocols/yahoo/yahoo.c:2010
+msgid "Normal authentication failed!"
+msgstr "सामान्य प्रमाणीकरण असफल!"
+
+#: src/protocols/yahoo/yahoo.c:2011
+msgid ""
+"The normal authentication method has failed. This means either your password "
+"is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
+"attempt to log in using Web Messenger authentication, which will result in "
+"reduced functionality and features."
+msgstr "सामान्य प्रमाणीकरण विधि असफल भयो । यसको मतलब कि त तपाईँको पासवर्ड गलत छ, वा याहूको प्रमाणीकरण योजना परिवर्तन भयो । वेब मेसेन्जर प्रमाणीकरण प्रयोग गरेर गाइमले अहिले लगइन गर्ने प्रयास गरिरहेको छ, जसले घटेको कार्यात्मकता र विशेषताहरुमा नतिजा गर्दछ ।"
+
+#: src/protocols/yahoo/yahoo.c:2019
+msgid "Incorrect password."
+msgstr "गलत पासवर्ड ।"
+
+#: src/protocols/yahoo/yahoo.c:2022
+msgid "Your account is locked, please log in to the Yahoo! website."
+msgstr "तपाईँको खातामा ताल्चा लगाइएको छ, कृपया याहू! वेबसाइटमा लगइन गर्नुहोस् ।"
+
+#: src/protocols/yahoo/yahoo.c:2025
+#, c-format
+msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
+msgstr "अज्ञात त्रुटि सङ्ख्या %d । याहू! वेबसाइटमा लगइन गर्नाले यसलाई स्थिर गर्न सक्छ ।"
+
+#: src/protocols/yahoo/yahoo.c:2079
+#, c-format
+msgid "Could not add buddy %s to group %s to the server list on account %s."
+msgstr "खाता %s को सर्भर सूचीमा समूह %s मा साथी %s थप्न सकेन ।"
+
+#: src/protocols/yahoo/yahoo.c:2082
+msgid "Could not add buddy to server list"
+msgstr "सर्भर सूचीमा साथी थप्न सकेन"
+
+#: src/protocols/yahoo/yahoo.c:2319 src/protocols/yahoo/yahoo.c:2467
+#: src/protocols/yahoo/ycht.c:414
+msgid "Unable to read"
+msgstr "पढ्न अक्षम"
+
+#: src/protocols/yahoo/yahoo.c:2489 src/protocols/yahoo/yahoo.c:2610
+#: src/protocols/yahoo/yahoo.c:2660 src/protocols/yahoo/yahoo.c:2670
+#: src/protocols/yahoo/yahoochat.c:1461 src/protocols/yahoo/yahoochat.c:1528
+#: src/protocols/yahoo/ycht.c:518
+msgid "Connection problem"
+msgstr "जडान समस्या"
+
+#: src/protocols/yahoo/yahoo.c:2764 src/protocols/yahoo/yahoo.c:3131
+#: src/protocols/yahoo/yahoo.c:3245
+msgid "Not At Home"
+msgstr "घरमा छैन"
+
+#: src/protocols/yahoo/yahoo.c:2766 src/protocols/yahoo/yahoo.c:3133
+#: src/protocols/yahoo/yahoo.c:3246
+msgid "Not At Desk"
+msgstr "डेस्कमा छैन"
+
+#: src/protocols/yahoo/yahoo.c:2768 src/protocols/yahoo/yahoo.c:3135
+#: src/protocols/yahoo/yahoo.c:3247
+msgid "Not In Office"
+msgstr "अफिसमा छैन"
+
+#: src/protocols/yahoo/yahoo.c:2772 src/protocols/yahoo/yahoo.c:3139
+#: src/protocols/yahoo/yahoo.c:3249
+msgid "On Vacation"
+msgstr "बिदामा छ"
+
+#: src/protocols/yahoo/yahoo.c:2776 src/protocols/yahoo/yahoo.c:3143
+#: src/protocols/yahoo/yahoo.c:3251
+msgid "Stepped Out"
+msgstr "बाहिर चरण राखियो"
+
+#: src/protocols/yahoo/yahoo.c:2857 src/protocols/yahoo/yahoo.c:2883
+msgid "Not on server list"
+msgstr "सर्भर सूचीमा छैन"
+
+#: src/protocols/yahoo/yahoo.c:2962
+msgid "Join in Chat"
+msgstr "कुराकानीमा जडान गर्नुहोस्"
+
+#: src/protocols/yahoo/yahoo.c:2967
+msgid "Initiate Conference"
+msgstr "सम्मेलन थालनी गर्नुहोस्"
+
+#: src/protocols/yahoo/yahoo.c:3019
+msgid "Active which ID?"
+msgstr "कुन ID सक्रिय गर्ने?"
+
+#: src/protocols/yahoo/yahoo.c:3028
+msgid "Join who in chat?"
+msgstr "जडान गर्नुहोस् को कुराकानीमा छ?"
+
+#: src/protocols/yahoo/yahoo.c:3038
+msgid "Activate ID..."
+msgstr "ID सक्रिय पार्नुहोस्..."
+
+#: src/protocols/yahoo/yahoo.c:3042
+msgid "Join user in chat..."
+msgstr "कुराकानीमा प्रयोगकर्ता जडान गर्नुहोस्..."
+
+#: src/protocols/yahoo/yahoo.c:3562
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join &lt;room&gt;:  याहू सञ्झ्यालमा कुराकानी कोठा जडान गर्नुहोस्"
+
+#: src/protocols/yahoo/yahoo.c:3566
+msgid "buzz: Buzz a contact to get their attention"
+msgstr "बज्: साथीको ध्यान आकृष्ट गर्न बज् गर्नुहोस्"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: src/protocols/yahoo/yahoo.c:3645 src/protocols/yahoo/yahoo.c:3647
+msgid "Yahoo Protocol Plugin"
+msgstr "याहू प्रोटोकल प्लगइन"
+
+#: src/protocols/yahoo/yahoo.c:3666
+msgid "Yahoo Japan"
+msgstr "याहू जापान"
+
+#: src/protocols/yahoo/yahoo.c:3669
+msgid "Pager host"
+msgstr "पेजर होस्ट"
+
+#: src/protocols/yahoo/yahoo.c:3672
+msgid "Japan Pager host"
+msgstr "जापान पेजर होस्ट"
+
+#: src/protocols/yahoo/yahoo.c:3675
+msgid "Pager port"
+msgstr "पेजर पोर्ट"
+
+#: src/protocols/yahoo/yahoo.c:3678
+msgid "File transfer host"
+msgstr "फाइल स्थान्तरण होस्ट"
+
+#: src/protocols/yahoo/yahoo.c:3681
+msgid "Japan File transfer host"
+msgstr "जापान फाइल स्थान्तरण होस्ट"
+
+#: src/protocols/yahoo/yahoo.c:3684
+msgid "File transfer port"
+msgstr "फाइल स्थान्तरण पोर्ट"
+
+#: src/protocols/yahoo/yahoo.c:3687
+msgid "Chat Room Locale"
+msgstr "कुराकानी कोठा स्थानीयता"
+
+#: src/protocols/yahoo/yahoo.c:3690
+msgid "Chat Room List Url"
+msgstr "कुराकानी कोठा सूची युआरएल"
+
+#: src/protocols/yahoo/yahoo.c:3693
+msgid "YCHT Host"
+msgstr "YCHT होस्ट"
+
+#: src/protocols/yahoo/yahoo.c:3696
+msgid "YCHT Port"
+msgstr "YCHT पोर्ट"
+
+#: src/protocols/yahoo/yahoochat.c:206
+#, c-format
+msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
+msgstr "%s ले कोठा \"%s\" मा तपाईँको सम्मेलन निमन्त्रणा घटायो किनभने \"%s\" ।"
+
+#: src/protocols/yahoo/yahoochat.c:208
+msgid "Invitation Rejected"
+msgstr "निमन्त्रणा अस्विकार गरियो"
+
+#: src/protocols/yahoo/yahoochat.c:362
+msgid "Failed to join chat"
+msgstr "कुराकानी जडान गर्न असफल"
+
+#: src/protocols/yahoo/yahoochat.c:362
+msgid "Maybe the room is full?"
+msgstr "कोठा भरिएको हुन सक्छ ?"
+
+#: src/protocols/yahoo/yahoochat.c:440
+#, c-format
+msgid "You are now chatting in %s."
+msgstr "तपाईँ अहिले %s मा कुराकानी गर्दै हुनुहुन्छ ।"
+
+#: src/protocols/yahoo/yahoochat.c:616
+msgid "Failed to join buddy in chat"
+msgstr "कुराकानीमा साथी जडान गर्न असफल"
+
+#: src/protocols/yahoo/yahoochat.c:617
+msgid "Maybe they're not in a chat?"
+msgstr "तिनीहरू कुराकानीमा नहुन सक्छन् ?"
+
+#: src/protocols/yahoo/yahoochat.c:1394
+msgid "Fetching the room list failed."
+msgstr "कोठा तान्न सकिएन।"
+
+#: src/protocols/yahoo/yahoochat.c:1447
+msgid "Voices"
+msgstr "स्वरहरू"
+
+#: src/protocols/yahoo/yahoochat.c:1450
+msgid "Webcams"
+msgstr "वेबक्यामहरू"
+
+#: src/protocols/yahoo/yahoochat.c:1461 src/protocols/yahoo/yahoochat.c:1528
+msgid "Unable to fetch room list."
+msgstr "कोठा सूची तान्न अक्षम ।"
+
+#: src/protocols/yahoo/yahoochat.c:1521
+msgid "User Rooms"
+msgstr "प्रयोगकर्ता कोठाहरू"
+
+#: src/protocols/yahoo/yahoo_profile.c:675
+#, c-format
+msgid "<b>IP Address:</b> %s<br>"
+msgstr "<b>IP ठेगाना:</b> %s<br>"
+
+#: src/protocols/yahoo/yahoo_profile.c:751
+msgid "Yahoo! Japan Profile"
+msgstr "याहू! जापान प्रोफाइल"
+
+#: src/protocols/yahoo/yahoo_profile.c:752
+msgid "Yahoo! Profile"
+msgstr "याहू! प्रोफाइल"
+
+#: src/protocols/yahoo/yahoo_profile.c:796
+msgid ""
+"Sorry, profiles marked as containing adult content are not supported at this "
+"time."
+msgstr "माफ गर्नुहोस्, एडल्ट सामग्री समाविष्टको रुपमा चिन्ह लगाइएका प्रोफाइलहरू यो समयमा समर्थित छैनन् ।"
+
+#: src/protocols/yahoo/yahoo_profile.c:798
+msgid ""
+"If you wish to view this profile, you will need to visit this link in your "
+"web browser"
+msgstr "यदि तपाईँ यो प्रोफाइल हेर्न चाहानुहुन्छ भने, तपाईँले तपाईँको वेब ब्राउजरको यो लिङ्कमा भ्रमण गर्नुपर्दछ"
+
+#: src/protocols/yahoo/yahoo_profile.c:976
+msgid "Yahoo! ID"
+msgstr "याहू! ID"
+
+#: src/protocols/yahoo/yahoo_profile.c:1050
+#: src/protocols/yahoo/yahoo_profile.c:1054
+#: src/protocols/yahoo/yahoo_profile.c:1058
+msgid "Hobbies"
+msgstr "रूचीहरू"
+
+#: src/protocols/yahoo/yahoo_profile.c:1068
+#: src/protocols/yahoo/yahoo_profile.c:1072
+msgid "Latest News"
+msgstr "हालका समाचारहरू"
+
+#: src/protocols/yahoo/yahoo_profile.c:1093
+msgid "Home Page"
+msgstr "गृह पृष्ठ"
+
+#: src/protocols/yahoo/yahoo_profile.c:1108
+msgid "Cool Link 1"
+msgstr "कूल लिङ्क १"
+
+#: src/protocols/yahoo/yahoo_profile.c:1113
+msgid "Cool Link 2"
+msgstr "कूल लिङ्क २"
+
+#: src/protocols/yahoo/yahoo_profile.c:1117
+msgid "Cool Link 3"
+msgstr "कूल लिङ्क ३"
+
+#: src/protocols/yahoo/yahoo_profile.c:1130
+msgid "Last Update"
+msgstr "अन्तिम अद्यावधिक"
+
+#: src/protocols/yahoo/yahoo_profile.c:1136
+#, c-format
+msgid "User information for %s unavailable"
+msgstr "%s का लागि प्रयोगकर्ता सूचना उपलब्ध छैन"
+
+#: src/protocols/yahoo/yahoo_profile.c:1142
+msgid ""
+"Sorry, this profile seems to be in a language that is not supported at this "
+"time."
+msgstr "माफ गर्नुहोला, यो प्रोफाइल हाल समर्थन प्राप्त नभएको भाषामा देखिन्छ ।"
+
+#: src/protocols/yahoo/yahoo_profile.c:1158
+msgid ""
+"Could not retrieve the user's profile. This most likely is a temporary "
+"server-side problem. Please try again later."
+msgstr ""
+"प्रयोगकर्ताको प्रोफाइल पुन:प्राप्त गर्न सकिएन । यसको प्रमुख समस्या अस्थायी सर्भर-साइड हुनसक्छ ।"
+"कृपया पछि फेरि प्रयास गर्नुहोस् ।"
+
+#: src/protocols/yahoo/yahoo_profile.c:1161
+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 "
+"profile. If you know that the user exists, please try again later."
+msgstr ""
+"प्रयोगकर्ताको प्रोफाइल पुन: प्राप्त गर्न सकिएन । यसको प्रमुख कारण प्रयोगकर्ता अवस्थित छैन "
+"जस्तो छ,  तथापि, याहू! ले कहिलेकाँही प्रयोगकर्ताको प्रोफाइल प्राप्त गर्न असफल हुन्छ । यदि तपाईँलाई "
+"प्रयोगकर्ता अवस्थित छ भन्ने थाहा छ भने, कृपया फेरि प्रयास गर्नुहोस् ।"
+
+#: src/protocols/yahoo/yahoo_profile.c:1169
+msgid "The user's profile is empty."
+msgstr "प्रयोगकर्ताको प्रोफाइल खाली छ ।"
+
+#: src/protocols/yahoo/ycht.c:401
+msgid "Connection problem with the YCHT server."
+msgstr "YCHT सर्भरसँग  जडान समस्या छ ।"
+
+#: src/protocols/zephyr/zephyr.c:327
+msgid ""
+"(There was an error converting this message.\t Check the 'Encoding' option "
+"in the Account Editor)"
+msgstr ""
+"(यो सन्देश रुपान्तरण गर्दा त्रुटि भेटियो ।\t खाता सम्पादकमा 'सङ्केतन' विकल्प "
+"जाँच गर्नुहोस्)"
+
+#: src/protocols/zephyr/zephyr.c:682
+#, c-format
+msgid "Unable send to chat %s,%s,%s"
+msgstr "%s,%s,%s कुराकानीमा पठाउन अक्षम"
+
+#: src/protocols/zephyr/zephyr.c:715 src/protocols/zephyr/zephyr.c:1124
+#, c-format
+msgid "<b>User:</b> %s<br>"
+msgstr "<b>प्रयोगकर्ता:</b> %s<br>"
+
+#: src/protocols/zephyr/zephyr.c:719 src/protocols/zephyr/zephyr.c:1129
+msgid "<br>Hidden or not logged-in"
+msgstr "<br>लुकेको छ वा लगइन गरेको छैन"
+
+#: src/protocols/zephyr/zephyr.c:724 src/protocols/zephyr/zephyr.c:1131
+#, c-format
+msgid "<br>At %s since %s"
+msgstr "<br> %s बाट %s मा"
+
+#: src/protocols/zephyr/zephyr.c:1414 src/protocols/zephyr/zephyr.c:1415
+msgid "Anyone"
+msgstr "कोही पनि"
+
+#: src/protocols/zephyr/zephyr.c:2143
+msgid "_Class:"
+msgstr "वर्ग:"
+
+#: src/protocols/zephyr/zephyr.c:2149
+msgid "_Instance:"
+msgstr "दृष्टान्त:"
+
+#: src/protocols/zephyr/zephyr.c:2155
+msgid "_Recipient:"
+msgstr "प्रापक:"
+
+#: src/protocols/zephyr/zephyr.c:2166
+#, c-format
+msgid "Attempt to subscribe to %s,%s,%s failed"
+msgstr "%s,%s,%s मा सदस्यता प्राप्त गर्ने प्रयास असफल"
+
+#: src/protocols/zephyr/zephyr.c:2471
+msgid "zlocate &lt;nick&gt;: Locate user"
+msgstr "zlocate &lt;nick&gt;: लोकेट प्रयोगकर्ता"
+
+#: src/protocols/zephyr/zephyr.c:2476
+msgid "zl &lt;nick&gt;: Locate user"
+msgstr "zl &lt;nick&gt;: प्रयोगकर्ता तोक्नुहोस्"
+
+#: src/protocols/zephyr/zephyr.c:2481
+msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
+msgstr "instance &lt;instance&gt;: यो वर्गमा प्रयोग गर्नका लागि दृष्टान्त सेट गर्नुहोस्"
+
+#: src/protocols/zephyr/zephyr.c:2486
+msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
+msgstr "inst &lt;instance&gt;: यो वर्गमा प्रयोग गर्नका लागि दृष्टान्त सेट गर्नुहोस्"
+
+#: src/protocols/zephyr/zephyr.c:2492
+msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
+msgstr "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: नयाँ कुराकानीमा जडान गर्नुहोस्"
+
+#: src/protocols/zephyr/zephyr.c:2497
+msgid "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+msgstr "zi &lt;instance&gt;: &lt;message,<i>instance</i>,*&gt; मा सन्देश पठाउनुहोस्"
+
+#: src/protocols/zephyr/zephyr.c:2503
+msgid ""
+"zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
+"<i>instance</i>,*&gt;"
+msgstr ""
+"zci &lt;class&gt; &lt;instance&gt;: &lt;<i>class</i>,"
+"<i>instance</i>,*&gt; मा सन्देश पठाउनुहोस्"
+
+#: src/protocols/zephyr/zephyr.c:2509
+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;"
+msgstr ""
+"zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: &lt;"
+"<i>class</i>,<i>instance</i>,<i>recipient</i>&gt; मा सन्देश पठाउनुहोस्"
+
+#: src/protocols/zephyr/zephyr.c:2515
+msgid ""
+"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
+"<i>instance</i>,<i>recipient</i>&gt;"
+msgstr ""
+"zir &lt;instance&gt; &lt;recipient&gt;: &lt;MESSAGE,"
+"<i>instance</i>,<i>recipient</i>&gt; मा सन्देश पठाउनुहोस्"
+
+#: src/protocols/zephyr/zephyr.c:2520
+msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
+msgstr "zc &lt;class&gt;:  &lt;<i>class</i>,PERSONAL,*&gt; मा सन्देश पठाउनुहोस्"
+
+#: src/protocols/zephyr/zephyr.c:2626
+msgid "Resubscribe"
+msgstr "पुन: सदस्यता"
+
+#: src/protocols/zephyr/zephyr.c:2629
+msgid "Retrieve subscriptions from server"
+msgstr "सर्भरबाट सदस्यता पुन: प्राप्त गर्नुहोस्"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: src/protocols/zephyr/zephyr.c:2712 src/protocols/zephyr/zephyr.c:2714
+msgid "Zephyr Protocol Plugin"
+msgstr "जेफिर प्रोटोकल प्लगइन"
+
+#: src/protocols/zephyr/zephyr.c:2739
+msgid "Export to .anyone"
+msgstr "कोही पनि .मा निर्यात गर्नुहोस्"
+
+#: src/protocols/zephyr/zephyr.c:2742
+msgid "Export to .zephyr.subs"
+msgstr "zephyr.subs मा निर्यात गर्नुहोस्"
+
+#: src/protocols/zephyr/zephyr.c:2745
+msgid "Exposure"
+msgstr "प्रदर्शक"
+
+#. XXX: why in the hell are we calling gaim_connection_error() here?
+#. Forbidden
+#: src/proxy.c:958
+#, c-format
+msgid "Access denied: proxy server forbids port %d tunnelling."
+msgstr "पहुँच अस्विकार: प्रोक्सी सर्भरले पोर्ट %d ट्युन्नेलिङ्ग रोकावट गर्दछ"
+
+#: src/proxy.c:962
+#, c-format
+msgid "Proxy connection error %d"
+msgstr "प्रोक्सी जडान त्रुटि %d"
+
+#: src/proxy.c:1790
+msgid "Invalid proxy settings"
+msgstr "अवैध प्रोक्सी सेटिङ्हरू"
+
+#: src/proxy.c:1790
+msgid ""
+"Either the host name or port number specified for your given proxy type is "
+"invalid."
+msgstr "तपाईँको प्रोक्सीका लागि निर्दिष्ट गरिएको होस्ट नाम वा पोर्ट नम्बर अवैध हुन सक्दछ ।"
+
+#. * Custom away message.
+#: src/prpl.h:187
+msgid "Custom"
+msgstr "अनुकूल"
+
+#. *
+#. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
+#.
+#: src/request.h:1255
+msgid "Accept"
+msgstr "स्वीकार गर्नुहोस्"
+
+#: src/server.c:64
+msgid "Please enter your password"
+msgstr "कृपया तपाईँको पासवर्ड प्रविष्ट गर्नुहोस्"
+
+#: src/server.c:533
+#, c-format
+msgid "%s is now known as %s.\n"
+msgstr "%s लाई अहिले %s को रुपमा चिनिन्छ ।\n"
+
+#: src/server.c:978
+#, c-format
+msgid "(%d message)"
+msgid_plural "(%d messages)"
+msgstr[0] "(%d सन्देश)"
+msgstr[1] "(%d सन्देशहरू)"
+
+#: src/server.c:992
+msgid "(1 message)"
+msgstr "(१ सन्देश)"
+
+#: src/server.c:1215 src/server.c:1224
+#, c-format
+msgid "%s logged in."
+msgstr "%s लग भयो ।"
+
+#: src/server.c:1236
+#, c-format
+msgid "%s signed on"
+msgstr "%s साइनअन भयो"
+
+#: src/server.c:1251
+#, c-format
+msgid "%s came back"
+msgstr "%s फर्कियो"
+
+#: src/server.c:1253
+#, c-format
+msgid "%s went away"
+msgstr "%s टाढा गयो"
+
+#: src/server.c:1267
+#, c-format
+msgid "%s became idle"
+msgstr "%s निष्क्रिय भयो"
+
+#: src/server.c:1278
+#, c-format
+msgid "%s became unidle"
+msgstr "%s निष्क्रिय भएन"
+
+#: src/server.c:1288 src/server.c:1295
+#, c-format
+msgid "%s logged out."
+msgstr "%s लगआउट भयो ।"
+
+#: src/server.c:1308
+#, c-format
+msgid "%s signed off"
+msgstr "%s साइनअफ भयो"
+
+#: src/server.c:1370
+#, c-format
+msgid ""
+"%s has just been warned by %s.\n"
+"Your new warning level is %d%%"
+msgstr ""
+"%s लाई हाल %s द्वारा चेतावनी गरिएको छ ।\n"
+"तपाईँको नयाँ चेतावनी स्तर %d%% हो"
+
+#: src/server.c:1373
+msgid "an anonymous person"
+msgstr "एउटा बेनामी व्यक्ति"
+
+#: src/server.c:1487
+#, c-format
+msgid ""
+"%s has invited %s to the chat room %s:\n"
+"<b>%s</b>"
+msgstr ""
+"%s ले %s लाई कुराकानी कोठा %s मा निमन्त्रणा गर्यो:\n"
+"<b>%s</b>"
+
+#: src/server.c:1493
+#, c-format
+msgid "%s has invited %s to the chat room %s\n"
+msgstr "%s ले %s लाई कुराकानी कोठा %s मा निमन्त्रणा गर्यो\n"
+
+#: src/server.c:1502
+msgid "Accept chat invitation?"
+msgstr "कुराकानी निमन्त्रणा स्विकार गर्नुहुन्छ ?"
+
+#. for people like myself who are too lazy to add an away msg :)
+#. I don't know who "myself" is in this context.  The exclamation point
+#. * makes it slightly less boring ;)
+#: src/status.c:36
+msgid "Sorry, I ran out for a bit!"
+msgstr "माफ गर्नुहोस्, म केहिबेरका लागि बाहिर हिडेँ!"
+
+#: src/stock.c:87
+msgid "_Alias"
+msgstr "उपनाम राख्नुहोस्"
+
+#: src/stock.c:89
+msgid "_Invite"
+msgstr "निमन्त्रणा गर्नुहोस्"
+
+#: src/stock.c:90
+msgid "_Modify"
+msgstr "परिमार्जन गर्नुहोस्"
+
+#: src/stock.c:91
+msgid "_Open Mail"
+msgstr "मेल खोल्नुहोस्"
+
+#: src/stock.c:93
+msgid "_Warn"
+msgstr "चेतावनि दिनुहोस्"
+
+#: src/util.c:2403
+msgid "Calculating..."
+msgstr "गणना गर्दैछ..."
+
+#: src/util.c:2406
+msgid "Unknown."
+msgstr "अज्ञात "
+
+#: src/util.c:2436
+msgid "second"
+msgid_plural "seconds"
+msgstr[0] "सेकेन्ड"
+msgstr[1] "सेकेन्ड"
+
+#: src/util.c:2450
+msgid "day"
+msgid_plural "days"
+msgstr[0] "दिन"
+msgstr[1] "दिन"
+
+#: src/util.c:2458
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "घण्टा"
+msgstr[1] "घण्टा"
+
+#: src/util.c:2466
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "मिनेट"
+msgstr[1] "मिनेट"
+
+#: src/util.c:2889
+msgid "g003: Error opening connection.\n"
+msgstr "g003: जडान खोल्दा त्रुटि ।\n"
+
--- a/po/sl.po	Wed Aug 09 06:23:18 2006 +0000
+++ b/po/sl.po	Wed Aug 09 14:47:37 2006 +0000
@@ -9,7 +9,7 @@
 "Project-Id-Version: Gaim 2.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-09-08 00:02-0400\n"
-"PO-Revision-Date: 2006-05-06 10:45+0100\n"
+"PO-Revision-Date: 2006-06-08 19:57+0100\n"
 "Last-Translator: Martin Srebotnjak <miles@filmsi.net>\n"
 "Language-Team: Martin Srebotnjak, LUGOS <sl@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -186,7 +186,7 @@
 msgstr "Za več neprebranih sporočil kliknite na desni miškin gumb ...\n"
 
 #: ../plugins/docklet/docklet.c:157
-#: ../src/gtkblist.c:3230
+#: ../src/gtkblist.c:3241
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
@@ -202,7 +202,7 @@
 #: ../plugins/docklet/docklet.c:435
 #: ../src/gtkstatusbox.c:673
 #: ../src/protocols/gg/gg.c:996
-#: ../src/protocols/jabber/buddy.c:1103
+#: ../src/protocols/jabber/buddy.c:1363
 #: ../src/protocols/msn/state.c:29
 #: ../src/protocols/msn/state.c:30
 #: ../src/protocols/msn/state.c:37
@@ -222,11 +222,11 @@
 #: ../src/protocols/gg/gg.c:999
 #: ../src/protocols/irc/irc.c:520
 #: ../src/protocols/irc/msgs.c:223
-#: ../src/protocols/jabber/buddy.c:1107
+#: ../src/protocols/jabber/buddy.c:1367
 #: ../src/protocols/novell/novell.c:2846
 #: ../src/protocols/oscar/oscar.c:719
-#: ../src/protocols/oscar/oscar.c:4401
-#: ../src/protocols/oscar/oscar.c:5444
+#: ../src/protocols/oscar/oscar.c:4397
+#: ../src/protocols/oscar/oscar.c:5440
 #: ../src/protocols/silc/buddy.c:1469
 #: ../src/protocols/yahoo/yahoo.c:3185
 #: ../src/protocols/yahoo/yahoo.c:3258
@@ -243,13 +243,13 @@
 msgstr "Neviden"
 
 #: ../plugins/docklet/docklet.c:447
-#: ../src/gtkblist.c:2960
+#: ../src/gtkblist.c:2971
 #: ../src/gtkstatusbox.c:676
 #: ../src/protocols/gg/gg.c:993
-#: ../src/protocols/jabber/buddy.c:1101
+#: ../src/protocols/jabber/buddy.c:1361
 #: ../src/protocols/novell/novell.c:2855
 #: ../src/protocols/oscar/oscar.c:785
-#: ../src/protocols/oscar/oscar.c:5416
+#: ../src/protocols/oscar/oscar.c:5412
 #: ../src/protocols/yahoo/yahoo.c:2729
 #: ../src/status.c:154
 msgid "Offline"
@@ -270,7 +270,7 @@
 msgstr "Pokaži seznam prijateljev"
 
 #: ../plugins/docklet/docklet.c:489
-#: ../src/gtkconv.c:5611
+#: ../src/gtkconv.c:5680
 msgid "Unread Messages"
 msgstr "Neprebrana sporočila"
 
@@ -314,7 +314,7 @@
 
 #: ../plugins/docklet/docklet.c:684
 #: ../plugins/docklet/docklet.c:692
-#: ../plugins/win32/winprefs/winprefs.c:424
+#: ../plugins/win32/winprefs/winprefs.c:462
 #: ../src/gtkprefs.c:823
 #: ../src/gtkprefs.c:1764
 #: ../src/gtkprefs.c:1778
@@ -329,7 +329,7 @@
 #: ../plugins/docklet/docklet.c:694
 #: ../plugins/timestamp_format.c:39
 #: ../plugins/timestamp_format.c:48
-#: ../plugins/win32/winprefs/winprefs.c:425
+#: ../plugins/win32/winprefs/winprefs.c:463
 #: ../src/gtkprefs.c:825
 msgid "Always"
 msgstr "vedno"
@@ -634,7 +634,7 @@
 #: ../plugins/gevolution/assoc-buddy.c:119
 #: ../src/gtkplugin.c:587
 #: ../src/gtkroomlist.c:604
-#: ../src/protocols/jabber/jabber.c:755
+#: ../src/protocols/jabber/jabber.c:759
 #: ../src/protocols/msn/msn.c:1527
 #: ../src/protocols/msn/msn.c:1580
 #: ../src/protocols/msn/msn.c:1601
@@ -646,7 +646,7 @@
 msgstr "Neposredno sporočanje"
 
 #: ../plugins/gevolution/add_buddy_dialog.c:442
-#: ../src/gtkblist.c:4526
+#: ../src/gtkblist.c:4530
 #: ../src/protocols/silc/buddy.c:736
 #: ../src/protocols/silc/buddy.c:1030
 #: ../src/protocols/silc/buddy.c:1075
@@ -663,16 +663,16 @@
 #. "Search"
 #: ../plugins/gevolution/add_buddy_dialog.c:468
 #: ../plugins/gevolution/assoc-buddy.c:353
-#: ../src/protocols/jabber/buddy.c:1459
-#: ../src/protocols/oscar/oscar.c:6024
+#: ../src/protocols/jabber/buddy.c:1720
+#: ../src/protocols/oscar/oscar.c:6020
 #: ../src/protocols/sametime/sametime.c:5524
 msgid "Search"
 msgstr "Išči"
 
 #: ../plugins/gevolution/add_buddy_dialog.c:549
 #: ../plugins/gevolution/new_person_dialog.c:307
-#: ../src/gtkblist.c:4610
-#: ../src/gtkblist.c:4974
+#: ../src/gtkblist.c:4614
+#: ../src/gtkblist.c:4978
 msgid "Group:"
 msgstr "Skupina:"
 
@@ -705,7 +705,7 @@
 
 #: ../plugins/gevolution/eds-utils.c:73
 #: ../plugins/gevolution/eds-utils.c:86
-#: ../src/protocols/jabber/jabber.c:1122
+#: ../src/protocols/jabber/jabber.c:1125
 msgid "None"
 msgstr "brez"
 
@@ -714,7 +714,7 @@
 #: ../src/blist.c:516
 #: ../src/blist.c:1278
 #: ../src/blist.c:1505
-#: ../src/gtkblist.c:4419
+#: ../src/gtkblist.c:4423
 #: ../src/protocols/jabber/roster.c:65
 msgid "Buddies"
 msgstr "Prijatelji"
@@ -791,7 +791,7 @@
 
 #: ../plugins/gevolution/new_person_dialog.c:295
 #: ../src/gtkaccount.c:784
-#: ../src/gtkblist.c:4572
+#: ../src/gtkblist.c:4576
 msgid "Screen name:"
 msgstr "Zaslonsko ime:"
 
@@ -1676,7 +1676,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../plugins/timestamp.c:254
+#: ../plugins/timestamp.c:256
 msgid "Timestamp"
 msgstr "Čas nastanka"
 
@@ -1684,8 +1684,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../plugins/timestamp.c:257
 #: ../plugins/timestamp.c:259
+#: ../plugins/timestamp.c:261
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "Doda čase nastanka vsakih N minut v slogu iChata."
 
@@ -1810,59 +1810,59 @@
 "\n"
 "* Pozor: Ta vstavek zahteva Win2000 ali novejše."
 
-#: ../plugins/win32/winprefs/winprefs.c:397
+#: ../plugins/win32/winprefs/winprefs.c:434
 msgid "GTK+ Runtime Version"
 msgstr "Nastavitve GTK+"
 
 #. Autostart
-#: ../plugins/win32/winprefs/winprefs.c:405
+#: ../plugins/win32/winprefs/winprefs.c:442
 msgid "Startup"
 msgstr "Zagon"
 
-#: ../plugins/win32/winprefs/winprefs.c:406
+#: ../plugins/win32/winprefs/winprefs.c:443
 msgid "_Start Gaim on Windows startup"
 msgstr "Za_ženi Gaim ob zagonu Windows"
 
 #. Buddy List
-#: ../plugins/win32/winprefs/winprefs.c:417
-#: ../src/gtkblist.c:3663
+#: ../plugins/win32/winprefs/winprefs.c:455
+#: ../src/gtkblist.c:3667
 msgid "Buddy List"
 msgstr "Seznam prijateljev"
 
-#: ../plugins/win32/winprefs/winprefs.c:418
+#: ../plugins/win32/winprefs/winprefs.c:456
 msgid "_Dockable Buddy List"
 msgstr "Le_pljiv seznam prijateljev"
 
 #. Blist On Top
-#: ../plugins/win32/winprefs/winprefs.c:422
+#: ../plugins/win32/winprefs/winprefs.c:460
 msgid "_Keep Buddy List window on top:"
 msgstr "_Ohrani seznam prijateljev nad vrhu:"
 
 #. XXX: Did this ever work?
-#: ../plugins/win32/winprefs/winprefs.c:427
+#: ../plugins/win32/winprefs/winprefs.c:465
 msgid "Only when docked"
 msgstr "samo, ko je lepljiv"
 
 #. Conversations
-#: ../plugins/win32/winprefs/winprefs.c:431
+#: ../plugins/win32/winprefs/winprefs.c:469
 #: ../src/gtkprefs.c:819
 #: ../src/gtkprefs.c:1879
 msgid "Conversations"
 msgstr "Pogovori"
 
-#: ../plugins/win32/winprefs/winprefs.c:432
+#: ../plugins/win32/winprefs/winprefs.c:470
 msgid "_Flash window when messages are received"
 msgstr "Utrip_aj z oknom, ko prispe novo sporočilo"
 
-#: ../plugins/win32/winprefs/winprefs.c:456
+#: ../plugins/win32/winprefs/winprefs.c:494
 msgid "WinGaim Options"
 msgstr "Možnosti Gaim za Windows"
 
-#: ../plugins/win32/winprefs/winprefs.c:458
+#: ../plugins/win32/winprefs/winprefs.c:496
 msgid "Options specific to Windows Gaim."
 msgstr "Nastavitve, specifične za okolje Windows."
 
-#: ../plugins/win32/winprefs/winprefs.c:459
+#: ../plugins/win32/winprefs/winprefs.c:497
 msgid "Provides options specific to Windows Gaim, such as buddy list docking and conversation flashing."
 msgstr "Ponuja posebne nastavitve okenskega Gaima, kot je "
 
@@ -1870,37 +1870,37 @@
 msgid "accounts"
 msgstr "Računi"
 
-#: ../src/account.c:923
+#: ../src/account.c:918
 msgid "Password is required to sign on."
 msgstr "Za prijavo je potrebno geslo."
 
-#: ../src/account.c:948
+#: ../src/account.c:943
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Vpišite geslo za %s (%s)"
 
-#: ../src/account.c:955
+#: ../src/account.c:950
 msgid "Enter Password"
 msgstr "Vnesi geslo"
 
-#: ../src/account.c:960
+#: ../src/account.c:955
 msgid "Save password"
 msgstr "Shrani geslo"
 
 #. *
 #. * 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:3546
-#: ../src/gtkdialogs.c:602
-#: ../src/gtkdialogs.c:739
-#: ../src/gtkdialogs.c:803
+#: ../src/account.c:963
+#: ../src/account.c:1134
+#: ../src/gtkblist.c:3551
+#: ../src/gtkdialogs.c:613
+#: ../src/gtkdialogs.c:750
+#: ../src/gtkdialogs.c:814
 #: ../src/gtkrequest.c:269
 #: ../src/protocols/gg/gg.c:497
 #: ../src/protocols/gg/gg.c:655
 #: ../src/protocols/gg/gg.c:791
-#: ../src/protocols/jabber/jabber.c:1319
+#: ../src/protocols/jabber/jabber.c:1322
 #: ../src/protocols/jabber/xdata.c:337
 #: ../src/protocols/msn/msn.c:250
 #: ../src/protocols/msn/msn.c:265
@@ -1909,10 +1909,10 @@
 #: ../src/protocols/oscar/oscar.c:1408
 #: ../src/protocols/oscar/oscar.c:2167
 #: ../src/protocols/oscar/oscar.c:2260
-#: ../src/protocols/oscar/oscar.c:5694
-#: ../src/protocols/oscar/oscar.c:5874
-#: ../src/protocols/oscar/oscar.c:5899
-#: ../src/protocols/oscar/oscar.c:5955
+#: ../src/protocols/oscar/oscar.c:5690
+#: ../src/protocols/oscar/oscar.c:5870
+#: ../src/protocols/oscar/oscar.c:5895
+#: ../src/protocols/oscar/oscar.c:5951
 #: ../src/protocols/silc/buddy.c:466
 #: ../src/protocols/silc/buddy.c:1182
 #: ../src/protocols/silc/chat.c:424
@@ -1927,22 +1927,22 @@
 msgid "OK"
 msgstr "V redu"
 
-#: ../src/account.c:969
-#: ../src/account.c:1140
-#: ../src/account.c:1177
+#: ../src/account.c:964
+#: ../src/account.c:1135
+#: ../src/account.c:1172
 #: ../src/gtkaccount.c:2182
 #: ../src/gtkaccount.c:2649
-#: ../src/gtkblist.c:5015
-#: ../src/gtkdialogs.c:603
-#: ../src/gtkdialogs.c:740
-#: ../src/gtkdialogs.c:804
-#: ../src/gtkdialogs.c:823
-#: ../src/gtkdialogs.c:845
-#: ../src/gtkdialogs.c:865
-#: ../src/gtkdialogs.c:909
-#: ../src/gtkdialogs.c:964
-#: ../src/gtkdialogs.c:1001
-#: ../src/gtkdialogs.c:1026
+#: ../src/gtkblist.c:5019
+#: ../src/gtkdialogs.c:614
+#: ../src/gtkdialogs.c:751
+#: ../src/gtkdialogs.c:815
+#: ../src/gtkdialogs.c:834
+#: ../src/gtkdialogs.c:856
+#: ../src/gtkdialogs.c:876
+#: ../src/gtkdialogs.c:920
+#: ../src/gtkdialogs.c:975
+#: ../src/gtkdialogs.c:1012
+#: ../src/gtkdialogs.c:1037
 #: ../src/gtkimhtmltoolbar.c:419
 #: ../src/gtkplugin.c:296
 #: ../src/gtkpounce.c:1077
@@ -1956,12 +1956,12 @@
 #: ../src/protocols/gg/gg.c:656
 #: ../src/protocols/gg/gg.c:792
 #: ../src/protocols/gg/gg.c:871
-#: ../src/protocols/jabber/buddy.c:575
-#: ../src/protocols/jabber/buddy.c:1460
-#: ../src/protocols/jabber/buddy.c:1494
+#: ../src/protocols/jabber/buddy.c:594
+#: ../src/protocols/jabber/buddy.c:1721
+#: ../src/protocols/jabber/buddy.c:1755
 #: ../src/protocols/jabber/chat.c:778
-#: ../src/protocols/jabber/jabber.c:824
-#: ../src/protocols/jabber/jabber.c:1320
+#: ../src/protocols/jabber/jabber.c:828
+#: ../src/protocols/jabber/jabber.c:1323
 #: ../src/protocols/jabber/xdata.c:338
 #: ../src/protocols/msn/msn.c:251
 #: ../src/protocols/msn/msn.c:266
@@ -1972,12 +1972,13 @@
 #: ../src/protocols/oscar/oscar.c:2168
 #: ../src/protocols/oscar/oscar.c:2209
 #: ../src/protocols/oscar/oscar.c:2261
-#: ../src/protocols/oscar/oscar.c:5695
-#: ../src/protocols/oscar/oscar.c:5747
-#: ../src/protocols/oscar/oscar.c:5875
-#: ../src/protocols/oscar/oscar.c:5900
-#: ../src/protocols/oscar/oscar.c:5956
-#: ../src/protocols/oscar/oscar.c:6025
+#: ../src/protocols/oscar/oscar.c:5691
+#: ../src/protocols/oscar/oscar.c:5743
+#: ../src/protocols/oscar/oscar.c:5871
+#: ../src/protocols/oscar/oscar.c:5896
+#: ../src/protocols/oscar/oscar.c:5952
+#: ../src/protocols/oscar/oscar.c:6021
+#: ../src/protocols/oscar/peer.c:942
 #: ../src/protocols/sametime/sametime.c:3368
 #: ../src/protocols/sametime/sametime.c:3453
 #: ../src/protocols/sametime/sametime.c:3623
@@ -1999,73 +2000,72 @@
 msgid "Cancel"
 msgstr "Prekliči"
 
-#: ../src/account.c:994
+#: ../src/account.c:989
 #: ../src/connection.c:96
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Manjka vstavek za protokol %s"
 
-#: ../src/account.c:996
+#: ../src/account.c:991
 #: ../src/connection.c:99
-#: ../src/gtkblist.c:3538
-#: ../src/gtkblist.c:3544
+#: ../src/gtkblist.c:3549
 msgid "Connection Error"
 msgstr "Napaka na povezavi"
 
-#: ../src/account.c:1076
+#: ../src/account.c:1071
 #: ../src/protocols/gg/gg.c:696
-#: ../src/protocols/jabber/jabber.c:1272
+#: ../src/protocols/jabber/jabber.c:1275
 msgid "New passwords do not match."
 msgstr "Novi gesli se ne ujemata."
 
-#: ../src/account.c:1085
+#: ../src/account.c:1080
 msgid "Fill out all fields completely."
 msgstr "Izpolnite vsa polja."
 
-#: ../src/account.c:1108
+#: ../src/account.c:1103
 msgid "Original password"
 msgstr "Obstoječe geslo"
 
-#: ../src/account.c:1115
+#: ../src/account.c:1110
 msgid "New password"
 msgstr "Novo geslo"
 
-#: ../src/account.c:1122
+#: ../src/account.c:1117
 msgid "New password (again)"
 msgstr "Novo geslo (ponovno)"
 
-#: ../src/account.c:1128
+#: ../src/account.c:1123
 #, c-format
 msgid "Change password for %s"
 msgstr "Spremeni geslo za %s"
 
-#: ../src/account.c:1136
+#: ../src/account.c:1131
 msgid "Please enter your current password and your new password."
 msgstr "Vnesite svoje obstoječe in novo geslo."
 
-#: ../src/account.c:1169
+#: ../src/account.c:1164
 #, c-format
 msgid "Change user information for %s"
 msgstr "Spremeni podatke za uporabika %s"
 
-#: ../src/account.c:1172
+#: ../src/account.c:1167
 #: ../src/protocols/toc/toc.c:1684
 msgid "Set User Info"
 msgstr "Nastavi informacije o uporabniku"
 
-#: ../src/account.c:1176
+#: ../src/account.c:1171
 #: ../src/gtkdebug.c:684
 #: ../src/gtkrequest.c:276
-#: ../src/protocols/jabber/buddy.c:574
+#: ../src/protocols/jabber/buddy.c:593
 msgid "Save"
 msgstr "Shrani"
 
-#: ../src/account.c:1679
+#: ../src/account.c:1681
 #: ../src/gtkft.c:159
 #: ../src/protocols/gg/gg.c:1002
-#: ../src/protocols/jabber/buddy.c:632
-#: ../src/protocols/jabber/buddy.c:1097
-#: ../src/protocols/jabber/buddy.c:1114
+#: ../src/protocols/jabber/buddy.c:636
+#: ../src/protocols/jabber/buddy.c:1357
+#: ../src/protocols/jabber/buddy.c:1374
 #: ../src/protocols/novell/novell.c:2858
 msgid "Unknown"
 msgstr "Neznan"
@@ -2254,31 +2254,31 @@
 msgid "File transfer complete"
 msgstr "Prenos datoteke je dokončan."
 
-#: ../src/ft.c:1028
+#: ../src/ft.c:1030
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Prekinili ste prenos %s"
 
-#: ../src/ft.c:1033
+#: ../src/ft.c:1035
 msgid "File transfer cancelled"
 msgstr "Prenos datoteke je preklican"
 
-#: ../src/ft.c:1091
+#: ../src/ft.c:1093
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s je prekinil prenos %s"
 
-#: ../src/ft.c:1096
+#: ../src/ft.c:1098
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s je prekinil prenos datoteke"
 
-#: ../src/ft.c:1153
+#: ../src/ft.c:1155
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "Prenos datoteke do %s ni uspel."
 
-#: ../src/ft.c:1155
+#: ../src/ft.c:1157
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "Prenos datoteke od %s ni uspel."
@@ -2309,8 +2309,8 @@
 msgstr "Geslo:"
 
 #: ../src/gtkaccount.c:863
-#: ../src/gtkblist.c:4593
-#: ../src/gtkblist.c:4959
+#: ../src/gtkblist.c:4597
+#: ../src/gtkblist.c:4963
 msgid "Alias:"
 msgstr "Psevdonim:"
 
@@ -2409,7 +2409,7 @@
 msgstr "Dodaj račun"
 
 #: ../src/gtkaccount.c:1749
-#: ../src/gtkblist.c:3547
+#: ../src/gtkblist.c:3552
 msgid "Modify Account"
 msgstr "Spremeni račun"
 
@@ -2423,7 +2423,7 @@
 
 #. Register button
 #: ../src/gtkaccount.c:1797
-#: ../src/protocols/jabber/jabber.c:823
+#: ../src/protocols/jabber/jabber.c:827
 msgid "Register"
 msgstr "Registriraj se"
 
@@ -2460,8 +2460,8 @@
 msgstr "Želite dodati prijatelja na seznam?"
 
 #: ../src/gtkaccount.c:2648
-#: ../src/gtkblist.c:5014
-#: ../src/gtkconv.c:1623
+#: ../src/gtkblist.c:5018
+#: ../src/gtkconv.c:1625
 #: ../src/gtkrequest.c:274
 #: ../src/protocols/gg/gg.c:870
 #: ../src/protocols/oscar/oscar.c:2453
@@ -2470,239 +2470,239 @@
 msgid "Add"
 msgstr "Dodaj"
 
-#: ../src/gtkblist.c:664
+#: ../src/gtkblist.c:673
 msgid "Join a Chat"
 msgstr "Pridruži se pomenku"
 
-#: ../src/gtkblist.c:685
+#: ../src/gtkblist.c:694
 msgid "Please enter the appropriate information about the chat you would like to join.\n"
 msgstr "Vnesite ustrezne informacije o pomenku, ki se mu želite pridružiti.\n"
 
-#: ../src/gtkblist.c:696
+#: ../src/gtkblist.c:705
 #: ../src/gtkpounce.c:519
 #: ../src/gtkroomlist.c:377
 msgid "_Account:"
 msgstr "_Račun:"
 
-#: ../src/gtkblist.c:940
+#: ../src/gtkblist.c:949
 msgid "Get _Info"
 msgstr "_Informacije"
 
-#: ../src/gtkblist.c:943
+#: ../src/gtkblist.c:952
 #: ../src/gtkstock.c:141
 msgid "I_M"
 msgstr "_Sporoči"
 
-#: ../src/gtkblist.c:949
+#: ../src/gtkblist.c:958
 msgid "_Send File"
 msgstr "_Pošlji datoteko"
 
-#: ../src/gtkblist.c:956
+#: ../src/gtkblist.c:965
 msgid "Add Buddy _Pounce"
 msgstr "Dodaj _opozorilo prijatelja"
 
-#: ../src/gtkblist.c:960
-#: ../src/gtkblist.c:964
-#: ../src/gtkblist.c:1063
-#: ../src/gtkblist.c:1086
+#: ../src/gtkblist.c:969
+#: ../src/gtkblist.c:973
+#: ../src/gtkblist.c:1072
+#: ../src/gtkblist.c:1095
 msgid "View _Log"
 msgstr "Poglej _dnevnik"
 
-#: ../src/gtkblist.c:975
+#: ../src/gtkblist.c:984
 msgid "Alias..."
 msgstr "Psevdonim ..."
 
-#: ../src/gtkblist.c:978
-#: ../src/gtkconv.c:1620
+#: ../src/gtkblist.c:987
+#: ../src/gtkconv.c:1622
 #: ../src/gtkrequest.c:275
 msgid "Remove"
 msgstr "Odstrani"
 
-#: ../src/gtkblist.c:984
-#: ../src/gtkblist.c:1071
-#: ../src/gtkblist.c:1092
+#: ../src/gtkblist.c:993
+#: ../src/gtkblist.c:1080
+#: ../src/gtkblist.c:1101
 msgid "_Alias..."
 msgstr "_Psevdonim ..."
 
-#: ../src/gtkblist.c:986
-#: ../src/gtkblist.c:1073
-#: ../src/gtkblist.c:1094
+#: ../src/gtkblist.c:995
+#: ../src/gtkblist.c:1082
+#: ../src/gtkblist.c:1103
 msgid "_Remove"
 msgstr "Odst_rani"
 
-#: ../src/gtkblist.c:1034
+#: ../src/gtkblist.c:1043
 msgid "Add a _Buddy"
 msgstr "Dodaj _prijatelja"
 
-#: ../src/gtkblist.c:1036
+#: ../src/gtkblist.c:1045
 msgid "Add a C_hat"
 msgstr "Dodaj po_menek"
 
-#: ../src/gtkblist.c:1039
+#: ../src/gtkblist.c:1048
 msgid "_Delete Group"
 msgstr "_Zbriši skupino"
 
-#: ../src/gtkblist.c:1041
+#: ../src/gtkblist.c:1050
 msgid "_Rename"
 msgstr "P_reimenuj"
 
 #. join button
-#: ../src/gtkblist.c:1059
+#: ../src/gtkblist.c:1068
 #: ../src/gtkroomlist.c:285
 #: ../src/gtkroomlist.c:441
 #: ../src/gtkstock.c:139
 msgid "_Join"
 msgstr "_Pridruži se"
 
-#: ../src/gtkblist.c:1061
+#: ../src/gtkblist.c:1070
 msgid "Auto-Join"
 msgstr "Samodejno-pridruži"
 
-#: ../src/gtkblist.c:1099
-#: ../src/gtkblist.c:1122
+#: ../src/gtkblist.c:1108
+#: ../src/gtkblist.c:1131
 msgid "_Collapse"
 msgstr "_Strni"
 
-#: ../src/gtkblist.c:1127
+#: ../src/gtkblist.c:1136
 msgid "_Expand"
 msgstr "_Razširi"
 
-#: ../src/gtkblist.c:1373
-#: ../src/gtkblist.c:1385
-#: ../src/gtkblist.c:3808
-#: ../src/gtkblist.c:3818
+#: ../src/gtkblist.c:1382
+#: ../src/gtkblist.c:1394
+#: ../src/gtkblist.c:3812
+#: ../src/gtkblist.c:3822
 msgid "/Tools/Mute Sounds"
 msgstr "/Orodja/Utišaj zvoke"
 
-#: ../src/gtkblist.c:1845
-#: ../src/gtkconv.c:4176
+#: ../src/gtkblist.c:1854
+#: ../src/gtkconv.c:4245
 #: ../src/gtkpounce.c:418
 msgid "You are not currently signed on with an account that can add that buddy."
 msgstr "Trenutno niste prijavljeni z nobenim računom, ki lahko doda tega prijatelja."
 
 #. Buddies menu
-#: ../src/gtkblist.c:2419
+#: ../src/gtkblist.c:2428
 msgid "/_Buddies"
 msgstr "/_Prijatelji"
 
-#: ../src/gtkblist.c:2420
+#: ../src/gtkblist.c:2429
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Prijatelji/Novo _neposredno sporočilo ..."
 
-#: ../src/gtkblist.c:2421
+#: ../src/gtkblist.c:2430
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Prijatelji/Pridruži se _pomenku ..."
 
-#: ../src/gtkblist.c:2422
+#: ../src/gtkblist.c:2431
 msgid "/Buddies/Get User _Info..."
 msgstr "/Prijatelji/Informacije o _uporabniku ..."
 
-#: ../src/gtkblist.c:2423
+#: ../src/gtkblist.c:2432
 msgid "/Buddies/View User _Log..."
 msgstr "/Prijatelji/Pog_lej uporabnikov dnevnik ..."
 
-#: ../src/gtkblist.c:2425
+#: ../src/gtkblist.c:2434
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Prijatelji/Prikaži prijatelje, ki niso na z_vezi"
 
-#: ../src/gtkblist.c:2426
+#: ../src/gtkblist.c:2435
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Prijatelji/Prikaži pra_zne skupine"
 
-#: ../src/gtkblist.c:2427
+#: ../src/gtkblist.c:2436
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/Prijatelji/Pokaži p_odrobnosti prijateljev"
 
-#: ../src/gtkblist.c:2428
+#: ../src/gtkblist.c:2437
 msgid "/Buddies/Show Idle _Times"
 msgstr "/Prijatelji/Pokaži čase _nedejavnosti"
 
-#: ../src/gtkblist.c:2429
+#: ../src/gtkblist.c:2438
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Prijatelji/Razvr_sti prijatelje"
 
-#: ../src/gtkblist.c:2431
+#: ../src/gtkblist.c:2440
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Prijatelji/Dodaj p_rijatelja ..."
 
-#: ../src/gtkblist.c:2432
+#: ../src/gtkblist.c:2441
 msgid "/Buddies/Add C_hat..."
 msgstr "/Prijatelji/Dodaj p_omenek ..."
 
-#: ../src/gtkblist.c:2433
+#: ../src/gtkblist.c:2442
 msgid "/Buddies/Add _Group..."
 msgstr "/Prijatelji/Dodaj s_kupino ..."
 
-#: ../src/gtkblist.c:2435
+#: ../src/gtkblist.c:2444
 msgid "/Buddies/_Quit"
 msgstr "/Prijatelji/Iz_hod"
 
 #. Accounts menu
-#: ../src/gtkblist.c:2438
+#: ../src/gtkblist.c:2447
 msgid "/_Accounts"
 msgstr "/_Računi"
 
-#: ../src/gtkblist.c:2439
-#: ../src/gtkblist.c:5591
+#: ../src/gtkblist.c:2448
+#: ../src/gtkblist.c:5595
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Računi/Dodaj\\/Uredi"
 
 #. Tools
-#: ../src/gtkblist.c:2442
+#: ../src/gtkblist.c:2451
 msgid "/_Tools"
 msgstr "/_Orodja"
 
-#: ../src/gtkblist.c:2443
+#: ../src/gtkblist.c:2452
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Orodja/Opozorila pri_jateljev"
 
-#: ../src/gtkblist.c:2444
+#: ../src/gtkblist.c:2453
 msgid "/Tools/Plu_gins"
 msgstr "/Orodja/Vstav_ki"
 
-#: ../src/gtkblist.c:2445
+#: ../src/gtkblist.c:2454
 msgid "/Tools/Pr_eferences"
 msgstr "/Orodja/_Nastavitve"
 
-#: ../src/gtkblist.c:2446
+#: ../src/gtkblist.c:2455
 msgid "/Tools/Pr_ivacy"
 msgstr "/Orodja/_Zasebnost"
 
-#: ../src/gtkblist.c:2448
+#: ../src/gtkblist.c:2457
 msgid "/Tools/_File Transfers"
 msgstr "/Orodja/_Prenosi datotek"
 
-#: ../src/gtkblist.c:2449
+#: ../src/gtkblist.c:2458
 msgid "/Tools/R_oom List"
 msgstr "/Orodja/_Seznam sob"
 
-#: ../src/gtkblist.c:2450
+#: ../src/gtkblist.c:2459
 msgid "/Tools/System _Log"
 msgstr "/Orodja/Sistemski _dnevnik"
 
-#: ../src/gtkblist.c:2452
+#: ../src/gtkblist.c:2461
 msgid "/Tools/Mute _Sounds"
 msgstr "/Orodja/_Utišaj zvoke"
 
 #. Help
-#: ../src/gtkblist.c:2455
+#: ../src/gtkblist.c:2464
 msgid "/_Help"
 msgstr "/_Pomoč"
 
-#: ../src/gtkblist.c:2456
+#: ../src/gtkblist.c:2465
 msgid "/Help/Online _Help"
 msgstr "/Pomoč/Pomoč _na spletu"
 
-#: ../src/gtkblist.c:2457
+#: ../src/gtkblist.c:2466
 msgid "/Help/_Debug Window"
 msgstr "/Pomoč/Raz_hroščevalno okno"
 
-#: ../src/gtkblist.c:2458
+#: ../src/gtkblist.c:2467
 msgid "/Help/_About"
 msgstr "/Pomoč/_O programu"
 
-#: ../src/gtkblist.c:2490
-#: ../src/gtkblist.c:2559
+#: ../src/gtkblist.c:2499
+#: ../src/gtkblist.c:2568
 #, c-format
 msgid ""
 "\n"
@@ -2711,7 +2711,7 @@
 "\n"
 "<b>Račun:</b> %s"
 
-#: ../src/gtkblist.c:2571
+#: ../src/gtkblist.c:2580
 #, c-format
 msgid ""
 "\n"
@@ -2720,7 +2720,7 @@
 "\n"
 "<b>Psevdonim:</b> %s"
 
-#: ../src/gtkblist.c:2583
+#: ../src/gtkblist.c:2592
 #, c-format
 msgid ""
 "\n"
@@ -2729,7 +2729,7 @@
 "\n"
 "<b>Vzdevek:</b> %s"
 
-#: ../src/gtkblist.c:2592
+#: ../src/gtkblist.c:2601
 #, c-format
 msgid ""
 "\n"
@@ -2738,7 +2738,7 @@
 "\n"
 "<b>Prijavljen(i):</b> %s"
 
-#: ../src/gtkblist.c:2603
+#: ../src/gtkblist.c:2612
 #, c-format
 msgid ""
 "\n"
@@ -2747,7 +2747,7 @@
 "\n"
 "<b>Nedejaven:</b> %s"
 
-#: ../src/gtkblist.c:2638
+#: ../src/gtkblist.c:2647
 #, c-format
 msgid ""
 "\n"
@@ -2756,7 +2756,7 @@
 "\n"
 "<b>Zadnjič viden:</b> pred %s"
 
-#: ../src/gtkblist.c:2647
+#: ../src/gtkblist.c:2656
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2764,7 +2764,7 @@
 "\n"
 "<b>Stanje:</b> Ni na zvezi"
 
-#: ../src/gtkblist.c:2658
+#: ../src/gtkblist.c:2667
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2772,7 +2772,7 @@
 "\n"
 "<b>Opis:</b> Strašljivo"
 
-#: ../src/gtkblist.c:2660
+#: ../src/gtkblist.c:2669
 msgid ""
 "\n"
 "<b>Status:</b> Awesome"
@@ -2780,7 +2780,7 @@
 "\n"
 "<b>Stanje</b>: Neverjetno!"
 
-#: ../src/gtkblist.c:2662
+#: ../src/gtkblist.c:2671
 msgid ""
 "\n"
 "<b>Status:</b> Rockin'"
@@ -2788,20 +2788,22 @@
 "\n"
 "<b>Stanje</b>: Kulsko"
 
-#: ../src/gtkblist.c:2951
+#: ../src/gtkblist.c:2962
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Nedejaven %dh %02dm"
 
-#: ../src/gtkblist.c:2953
+#: ../src/gtkblist.c:2964
 #, c-format
 msgid "Idle %dm"
 msgstr "Nedejaven %dm"
 
 #. Idle stuff
-#: ../src/gtkblist.c:2956
+#: ../src/gtkblist.c:2967
 #: ../src/gtkprefs.c:1760
 #: ../src/protocols/bonjour/bonjour.c:333
+#: ../src/protocols/jabber/buddy.c:641
+#: ../src/protocols/jabber/buddy.c:672
 #: ../src/protocols/msn/msn.c:550
 #: ../src/protocols/msn/state.c:32
 #: ../src/protocols/novell/novell.c:2852
@@ -2811,165 +2813,166 @@
 msgid "Idle"
 msgstr "Nedejaven"
 
-#: ../src/gtkblist.c:3088
+#: ../src/gtkblist.c:3099
 msgid "/Buddies/New Instant Message..."
 msgstr "/Prijatelji/Novo neposredno sporočilo ..."
 
-#: ../src/gtkblist.c:3089
-#: ../src/gtkblist.c:3122
+#: ../src/gtkblist.c:3100
+#: ../src/gtkblist.c:3133
 msgid "/Buddies/Join a Chat..."
 msgstr "/Prijatelji/Pridruži se pomenku ..."
 
-#: ../src/gtkblist.c:3090
+#: ../src/gtkblist.c:3101
 msgid "/Buddies/Get User Info..."
 msgstr "/Prijatelji/Informacije o uporabniku ..."
 
-#: ../src/gtkblist.c:3091
+#: ../src/gtkblist.c:3102
 msgid "/Buddies/Add Buddy..."
 msgstr "/Prijatelji/Dodaj prijatelja ..."
 
-#: ../src/gtkblist.c:3092
-#: ../src/gtkblist.c:3125
+#: ../src/gtkblist.c:3103
+#: ../src/gtkblist.c:3136
 msgid "/Buddies/Add Chat..."
 msgstr "/Prijatelji/Dodaj pomenek ..."
 
-#: ../src/gtkblist.c:3093
+#: ../src/gtkblist.c:3104
 msgid "/Buddies/Add Group..."
 msgstr "/Prijatelji/Dodaj skupino ..."
 
-#: ../src/gtkblist.c:3128
+#: ../src/gtkblist.c:3139
 msgid "/Tools/Buddy Pounces"
 msgstr "/Orodja/Opozorila prijateljev"
 
-#: ../src/gtkblist.c:3131
+#: ../src/gtkblist.c:3142
 msgid "/Tools/Privacy"
 msgstr "/Orodja/Zasebnost"
 
-#: ../src/gtkblist.c:3134
+#: ../src/gtkblist.c:3145
 msgid "/Tools/Room List"
 msgstr "/Orodja/Seznam sob"
 
-#: ../src/gtkblist.c:3328
+#: ../src/gtkblist.c:3339
 msgid "Manually"
 msgstr "ročno"
 
-#: ../src/gtkblist.c:3330
+#: ../src/gtkblist.c:3341
 msgid "Alphabetically"
 msgstr "abecedno"
 
-#: ../src/gtkblist.c:3331
+#: ../src/gtkblist.c:3342
 msgid "By status"
 msgstr "po stanju"
 
-#: ../src/gtkblist.c:3332
+#: ../src/gtkblist.c:3343
 msgid "By log size"
 msgstr "po obsegu dnevnika"
 
-#: ../src/gtkblist.c:3532
-#: ../src/gtkconn.c:196
+#: ../src/gtkblist.c:3544
+#: ../src/gtkconn.c:184
 #, c-format
 msgid "%s disconnected"
 msgstr "%s se je odjavil"
 
-#: ../src/gtkblist.c:3548
+#: ../src/gtkblist.c:3553
 #: ../src/protocols/sametime/sametime.c:3622
 msgid "Connect"
 msgstr "Poveži se"
 
-#: ../src/gtkblist.c:3548
+#: ../src/gtkblist.c:3553
 msgid "Re-enable Account"
 msgstr "Ponovno omogoči račun"
 
-#: ../src/gtkblist.c:3570
+#: ../src/gtkblist.c:3574
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s ni več povezan: %s</span>"
 
-#: ../src/gtkblist.c:3697
+#: ../src/gtkblist.c:3701
 msgid "/Accounts"
 msgstr "/Računi"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../src/gtkblist.c:3802
+#: ../src/gtkblist.c:3806
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Prijatelji/Pokaži prijatelje, ki niso na zvezi"
 
-#: ../src/gtkblist.c:3805
+#: ../src/gtkblist.c:3809
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Prijatelji/Pokaži prazne skupine"
 
-#: ../src/gtkblist.c:3811
+#: ../src/gtkblist.c:3815
 msgid "/Buddies/Show Buddy Details"
 msgstr "/Prijatelji/Pokaži podrobnosti prijatelja"
 
-#: ../src/gtkblist.c:3814
+#: ../src/gtkblist.c:3818
 msgid "/Buddies/Show Idle Times"
 msgstr "/Prijatelji/Pokaži čase nedejavnosti"
 
-#: ../src/gtkblist.c:4550
+#: ../src/gtkblist.c:4554
 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. The alias will be displayed in place of the screen name whenever possible.\n"
 msgstr "Prosim vnesite ime osebe, ki jo želite dodati vašemu seznamu prijateljev. Vnesete lahko tudi psevdonim ali vzdevek. Kjer bo izvedljivo, bo namesto vzdevka prikazan psevdonim.\n"
 
 #. Set up stuff for the account box
-#: ../src/gtkblist.c:4620
-#: ../src/gtkblist.c:4939
+#: ../src/gtkblist.c:4624
+#: ../src/gtkblist.c:4943
 msgid "Account:"
 msgstr "Račun:"
 
-#: ../src/gtkblist.c:4872
+#: ../src/gtkblist.c:4876
 msgid "This protocol does not support chat rooms."
 msgstr "Ta protokol ne podpira klepetalnic."
 
-#: ../src/gtkblist.c:4888
+#: ../src/gtkblist.c:4892
 msgid "You are not currently signed on with any protocols that have the ability to chat."
 msgstr "Trenutno niste prijavljeni na nobenem izmed protokolov, ki podpirajo pomenke."
 
-#: ../src/gtkblist.c:4905
+#: ../src/gtkblist.c:4909
 msgid "Add Chat"
 msgstr "Dodaj pomenek"
 
-#: ../src/gtkblist.c:4929
+#: ../src/gtkblist.c:4933
 msgid "Please enter an alias, and the appropriate information about the chat you would like to add to your buddy list.\n"
 msgstr "Prosim vnesite psevdonim in ostale informacije za pomenek, ki ga želite dodati na seznam prijateljev.\n"
 
-#: ../src/gtkblist.c:5011
+#: ../src/gtkblist.c:5015
 #: ../src/protocols/sametime/sametime.c:5311
 #: ../src/protocols/sametime/sametime.c:5398
 msgid "Add Group"
 msgstr "Dodaj skupino"
 
-#: ../src/gtkblist.c:5012
+#: ../src/gtkblist.c:5016
 msgid "Please enter the name of the group to be added."
 msgstr "Prosimo vnesite ime skupine, ki jo želite dodati."
 
-#: ../src/gtkblist.c:5631
+#: ../src/gtkblist.c:5635
 msgid "_Edit Account"
 msgstr "_Uredi račun"
 
-#: ../src/gtkblist.c:5664
-#: ../src/gtkblist.c:5670
+#: ../src/gtkblist.c:5668
+#: ../src/gtkblist.c:5674
+#: ../src/gtkconv.c:2753
 msgid "No actions available"
 msgstr "Na voljo ni nobenega ukaza"
 
-#: ../src/gtkblist.c:5678
+#: ../src/gtkblist.c:5682
 msgid "_Disable"
 msgstr "_Onemogoči"
 
-#: ../src/gtkblist.c:5690
+#: ../src/gtkblist.c:5694
 msgid "Enable Account"
 msgstr "Omogoči račun"
 
-#: ../src/gtkblist.c:5743
+#: ../src/gtkblist.c:5747
 msgid "/Tools"
 msgstr "/Orodja"
 
-#: ../src/gtkblist.c:5829
+#: ../src/gtkblist.c:5833
 msgid "/Buddies/Sort Buddies"
 msgstr "/Prijatelji/Razvrsti prijatelje"
 
-#: ../src/gtkconn.c:197
+#: ../src/gtkconn.c:185
 #, c-format
 msgid ""
 "%s was disconnected due to an error: %s\n"
@@ -3018,317 +3021,330 @@
 msgid "That command doesn't work on this protocol."
 msgstr "Ta ukaz ne deluje na tem protokolu."
 
-#: ../src/gtkconv.c:742
-#: ../src/gtkconv.c:768
+#: ../src/gtkconv.c:743
+#: ../src/gtkconv.c:769
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Tisti prijatelj ne uporablja enakega protokola kot ta pogovor."
 
-#: ../src/gtkconv.c:762
+#: ../src/gtkconv.c:763
 msgid "You are not currently signed on with an account that can invite that buddy."
 msgstr "Trenutno niste prijavljeni z nobenim računom, ki lahko doda tega prijatelja."
 
-#: ../src/gtkconv.c:815
+#: ../src/gtkconv.c:816
 msgid "Invite Buddy Into Chat Room"
 msgstr "Povabi prijatelja v pogovorno sobo"
 
 #. Put our happy label in it.
-#: ../src/gtkconv.c:845
+#: ../src/gtkconv.c:846
 msgid "Please enter the name of the user you wish to invite, along with an optional invite message."
 msgstr "Prosim vnesite ime uporabnika, ki ga želite povabiti, dodate pa lahko še povabilo."
 
-#: ../src/gtkconv.c:866
+#: ../src/gtkconv.c:867
 msgid "_Buddy:"
 msgstr "_Prijatelj:"
 
-#: ../src/gtkconv.c:886
+#: ../src/gtkconv.c:887
 #: ../src/gtksavedstatuses.c:1107
 #: ../src/gtksavedstatuses.c:1443
 msgid "_Message:"
 msgstr "_Sporočilo:"
 
-#: ../src/gtkconv.c:943
-#: ../src/gtkconv.c:2359
+#: ../src/gtkconv.c:944
+#: ../src/gtkconv.c:2370
 #: ../src/gtkdebug.c:217
 #: ../src/gtkft.c:490
 msgid "Unable to open file."
 msgstr "Datoteke ni bilo mogoče odprti."
 
-#: ../src/gtkconv.c:949
+#: ../src/gtkconv.c:950
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Pogovor z %s</h1>\n"
 
-#: ../src/gtkconv.c:973
+#: ../src/gtkconv.c:974
 msgid "Save Conversation"
 msgstr "Shrani pogovor"
 
-#: ../src/gtkconv.c:1094
+#: ../src/gtkconv.c:1095
 #: ../src/gtkdebug.c:165
 #: ../src/gtkdebug.c:678
 msgid "Find"
 msgstr "Najdi"
 
-#: ../src/gtkconv.c:1120
+#: ../src/gtkconv.c:1121
 #: ../src/gtkdebug.c:193
 msgid "_Search for:"
 msgstr "_Išči:"
 
-#: ../src/gtkconv.c:1291
+#: ../src/gtkconv.c:1292
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr "Začelo se je beleženje v dnevnik. Vsa nadaljna sporočila pogovora bodo zabeležena."
 
-#: ../src/gtkconv.c:1299
+#: ../src/gtkconv.c:1300
 msgid "Logging stopped. Future messages in this conversation will not be logged."
 msgstr "Beleženje v dnevnik ustavljeno. Nadaljna sporočila pogovora ne bodo zabeležena."
 
-#: ../src/gtkconv.c:1560
+#: ../src/gtkconv.c:1562
 msgid "IM"
 msgstr "Sporoči"
 
-#: ../src/gtkconv.c:1571
+#: ../src/gtkconv.c:1573
 #: ../src/protocols/oscar/oscar.c:640
 msgid "Send File"
 msgstr "Pošlji datoteko"
 
-#: ../src/gtkconv.c:1586
+#: ../src/gtkconv.c:1588
 msgid "Un-Ignore"
 msgstr "Ne prezri"
 
-#: ../src/gtkconv.c:1589
+#: ../src/gtkconv.c:1591
 msgid "Ignore"
 msgstr "Prezri"
 
-#: ../src/gtkconv.c:1599
+#: ../src/gtkconv.c:1601
 msgid "Info"
 msgstr "Informacije"
 
-#: ../src/gtkconv.c:1609
+#: ../src/gtkconv.c:1611
 msgid "Get Away Message"
 msgstr "Sporočilo o odsotnosti"
 
-#: ../src/gtkconv.c:1632
+#: ../src/gtkconv.c:1634
 msgid "Last said"
 msgstr "Nazadnje rečeno"
 
-#: ../src/gtkconv.c:2367
+#: ../src/gtkconv.c:2378
 msgid "Unable to save icon file to disk."
 msgstr "Datoteke z ikonami ni bilo mogoče shraniti."
 
-#: ../src/gtkconv.c:2391
+#: ../src/gtkconv.c:2402
 msgid "Save Icon"
 msgstr "Shrani ikono"
 
-#: ../src/gtkconv.c:2440
+#: ../src/gtkconv.c:2451
 msgid "Animate"
 msgstr "Animiraj"
 
-#: ../src/gtkconv.c:2445
+#: ../src/gtkconv.c:2456
 msgid "Hide Icon"
 msgstr "Skrij ikono"
 
-#: ../src/gtkconv.c:2451
+#: ../src/gtkconv.c:2462
 msgid "Save Icon As..."
 msgstr "Shrani ikono kot ..."
 
 #. Conversation menu
-#: ../src/gtkconv.c:2592
+#: ../src/gtkconv.c:2602
 msgid "/_Conversation"
 msgstr "/_Pogovor"
 
-#: ../src/gtkconv.c:2594
+#: ../src/gtkconv.c:2604
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Pogovor/Novo neposredno sporočilo ..."
 
-#: ../src/gtkconv.c:2599
+#: ../src/gtkconv.c:2609
 msgid "/Conversation/_Find..."
 msgstr "/Pogovor/_Najdi ..."
 
-#: ../src/gtkconv.c:2601
-msgid "/Conversation/View _Log"
-msgstr "/Pogovor/Pog_lej dnevnik ..."
-
-#: ../src/gtkconv.c:2602
-msgid "/Conversation/_Save As..."
-msgstr "/Pogovor/_Shrani kot ..."
-
-#: ../src/gtkconv.c:2604
-msgid "/Conversation/Clea_r Scrollback"
-msgstr "/Pogovor/Po_čisti pogovor"
-
-#: ../src/gtkconv.c:2608
-msgid "/Conversation/Se_nd File..."
-msgstr "/Pogovor/_Pošlji datoteko ..."
-
-#: ../src/gtkconv.c:2609
-msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/Pogovor/Dodaj _opozorilo prijatelja ..."
-
 #: ../src/gtkconv.c:2611
+msgid "/Conversation/View _Log"
+msgstr "/Pogovor/Pog_lej dnevnik ..."
+
+#: ../src/gtkconv.c:2612
+msgid "/Conversation/_Save As..."
+msgstr "/Pogovor/_Shrani kot ..."
+
+#: ../src/gtkconv.c:2614
+msgid "/Conversation/Clea_r Scrollback"
+msgstr "/Pogovor/Po_čisti pogovor"
+
+#: ../src/gtkconv.c:2618
+msgid "/Conversation/Se_nd File..."
+msgstr "/Pogovor/_Pošlji datoteko ..."
+
+#: ../src/gtkconv.c:2619
+msgid "/Conversation/Add Buddy _Pounce..."
+msgstr "/Pogovor/Dodaj _opozorilo prijatelja ..."
+
+#: ../src/gtkconv.c:2621
 msgid "/Conversation/_Get Info"
 msgstr "/Pogovor/_Informacije"
 
-#: ../src/gtkconv.c:2613
+#: ../src/gtkconv.c:2623
 msgid "/Conversation/In_vite..."
 msgstr "/Pogovor/Po_vabi ..."
 
-#: ../src/gtkconv.c:2618
+#: ../src/gtkconv.c:2625
+msgid "/Conversation/M_ore"
+msgstr "/Pogovor/_Več"
+
+#: ../src/gtkconv.c:2629
 msgid "/Conversation/Al_ias..."
 msgstr "/Pogovor/Psevdon_im ..."
 
-#: ../src/gtkconv.c:2620
+#: ../src/gtkconv.c:2631
 msgid "/Conversation/_Block..."
 msgstr "/Pogovor/_Zavrni ..."
 
-#: ../src/gtkconv.c:2622
+#: ../src/gtkconv.c:2633
 msgid "/Conversation/_Add..."
 msgstr "/Pogovor/Dod_aj ..."
 
-#: ../src/gtkconv.c:2624
+#: ../src/gtkconv.c:2635
 msgid "/Conversation/_Remove..."
 msgstr "/Pogovor/Odst_rani ..."
 
-#: ../src/gtkconv.c:2629
+#: ../src/gtkconv.c:2640
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Pogovor/Vstavi _povezavo ..."
 
-#: ../src/gtkconv.c:2631
+#: ../src/gtkconv.c:2642
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Pogovor/Vstavi _sliko ..."
 
-#: ../src/gtkconv.c:2636
+#: ../src/gtkconv.c:2647
 msgid "/Conversation/_Close"
 msgstr "/Pogovor/_Zapri"
 
 #. Options
-#: ../src/gtkconv.c:2640
+#: ../src/gtkconv.c:2651
 msgid "/_Options"
 msgstr "/M_ožnosti"
 
-#: ../src/gtkconv.c:2641
+#: ../src/gtkconv.c:2652
 msgid "/Options/Enable _Logging"
 msgstr "/Možnosti/Vk_ljuči dnevnik"
 
-#: ../src/gtkconv.c:2642
+#: ../src/gtkconv.c:2653
 msgid "/Options/Enable _Sounds"
 msgstr "/Možnosti/Vključi _zvoke"
 
-#: ../src/gtkconv.c:2643
+#: ../src/gtkconv.c:2654
 msgid "/Options/Show Buddy _Icon"
 msgstr "/Možnosti/Prikaži ikono prijatelja"
 
-#: ../src/gtkconv.c:2645
+#: ../src/gtkconv.c:2656
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Možnosti/Prikaži orodno vrstico za _oblikovanje"
 
-#: ../src/gtkconv.c:2646
+#: ../src/gtkconv.c:2657
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Možnosti/Pr_ikaži časovne žige"
 
-#: ../src/gtkconv.c:2738
+#: ../src/gtkconv.c:2732
+msgid "/Conversation/More"
+msgstr "/Pogovor/Več"
+
+#: ../src/gtkconv.c:2770
+#: ../src/gtkconv.c:2797
+msgid "/Conversation"
+msgstr "/Pogovor"
+
+#: ../src/gtkconv.c:2807
 msgid "/Conversation/View Log"
 msgstr "/Pogovor/Prikaži dnevnik ..."
 
-#: ../src/gtkconv.c:2744
+#: ../src/gtkconv.c:2813
 msgid "/Conversation/Send File..."
 msgstr "/Pogovor/Pošlji datoteko ..."
 
-#: ../src/gtkconv.c:2748
+#: ../src/gtkconv.c:2817
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Pogovor/Dodaj opozorilo prijatelja ..."
 
-#: ../src/gtkconv.c:2754
+#: ../src/gtkconv.c:2823
 msgid "/Conversation/Get Info"
 msgstr "/Pogovor/Informacije"
 
-#: ../src/gtkconv.c:2758
+#: ../src/gtkconv.c:2827
 msgid "/Conversation/Invite..."
 msgstr "/Pogovor/Povabi ..."
 
-#: ../src/gtkconv.c:2764
+#: ../src/gtkconv.c:2833
 msgid "/Conversation/Alias..."
 msgstr "/Pogovor/Psevdonim ..."
 
-#: ../src/gtkconv.c:2768
+#: ../src/gtkconv.c:2837
 msgid "/Conversation/Block..."
 msgstr "/Pogovor/Zavrni ..."
 
-#: ../src/gtkconv.c:2772
+#: ../src/gtkconv.c:2841
 msgid "/Conversation/Add..."
 msgstr "/Pogovor/Dodaj ..."
 
-#: ../src/gtkconv.c:2776
+#: ../src/gtkconv.c:2845
 msgid "/Conversation/Remove..."
 msgstr "/Pogovor/Odstrani ..."
 
-#: ../src/gtkconv.c:2782
+#: ../src/gtkconv.c:2851
 msgid "/Conversation/Insert Link..."
 msgstr "/Pogovor/Vstavi povezavo ..."
 
-#: ../src/gtkconv.c:2786
+#: ../src/gtkconv.c:2855
 msgid "/Conversation/Insert Image..."
 msgstr "/Pogovor/Vstavi sliko ..."
 
-#: ../src/gtkconv.c:2792
+#: ../src/gtkconv.c:2861
 msgid "/Options/Enable Logging"
 msgstr "/Možnosti/Vključi dnevnik"
 
-#: ../src/gtkconv.c:2795
+#: ../src/gtkconv.c:2864
 msgid "/Options/Enable Sounds"
 msgstr "/Možnosti/Vključi zvoke"
 
-#: ../src/gtkconv.c:2808
+#: ../src/gtkconv.c:2877
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Možnosti/Prikaži orodno vrstico za oblikovanje"
 
-#: ../src/gtkconv.c:2811
+#: ../src/gtkconv.c:2880
 msgid "/Options/Show Timestamps"
 msgstr "/Možnosti/Prikaži časovne žige"
 
-#: ../src/gtkconv.c:2814
+#: ../src/gtkconv.c:2883
 msgid "/Options/Show Buddy Icon"
 msgstr "/Možnosti/Prikaži ikono prijatelja"
 
-#: ../src/gtkconv.c:2894
+#: ../src/gtkconv.c:2963
 msgid "User is typing..."
 msgstr "Uporabnik tipka ..."
 
-#: ../src/gtkconv.c:2897
+#: ../src/gtkconv.c:2966
 msgid "User has typed something and stopped"
 msgstr "Uporabnik je napisal nekaj in se ustavil."
 
 #. Build the Send To menu
-#: ../src/gtkconv.c:3080
+#: ../src/gtkconv.c:3149
 msgid "_Send To"
 msgstr "_Pošlji k"
 
-#: ../src/gtkconv.c:3732
+#: ../src/gtkconv.c:3801
 msgid "_Send"
 msgstr "_Pošlji"
 
-#: ../src/gtkconv.c:3787
+#: ../src/gtkconv.c:3856
 #: ../src/protocols/sametime/sametime.c:3564
 msgid "Topic:"
 msgstr "Tema:"
 
 #. Setup the label telling how many people are in the room.
-#: ../src/gtkconv.c:3839
+#: ../src/gtkconv.c:3908
 msgid "0 people in room"
 msgstr "0 ljudi v sobi"
 
-#: ../src/gtkconv.c:3918
+#: ../src/gtkconv.c:3987
 msgid "IM the user"
 msgstr "Pošlji sporočilo uporabniku"
 
-#: ../src/gtkconv.c:3931
+#: ../src/gtkconv.c:4000
 msgid "Ignore the user"
 msgstr "Prezri uporabnika"
 
-#: ../src/gtkconv.c:3943
+#: ../src/gtkconv.c:4012
 msgid "Get the user's information"
 msgstr "Poizvedi o uporabniku"
 
-#: ../src/gtkconv.c:4929
-#: ../src/gtkconv.c:5038
+#: ../src/gtkconv.c:4998
+#: ../src/gtkconv.c:5107
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
@@ -3337,89 +3353,89 @@
 msgstr[2] "%d osebi v sobi"
 msgstr[3] "%d osebe v sobi"
 
-#: ../src/gtkconv.c:5595
+#: ../src/gtkconv.c:5664
 #: ../src/gtkstatusbox.c:366
 msgid "Typing"
 msgstr "Tipka"
 
-#: ../src/gtkconv.c:5601
+#: ../src/gtkconv.c:5670
 msgid "Stopped Typing"
 msgstr "Prenehal tipkati"
 
-#: ../src/gtkconv.c:5606
+#: ../src/gtkconv.c:5675
 msgid "Nick Said"
 msgstr "Vzdevek pravi"
 
-#: ../src/gtkconv.c:5616
+#: ../src/gtkconv.c:5685
 msgid "New Event"
 msgstr "Nov dogodek"
 
-#: ../src/gtkconv.c:6506
+#: ../src/gtkconv.c:6575
 msgid "say &lt;message&gt;:  Send a message normally as if you weren't using a command."
 msgstr "say &lt;sporočilo&gt;:  Pošlji sporočilo kot ponavadi, kot če ne bi uporabljal ukaza."
 
-#: ../src/gtkconv.c:6509
+#: ../src/gtkconv.c:6578
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;dejanje&gt;:  Pošlji prijatelju ali klepetu dejanje v slogu IRC-a."
 
-#: ../src/gtkconv.c:6512
+#: ../src/gtkconv.c:6581
 msgid "debug &lt;option&gt;:  Send various debug information to the current conversation."
 msgstr "razrošči &lt;možnost&gt;:  Trenutnim pomenkom pošlji različne informacije o razhroščevanju."
 
-#: ../src/gtkconv.c:6515
+#: ../src/gtkconv.c:6584
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Počisti izpisane replike pomenka."
 
-#: ../src/gtkconv.c:6518
+#: ../src/gtkconv.c:6587
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "pomoč &lt;ukaz&gt;:  Pomoč o določenem ukazu."
 
-#: ../src/gtkconv.c:6677
+#: ../src/gtkconv.c:6746
 msgid "Confirm close"
 msgstr "Potrdi zaprtje"
 
-#: ../src/gtkconv.c:6709
+#: ../src/gtkconv.c:6778
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "Imate neprebrana sporočila. Ste prepričani, da želite zapreti okno?"
 
-#: ../src/gtkconv.c:7231
+#: ../src/gtkconv.c:7300
 msgid "Close other tabs"
 msgstr "Zapri druge zavihke"
 
-#: ../src/gtkconv.c:7237
+#: ../src/gtkconv.c:7306
 msgid "Close all tabs"
 msgstr "Zapri vse zavihke"
 
-#: ../src/gtkconv.c:7245
+#: ../src/gtkconv.c:7314
 msgid "Detach this tab"
 msgstr "Odpni ta zavihek"
 
-#: ../src/gtkconv.c:7251
+#: ../src/gtkconv.c:7320
 msgid "Close this tab"
 msgstr "Zapri ta zavihek"
 
-#: ../src/gtkconv.c:7511
+#: ../src/gtkconv.c:7580
 msgid "Close conversation"
 msgstr "Zapri pogovor"
 
-#: ../src/gtkconv.c:7975
+#: ../src/gtkconv.c:8044
 msgid "Last created window"
 msgstr "zadnje odprto okno"
 
-#: ../src/gtkconv.c:7977
+#: ../src/gtkconv.c:8046
 msgid "Separate IM and Chat windows"
 msgstr "loči okna za klepet in zasebni pomenek"
 
-#: ../src/gtkconv.c:7979
+#: ../src/gtkconv.c:8048
 #: ../src/gtkprefs.c:1258
 msgid "New window"
 msgstr "novo okno"
 
-#: ../src/gtkconv.c:7981
+#: ../src/gtkconv.c:8050
 msgid "By group"
 msgstr "po skupinah"
 
-#: ../src/gtkconv.c:7983
+#: ../src/gtkconv.c:8052
 msgid "By account"
 msgstr "po vrsti računa"
 
@@ -3517,7 +3533,7 @@
 
 #: ../src/gtkdialogs.c:110
 #: ../src/gtkdialogs.c:111
-#: ../src/gtkdialogs.c:169
+#: ../src/gtkdialogs.c:174
 msgid "Bulgarian"
 msgstr "bolgarsko"
 
@@ -3531,324 +3547,335 @@
 msgstr "bosansko"
 
 #: ../src/gtkdialogs.c:115
-#: ../src/gtkdialogs.c:170
-#: ../src/gtkdialogs.c:171
+#: ../src/gtkdialogs.c:175
+#: ../src/gtkdialogs.c:176
 msgid "Catalan"
 msgstr "katalonsko"
 
 #: ../src/gtkdialogs.c:116
-msgid "Valencian"
-msgstr "valencijansko"
-
 #: ../src/gtkdialogs.c:117
-#: ../src/gtkdialogs.c:172
+msgid "Valencian-Catalan"
+msgstr "valencijansko-katalonsko"
+
+#: ../src/gtkdialogs.c:118
+#: ../src/gtkdialogs.c:177
 msgid "Czech"
 msgstr "češko"
 
-#: ../src/gtkdialogs.c:118
-msgid "Danish"
-msgstr "dansko"
-
 #: ../src/gtkdialogs.c:119
+msgid "Danish"
+msgstr "dansko"
+
 #: ../src/gtkdialogs.c:120
-#: ../src/gtkdialogs.c:173
+#: ../src/gtkdialogs.c:121
+#: ../src/gtkdialogs.c:178
 msgid "German"
 msgstr "nemško"
 
-#: ../src/gtkdialogs.c:121
 #: ../src/gtkdialogs.c:122
+#: ../src/gtkdialogs.c:123
 msgid "Greek"
 msgstr "grško"
 
-#: ../src/gtkdialogs.c:123
-msgid "Australian English"
-msgstr "avstralsko-angleško"
-
 #: ../src/gtkdialogs.c:124
+msgid "Australian English"
+msgstr "avstralsko-angleško"
+
+#: ../src/gtkdialogs.c:125
 msgid "Canadian English"
 msgstr "kanadsko-angleško"
 
-#: ../src/gtkdialogs.c:125
-msgid "British English"
-msgstr "britansko-angleško"
-
 #: ../src/gtkdialogs.c:126
-#: ../src/gtkdialogs.c:174
-#: ../src/gtkdialogs.c:175
-#: ../src/gtkdialogs.c:176
-#: ../src/gtkdialogs.c:177
-msgid "Spanish"
-msgstr "špansko"
+msgid "British English"
+msgstr "britansko-angleško"
 
 #: ../src/gtkdialogs.c:127
-#: ../src/gtkdialogs.c:128
-msgid "Persian"
-msgstr "perzijsko"
-
-#: ../src/gtkdialogs.c:129
-#: ../src/gtkdialogs.c:178
 #: ../src/gtkdialogs.c:179
-msgid "Finnish"
-msgstr "finsko"
-
-#: ../src/gtkdialogs.c:130
 #: ../src/gtkdialogs.c:180
 #: ../src/gtkdialogs.c:181
 #: ../src/gtkdialogs.c:182
-#: ../src/gtkdialogs.c:183
-msgid "French"
-msgstr "francosko"
-
+msgid "Spanish"
+msgstr "špansko"
+
+#: ../src/gtkdialogs.c:128
+#: ../src/gtkdialogs.c:129
+msgid "Euskera(Basque)"
+msgstr "baskijsko"
+
+#: ../src/gtkdialogs.c:130
 #: ../src/gtkdialogs.c:131
-msgid "Galician"
-msgstr "galicijsko"
+msgid "Persian"
+msgstr "perzijsko"
 
 #: ../src/gtkdialogs.c:132
+#: ../src/gtkdialogs.c:183
 #: ../src/gtkdialogs.c:184
-msgid "Hebrew"
-msgstr "hebrejsko"
+msgid "Finnish"
+msgstr "finsko"
 
 #: ../src/gtkdialogs.c:133
-msgid "Hindi"
-msgstr "hindujsko"
-
-#: ../src/gtkdialogs.c:134
-msgid "Hungarian"
-msgstr "madžarsko"
-
-#: ../src/gtkdialogs.c:135
 #: ../src/gtkdialogs.c:185
-msgid "Italian"
-msgstr "italijansko"
-
-#: ../src/gtkdialogs.c:136
 #: ../src/gtkdialogs.c:186
 #: ../src/gtkdialogs.c:187
 #: ../src/gtkdialogs.c:188
-msgid "Japanese"
-msgstr "japonsko"
+msgid "French"
+msgstr "francosko"
+
+#: ../src/gtkdialogs.c:134
+msgid "Galician"
+msgstr "galicijsko"
+
+#: ../src/gtkdialogs.c:135
+#: ../src/gtkdialogs.c:189
+msgid "Hebrew"
+msgstr "hebrejsko"
+
+#: ../src/gtkdialogs.c:136
+msgid "Hindi"
+msgstr "hindujsko"
 
 #: ../src/gtkdialogs.c:137
-#: ../src/gtkdialogs.c:189
-msgid "Georgian"
-msgstr "gruzijsko"
+msgid "Hungarian"
+msgstr "madžarsko"
 
 #: ../src/gtkdialogs.c:138
 #: ../src/gtkdialogs.c:190
-msgid "Korean"
-msgstr "korejsko"
+msgid "Italian"
+msgstr "italijansko"
 
 #: ../src/gtkdialogs.c:139
+#: ../src/gtkdialogs.c:191
+#: ../src/gtkdialogs.c:192
+#: ../src/gtkdialogs.c:193
+msgid "Japanese"
+msgstr "japonsko"
+
 #: ../src/gtkdialogs.c:140
+#: ../src/gtkdialogs.c:194
+msgid "Georgian"
+msgstr "gruzijsko"
+
 #: ../src/gtkdialogs.c:141
-msgid "Kurdish"
-msgstr "kurdsko"
+#: ../src/gtkdialogs.c:195
+msgid "Korean"
+msgstr "korejsko"
 
 #: ../src/gtkdialogs.c:142
-#: ../src/gtkdialogs.c:191
-#: ../src/gtkdialogs.c:192
+#: ../src/gtkdialogs.c:143
+#: ../src/gtkdialogs.c:144
+msgid "Kurdish"
+msgstr "kurdsko"
+
+#: ../src/gtkdialogs.c:145
+#: ../src/gtkdialogs.c:196
+#: ../src/gtkdialogs.c:197
 msgid "Lithuanian"
 msgstr "litvansko"
 
-#: ../src/gtkdialogs.c:143
+#: ../src/gtkdialogs.c:146
 msgid "Macedonian"
 msgstr "makedonsko"
 
-#: ../src/gtkdialogs.c:144
+#: ../src/gtkdialogs.c:147
 msgid "Dutch, Flemish"
 msgstr "nizozemsko, flamsko"
 
-#: ../src/gtkdialogs.c:145
+#: ../src/gtkdialogs.c:148
 msgid "Norwegian"
 msgstr "norveško"
 
-#: ../src/gtkdialogs.c:146
-#: ../src/gtkdialogs.c:147
-#: ../src/gtkdialogs.c:193
+#: ../src/gtkdialogs.c:149
+#: ../src/gtkdialogs.c:150
+#: ../src/gtkdialogs.c:198
 msgid "Polish"
 msgstr "poljsko"
 
-#: ../src/gtkdialogs.c:148
-msgid "Portuguese"
-msgstr "portugalsko"
-
-#: ../src/gtkdialogs.c:149
-msgid "Portuguese-Brazil"
-msgstr "portugalsko (Brazilija)"
-
-#: ../src/gtkdialogs.c:150
-msgid "Romanian"
-msgstr "romunsko"
-
 #: ../src/gtkdialogs.c:151
-#: ../src/gtkdialogs.c:194
-#: ../src/gtkdialogs.c:195
-msgid "Russian"
-msgstr "rusko"
+msgid "Portuguese"
+msgstr "portugalsko"
 
 #: ../src/gtkdialogs.c:152
+msgid "Portuguese-Brazil"
+msgstr "portugalsko (Brazilija)"
+
 #: ../src/gtkdialogs.c:153
-msgid "Serbian"
-msgstr "srbsko"
+msgid "Romanian"
+msgstr "romunsko"
 
 #: ../src/gtkdialogs.c:154
-msgid "Slovenian"
-msgstr "slovensko"
+#: ../src/gtkdialogs.c:199
+#: ../src/gtkdialogs.c:200
+msgid "Russian"
+msgstr "rusko"
 
 #: ../src/gtkdialogs.c:155
-#: ../src/gtkdialogs.c:197
-msgid "Swedish"
-msgstr "švedsko"
-
 #: ../src/gtkdialogs.c:156
-msgid "Tamil"
-msgstr "tamilsko"
+msgid "Serbian"
+msgstr "srbsko"
 
 #: ../src/gtkdialogs.c:157
-msgid "Telugu"
-msgstr "teluško"
+#: ../src/gtkdialogs.c:201
+msgid "Slovak"
+msgstr "slovaško"
 
 #: ../src/gtkdialogs.c:158
-msgid "Turkish"
-msgstr "turško"
-
-#: ../src/gtkdialogs.c:159
-msgid "Vietnamese"
-msgstr "vietnamsko"
+msgid "Slovenian"
+msgstr "slovensko"
 
 #: ../src/gtkdialogs.c:159
-msgid "T.M.Thanh and the Gnome-Vi Team"
-msgstr "T.M.Thanh in ekipa Gnome-Vi"
+#: ../src/gtkdialogs.c:202
+msgid "Swedish"
+msgstr "švedsko"
 
 #: ../src/gtkdialogs.c:160
-#: ../src/gtkdialogs.c:198
+msgid "Tamil"
+msgstr "tamilsko"
+
+#: ../src/gtkdialogs.c:161
+msgid "Telugu"
+msgstr "teluško"
+
+#: ../src/gtkdialogs.c:162
+msgid "Thai"
+msgstr "tajsko"
+
+#: ../src/gtkdialogs.c:163
+msgid "Turkish"
+msgstr "turško"
+
+#: ../src/gtkdialogs.c:164
+msgid "Vietnamese"
+msgstr "vietnamsko"
+
+#: ../src/gtkdialogs.c:164
+msgid "T.M.Thanh and the Gnome-Vi Team"
+msgstr "T.M.Thanh in ekipa Gnome-Vi"
+
+#: ../src/gtkdialogs.c:165
+#: ../src/gtkdialogs.c:203
 msgid "Simplified Chinese"
 msgstr "poenostavljeno kitajsko"
 
-#: ../src/gtkdialogs.c:161
-#: ../src/gtkdialogs.c:162
-#: ../src/gtkdialogs.c:199
+#: ../src/gtkdialogs.c:166
+#: ../src/gtkdialogs.c:167
+#: ../src/gtkdialogs.c:204
 msgid "Traditional Chinese"
 msgstr "tradicionalno kitajsko"
 
-#: ../src/gtkdialogs.c:168
+#: ../src/gtkdialogs.c:173
 msgid "Amharic"
 msgstr "amharsko"
 
-#: ../src/gtkdialogs.c:196
-msgid "Slovak"
-msgstr "slovaško"
-
-#: ../src/gtkdialogs.c:240
+#: ../src/gtkdialogs.c:245
 msgid "About Gaim"
 msgstr "O programu Gaim"
 
-#: ../src/gtkdialogs.c:264
+#: ../src/gtkdialogs.c:269
 msgid "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, and Gadu-Gadu all at once.  It is written using GTK+.<BR><BR>You may modify and redistribute the program under the terms of the GPL (version 2 or later).  A copy of the GPL is contained in the 'COPYING' file distributed with Gaim.  Gaim is copyrighted by its contributors.  See the 'COPYRIGHT' file for the complete list of contributors.  We provide no warranty for this program.<BR><BR>"
 msgstr "Gaim je modularen odjemalec za neposredna sporočila, ki lahko hkrati uporablja protokole AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr in Gadu-Gadu. Napisan je s pomočjo Gtk+.<BR><BR>Program lahko spreminjate in razširjate pod pogoji licence GPL (različice 2 ali novejše).  Kopija GPL je v datoteki 'COPYING', ki je distribuirana s programom Gaim.  Gaim je zaščitena znamka svojih avtorjev.  Oglejte si datoteko 'COPYRIGHT' za popoln seznam sodelavcev.  Za program ni na voljo nikakršna garancija.<BR><BR>"
 
-#: ../src/gtkdialogs.c:278
+#: ../src/gtkdialogs.c:283
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #wingaim na irc.freenode.net<BR><BR>"
 
-#: ../src/gtkdialogs.c:281
+#: ../src/gtkdialogs.c:286
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #gaim na irc.freenode.net<BR><BR>"
 
-#: ../src/gtkdialogs.c:287
+#: ../src/gtkdialogs.c:292
 msgid "Current Developers"
 msgstr "Trenutni razvijalci"
 
-#: ../src/gtkdialogs.c:302
+#: ../src/gtkdialogs.c:307
 msgid "Crazy Patch Writers"
 msgstr "Nori razvijalci obližev"
 
-#: ../src/gtkdialogs.c:317
+#: ../src/gtkdialogs.c:322
 msgid "Retired Developers"
 msgstr "Upokojeni razvijalci"
 
-#: ../src/gtkdialogs.c:332
+#: ../src/gtkdialogs.c:337
 msgid "Current Translators"
 msgstr "Trenutni prevajalci"
 
-#: ../src/gtkdialogs.c:352
+#: ../src/gtkdialogs.c:357
 msgid "Past Translators"
 msgstr "Nekdanji prevajalci"
 
-#: ../src/gtkdialogs.c:370
+#: ../src/gtkdialogs.c:375
 msgid "Debugging Information"
 msgstr "Informacije za razhroščevanje"
 
-#: ../src/gtkdialogs.c:584
-#: ../src/gtkdialogs.c:721
-#: ../src/gtkdialogs.c:784
+#: ../src/gtkdialogs.c:595
+#: ../src/gtkdialogs.c:732
+#: ../src/gtkdialogs.c:795
 msgid "_Name"
 msgstr "_Ime"
 
-#: ../src/gtkdialogs.c:589
-#: ../src/gtkdialogs.c:726
-#: ../src/gtkdialogs.c:789
+#: ../src/gtkdialogs.c:600
+#: ../src/gtkdialogs.c:737
+#: ../src/gtkdialogs.c:800
 msgid "_Account"
 msgstr "_Račun"
 
-#: ../src/gtkdialogs.c:597
+#: ../src/gtkdialogs.c:608
 msgid "New Instant Message"
 msgstr "Novo neposredno sporočilo"
 
-#: ../src/gtkdialogs.c:599
+#: ../src/gtkdialogs.c:610
 msgid "Please enter the screen name or alias of the person you would like to IM."
 msgstr "Vnesite vzdevek osebe, ki ji želite poslati neposredno sporočilo."
 
-#: ../src/gtkdialogs.c:734
+#: ../src/gtkdialogs.c:745
 msgid "Get User Info"
 msgstr "Informacije o uporabniku"
 
-#: ../src/gtkdialogs.c:736
+#: ../src/gtkdialogs.c:747
 msgid "Please enter the screen name or alias of the person whose info you would like to view."
 msgstr "Vnesite vzdevek osebe, o kateri si želite ogledati podatke."
 
-#: ../src/gtkdialogs.c:798
+#: ../src/gtkdialogs.c:809
 msgid "View User Log"
 msgstr "Prikaži uporabniški dnevnik"
 
-#: ../src/gtkdialogs.c:800
+#: ../src/gtkdialogs.c:811
 msgid "Please enter the screen name or alias of the person whose log you would like to view."
 msgstr "Vnesite vzdevek osebe, o kateri želite pridobiti dnevnik."
 
-#: ../src/gtkdialogs.c:819
+#: ../src/gtkdialogs.c:830
 msgid "Alias Contact"
 msgstr "Psevdonim stika"
 
-#: ../src/gtkdialogs.c:820
+#: ../src/gtkdialogs.c:831
 msgid "Enter an alias for this contact."
 msgstr "Vnesite psevdonim za ta pomenek."
 
-#: ../src/gtkdialogs.c:822
-#: ../src/gtkdialogs.c:844
-#: ../src/gtkdialogs.c:864
+#: ../src/gtkdialogs.c:833
+#: ../src/gtkdialogs.c:855
+#: ../src/gtkdialogs.c:875
 #: ../src/gtkrequest.c:277
 #: ../src/protocols/silc/chat.c:587
 msgid "Alias"
 msgstr "Psevdonim"
 
-#: ../src/gtkdialogs.c:840
+#: ../src/gtkdialogs.c:851
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Vnesite psevdonim za %s."
 
-#: ../src/gtkdialogs.c:842
+#: ../src/gtkdialogs.c:853
 msgid "Alias Buddy"
 msgstr "Psevdonim prijatelja"
 
-#: ../src/gtkdialogs.c:861
+#: ../src/gtkdialogs.c:872
 msgid "Alias Chat"
 msgstr "Psevdonim pomenka"
 
-#: ../src/gtkdialogs.c:862
+#: ../src/gtkdialogs.c:873
 msgid "Enter an alias for this chat."
 msgstr "Vnesite psevdonim za ta pomenek."
 
-#: ../src/gtkdialogs.c:899
+#: ../src/gtkdialogs.c:910
 #, c-format
 msgid "You are about to remove the contact containing %s and %d other buddy from your buddy list.  Do you want to continue?"
 msgid_plural "You are about to remove the contact containing %s and %d other buddies from your buddy list.  Do you want to continue?"
@@ -3857,50 +3884,50 @@
 msgstr[2] "S seznama prijateljev boste odstranili stik, ki vsebuje %s in %d druga prijatelja. Ali želite nadaljevati?"
 msgstr[3] "S seznama prijateljev boste odstranili stik, ki vsebuje %s in %d druge prijatelje. Ali želite nadaljevati?"
 
-#: ../src/gtkdialogs.c:907
+#: ../src/gtkdialogs.c:918
 msgid "Remove Contact"
 msgstr "Odstrani stik"
 
-#: ../src/gtkdialogs.c:908
+#: ../src/gtkdialogs.c:919
 msgid "_Remove Contact"
 msgstr "_Odstrani stik"
 
-#: ../src/gtkdialogs.c:959
+#: ../src/gtkdialogs.c:970
 #, 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 seznama prijateljev boste odstranili skupino %s. Ali želite nadaljevati?"
 
-#: ../src/gtkdialogs.c:962
+#: ../src/gtkdialogs.c:973
 msgid "Remove Group"
 msgstr "Odstrani skupino"
 
-#: ../src/gtkdialogs.c:963
+#: ../src/gtkdialogs.c:974
 msgid "_Remove Group"
 msgstr "_Odstrani skupino"
 
-#: ../src/gtkdialogs.c:996
+#: ../src/gtkdialogs.c:1007
 #, c-format
 msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Odstranili boste %s s seznama prijateljev. Ali želite nadaljevati?"
 
-#: ../src/gtkdialogs.c:999
+#: ../src/gtkdialogs.c:1010
 msgid "Remove Buddy"
 msgstr "Odstrani prijatelja"
 
-#: ../src/gtkdialogs.c:1000
+#: ../src/gtkdialogs.c:1011
 msgid "_Remove Buddy"
 msgstr "_Odstrani prijatelja"
 
-#: ../src/gtkdialogs.c:1021
+#: ../src/gtkdialogs.c:1032
 #, c-format
 msgid "You are about to remove the chat %s from your buddy list.  Do you want to continue?"
 msgstr "S seznama prijateljev boste odstranili pomenek %s. Ali želite nadaljevati?"
 
-#: ../src/gtkdialogs.c:1024
+#: ../src/gtkdialogs.c:1035
 msgid "Remove Chat"
 msgstr "Odstrani pomenek"
 
-#: ../src/gtkdialogs.c:1025
+#: ../src/gtkdialogs.c:1036
 msgid "_Remove Chat"
 msgstr "_Odstrani pomenek"
 
@@ -4353,7 +4380,7 @@
 msgstr "Odpri vsa sporočila"
 
 #: ../src/gtknotify.c:411
-#: ../src/protocols/jabber/jabber.c:1115
+#: ../src/protocols/jabber/jabber.c:1118
 msgid "From"
 msgstr "Od"
 
@@ -4660,8 +4687,8 @@
 msgstr "Ikona"
 
 #: ../src/gtkprefs.c:680
-#: ../src/protocols/jabber/buddy.c:267
-#: ../src/protocols/jabber/buddy.c:820
+#: ../src/protocols/jabber/buddy.c:286
+#: ../src/protocols/jabber/buddy.c:926
 #: ../src/protocols/jabber/chat.c:767
 msgid "Description"
 msgstr "Opis"
@@ -5249,8 +5276,8 @@
 msgstr "_Dodaj pomenek"
 
 #: ../src/gtksavedstatuses.c:433
-#: ../src/protocols/jabber/buddy.c:264
-#: ../src/protocols/jabber/buddy.c:814
+#: ../src/protocols/jabber/buddy.c:283
+#: ../src/protocols/jabber/buddy.c:920
 #: ../src/protocols/novell/novell.c:1484
 msgid "Title"
 msgstr "Naziv"
@@ -5269,21 +5296,21 @@
 #: ../src/protocols/gg/gg.c:1616
 #: ../src/protocols/gg/gg.c:1621
 #: ../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/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:2866
 #: ../src/protocols/novell/novell.c:2972
 #: ../src/protocols/novell/novell.c:2978
 #: ../src/protocols/novell/novell.c:2984
-#: ../src/protocols/oscar/oscar.c:5366
-#: ../src/protocols/oscar/oscar.c:5381
-#: ../src/protocols/oscar/oscar.c:5386
-#: ../src/protocols/oscar/oscar.c:5594
-#: ../src/protocols/oscar/oscar.c:5606
+#: ../src/protocols/oscar/oscar.c:5362
+#: ../src/protocols/oscar/oscar.c:5377
+#: ../src/protocols/oscar/oscar.c:5382
+#: ../src/protocols/oscar/oscar.c:5590
+#: ../src/protocols/oscar/oscar.c:5602
 #: ../src/protocols/sametime/sametime.c:3266
 #: ../src/protocols/sametime/sametime.c:3272
 #: ../src/protocols/sametime/sametime.c:3278
@@ -5319,10 +5346,10 @@
 #: ../src/protocols/gg/gg.c:1024
 #: ../src/protocols/gg/gg.c:1574
 #: ../src/protocols/gg/gg.c:1578
-#: ../src/protocols/jabber/buddy.c:625
-#: ../src/protocols/jabber/buddy.c:632
-#: ../src/protocols/jabber/buddy.c:643
-#: ../src/protocols/jabber/jabber.c:1153
+#: ../src/protocols/jabber/buddy.c:629
+#: ../src/protocols/jabber/buddy.c:636
+#: ../src/protocols/jabber/buddy.c:662
+#: ../src/protocols/jabber/jabber.c:1156
 #: ../src/protocols/msn/msn.c:548
 #: ../src/protocols/novell/novell.c:2865
 #: ../src/protocols/novell/novell.c:2869
@@ -5397,24 +5424,10 @@
 msgid "Someone says your screen name in chat"
 msgstr "Nekdo omeni vaše ime v sobi"
 
-#: ../src/gtksound.c:413
-#, c-format
-msgid "Unable to play sound because the chosen file (%s) does not exist."
-msgstr "Zvoka ni mogoče predvajati, ker izbrana datoteka (%s) ne obstaja."
-
-#: ../src/gtksound.c:429
-msgid "Unable to play sound because the 'Command' sound method has been chosen, but no command has been set."
-msgstr "Ni bilo mogoče predvajati zvoka, ker ste izbrali ukaz za predvajanje zvoka, niste pa nastavili ukaza."
-
-#: ../src/gtksound.c:441
-#, c-format
-msgid "Unable to play sound because the configured sound command could not be launched: %s"
-msgstr "Zvoka ni bilo mogoče predvajati, ker izbranega ukaza za zvok ni bilo mogoče pognati: %s"
-
 #. connect to the server
 #: ../src/gtkstatusbox.c:368
 #: ../src/protocols/irc/irc.c:313
-#: ../src/protocols/jabber/jabber.c:979
+#: ../src/protocols/jabber/jabber.c:983
 #: ../src/protocols/msn/session.c:344
 #: ../src/protocols/napster/napster.c:536
 #: ../src/protocols/novell/novell.c:2181
@@ -5529,58 +5542,58 @@
 msgid "Select color"
 msgstr "Izberite barvo"
 
-#: ../src/log.c:177
+#: ../src/log.c:180
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">Beleženje nima možnosti branja</font></b>"
 
-#: ../src/log.c:558
+#: ../src/log.c:561
 msgid "HTML"
 msgstr "HTML"
 
-#: ../src/log.c:569
+#: ../src/log.c:572
 msgid "Plain text"
 msgstr "Navadno besedilo"
 
-#: ../src/log.c:580
+#: ../src/log.c:583
 msgid "Old Gaim"
 msgstr "Stari Gaim"
 
-#: ../src/log.c:675
+#: ../src/log.c:678
 msgid "Logging of this conversation failed."
 msgstr "Beleženje tega pogovora v dnevnik ni uspelo."
 
-#: ../src/log.c:1025
+#: ../src/log.c:1028
 msgid "XML"
 msgstr "XML"
 
-#: ../src/log.c:1099
+#: ../src/log.c:1102
 #, c-format
 msgid "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
 msgstr "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;SAMODEJNI ODGOVOR&gt;:</b></font> %s<br/>\n"
 
-#: ../src/log.c:1101
+#: ../src/log.c:1104
 #, c-format
 msgid "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
 msgstr "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;SAMODEJNI ODGOVOR&gt;:</b></font> %s<br/>\n"
 
-#: ../src/log.c:1159
-#: ../src/log.c:1291
+#: ../src/log.c:1162
+#: ../src/log.c:1294
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>Ni mogoče najti poti do dnevnika!</b></font>"
 
-#: ../src/log.c:1171
-#: ../src/log.c:1305
+#: ../src/log.c:1174
+#: ../src/log.c:1308
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Ni mogoče brati datoteke: %s</b></font>"
 
-#: ../src/log.c:1233
+#: ../src/log.c:1236
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
 #: ../src/plugin.c:281
-#: ../src/protocols/jabber/buddy.c:1384
+#: ../src/protocols/jabber/buddy.c:1645
 #: ../src/protocols/msn/servconn.c:139
 #: ../src/protocols/msn/session.c:321
 #: ../src/protocols/oscar/oscar.c:2701
@@ -5689,7 +5702,7 @@
 #: ../src/protocols/irc/irc.c:900
 #: ../src/protocols/msn/msn.c:2049
 #: ../src/protocols/napster/napster.c:724
-#: ../src/protocols/oscar/oscar.c:6470
+#: ../src/protocols/oscar/oscar.c:6466
 #: ../src/protocols/sametime/sametime.c:5635
 #: ../src/protocols/silc/silc.c:1858
 #: ../src/protocols/toc/toc.c:2344
@@ -5698,19 +5711,19 @@
 
 #: ../src/protocols/bonjour/bonjour.c:582
 #: ../src/protocols/gg/gg.c:622
-#: ../src/protocols/jabber/jabber.c:770
+#: ../src/protocols/jabber/jabber.c:774
 msgid "First name"
 msgstr "Ime"
 
 #: ../src/protocols/bonjour/bonjour.c:585
 #: ../src/protocols/gg/gg.c:617
-#: ../src/protocols/jabber/jabber.c:775
+#: ../src/protocols/jabber/jabber.c:779
 msgid "Last name"
 msgstr "Priimek"
 
 #: ../src/protocols/bonjour/bonjour.c:588
 #: ../src/protocols/gg/gg.c:468
-#: ../src/protocols/jabber/jabber.c:760
+#: ../src/protocols/jabber/jabber.c:764
 #: ../src/protocols/silc/silc.c:699
 #: ../src/protocols/silc/silc.c:939
 msgid "E-mail"
@@ -5824,8 +5837,8 @@
 
 #: ../src/protocols/gg/gg.c:473
 #: ../src/protocols/gg/gg.c:764
-#: ../src/protocols/jabber/jabber.c:749
-#: ../src/protocols/jabber/jabber.c:1307
+#: ../src/protocols/jabber/jabber.c:753
+#: ../src/protocols/jabber/jabber.c:1310
 msgid "Password"
 msgstr "Geslo"
 
@@ -5858,11 +5871,11 @@
 #: ../src/protocols/gg/gg.c:1038
 #: ../src/protocols/gg/gg.c:1104
 #: ../src/protocols/gg/gg.c:2175
-#: ../src/protocols/jabber/buddy.c:252
-#: ../src/protocols/jabber/buddy.c:697
-#: ../src/protocols/jabber/buddy.c:1261
-#: ../src/protocols/jabber/buddy.c:1443
-#: ../src/protocols/jabber/jabber.c:765
+#: ../src/protocols/jabber/buddy.c:271
+#: ../src/protocols/jabber/buddy.c:803
+#: ../src/protocols/jabber/buddy.c:1522
+#: ../src/protocols/jabber/buddy.c:1704
+#: ../src/protocols/jabber/jabber.c:769
 #: ../src/protocols/msn/msn.c:1368
 #: ../src/protocols/msn/msn.c:1530
 #: ../src/protocols/silc/buddy.c:1528
@@ -5876,7 +5889,7 @@
 #: ../src/protocols/gg/gg.c:632
 #: ../src/protocols/gg/gg.c:1043
 #: ../src/protocols/gg/gg.c:1107
-#: ../src/protocols/jabber/jabber.c:785
+#: ../src/protocols/jabber/jabber.c:789
 #: ../src/protocols/oscar/oscar.c:3687
 #: ../src/protocols/oscar/oscar.c:3695
 msgid "City"
@@ -5971,8 +5984,8 @@
 
 #: ../src/protocols/gg/gg.c:1033
 #: ../src/protocols/gg/gg.c:1101
-#: ../src/protocols/jabber/buddy.c:1257
-#: ../src/protocols/jabber/buddy.c:1433
+#: ../src/protocols/jabber/buddy.c:1518
+#: ../src/protocols/jabber/buddy.c:1694
 #: ../src/protocols/oscar/oscar.c:3634
 #: ../src/protocols/silc/ops.c:1024
 msgid "First Name"
@@ -6191,8 +6204,8 @@
 msgstr "IRC vzdevki ne smejo vsebovati presledka"
 
 #: ../src/protocols/irc/irc.c:321
-#: ../src/protocols/jabber/jabber.c:550
-#: ../src/protocols/jabber/jabber.c:890
+#: ../src/protocols/jabber/jabber.c:554
+#: ../src/protocols/jabber/jabber.c:893
 msgid "SSL support unavailable"
 msgstr "Podpora SSL ni na voljo"
 
@@ -6203,18 +6216,18 @@
 msgstr "Vtičnice ni bilo mogoče ustvariti"
 
 #: ../src/protocols/irc/irc.c:404
-#: ../src/protocols/jabber/jabber.c:421
+#: ../src/protocols/jabber/jabber.c:426
 #: ../src/protocols/oscar/oscar.c:1246
 msgid "Couldn't connect to host"
 msgstr "Povezava do gostitelja ni uspela"
 
 #: ../src/protocols/irc/irc.c:429
-#: ../src/protocols/jabber/jabber.c:448
+#: ../src/protocols/jabber/jabber.c:453
 msgid "Connection Failed"
 msgstr "Povezava ni uspela"
 
 #: ../src/protocols/irc/irc.c:432
-#: ../src/protocols/jabber/jabber.c:451
+#: ../src/protocols/jabber/jabber.c:456
 msgid "SSL Handshake Failed"
 msgstr "Rokovanje SSL ni uspelo"
 
@@ -6257,10 +6270,10 @@
 #. host to connect to
 #: ../src/protocols/irc/irc.c:897
 #: ../src/protocols/irc/msgs.c:235
-#: ../src/protocols/jabber/jabber.c:1905
+#: ../src/protocols/jabber/jabber.c:1908
 #: ../src/protocols/msn/msn.c:2044
 #: ../src/protocols/napster/napster.c:719
-#: ../src/protocols/oscar/oscar.c:6467
+#: ../src/protocols/oscar/oscar.c:6463
 #: ../src/protocols/sametime/sametime.c:5630
 #: ../src/protocols/silc/ops.c:1242
 #: ../src/protocols/silc/ops.c:1344
@@ -6275,7 +6288,7 @@
 
 #: ../src/protocols/irc/irc.c:906
 #: ../src/protocols/irc/msgs.c:229
-#: ../src/protocols/jabber/jabber.c:745
+#: ../src/protocols/jabber/jabber.c:749
 #: ../src/protocols/silc/buddy.c:1531
 #: ../src/protocols/silc/ops.c:1189
 #: ../src/protocols/silc/ops.c:1191
@@ -6568,7 +6581,7 @@
 msgstr "names [kanal]:  Seznam uporabnikov, ki so trenutno na kanalu."
 
 #: ../src/protocols/irc/parse.c:129
-#: ../src/protocols/jabber/jabber.c:1743
+#: ../src/protocols/jabber/jabber.c:1746
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;nov vzdevek&gt;:  Spremenite vaš vzdevek."
 
@@ -6714,254 +6727,264 @@
 msgid "SASL error"
 msgstr "Napaka SASL"
 
-#: ../src/protocols/jabber/buddy.c:249
-#: ../src/protocols/jabber/buddy.c:666
+#: ../src/protocols/jabber/buddy.c:268
+#: ../src/protocols/jabber/buddy.c:772
 #: ../src/protocols/silc/ops.c:1020
 msgid "Full Name"
 msgstr "Polno ime"
 
-#: ../src/protocols/jabber/buddy.c:250
-#: ../src/protocols/jabber/buddy.c:679
+#: ../src/protocols/jabber/buddy.c:269
+#: ../src/protocols/jabber/buddy.c:785
 #: ../src/protocols/silc/ops.c:1032
 msgid "Family Name"
 msgstr "Družinsko ime"
 
-#: ../src/protocols/jabber/buddy.c:251
-#: ../src/protocols/jabber/buddy.c:683
+#: ../src/protocols/jabber/buddy.c:270
+#: ../src/protocols/jabber/buddy.c:789
 msgid "Given Name"
 msgstr "Ime"
 
-#: ../src/protocols/jabber/buddy.c:253
-#: ../src/protocols/jabber/jabber.c:805
+#: ../src/protocols/jabber/buddy.c:272
+#: ../src/protocols/jabber/jabber.c:809
 msgid "URL"
 msgstr "URL"
 
-#: ../src/protocols/jabber/buddy.c:254
-#: ../src/protocols/jabber/buddy.c:735
+#: ../src/protocols/jabber/buddy.c:273
+#: ../src/protocols/jabber/buddy.c:841
 msgid "Street Address"
 msgstr "Naslov"
 
-#: ../src/protocols/jabber/buddy.c:255
-#: ../src/protocols/jabber/buddy.c:731
+#: ../src/protocols/jabber/buddy.c:274
+#: ../src/protocols/jabber/buddy.c:837
 msgid "Extended Address"
 msgstr "Naslov (dodatno)"
 
-#: ../src/protocols/jabber/buddy.c:256
-#: ../src/protocols/jabber/buddy.c:739
+#: ../src/protocols/jabber/buddy.c:275
+#: ../src/protocols/jabber/buddy.c:845
 msgid "Locality"
 msgstr "Okraj"
 
-#: ../src/protocols/jabber/buddy.c:257
-#: ../src/protocols/jabber/buddy.c:743
+#: ../src/protocols/jabber/buddy.c:276
+#: ../src/protocols/jabber/buddy.c:849
 msgid "Region"
 msgstr "Regija"
 
-#: ../src/protocols/jabber/buddy.c:258
-#: ../src/protocols/jabber/buddy.c:747
+#: ../src/protocols/jabber/buddy.c:277
+#: ../src/protocols/jabber/buddy.c:853
 msgid "Postal Code"
 msgstr "Poštna številka"
 
-#: ../src/protocols/jabber/buddy.c:259
-#: ../src/protocols/jabber/buddy.c:752
+#: ../src/protocols/jabber/buddy.c:278
+#: ../src/protocols/jabber/buddy.c:858
 #: ../src/protocols/silc/silc.c:943
 msgid "Country"
 msgstr "Država"
 
-#: ../src/protocols/jabber/buddy.c:260
-#: ../src/protocols/jabber/buddy.c:763
-#: ../src/protocols/jabber/buddy.c:770
+#: ../src/protocols/jabber/buddy.c:279
+#: ../src/protocols/jabber/buddy.c:869
+#: ../src/protocols/jabber/buddy.c:876
 msgid "Telephone"
 msgstr "Telefon"
 
-#: ../src/protocols/jabber/buddy.c:261
-#: ../src/protocols/jabber/buddy.c:781
-#: ../src/protocols/jabber/buddy.c:789
-#: ../src/protocols/jabber/buddy.c:1263
+#: ../src/protocols/jabber/buddy.c:280
+#: ../src/protocols/jabber/buddy.c:887
+#: ../src/protocols/jabber/buddy.c:895
+#: ../src/protocols/jabber/buddy.c:1524
 #: ../src/protocols/silc/ops.c:1075
 #: ../src/protocols/silc/util.c:526
 #: ../src/protocols/yahoo/yahoo_profile.c:1036
 msgid "E-Mail"
 msgstr "E-pošta"
 
-#: ../src/protocols/jabber/buddy.c:262
-#: ../src/protocols/jabber/buddy.c:804
+#: ../src/protocols/jabber/buddy.c:281
+#: ../src/protocols/jabber/buddy.c:910
 msgid "Organization Name"
 msgstr "Ime organizacije"
 
-#: ../src/protocols/jabber/buddy.c:263
-#: ../src/protocols/jabber/buddy.c:808
+#: ../src/protocols/jabber/buddy.c:282
+#: ../src/protocols/jabber/buddy.c:914
 msgid "Organization Unit"
 msgstr "Enota organizacije"
 
-#: ../src/protocols/jabber/buddy.c:265
-#: ../src/protocols/jabber/buddy.c:817
+#: ../src/protocols/jabber/buddy.c:284
+#: ../src/protocols/jabber/buddy.c:923
 msgid "Role"
 msgstr "Funkcija"
 
-#: ../src/protocols/jabber/buddy.c:266
-#: ../src/protocols/jabber/buddy.c:700
+#: ../src/protocols/jabber/buddy.c:285
+#: ../src/protocols/jabber/buddy.c:806
 #: ../src/protocols/msn/msn.c:1589
 #: ../src/protocols/oscar/oscar.c:3667
 msgid "Birthday"
 msgstr "Rojstni dan"
 
-#: ../src/protocols/jabber/buddy.c:569
-#: ../src/protocols/jabber/buddy.c:570
+#: ../src/protocols/jabber/buddy.c:588
+#: ../src/protocols/jabber/buddy.c:589
 msgid "Edit Jabber vCard"
 msgstr "Urejanje Jabber vVizitke"
 
-#: ../src/protocols/jabber/buddy.c:571
+#: ../src/protocols/jabber/buddy.c:590
 msgid "All items below are optional. Enter only the information with which you feel comfortable."
 msgstr "Vsa spodnja polja so izbirna. Vnesite samo informacije, ki jih želite."
 
-#: ../src/protocols/jabber/buddy.c:641
-#: ../src/protocols/jabber/jabber.c:1908
+#: ../src/protocols/jabber/buddy.c:646
+#: ../src/protocols/jabber/buddy.c:677
+msgid "Client:"
+msgstr "Odjemalec:"
+
+#: ../src/protocols/jabber/buddy.c:650
+#: ../src/protocols/jabber/buddy.c:681
+msgid "Operating System"
+msgstr "Operacijski sistem"
+
+#: ../src/protocols/jabber/buddy.c:660
+#: ../src/protocols/jabber/jabber.c:1911
 msgid "Resource"
 msgstr "Vir"
 
-#: ../src/protocols/jabber/buddy.c:687
+#: ../src/protocols/jabber/buddy.c:793
 #: ../src/protocols/silc/ops.c:1028
 msgid "Middle Name"
 msgstr "Drugo ime"
 
-#: ../src/protocols/jabber/buddy.c:720
-#: ../src/protocols/jabber/jabber.c:780
+#: ../src/protocols/jabber/buddy.c:826
+#: ../src/protocols/jabber/jabber.c:784
 #: ../src/protocols/oscar/oscar.c:3686
 #: ../src/protocols/oscar/oscar.c:3694
 #: ../src/protocols/silc/ops.c:1064
 msgid "Address"
 msgstr "Naslov"
 
-#: ../src/protocols/jabber/buddy.c:727
+#: ../src/protocols/jabber/buddy.c:833
 msgid "P.O. Box"
 msgstr "Poštni nabiralnik"
 
-#: ../src/protocols/jabber/buddy.c:841
+#: ../src/protocols/jabber/buddy.c:947
 msgid "Photo"
 msgstr "Fotografija"
 
-#: ../src/protocols/jabber/buddy.c:841
+#: ../src/protocols/jabber/buddy.c:947
 msgid "Logo"
 msgstr "Logotip"
 
-#: ../src/protocols/jabber/buddy.c:1044
+#: ../src/protocols/jabber/buddy.c:1304
 msgid "Un-hide From"
 msgstr "Ne skrij pred"
 
-#: ../src/protocols/jabber/buddy.c:1048
+#: ../src/protocols/jabber/buddy.c:1308
 msgid "Temporarily Hide From"
 msgstr "Začasno skrij pred"
 
 #. && NOT ME
-#: ../src/protocols/jabber/buddy.c:1056
+#: ../src/protocols/jabber/buddy.c:1316
 msgid "Cancel Presence Notification"
 msgstr "Prekliči obvestilo o prisotnosti"
 
-#: ../src/protocols/jabber/buddy.c:1063
+#: ../src/protocols/jabber/buddy.c:1323
 msgid "(Re-)Request authorization"
 msgstr "Ponovno zahtevaj pooblastitev"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../src/protocols/jabber/buddy.c:1072
+#: ../src/protocols/jabber/buddy.c:1332
 msgid "Unsubscribe"
 msgstr "Odjavi"
 
-#: ../src/protocols/jabber/buddy.c:1099
+#: ../src/protocols/jabber/buddy.c:1359
 #: ../src/protocols/jabber/chat.c:675
 #: ../src/protocols/jabber/chat.c:686
-#: ../src/protocols/jabber/jabber.c:1165
+#: ../src/protocols/jabber/jabber.c:1168
 #: ../src/protocols/silc/ops.c:1449
 msgid "Error"
 msgstr "Napaka"
 
-#: ../src/protocols/jabber/buddy.c:1105
-#: ../src/protocols/jabber/jabber.c:1190
+#: ../src/protocols/jabber/buddy.c:1365
+#: ../src/protocols/jabber/jabber.c:1193
 msgid "Chatty"
 msgstr "Pomenek"
 
-#: ../src/protocols/jabber/buddy.c:1109
+#: ../src/protocols/jabber/buddy.c:1369
 #: ../src/status.c:159
 msgid "Extended Away"
 msgstr "Odsotnost - Napredno"
 
-#: ../src/protocols/jabber/buddy.c:1111
-#: ../src/protocols/jabber/jabber.c:1220
+#: ../src/protocols/jabber/buddy.c:1371
+#: ../src/protocols/jabber/jabber.c:1223
 #: ../src/protocols/oscar/oscar.c:713
-#: ../src/protocols/oscar/oscar.c:5623
+#: ../src/protocols/oscar/oscar.c:5619
 #: ../src/protocols/sametime/sametime.c:3277
 msgid "Do Not Disturb"
 msgstr "Ne moti"
 
-#: ../src/protocols/jabber/buddy.c:1255
+#: ../src/protocols/jabber/buddy.c:1516
 msgid "JID"
 msgstr "JID"
 
-#: ../src/protocols/jabber/buddy.c:1259
-#: ../src/protocols/jabber/buddy.c:1438
+#: ../src/protocols/jabber/buddy.c:1520
+#: ../src/protocols/jabber/buddy.c:1699
 #: ../src/protocols/oscar/oscar.c:3635
 msgid "Last Name"
 msgstr "Priimek"
 
-#: ../src/protocols/jabber/buddy.c:1291
+#: ../src/protocols/jabber/buddy.c:1552
 msgid "The following are the results of your search"
 msgstr "To so rezultati vašega iskanja"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../src/protocols/jabber/buddy.c:1366
+#: ../src/protocols/jabber/buddy.c:1627
 msgid "Find a contact by entering the search criteria in the given fields. Note: Each field supports wild card searches (%)"
 msgstr "Najdi stik z vnosom iskalnih kriterijev v dana polja. Opomba: vsa polja dovoljujejo iskanje z nadomestnimi znaki (%)."
 
-#: ../src/protocols/jabber/buddy.c:1386
+#: ../src/protocols/jabber/buddy.c:1647
 msgid "Directory Query Failed"
 msgstr "Povpraševanje po imeniku ni uspelo"
 
-#: ../src/protocols/jabber/buddy.c:1387
+#: ../src/protocols/jabber/buddy.c:1648
 msgid "Could not query the directory server."
 msgstr "Povpraševanje na strežniku z imenikom ni uspelo."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../src/protocols/jabber/buddy.c:1421
+#: ../src/protocols/jabber/buddy.c:1682
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Ukazi strežniku: %s"
 
-#: ../src/protocols/jabber/buddy.c:1428
+#: ../src/protocols/jabber/buddy.c:1689
 msgid "Fill in one or more fields to search for any matching Jabber users."
 msgstr "Izpolnite eno ali več polj za iskanje uporabnikov Jabberja."
 
-#: ../src/protocols/jabber/buddy.c:1448
+#: ../src/protocols/jabber/buddy.c:1709
 #: ../src/protocols/novell/novell.c:1488
 #: ../src/protocols/oscar/oscar.c:3637
 #: ../src/protocols/oscar/oscar.c:3644
 msgid "E-Mail Address"
 msgstr "E-naslov"
 
-#: ../src/protocols/jabber/buddy.c:1457
-#: ../src/protocols/jabber/buddy.c:1458
+#: ../src/protocols/jabber/buddy.c:1718
+#: ../src/protocols/jabber/buddy.c:1719
 msgid "Search for Jabber users"
 msgstr "Išči uporabnike Jabberja"
 
-#: ../src/protocols/jabber/buddy.c:1472
+#: ../src/protocols/jabber/buddy.c:1733
 msgid "Invalid Directory"
 msgstr "Neveljaven imenik"
 
-#: ../src/protocols/jabber/buddy.c:1489
+#: ../src/protocols/jabber/buddy.c:1750
 msgid "Enter a User Directory"
 msgstr "Vnesi uporabniški imenik"
 
-#: ../src/protocols/jabber/buddy.c:1490
+#: ../src/protocols/jabber/buddy.c:1751
 msgid "Select a user directory to search"
 msgstr "Izberite imenik za iskanje"
 
-#: ../src/protocols/jabber/buddy.c:1493
+#: ../src/protocols/jabber/buddy.c:1754
 msgid "Search Directory"
 msgstr "Imenik iskanja"
 
 #: ../src/protocols/jabber/chat.c:41
-#: ../src/protocols/oscar/oscar.c:5108
+#: ../src/protocols/oscar/oscar.c:5104
 #: ../src/protocols/yahoo/yahoochat.c:998
 msgid "_Room:"
 msgstr "_Soba:"
@@ -7055,450 +7078,450 @@
 msgid "Error initializing session"
 msgstr "Napaka pri inicializaciji seje"
 
-#: ../src/protocols/jabber/jabber.c:226
-#: ../src/protocols/jabber/jabber.c:275
-#: ../src/protocols/jabber/jabber.c:303
+#: ../src/protocols/jabber/jabber.c:232
+#: ../src/protocols/jabber/jabber.c:281
+#: ../src/protocols/jabber/jabber.c:309
 msgid "Write error"
 msgstr "Napaka pri pisanju"
 
-#: ../src/protocols/jabber/jabber.c:355
-#: ../src/protocols/jabber/jabber.c:388
+#: ../src/protocols/jabber/jabber.c:361
+#: ../src/protocols/jabber/jabber.c:394
 msgid "Read Error"
 msgstr "Napaka pri branju"
 
-#: ../src/protocols/jabber/jabber.c:474
-#: ../src/protocols/jabber/jabber.c:900
+#: ../src/protocols/jabber/jabber.c:479
+#: ../src/protocols/jabber/jabber.c:903
 msgid "Unable to create socket"
 msgstr "Ni mogoče ustvariti vtičnice"
 
-#: ../src/protocols/jabber/jabber.c:520
-#: ../src/protocols/jabber/jabber.c:857
+#: ../src/protocols/jabber/jabber.c:524
+#: ../src/protocols/jabber/jabber.c:861
 msgid "Invalid Jabber ID"
 msgstr "Neveljaven Jabber ID"
 
-#: ../src/protocols/jabber/jabber.c:590
+#: ../src/protocols/jabber/jabber.c:594
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registracija %s@%s uspela!"
 
-#: ../src/protocols/jabber/jabber.c:592
-#: ../src/protocols/jabber/jabber.c:593
+#: ../src/protocols/jabber/jabber.c:596
+#: ../src/protocols/jabber/jabber.c:597
 msgid "Registration Successful"
 msgstr "Registracija uspela!"
 
-#: ../src/protocols/jabber/jabber.c:599
-#: ../src/protocols/jabber/jabber.c:1456
+#: ../src/protocols/jabber/jabber.c:603
+#: ../src/protocols/jabber/jabber.c:1459
 msgid "Unknown Error"
 msgstr "Neznana napaka"
 
-#: ../src/protocols/jabber/jabber.c:601
-#: ../src/protocols/jabber/jabber.c:602
+#: ../src/protocols/jabber/jabber.c:605
+#: ../src/protocols/jabber/jabber.c:606
 msgid "Registration Failed"
 msgstr "Napaka pri registraciji"
 
-#: ../src/protocols/jabber/jabber.c:713
-#: ../src/protocols/jabber/jabber.c:714
+#: ../src/protocols/jabber/jabber.c:717
+#: ../src/protocols/jabber/jabber.c:718
 msgid "Already Registered"
 msgstr "Že registriran"
 
-#: ../src/protocols/jabber/jabber.c:790
+#: ../src/protocols/jabber/jabber.c:794
 #: ../src/protocols/oscar/oscar.c:3688
 #: ../src/protocols/oscar/oscar.c:3696
 msgid "State"
 msgstr "Zvezna država"
 
-#: ../src/protocols/jabber/jabber.c:795
+#: ../src/protocols/jabber/jabber.c:799
 msgid "Postal code"
 msgstr "Poštna številka"
 
-#: ../src/protocols/jabber/jabber.c:800
+#: ../src/protocols/jabber/jabber.c:804
 #: ../src/protocols/silc/ops.c:1069
 #: ../src/protocols/silc/silc.c:701
 #: ../src/protocols/silc/util.c:528
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/protocols/jabber/jabber.c:810
+#: ../src/protocols/jabber/jabber.c:814
 msgid "Date"
 msgstr "Datum"
 
-#: ../src/protocols/jabber/jabber.c:818
+#: ../src/protocols/jabber/jabber.c:822
 msgid "Please fill out the information below to register your new account."
 msgstr "Za registracijo novega računa morate izpolniti spodnja polja."
 
-#: ../src/protocols/jabber/jabber.c:821
-#: ../src/protocols/jabber/jabber.c:822
+#: ../src/protocols/jabber/jabber.c:825
+#: ../src/protocols/jabber/jabber.c:826
 msgid "Register New Jabber Account"
 msgstr "Registrirajte nov račun za Jabber"
 
-#: ../src/protocols/jabber/jabber.c:983
+#: ../src/protocols/jabber/jabber.c:987
 msgid "Initializing Stream"
 msgstr "Inicializacija toka"
 
-#: ../src/protocols/jabber/jabber.c:989
+#: ../src/protocols/jabber/jabber.c:992
 #: ../src/protocols/msn/session.c:350
 msgid "Authenticating"
 msgstr "Overovljanje"
 
-#: ../src/protocols/jabber/jabber.c:998
+#: ../src/protocols/jabber/jabber.c:1001
 msgid "Re-initializing Stream"
 msgstr "Ponovna inicializacija toka"
 
-#: ../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/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:782
-#: ../src/protocols/oscar/oscar.c:5414
+#: ../src/protocols/oscar/oscar.c:5410
 msgid "Not Authorized"
 msgstr "Nepooblaščeno"
 
-#: ../src/protocols/jabber/jabber.c:1111
+#: ../src/protocols/jabber/jabber.c:1114
 msgid "Both"
 msgstr "Oboje"
 
-#: ../src/protocols/jabber/jabber.c:1113
+#: ../src/protocols/jabber/jabber.c:1116
 msgid "From (To pending)"
 msgstr "Od (Za čakajoče)"
 
-#: ../src/protocols/jabber/jabber.c:1118
+#: ../src/protocols/jabber/jabber.c:1121
 msgid "To"
 msgstr "Za"
 
-#: ../src/protocols/jabber/jabber.c:1120
+#: ../src/protocols/jabber/jabber.c:1123
 msgid "None (To pending)"
 msgstr "Brez (Za čakajoče)"
 
-#: ../src/protocols/jabber/jabber.c:1124
+#: ../src/protocols/jabber/jabber.c:1127
 msgid "Subscription"
 msgstr "Naročilo"
 
-#: ../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: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
 msgid "Priority"
 msgstr "Prednost stika"
 
-#: ../src/protocols/jabber/jabber.c:1250
+#: ../src/protocols/jabber/jabber.c:1253
 msgid "Password Changed"
 msgstr "Geslo spremenjeno"
 
-#: ../src/protocols/jabber/jabber.c:1251
+#: ../src/protocols/jabber/jabber.c:1254
 msgid "Your password has been changed."
 msgstr "Vaše geslo je bilo spremenjeno."
 
-#: ../src/protocols/jabber/jabber.c:1255
-#: ../src/protocols/jabber/jabber.c:1256
+#: ../src/protocols/jabber/jabber.c:1258
+#: ../src/protocols/jabber/jabber.c:1259
 msgid "Error changing password"
 msgstr "Napaka pri spreminjanju gesla"
 
-#: ../src/protocols/jabber/jabber.c:1312
+#: ../src/protocols/jabber/jabber.c:1315
 msgid "Password (again)"
 msgstr "Novo geslo (ponovno)"
 
-#: ../src/protocols/jabber/jabber.c:1317
-#: ../src/protocols/jabber/jabber.c:1318
+#: ../src/protocols/jabber/jabber.c:1320
+#: ../src/protocols/jabber/jabber.c:1321
 msgid "Change Jabber Password"
 msgstr "Spremeni geslo za Jabber"
 
-#: ../src/protocols/jabber/jabber.c:1318
+#: ../src/protocols/jabber/jabber.c:1321
 msgid "Please enter your new password"
 msgstr "Vnesite svoje novo geslo"
 
-#: ../src/protocols/jabber/jabber.c:1328
-#: ../src/protocols/oscar/oscar.c:6184
+#: ../src/protocols/jabber/jabber.c:1331
+#: ../src/protocols/oscar/oscar.c:6180
 #: ../src/protocols/silc/silc.c:1023
 msgid "Set User Info..."
 msgstr "Nastavi informacije o uporabniku ..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../src/protocols/jabber/jabber.c:1333
-#: ../src/protocols/oscar/oscar.c:6195
+#: ../src/protocols/jabber/jabber.c:1336
+#: ../src/protocols/oscar/oscar.c:6191
 #: ../src/protocols/silc/silc.c:1019
 msgid "Change Password..."
 msgstr "Spremeni geslo ..."
 
 #. }
-#: ../src/protocols/jabber/jabber.c:1338
+#: ../src/protocols/jabber/jabber.c:1341
 msgid "Search for Users..."
 msgstr "Najdi uporabnike ..."
 
-#: ../src/protocols/jabber/jabber.c:1414
+#: ../src/protocols/jabber/jabber.c:1417
 msgid "Bad Request"
 msgstr "Napačna zahteva"
 
-#: ../src/protocols/jabber/jabber.c:1416
+#: ../src/protocols/jabber/jabber.c:1419
 msgid "Conflict"
 msgstr "Spor"
 
-#: ../src/protocols/jabber/jabber.c:1418
+#: ../src/protocols/jabber/jabber.c:1421
 msgid "Feature Not Implemented"
 msgstr "Možnost ni uvedena"
 
-#: ../src/protocols/jabber/jabber.c:1420
+#: ../src/protocols/jabber/jabber.c:1423
 msgid "Forbidden"
 msgstr "Prepovedano"
 
-#: ../src/protocols/jabber/jabber.c:1422
+#: ../src/protocols/jabber/jabber.c:1425
 msgid "Gone"
 msgstr "Ni na voljo"
 
-#: ../src/protocols/jabber/jabber.c:1424
-#: ../src/protocols/jabber/jabber.c:1499
+#: ../src/protocols/jabber/jabber.c:1427
+#: ../src/protocols/jabber/jabber.c:1502
 msgid "Internal Server Error"
 msgstr "Notranja napaka strežnika"
 
-#: ../src/protocols/jabber/jabber.c:1426
+#: ../src/protocols/jabber/jabber.c:1429
 msgid "Item Not Found"
 msgstr "Predmeta ni mogoče najti"
 
-#: ../src/protocols/jabber/jabber.c:1428
+#: ../src/protocols/jabber/jabber.c:1431
 msgid "Malformed Jabber ID"
 msgstr "Nepravilen Jabber ID"
 
-#: ../src/protocols/jabber/jabber.c:1430
+#: ../src/protocols/jabber/jabber.c:1433
 msgid "Not Acceptable"
 msgstr "Ni mogoče sprejeti"
 
-#: ../src/protocols/jabber/jabber.c:1432
+#: ../src/protocols/jabber/jabber.c:1435
 msgid "Not Allowed"
 msgstr "Ni dovoljeno"
 
-#: ../src/protocols/jabber/jabber.c:1436
+#: ../src/protocols/jabber/jabber.c:1439
 msgid "Payment Required"
 msgstr "Zahtevano plačilo"
 
-#: ../src/protocols/jabber/jabber.c:1438
+#: ../src/protocols/jabber/jabber.c:1441
 msgid "Recipient Unavailable"
 msgstr "Dobitnik ni na voljo"
 
-#: ../src/protocols/jabber/jabber.c:1442
+#: ../src/protocols/jabber/jabber.c:1445
 msgid "Registration Required"
 msgstr "Zahtevana registracija"
 
-#: ../src/protocols/jabber/jabber.c:1444
+#: ../src/protocols/jabber/jabber.c:1447
 msgid "Remote Server Not Found"
 msgstr "Oddaljenega strežnika ni mogoče najti"
 
-#: ../src/protocols/jabber/jabber.c:1446
+#: ../src/protocols/jabber/jabber.c:1449
 msgid "Remote Server Timeout"
 msgstr "Časovna omejitev oddaljenega strežnika je potekla"
 
-#: ../src/protocols/jabber/jabber.c:1448
+#: ../src/protocols/jabber/jabber.c:1451
 msgid "Server Overloaded"
 msgstr "Strežnik je preobremenjen"
 
-#: ../src/protocols/jabber/jabber.c:1450
+#: ../src/protocols/jabber/jabber.c:1453
 msgid "Service Unavailable"
 msgstr "Storitev ni dostopna"
 
-#: ../src/protocols/jabber/jabber.c:1452
+#: ../src/protocols/jabber/jabber.c:1455
 msgid "Subscription Required"
 msgstr "Zahtevano naročilo"
 
-#: ../src/protocols/jabber/jabber.c:1454
+#: ../src/protocols/jabber/jabber.c:1457
 msgid "Unexpected Request"
 msgstr "Nepričakovana zahteva"
 
-#: ../src/protocols/jabber/jabber.c:1461
+#: ../src/protocols/jabber/jabber.c:1464
 msgid "Authorization Aborted"
 msgstr "Pooblastitev prekinjena"
 
-#: ../src/protocols/jabber/jabber.c:1463
+#: ../src/protocols/jabber/jabber.c:1466
 msgid "Incorrect encoding in authorization"
 msgstr "Napačno kodiranje pri pooblastitvi"
 
-#: ../src/protocols/jabber/jabber.c:1466
+#: ../src/protocols/jabber/jabber.c:1469
 msgid "Invalid authzid"
 msgstr "Neveljaven ID pooblastila"
 
-#: ../src/protocols/jabber/jabber.c:1469
+#: ../src/protocols/jabber/jabber.c:1472
 msgid "Invalid Authorization Mechanism"
 msgstr "Neveljaven mehanizem pooblastil"
 
-#: ../src/protocols/jabber/jabber.c:1472
+#: ../src/protocols/jabber/jabber.c:1475
 msgid "Authorization mechanism too weak"
 msgstr "Prešibek mehanizem pooblastil"
 
-#: ../src/protocols/jabber/jabber.c:1477
+#: ../src/protocols/jabber/jabber.c:1480
 msgid "Temporary Authentication Failure"
 msgstr "Napaka začasne overovitve"
 
-#: ../src/protocols/jabber/jabber.c:1480
+#: ../src/protocols/jabber/jabber.c:1483
 msgid "Authentication Failure"
 msgstr "Napaka pri overovitvi"
 
-#: ../src/protocols/jabber/jabber.c:1484
+#: ../src/protocols/jabber/jabber.c:1487
 msgid "Bad Format"
 msgstr "Napačna oblika"
 
-#: ../src/protocols/jabber/jabber.c:1486
+#: ../src/protocols/jabber/jabber.c:1489
 msgid "Bad Namespace Prefix"
 msgstr "Napačna predpona imenskega prostora"
 
-#: ../src/protocols/jabber/jabber.c:1489
+#: ../src/protocols/jabber/jabber.c:1492
 msgid "Resource Conflict"
 msgstr "Spor vira"
 
-#: ../src/protocols/jabber/jabber.c:1491
+#: ../src/protocols/jabber/jabber.c:1494
 #: ../src/protocols/silc/ops.c:1728
 msgid "Connection Timeout"
 msgstr "Časovna omejitev povezave potekla"
 
-#: ../src/protocols/jabber/jabber.c:1493
+#: ../src/protocols/jabber/jabber.c:1496
 msgid "Host Gone"
 msgstr "Gostitelj ni na voljo"
 
-#: ../src/protocols/jabber/jabber.c:1495
+#: ../src/protocols/jabber/jabber.c:1498
 msgid "Host Unknown"
 msgstr "Neznan gostitelj"
 
-#: ../src/protocols/jabber/jabber.c:1497
+#: ../src/protocols/jabber/jabber.c:1500
 msgid "Improper Addressing"
 msgstr "Neustrezno naslavljanje"
 
-#: ../src/protocols/jabber/jabber.c:1501
+#: ../src/protocols/jabber/jabber.c:1504
 msgid "Invalid ID"
 msgstr "Neveljaven ID"
 
-#: ../src/protocols/jabber/jabber.c:1503
+#: ../src/protocols/jabber/jabber.c:1506
 msgid "Invalid Namespace"
 msgstr "Neveljaven imenski prostor"
 
-#: ../src/protocols/jabber/jabber.c:1505
+#: ../src/protocols/jabber/jabber.c:1508
 msgid "Invalid XML"
 msgstr "Neveljaven XML"
 
-#: ../src/protocols/jabber/jabber.c:1507
+#: ../src/protocols/jabber/jabber.c:1510
 msgid "Non-matching Hosts"
 msgstr "Neujemajoči gostitelji"
 
-#: ../src/protocols/jabber/jabber.c:1511
+#: ../src/protocols/jabber/jabber.c:1514
 msgid "Policy Violation"
 msgstr "Zloraba politike"
 
-#: ../src/protocols/jabber/jabber.c:1513
+#: ../src/protocols/jabber/jabber.c:1516
 msgid "Remote Connection Failed"
 msgstr "Oddaljena povezava ni uspela"
 
-#: ../src/protocols/jabber/jabber.c:1515
+#: ../src/protocols/jabber/jabber.c:1518
 msgid "Resource Constraint"
 msgstr "Zadrega vira"
 
-#: ../src/protocols/jabber/jabber.c:1517
+#: ../src/protocols/jabber/jabber.c:1520
 msgid "Restricted XML"
 msgstr "Omejen XML"
 
-#: ../src/protocols/jabber/jabber.c:1519
+#: ../src/protocols/jabber/jabber.c:1522
 msgid "See Other Host"
 msgstr "Glej druge gostitelje"
 
-#: ../src/protocols/jabber/jabber.c:1521
+#: ../src/protocols/jabber/jabber.c:1524
 msgid "System Shutdown"
 msgstr "Izklop sistema"
 
-#: ../src/protocols/jabber/jabber.c:1523
+#: ../src/protocols/jabber/jabber.c:1526
 msgid "Undefined Condition"
 msgstr "Nedoločen pogoj"
 
-#: ../src/protocols/jabber/jabber.c:1525
+#: ../src/protocols/jabber/jabber.c:1528
 msgid "Unsupported Encoding"
 msgstr "Nepodprto kodiranje"
 
-#: ../src/protocols/jabber/jabber.c:1527
+#: ../src/protocols/jabber/jabber.c:1530
 msgid "Unsupported Stanza Type"
 msgstr "Nepodprt tip vrstice"
 
-#: ../src/protocols/jabber/jabber.c:1529
+#: ../src/protocols/jabber/jabber.c:1532
 msgid "Unsupported Version"
 msgstr "Nepodprta različica"
 
-#: ../src/protocols/jabber/jabber.c:1531
+#: ../src/protocols/jabber/jabber.c:1534
 msgid "XML Not Well Formed"
 msgstr "Slabo oblikovan XML"
 
-#: ../src/protocols/jabber/jabber.c:1533
+#: ../src/protocols/jabber/jabber.c:1536
 msgid "Stream Error"
 msgstr "Napaka toka"
 
-#: ../src/protocols/jabber/jabber.c:1600
+#: ../src/protocols/jabber/jabber.c:1603
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Ni mogoče prepovedati uporabnika %s"
 
-#: ../src/protocols/jabber/jabber.c:1620
+#: ../src/protocols/jabber/jabber.c:1623
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Neznana včlanitev: \"%s\""
 
-#: ../src/protocols/jabber/jabber.c:1625
+#: ../src/protocols/jabber/jabber.c:1628
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Uporabnika %s ni mogoče včlaniti kot \"%s\""
 
-#: ../src/protocols/jabber/jabber.c:1644
+#: ../src/protocols/jabber/jabber.c:1647
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Neznana vloga: \"%s\""
 
 #  Data is assumed to be the destination sn
-#: ../src/protocols/jabber/jabber.c:1651
+#: ../src/protocols/jabber/jabber.c:1654
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "Ni moč določiti vloge \"%s\" za uporabnika: %s"
 
-#: ../src/protocols/jabber/jabber.c:1704
+#: ../src/protocols/jabber/jabber.c:1707
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Ni mogoče brcniti uporabnika %s"
 
-#: ../src/protocols/jabber/jabber.c:1735
+#: ../src/protocols/jabber/jabber.c:1738
 msgid "config:  Configure a chat room."
 msgstr "config:  Nastavi pogovorno sobo."
 
-#: ../src/protocols/jabber/jabber.c:1739
+#: ../src/protocols/jabber/jabber.c:1742
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Nastavi pogovorno sobo."
 
-#: ../src/protocols/jabber/jabber.c:1748
+#: ../src/protocols/jabber/jabber.c:1751
 msgid "part [room]:  Leave the room."
 msgstr "part [soba]:  Zapusti sobo."
 
-#: ../src/protocols/jabber/jabber.c:1753
+#: ../src/protocols/jabber/jabber.c:1756
 msgid "register:  Register with a chat room."
 msgstr "register:  Registriraj se v pogovorno sobo."
 
-#: ../src/protocols/jabber/jabber.c:1759
+#: ../src/protocols/jabber/jabber.c:1762
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [nova tema]:  Oglej si ali spremeni temo."
 
-#: ../src/protocols/jabber/jabber.c:1765
+#: ../src/protocols/jabber/jabber.c:1768
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;uporabnik&gt; [soba]:  Prepovej uporabnika v sobi."
 
-#: ../src/protocols/jabber/jabber.c:1771
+#: ../src/protocols/jabber/jabber.c:1774
 msgid "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's affiliation with the room."
 msgstr "affiliate &lt;uporabnik&gt; &lt;lastnik|skrbnik|član|izločenec|nihče&gt;: Nastavitev uporabnikovega statusa v sobi."
 
-#: ../src/protocols/jabber/jabber.c:1777
+#: ../src/protocols/jabber/jabber.c:1780
 msgid "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's role in the room."
 msgstr "role &lt;uporabnik&gt; &lt;moderator|participant|visitor|none&gt;: Nastavitev uporabnikove vloge v sobi."
 
-#: ../src/protocols/jabber/jabber.c:1783
+#: ../src/protocols/jabber/jabber.c:1786
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;uporabnik&gt; [soba]:  Povabite uporabnika v sobo."
 
-#: ../src/protocols/jabber/jabber.c:1789
+#: ../src/protocols/jabber/jabber.c:1792
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;soba&gt; [strežnik]:  Pridruži se pomenku na tem strežniku."
 
-#: ../src/protocols/jabber/jabber.c:1795
+#: ../src/protocols/jabber/jabber.c:1798
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;uporabnik&gt; [soba]:  Brcni uporabnika iz sobe."
 
-#: ../src/protocols/jabber/jabber.c:1800
+#: ../src/protocols/jabber/jabber.c:1803
 msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr "msg &lt;uporabnik&gt; &lt;sporočilo&gt;:  Pošljite zasebno sporočilo drugemu uporabniku."
 
@@ -7512,34 +7535,34 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/jabber/jabber.c:1883
-#: ../src/protocols/jabber/jabber.c:1885
+#: ../src/protocols/jabber/jabber.c:1886
+#: ../src/protocols/jabber/jabber.c:1888
 msgid "Jabber Protocol Plugin"
 msgstr "Dodatek za protokol Jabber"
 
-#: ../src/protocols/jabber/jabber.c:1911
+#: ../src/protocols/jabber/jabber.c:1914
 msgid "Use TLS if available"
 msgstr "Uporabite TLS, če je na voljo"
 
-#: ../src/protocols/jabber/jabber.c:1916
+#: ../src/protocols/jabber/jabber.c:1919
 msgid "Require TLS"
 msgstr "Zahtevaj TLS"
 
-#: ../src/protocols/jabber/jabber.c:1919
+#: ../src/protocols/jabber/jabber.c:1922
 msgid "Force old (port 5223) SSL"
 msgstr "Vsili star SSL (vrata 5223)"
 
-#: ../src/protocols/jabber/jabber.c:1924
+#: ../src/protocols/jabber/jabber.c:1927
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Dovoli overovitev z navadnim besedilom preko nešifriranih toka"
 
-#: ../src/protocols/jabber/jabber.c:1929
+#: ../src/protocols/jabber/jabber.c:1932
 #: ../src/protocols/simple/simple.c:1775
 msgid "Connect port"
 msgstr "Poveži vrata"
 
 #. Account options
-#: ../src/protocols/jabber/jabber.c:1933
+#: ../src/protocols/jabber/jabber.c:1936
 #: ../src/protocols/silc/silc.c:1854
 msgid "Connect server"
 msgstr "Poveži se na strežnik"
@@ -7573,55 +7596,56 @@
 msgid " (Code %s)"
 msgstr " (Koda %s)"
 
-#: ../src/protocols/jabber/parser.c:131
+#: ../src/protocols/jabber/parser.c:279
+#: ../src/protocols/jabber/parser.c:288
 msgid "XML Parse error"
 msgstr "Napaka pri razčlenjevanu XML"
 
-#: ../src/protocols/jabber/presence.c:309
+#: ../src/protocols/jabber/presence.c:308
 msgid "Unknown Error in presence"
 msgstr "Prišlo je do neznane napake"
 
-#: ../src/protocols/jabber/presence.c:314
+#: ../src/protocols/jabber/presence.c:313
 #: ../src/protocols/msn/userlist.c:104
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list."
 msgstr "Uporabnik %s želi dodati %s na svoj seznam prijateljev."
 
-#: ../src/protocols/jabber/presence.c:323
+#: ../src/protocols/jabber/presence.c:322
 #: ../src/protocols/oscar/oscar.c:2381
-#: ../src/protocols/oscar/oscar.c:5039
+#: ../src/protocols/oscar/oscar.c:5035
 msgid "_Authorize"
 msgstr "_Pooblasti"
 
-#: ../src/protocols/jabber/presence.c:324
+#: ../src/protocols/jabber/presence.c:323
 #: ../src/protocols/oscar/oscar.c:2383
-#: ../src/protocols/oscar/oscar.c:5040
+#: ../src/protocols/oscar/oscar.c:5036
 msgid "_Deny"
 msgstr "_Zavrni"
 
+#: ../src/protocols/jabber/presence.c:380
 #: ../src/protocols/jabber/presence.c:381
-#: ../src/protocols/jabber/presence.c:382
 msgid "Create New Room"
 msgstr "Ustvari novo sobo"
 
-#: ../src/protocols/jabber/presence.c:383
+#: ../src/protocols/jabber/presence.c:382
 msgid "You are creating a new room.  Would you like to configure it, or accept the default settings?"
 msgstr "Ustvarili boste novo sobo. Jo želite najprej nastaviti ali boste sprejeli privzete nastavitve?"
 
-#: ../src/protocols/jabber/presence.c:386
+#: ../src/protocols/jabber/presence.c:385
 msgid "_Configure Room"
 msgstr "_Nastavi sobo"
 
-#: ../src/protocols/jabber/presence.c:388
+#: ../src/protocols/jabber/presence.c:387
 msgid "_Accept Defaults"
 msgstr "_Sprejmi privzeto"
 
-#: ../src/protocols/jabber/presence.c:426
+#: ../src/protocols/jabber/presence.c:425
 #, c-format
 msgid "Error in chat %s"
 msgstr "Napaka v pomenku %s"
 
-#: ../src/protocols/jabber/presence.c:429
+#: ../src/protocols/jabber/presence.c:428
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Napaka pri pridruževanju pomenku %s"
@@ -8961,6 +8985,46 @@
 msgid "Server port"
 msgstr "Vrata strežnika"
 
+#: ../src/protocols/oscar/flap_connection.c:222
+msgid "Server closed the connection."
+msgstr "Strežnik je zaprl povezavo."
+
+#: ../src/protocols/oscar/flap_connection.c:224
+msgid "Lost connection with server for an unknown reason."
+msgstr "Povezava s strežnikom izgubljena iz neznanega razloga."
+
+#: ../src/protocols/oscar/flap_connection.c:226
+msgid "Received invalid data on connection with server."
+msgstr "Na povezavi s strežnikom prejeti neveljavni podatki."
+
+#: ../src/protocols/oscar/flap_connection.c:228
+msgid "Could not establish a connection with the server."
+msgstr "Povezave s strežnikom ni mogoče vzpostaviti."
+
+#: ../src/protocols/oscar/odc.c:41
+msgid "The remote user has closed the connection."
+msgstr "Oddaljeni uporabnik je zaprl povezavo."
+
+#: ../src/protocols/oscar/odc.c:45
+msgid "The remote user has declined your request."
+msgstr "Oddaljeni uporabnik je zavrnil vašo zahtevo."
+
+#: ../src/protocols/oscar/odc.c:49
+msgid "Lost connection with the remote user for an unknown reason."
+msgstr "Iz neznanega razloga izgubljena povezava z oddaljenim uporabnikom."
+
+#: ../src/protocols/oscar/odc.c:53
+msgid "Received invalid data on connection with remote user."
+msgstr "Pri povezavi z oddaljenim uporabnikom prejeti neveljavni podatki."
+
+#: ../src/protocols/oscar/odc.c:57
+msgid "Could not establish a connection with the remote user."
+msgstr "Povezave z oddaljenim uporabnikom ni mogoče vzpostaviti."
+
+#: ../src/protocols/oscar/odc.c:567
+msgid "Direct IM established"
+msgstr "Vzpostavljeno neposredno sporočanje"
+
 #: ../src/protocols/oscar/oscar.c:144
 msgid "Invalid error"
 msgstr "Neveljavna napaka"
@@ -9080,7 +9144,7 @@
 msgstr "Pomenek"
 
 #: ../src/protocols/oscar/oscar.c:637
-#: ../src/protocols/oscar/oscar.c:5793
+#: ../src/protocols/oscar/oscar.c:5789
 msgid "Get File"
 msgstr "Sprejmi datoteko"
 
@@ -9153,17 +9217,17 @@
 msgstr "Kamera"
 
 #: ../src/protocols/oscar/oscar.c:711
-#: ../src/protocols/oscar/oscar.c:5600
+#: ../src/protocols/oscar/oscar.c:5596
 msgid "Free For Chat"
 msgstr "Na voljo za pogovor"
 
 #: ../src/protocols/oscar/oscar.c:715
-#: ../src/protocols/oscar/oscar.c:5628
+#: ../src/protocols/oscar/oscar.c:5624
 msgid "Not Available"
 msgstr "Ni na voljo"
 
 #: ../src/protocols/oscar/oscar.c:717
-#: ../src/protocols/oscar/oscar.c:5618
+#: ../src/protocols/oscar/oscar.c:5614
 msgid "Occupied"
 msgstr "Zaseden"
 
@@ -9306,8 +9370,8 @@
 #: ../src/protocols/oscar/oscar.c:2259
 #: ../src/protocols/oscar/oscar.c:2367
 #: ../src/protocols/oscar/oscar.c:2391
-#: ../src/protocols/oscar/oscar.c:5025
-#: ../src/protocols/oscar/oscar.c:5077
+#: ../src/protocols/oscar/oscar.c:5021
+#: ../src/protocols/oscar/oscar.c:5073
 msgid "No reason given."
 msgstr "Ni podanega razloga."
 
@@ -9325,7 +9389,7 @@
 "%s"
 
 #: ../src/protocols/oscar/oscar.c:2379
-#: ../src/protocols/oscar/oscar.c:5037
+#: ../src/protocols/oscar/oscar.c:5033
 msgid "Authorization Request"
 msgstr "Zahtevek po pooblastilu"
 
@@ -9686,7 +9750,7 @@
 msgid "Profile too long."
 msgstr "Profil je predolg."
 
-#: ../src/protocols/oscar/oscar.c:4408
+#: ../src/protocols/oscar/oscar.c:4404
 #, c-format
 msgid "The maximum away message length of %d byte has been exceeded.  Gaim has truncated it for you."
 msgid_plural "The maximum away message length of %d bytes has been exceeded.  Gaim has truncated it for you."
@@ -9695,63 +9759,63 @@
 msgstr[2] "Največja dolžina sporočila odsotnosti %d bajta je bila presežena.  Gaim ga je skrajšal namesto vas."
 msgstr[3] "Največja dolžina sporočila odsotnosti %d bajte je bila presežena.  Gaim ga je skrajšal namesto vas."
 
-#: ../src/protocols/oscar/oscar.c:4413
+#: ../src/protocols/oscar/oscar.c:4409
 msgid "Away message too long."
 msgstr "Spo_ročilo o odsotnosti:"
 
-#: ../src/protocols/oscar/oscar.c:4482
+#: ../src/protocols/oscar/oscar.c:4478
 #, c-format
 msgid "Could not add the buddy %s because the screen name is invalid.  Screen names must either start with a letter and contain only letters, numbers and spaces, or contain only numbers."
 msgstr "Ni mogoče dodati prijatelja %s, ker vzdevek ni veljaven. Vzdevki se morajo začeti s črko, vsebujejo lahko le črke, številke in presledke, lahko pa so tudi sestavljeni iz samih števil."
 
-#: ../src/protocols/oscar/oscar.c:4484
-#: ../src/protocols/oscar/oscar.c:4883
-#: ../src/protocols/oscar/oscar.c:4897
+#: ../src/protocols/oscar/oscar.c:4480
+#: ../src/protocols/oscar/oscar.c:4879
+#: ../src/protocols/oscar/oscar.c:4893
 msgid "Unable To Add"
 msgstr "Nemogoče dodati"
 
-#: ../src/protocols/oscar/oscar.c:4588
+#: ../src/protocols/oscar/oscar.c:4584
 msgid "Unable To Retrieve Buddy List"
 msgstr "Seznama prijateljev ni bilo mogoče pridobiti"
 
-#: ../src/protocols/oscar/oscar.c:4589
+#: ../src/protocols/oscar/oscar.c:4585
 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 a few hours."
 msgstr "Gaim začasno ni uspel pridobiti vašega seznama prijateljev z AIM strežnikov. Vaš seznam prijateljev ni izgubljen, verjetno pa bo postal dosegljiv v nekaj urah."
 
-#: ../src/protocols/oscar/oscar.c:4781
-#: ../src/protocols/oscar/oscar.c:4782
-#: ../src/protocols/oscar/oscar.c:4787
-#: ../src/protocols/oscar/oscar.c:4941
-#: ../src/protocols/oscar/oscar.c:4942
-#: ../src/protocols/oscar/oscar.c:4947
+#: ../src/protocols/oscar/oscar.c:4777
+#: ../src/protocols/oscar/oscar.c:4778
+#: ../src/protocols/oscar/oscar.c:4783
+#: ../src/protocols/oscar/oscar.c:4937
+#: ../src/protocols/oscar/oscar.c:4938
+#: ../src/protocols/oscar/oscar.c:4943
 msgid "Orphans"
 msgstr "Sirote"
 
-#: ../src/protocols/oscar/oscar.c:4881
+#: ../src/protocols/oscar/oscar.c:4877
 #, c-format
 msgid "Could not add the buddy %s because you have too many buddies in your buddy list.  Please remove one and try again."
 msgstr "Prijatelja %s ni bilo mogoče dodati, ker imate na seznamu preveč prijateljev. Prosim odstranite enega in poskusite ponovno."
 
-#: ../src/protocols/oscar/oscar.c:4881
-#: ../src/protocols/oscar/oscar.c:4895
+#: ../src/protocols/oscar/oscar.c:4877
+#: ../src/protocols/oscar/oscar.c:4891
 msgid "(no name)"
 msgstr "(brez imena)"
 
-#: ../src/protocols/oscar/oscar.c:4895
+#: ../src/protocols/oscar/oscar.c:4891
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason.  The most common reason for this is that you have the maximum number of allowed buddies in your buddy list."
 msgstr "Prijatelja %s iz neznanega razloga ni bilo mogoče dodati na seznam. Najpogostejši razlog za to je preveliko število prijateljev na vašem seznamu."
 
-#: ../src/protocols/oscar/oscar.c:4978
+#: ../src/protocols/oscar/oscar.c:4974
 #, c-format
 msgid "The user %s has given you permission to add you to their buddy list.  Do you want to add them?"
 msgstr "Uporabnik %s vam je dovolil, da ga dodate na svoj seznam prijateljev. Ali ga želite dodati?"
 
-#: ../src/protocols/oscar/oscar.c:4984
+#: ../src/protocols/oscar/oscar.c:4980
 msgid "Authorization Given"
 msgstr "Pooblastilo odobreno"
 
-#: ../src/protocols/oscar/oscar.c:5028
+#: ../src/protocols/oscar/oscar.c:5024
 #, c-format
 msgid ""
 "The user %s wants to add %s to their buddy list for the following reason:\n"
@@ -9761,17 +9825,17 @@
 "%s"
 
 #. Granted
-#: ../src/protocols/oscar/oscar.c:5073
+#: ../src/protocols/oscar/oscar.c:5069
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "Uporabnik %s je odobril zahtevo, da ga dodate na svoj seznam prijateljev."
 
-#: ../src/protocols/oscar/oscar.c:5074
+#: ../src/protocols/oscar/oscar.c:5070
 msgid "Authorization Granted"
 msgstr "Pooblastilo odobreno"
 
 #. Denied
-#: ../src/protocols/oscar/oscar.c:5077
+#: ../src/protocols/oscar/oscar.c:5073
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the following reason:\n"
@@ -9780,168 +9844,169 @@
 "Uporabnik %s je zavrnil vašo zahtevo, da ga dodate na svoj seznam prijateljev, ker:\n"
 "%s"
 
-#: ../src/protocols/oscar/oscar.c:5078
+#: ../src/protocols/oscar/oscar.c:5074
 msgid "Authorization Denied"
 msgstr "Pooblastilo zavrnjeno"
 
-#: ../src/protocols/oscar/oscar.c:5114
+#: ../src/protocols/oscar/oscar.c:5110
 #: ../src/protocols/toc/toc.c:1372
 msgid "_Exchange:"
 msgstr "_Izmenjaj:"
 
-#: ../src/protocols/oscar/oscar.c:5154
+#: ../src/protocols/oscar/oscar.c:5150
 msgid "Invalid chat name specified."
 msgstr "Navedeno je neveljavno ime pomenka."
 
-#: ../src/protocols/oscar/oscar.c:5224
+#: ../src/protocols/oscar/oscar.c:5220
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "Vaša slika IM ni bila poslana. Slik IM ne morete pošiljati v klepetih AIM."
 
-#: ../src/protocols/oscar/oscar.c:5386
+#: ../src/protocols/oscar/oscar.c:5382
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(pridobivanje ...)</i>"
 
-#: ../src/protocols/oscar/oscar.c:5691
+#: ../src/protocols/oscar/oscar.c:5687
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Komentar o prijatelju %s"
 
-#: ../src/protocols/oscar/oscar.c:5692
+#: ../src/protocols/oscar/oscar.c:5688
 msgid "Buddy Comment:"
 msgstr "Komentar prijatelja:"
 
-#: ../src/protocols/oscar/oscar.c:5738
+#: ../src/protocols/oscar/oscar.c:5734
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Izbrali ste neposredno povezovanje z %s."
 
-#: ../src/protocols/oscar/oscar.c:5742
+#: ../src/protocols/oscar/oscar.c:5738
 msgid "Because this reveals your IP address, it may be considered a security risk.  Do you wish to continue?"
 msgstr "Ker razkrije vaš naslov IP, lahko velja za kršitev zasebnosti. Želite nadaljevati?"
 
-#: ../src/protocols/oscar/oscar.c:5746
+#: ../src/protocols/oscar/oscar.c:5742
+#: ../src/protocols/oscar/peer.c:941
 msgid "_Connect"
 msgstr "_Poveži"
 
-#: ../src/protocols/oscar/oscar.c:5764
+#: ../src/protocols/oscar/oscar.c:5760
 msgid "Edit Buddy Comment"
 msgstr "Uredi komentar prijatelja"
 
-#: ../src/protocols/oscar/oscar.c:5772
+#: ../src/protocols/oscar/oscar.c:5768
 msgid "Get Status Msg"
 msgstr "Poizvedi o stanju"
 
-#: ../src/protocols/oscar/oscar.c:5785
+#: ../src/protocols/oscar/oscar.c:5781
 msgid "Direct IM"
 msgstr "Neposredni pogovor"
 
-#: ../src/protocols/oscar/oscar.c:5807
+#: ../src/protocols/oscar/oscar.c:5803
 msgid "Re-request Authorization"
 msgstr "Ponovno zahtevaj pooblastilo"
 
-#: ../src/protocols/oscar/oscar.c:5864
+#: ../src/protocols/oscar/oscar.c:5860
 msgid "Require authorization"
 msgstr "Zahtevaj pooblastilo"
 
-#: ../src/protocols/oscar/oscar.c:5867
+#: ../src/protocols/oscar/oscar.c:5863
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Spletno zaveden (s to funkcijo boste prejemali tudi SPAM!)"
 
-#: ../src/protocols/oscar/oscar.c:5872
+#: ../src/protocols/oscar/oscar.c:5868
 msgid "ICQ Privacy Options"
 msgstr "Možnosti zasebnosti ICQ"
 
-#: ../src/protocols/oscar/oscar.c:5889
+#: ../src/protocols/oscar/oscar.c:5885
 msgid "The new formatting is invalid."
 msgstr "Oblika novega zapisa je neveljavna."
 
-#: ../src/protocols/oscar/oscar.c:5890
+#: ../src/protocols/oscar/oscar.c:5886
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "Z oblikovanjem vzdevka lahko spreminjate samo velike črke in presledke."
 
-#: ../src/protocols/oscar/oscar.c:5897
+#: ../src/protocols/oscar/oscar.c:5893
 msgid "New screen name formatting:"
 msgstr "Nov vzdevek za oblikovanje:"
 
-#: ../src/protocols/oscar/oscar.c:5953
+#: ../src/protocols/oscar/oscar.c:5949
 msgid "Change Address To:"
 msgstr "Spremeni naslov v:"
 
+#: ../src/protocols/oscar/oscar.c:5994
+msgid "<i>you are not waiting for authorization</i>"
+msgstr "<i>ne čakate na pooblastilo</i>"
+
+#: ../src/protocols/oscar/oscar.c:5997
+msgid "You are awaiting authorization from the following buddies"
+msgstr "Pričakujete pooblastila od naslednjih prijateljev"
+
 #: ../src/protocols/oscar/oscar.c:5998
-msgid "<i>you are not waiting for authorization</i>"
-msgstr "<i>ne čakate na pooblastilo</i>"
-
-#: ../src/protocols/oscar/oscar.c:6001
-msgid "You are awaiting authorization from the following buddies"
-msgstr "Pričakujete pooblastila od naslednjih prijateljev"
-
-#: ../src/protocols/oscar/oscar.c:6002
 msgid "You can re-request authorization from these buddies by right-clicking on them and selecting \"Re-request Authorization.\""
 msgstr "Če želite, lahko ponovno zahtevate pooblastilo od teh prijateljev, tako da desno kliknete na njih in izberete \"Ponovno zahtevaj pooblastilo.\""
 
-#: ../src/protocols/oscar/oscar.c:6019
+#: ../src/protocols/oscar/oscar.c:6015
 msgid "Find Buddy by E-Mail"
 msgstr "Najdi prijatelja po e-pošti"
 
-#: ../src/protocols/oscar/oscar.c:6020
+#: ../src/protocols/oscar/oscar.c:6016
 msgid "Search for a buddy by e-mail address"
 msgstr "Išči prijatelje po naslovu e-pošte"
 
-#: ../src/protocols/oscar/oscar.c:6021
+#: ../src/protocols/oscar/oscar.c:6017
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Vnesite naslov e-pošte prijatelja, ki ga želite najti"
 
-#: ../src/protocols/oscar/oscar.c:6190
+#: ../src/protocols/oscar/oscar.c:6186
 msgid "Set User Info (URL)..."
 msgstr "Nastavi informacije o uporabniku (URL) ..."
 
+#: ../src/protocols/oscar/oscar.c:6197
+msgid "Change Password (URL)"
+msgstr "Spremeni geslo (URL povezava)"
+
 #: ../src/protocols/oscar/oscar.c:6201
-msgid "Change Password (URL)"
-msgstr "Spremeni geslo (URL povezava)"
-
-#: ../src/protocols/oscar/oscar.c:6205
 msgid "Configure IM Forwarding (URL)"
 msgstr "Nastavi posredovanje sporočil (URL)"
 
 #. ICQ actions
-#: ../src/protocols/oscar/oscar.c:6215
+#: ../src/protocols/oscar/oscar.c:6211
 msgid "Set Privacy Options..."
 msgstr "Nastavi možnosti zasebnosti ..."
 
 #. AIM actions
-#: ../src/protocols/oscar/oscar.c:6222
+#: ../src/protocols/oscar/oscar.c:6218
 msgid "Format Screen Name..."
 msgstr "Oblikuj vzdevek ..."
 
-#: ../src/protocols/oscar/oscar.c:6226
+#: ../src/protocols/oscar/oscar.c:6222
 msgid "Confirm Account"
 msgstr "Potrdi račun"
 
-#: ../src/protocols/oscar/oscar.c:6230
+#: ../src/protocols/oscar/oscar.c:6226
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Prikaži trenutno registriran e-naslov"
 
-#: ../src/protocols/oscar/oscar.c:6234
+#: ../src/protocols/oscar/oscar.c:6230
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Spremeni trenutno registriran e-naslov ..."
 
-#: ../src/protocols/oscar/oscar.c:6241
+#: ../src/protocols/oscar/oscar.c:6237
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Pokaži prijatelje, ki čakajo na pooblastilo"
 
-#: ../src/protocols/oscar/oscar.c:6247
+#: ../src/protocols/oscar/oscar.c:6243
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Išči prijatelja po e-naslovu ..."
 
-#: ../src/protocols/oscar/oscar.c:6252
+#: ../src/protocols/oscar/oscar.c:6248
 msgid "Search for Buddy by Information"
 msgstr "Išči prijatelja po informaciji"
 
-#: ../src/protocols/oscar/oscar.c:6318
+#: ../src/protocols/oscar/oscar.c:6314
 msgid "Use recent buddies group"
 msgstr "Uporabi nedavno skupino prijateljev"
 
-#: ../src/protocols/oscar/oscar.c:6321
+#: ../src/protocols/oscar/oscar.c:6317
 msgid "Show how long you have been idle"
 msgstr "Prikaz časa vaše odsotnosti"
 
@@ -9955,17 +10020,17 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../src/protocols/oscar/oscar.c:6446
-#: ../src/protocols/oscar/oscar.c:6448
+#: ../src/protocols/oscar/oscar.c:6442
+#: ../src/protocols/oscar/oscar.c:6444
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "Vstavek za protokol AIM/ICQ"
 
-#: ../src/protocols/oscar/oscar.c:6473
+#: ../src/protocols/oscar/oscar.c:6469
 #: ../src/protocols/zephyr/zephyr.c:2920
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: ../src/protocols/oscar/oscar.c:6477
+#: ../src/protocols/oscar/oscar.c:6473
 msgid ""
 "Always use AIM/ICQ proxy server\n"
 "(slower, but does not reveal your IP address)"
@@ -9973,6 +10038,30 @@
 "Vedno uporabi strežnik prehoda AIM/ICQ\n"
 "(počasneje, vendar ne razkrije vašega naslova IP)"
 
+#: ../src/protocols/oscar/peer.c:613
+#, c-format
+msgid "Asking %s to connect to us at %s:%hu for Direct IM."
+msgstr "Spraševanje %s za povezavo z nami pri %s:%hu za neposredno sporočanje."
+
+#: ../src/protocols/oscar/peer.c:662
+#: ../src/protocols/oscar/peer.c:693
+#, c-format
+msgid "Attempting to connect to %s:%hu."
+msgstr "Poskus povezave na %s:%hu."
+
+#: ../src/protocols/oscar/peer.c:753
+msgid "Attempting to connect via proxy server."
+msgstr "Poskus povezave prek strežnika-prehoda."
+
+#: ../src/protocols/oscar/peer.c:931
+#, c-format
+msgid "%s has just asked to directly connect to %s"
+msgstr "%s vas je ravnokar prosil za neposredno povezavo na %s"
+
+#: ../src/protocols/oscar/peer.c:935
+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 considered a privacy risk."
+msgstr "To zahteva neposredno povezavo med dvema računalnikoma in je nujno potrebno za sporočanje s slikami. Ker bo razkrit naslov IP, sodi ta povezava med tveganja zasebnosti."
+
 #: ../src/protocols/sametime/sametime.c:415
 msgid "Connection closed (writing)"
 msgstr "Povezava zaprta (pisanje)"
@@ -12693,11 +12782,11 @@
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
-#: ../src/savedstatuses.c:44
+#: ../src/savedstatuses.c:45
 msgid "I'm not here right now"
 msgstr "Trenutno nisem tukaj"
 
-#: ../src/savedstatuses.c:519
+#: ../src/savedstatuses.c:524
 msgid "saved statuses"
 msgstr "shranjena stanja"
 
--- a/po/zh_TW.po	Wed Aug 09 06:23:18 2006 +0000
+++ b/po/zh_TW.po	Wed Aug 09 14:47:37 2006 +0000
@@ -44,8 +44,8 @@
 msgstr ""
 "Project-Id-Version: Gaim 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-19 23:53+0800\n"
-"PO-Revision-Date: 2005-12-20 00:38+0800\n"
+"POT-Creation-Date: 2006-07-29 22:03+0800\n"
+"PO-Revision-Date: 2006-07-30 00:30+0800\n"
 "Last-Translator: Paladin R. Liu <paladin@ms1.hinet.net>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\n"
 "MIME-Version: 1.0\n"
@@ -71,7 +71,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ciphertest.c:264
+#: ../plugins/ciphertest.c:264
 msgid "Cipher Test"
 msgstr "加密測試"
 
@@ -79,41 +79,46 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ciphertest.c:267
-#: plugins/ciphertest.c:269
+#: ../plugins/ciphertest.c:267
+#: ../plugins/ciphertest.c:269
 msgid "Tests the ciphers that ship with gaim."
 msgstr ""
 
-#: plugins/contact_priority.c:61
+#: ../plugins/contact_priority.c:61
 msgid "Buddy is idle"
 msgstr "好友閒置"
 
-#: plugins/contact_priority.c:62
+#: ../plugins/contact_priority.c:62
 msgid "Buddy is away"
 msgstr "好友離開"
 
-#: plugins/contact_priority.c:63
+#: ../plugins/contact_priority.c:63
 msgid "Buddy is \"extended\" away"
 msgstr "好友離開"
 
-#: plugins/contact_priority.c:64
+#. Not used yet.
+#: ../plugins/contact_priority.c:66
+msgid "Buddy is mobile"
+msgstr "好友使用行動裝置"
+
+#: ../plugins/contact_priority.c:68
 msgid "Buddy is offline"
 msgstr "好友離線"
 
-#: plugins/contact_priority.c:86
+#: ../plugins/contact_priority.c:90
 msgid "Point values to use when..."
 msgstr "個別好友狀態的得分值:"
 
-#: plugins/contact_priority.c:114
+#: ../plugins/contact_priority.c:118
 msgid "The buddy with the <i>largest score</i> is the buddy who will have priority in the contact.\n"
 msgstr ""
 
-#: plugins/contact_priority.c:121
+#: ../plugins/contact_priority.c:125
 msgid "Use last buddy when scores are equal"
 msgstr ""
 
 # NOTE 怪怪的,不知道指的是什麼?!
-#: plugins/contact_priority.c:126
+#: ../plugins/contact_priority.c:130
 msgid "Point values to use for account..."
 msgstr "個別帳號的得分值"
 
@@ -123,19 +128,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/contact_priority.c:177
+#: ../plugins/contact_priority.c:182
 msgid "Contact Priority"
 msgstr "好友優先次序"
 
 #. *< name
 #. *< version
 #. *< summary
-#: plugins/contact_priority.c:180
+#: ../plugins/contact_priority.c:185
 msgid "Allows for controlling the values associated with different buddy states."
 msgstr "讓你自定各個好友狀態的得分值。"
 
 #. *< description
-#: plugins/contact_priority.c:182
+#: ../plugins/contact_priority.c:187
 msgid "Allows for changing the point values of idle/away/offline states for buddies in contact priority computations."
 msgstr "讓你自定「閒置」、「離開」及「離線」狀態的得分值,以便計算好友帳號的優先次序。"
 
@@ -146,54 +151,51 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/crazychat/cc_gaim_plugin.c:146
-#, fuzzy
+#: ../plugins/crazychat/cc_gaim_plugin.c:146
 msgid "Crazychat"
-msgstr "聊天"
+msgstr "Crazychat"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/crazychat/cc_gaim_plugin.c:149
+#: ../plugins/crazychat/cc_gaim_plugin.c:149
 msgid "Plugin to establish a Crazychat session."
 msgstr ""
 
 #. *  description
-#: plugins/crazychat/cc_gaim_plugin.c:151
+#: ../plugins/crazychat/cc_gaim_plugin.c:151
 msgid "Uses Gaim to obtain buddy ips to connect for a Crazychat session"
 msgstr ""
 
 #. make the network configuration frame
-#: plugins/crazychat/cc_gaim_plugin.c:295
-#, fuzzy
+#: ../plugins/crazychat/cc_gaim_plugin.c:295
 msgid "Network Configuration"
-msgstr "滑鼠動作設定"
-
-#: plugins/crazychat/cc_gaim_plugin.c:307
+msgstr "網路設定"
+
+#: ../plugins/crazychat/cc_gaim_plugin.c:307
 msgid "TCP port"
 msgstr "TCP通訊埠"
 
-#: plugins/crazychat/cc_gaim_plugin.c:317
+#: ../plugins/crazychat/cc_gaim_plugin.c:317
 msgid "UDP port"
 msgstr "UDP通訊埠"
 
 #. make the feature configuration frame
-#: plugins/crazychat/cc_gaim_plugin.c:329
+#: ../plugins/crazychat/cc_gaim_plugin.c:329
 #, fuzzy
 msgid "Feature Calibration"
 msgstr "要求認證"
 
 #. add enabled / disabled
-#: plugins/crazychat/cc_gaim_plugin.c:345
-#: src/gtkaccount.c:2235
-#: src/gtkplugin.c:414
+#: ../plugins/crazychat/cc_gaim_plugin.c:345
+#: ../src/gtkaccount.c:2268
+#: ../src/gtkplugin.c:574
 msgid "Enabled"
 msgstr "啟動"
 
-#: plugins/crazychat/cc_gaim_plugin.c:350
-#, fuzzy
+#: ../plugins/crazychat/cc_gaim_plugin.c:350
 msgid "Disabled"
-msgstr "啟動"
+msgstr "停用"
 
 #. *< type
 #. *< ui_requirement
@@ -201,117 +203,181 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/dbus-example.c:135
+#: ../plugins/dbus-example.c:155
 #, fuzzy
-msgid "DBus"
-msgstr "忙碌"
+msgid "DBus Example"
+msgstr "DBus模組範例"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/dbus-example.c:138
-#: plugins/dbus-example.c:140
+#: ../plugins/dbus-example.c:158
+#: ../plugins/dbus-example.c:160
 msgid "DBus Plugin Example"
 msgstr "DBus模組範例"
 
 #  NOTE 譯文更動 by Ambrose
-#: plugins/docklet/docklet.c:153
-#, fuzzy
+#: ../plugins/docklet/docklet.c:154
 msgid "Right-click for more unread messages...\n"
-msgstr "顯示細節"
-
-#: plugins/docklet/docklet.c:156
-#: src/gtkblist.c:3244
-#, fuzzy, c-format
+msgstr "按右鍵以讀取未讀訊息...\n"
+
+#: ../plugins/docklet/docklet.c:157
+#: ../src/gtkblist.c:3262
+#, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
-msgstr[0] "%d 個由 %s 發出的尚未讀取訊息\n"
-msgstr[1] "%d 個由 %s 發出的尚未讀取訊息\n"
-
-#: plugins/docklet/docklet.c:370
+msgstr[0] "%d 個由 %s 發出的未讀取訊息\n"
+msgstr[1] "%d 個由 %s 發出的未讀取訊息\n"
+
+#: ../plugins/docklet/docklet.c:432
+msgid "Change Status"
+msgstr "變更狀態"
+
+#: ../plugins/docklet/docklet.c:435
+#: ../src/gtkstatusbox.c:673
+#: ../src/protocols/gg/gg.c:996
+#: ../src/protocols/jabber/buddy.c:1363
+#: ../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:2843
+#: ../src/protocols/yahoo/yahoo.c:2741
+#: ../src/status.c:155
+msgid "Available"
+msgstr "上線"
+
+#. Away stuff
+#. get_yahoo_status_from_gaim_status() returns YAHOO_STATUS_CUSTOM for
+#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
+#: ../plugins/docklet/docklet.c:439
+#: ../src/gtkprefs.c:1774
+#: ../src/gtkstatusbox.c:674
+#: ../src/protocols/gg/gg.c:999
+#: ../src/protocols/irc/irc.c:520
+#: ../src/protocols/irc/msgs.c:223
+#: ../src/protocols/jabber/buddy.c:1367
+#: ../src/protocols/novell/novell.c:2846
+#: ../src/protocols/oscar/oscar.c:719
+#: ../src/protocols/oscar/oscar.c:4423
+#: ../src/protocols/oscar/oscar.c:5466
+#: ../src/protocols/silc/buddy.c:1469
+#: ../src/protocols/yahoo/yahoo.c:3211
+#: ../src/protocols/yahoo/yahoo.c:3284
+#: ../src/status.c:158
+msgid "Away"
+msgstr "離開"
+
+#: ../plugins/docklet/docklet.c:443
+#: ../src/gtkstatusbox.c:675
+#: ../src/protocols/oscar/oscar.c:723
+#: ../src/protocols/yahoo/yahoo.c:2735
+#: ../src/status.c:157
+msgid "Invisible"
+msgstr "隱身"
+
+#: ../plugins/docklet/docklet.c:447
+#: ../src/gtkblist.c:2966
+#: ../src/gtkstatusbox.c:676
+#: ../src/protocols/gg/gg.c:993
+#: ../src/protocols/jabber/buddy.c:1361
+#: ../src/protocols/novell/novell.c:2855
+#: ../src/protocols/oscar/oscar.c:794
+#: ../src/protocols/oscar/oscar.c:5438
+#: ../src/protocols/yahoo/yahoo.c:2739
+#: ../src/status.c:154
+msgid "Offline"
+msgstr "離線"
+
+#: ../plugins/docklet/docklet.c:467
+#: ../src/gtkstatusbox.c:681
+#, fuzzy
+msgid "New..."
+msgstr "檢視..."
+
+# XXX 要覆查
+#: ../plugins/docklet/docklet.c:468
+#: ../src/gtkstatusbox.c:682
+msgid "Saved..."
+msgstr "已儲存..."
+
+#: ../plugins/docklet/docklet.c:484
 msgid "Show Buddy List"
 msgstr "顯示好友清單"
 
-#: plugins/docklet/docklet.c:375
+#: ../plugins/docklet/docklet.c:489
+#: ../src/gtkconv.c:5743
 msgid "Unread Messages"
 msgstr "未讀訊息"
 
-#: plugins/docklet/docklet.c:396
+#: ../plugins/docklet/docklet.c:510
 msgid "New Message..."
 msgstr "新訊息..."
 
-#: plugins/docklet/docklet.c:400
-msgid "Join A Chat..."
-msgstr "加入聊天室..."
-
-#: plugins/docklet/docklet.c:405
-#: src/gtkaccount.c:2458
+#: ../plugins/docklet/docklet.c:519
+#: ../src/gtkaccount.c:2484
 msgid "Accounts"
 msgstr "帳號清單"
 
-#: plugins/docklet/docklet.c:406
-#: src/gtkplugin.c:383
+#: ../plugins/docklet/docklet.c:520
+#: ../src/gtkplugin.c:538
 msgid "Plugins"
 msgstr "模組清單"
 
-#: plugins/docklet/docklet.c:407
-#: src/gtkprefs.c:1781
+#: ../plugins/docklet/docklet.c:521
+#: ../src/gtkprefs.c:1915
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: plugins/docklet/docklet.c:411
-#: src/gtkft.c:707
-#: src/protocols/oscar/oscar.c:8423
-msgid "File Transfers"
-msgstr "檔案傳輸"
-
-#: plugins/docklet/docklet.c:413
+#: ../plugins/docklet/docklet.c:525
 msgid "Mute Sounds"
 msgstr "靜音"
 
 #. TODO: need a submenu to change status, this needs to "link"
 #. * to the status in the buddy list gtkstatusbox
 #.
-#: plugins/docklet/docklet.c:426
+#: ../plugins/docklet/docklet.c:538
 msgid "Quit"
 msgstr "結束程式"
 
-#: plugins/docklet/docklet.c:567
+#: ../plugins/docklet/docklet.c:679
 msgid "Blink tray icon for unread..."
-msgstr ""
-
-#: plugins/docklet/docklet.c:570
+msgstr "有未讀取訊息時,閃爍工作匣圖示..."
+
+#: ../plugins/docklet/docklet.c:682
 msgid "_Instant Messages:"
 msgstr "即時訊息(_I):"
 
-#: plugins/docklet/docklet.c:572
-#: plugins/docklet/docklet.c:580
-#: plugins/win32/winprefs/winprefs.c:412
-#: src/gtkprefs.c:816
-#: src/gtkprefs.c:1667
+#: ../plugins/docklet/docklet.c:684
+#: ../plugins/docklet/docklet.c:692
+#: ../plugins/win32/winprefs/winprefs.c:462
+#: ../src/gtkprefs.c:823
+#: ../src/gtkprefs.c:1764
+#: ../src/gtkprefs.c:1778
 msgid "Never"
 msgstr "從不"
 
-#: plugins/docklet/docklet.c:573
+#: ../plugins/docklet/docklet.c:685
 msgid "In hidden conversations"
 msgstr "在隱藏交談"
 
-#: plugins/docklet/docklet.c:574
-#: plugins/docklet/docklet.c:582
-#: plugins/win32/winprefs/winprefs.c:413
-#: src/gtkprefs.c:818
-#, fuzzy
+#: ../plugins/docklet/docklet.c:686
+#: ../plugins/docklet/docklet.c:694
+#: ../plugins/timestamp_format.c:39
+#: ../plugins/timestamp_format.c:48
+#: ../plugins/win32/winprefs/winprefs.c:463
+#: ../src/gtkprefs.c:825
 msgid "Always"
 msgstr "離開"
 
-#: plugins/docklet/docklet.c:578
+#: ../plugins/docklet/docklet.c:690
 msgid "C_hat Messages:"
 msgstr "聊天訊息(_H):"
 
-#: plugins/docklet/docklet.c:581
+#: ../plugins/docklet/docklet.c:693
 msgid "When my nick is said"
-msgstr ""
+msgstr "當我的暱稱被提到"
 
 #. *< type
 #. *< ui_requirement
@@ -319,47 +385,46 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/docklet/docklet.c:607
+#: ../plugins/docklet/docklet.c:720
 msgid "System Tray Icon"
 msgstr "系統工作匣圖示"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/docklet/docklet.c:610
+#: ../plugins/docklet/docklet.c:723
 msgid "Displays an icon for Gaim in the system tray."
 msgstr "在系統工作匣中顯示 Gaim 的圖示。"
 
 # NOTE queuing semantics clarified by marv on #gaim
 #. *  description
-#: plugins/docklet/docklet.c:612
-#, fuzzy
+#: ../plugins/docklet/docklet.c:725
 msgid "Displays a system tray icon (in GNOME, KDE, or Windows for example) to show the current status of Gaim, allow fast access to commonly used functions, and to toggle display of the buddy list. Also provides options to blink for unread messages."
-msgstr "在工作匣上(例如 GNOME、KDE 或微軟視窗等的工作匣)顯示 Gaim 目前的狀態;讓您快速的操作 Gaim 的幾項常用功能(包括開啟或關閉好友清單或登入視窗);並讓您可以選擇將收到的訊息存到佇列中,直到工作匣圖示被點擊,如同使用 ICQ 一樣。"
-
-#: plugins/docklet/eggtrayicon.c:122
+msgstr "將 Gaim 目前的狀態,顯示於系統工作匣圖示上(例如於 GNOME、KDE 或微軟視窗等),同時提供對常用功能的快速操作,以及整合好友清單的顯示。它也提供在收到未讀取訊息時,閃爍工作匣圖示的功能(可選)。"
+
+#: ../plugins/docklet/eggtrayicon.c:123
 #, fuzzy
 msgid "Orientation"
 msgstr "所屬機構"
 
-#: plugins/docklet/eggtrayicon.c:123
+#: ../plugins/docklet/eggtrayicon.c:124
 msgid "The orientation of the tray."
 msgstr ""
 
-#: plugins/extplacement.c:80
+#: ../plugins/extplacement.c:80
 msgid "By conversation count"
 msgstr "依交談個數"
 
-#: plugins/extplacement.c:101
+#: ../plugins/extplacement.c:101
 msgid "Conversation Placement"
 msgstr "交談位置"
 
-#: plugins/extplacement.c:106
+#: ../plugins/extplacement.c:106
 msgid "Number of conversations per window"
 msgstr "視窗內之交談個數上限"
 
 #  XXX 要核實譯文!
-#: plugins/extplacement.c:112
+#: ../plugins/extplacement.c:112
 msgid "Separate IM and Chat windows when placing by number"
 msgstr "依交談個數放置新交談時,以不同的視窗顯示即時訊息和聊天"
 
@@ -369,20 +434,20 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/extplacement.c:133
+#: ../plugins/extplacement.c:135
 msgid "ExtPlacement"
 msgstr "視窗位置額外選項"
 
 #. *< name
 #. *< version
-#: plugins/extplacement.c:135
+#: ../plugins/extplacement.c:137
 msgid "Extra conversation placement options."
 msgstr "交談視窗位置額外選項。"
 
 #  XXX 譯得很差,請改良 :-(
 #. *< summary
 #. *  description
-#: plugins/extplacement.c:137
+#: ../plugins/extplacement.c:139
 msgid "Restrict the number of conversations per windows, optionally separating IMs and Chats"
 msgstr "限制視窗可容之交談數目,亦可選擇以不同的視窗顯示即時訊息和聊天"
 
@@ -392,7 +457,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/filectl.c:245
+#: ../plugins/filectl.c:248
 msgid "Gaim File Control"
 msgstr "Gaim 檔案控制"
 
@@ -400,8 +465,8 @@
 #. *< 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 "允許您在檔案中輸入指令以控制 Gaim。"
 
@@ -411,20 +476,20 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaiminc.c:91
+#: ../plugins/gaiminc.c:91
 msgid "Gaim Demonstration Plugin"
 msgstr "Gaim 範例模組"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaiminc.c:94
+#: ../plugins/gaiminc.c:94
 msgid "An example plugin that does stuff - see the description."
 msgstr "一個 Gaim 的範例模組 - 請看介紹。"
 
 # NOTE 譯文更動 by Ambrose
 #. *  description
-#: plugins/gaiminc.c:96
+#: ../plugins/gaiminc.c:96
 msgid ""
 "This is a really cool plugin that does a lot of stuff:\n"
 "- It tells you who wrote the program when you log in\n"
@@ -436,110 +501,130 @@
 "- 它會將所有收到的訊息左右掉轉\n"
 "- 它會在您的好友登入時,立刻送出一個訊息給他們"
 
-#: plugins/gaimrc.c:41
+#: ../plugins/gaimrc.c:41
 msgid "Cursor Color"
 msgstr "游標顏色"
 
-#: plugins/gaimrc.c:42
+#: ../plugins/gaimrc.c:42
 msgid "Secondary Cursor Color"
 msgstr ""
 
-#: plugins/gaimrc.c:43
+#: ../plugins/gaimrc.c:43
 msgid "Hyperlink Color"
 msgstr "超連結顏色"
 
-#: plugins/gaimrc.c:58
+#: ../plugins/gaimrc.c:56
 msgid "GtkTreeView Expander Size"
 msgstr "GtkTreeView展開器大小"
 
-#: plugins/gaimrc.c:59
-#, fuzzy
-msgid "GtkTreeView Expander Indentation"
-msgstr "GtkTreeView展開器大小"
-
-#: plugins/gaimrc.c:60
+#: ../plugins/gaimrc.c:57
 msgid "GtkTreeView Horizontal Separation"
 msgstr ""
 
-#: plugins/gaimrc.c:79
+#: ../plugins/gaimrc.c:76
 msgid "Conversation Entry"
 msgstr ""
 
-#: plugins/gaimrc.c:80
+#: ../plugins/gaimrc.c:77
 msgid "Conversation History"
 msgstr "交談歷史"
 
-#: plugins/gaimrc.c:81
+#: ../plugins/gaimrc.c:78
 msgid "Log Viewer"
 msgstr "日誌檢視器"
 
-#: plugins/gaimrc.c:82
+#: ../plugins/gaimrc.c:79
 msgid "Request Dialog"
 msgstr ""
 
-#: plugins/gaimrc.c:83
+#: ../plugins/gaimrc.c:80
 msgid "Notify Dialog"
 msgstr ""
 
-#: plugins/gaimrc.c:286
+#: ../plugins/gaimrc.c:91
+#, fuzzy
+msgid "GtkTreeView Indent Expanders"
+msgstr "GtkTreeView展開器大小"
+
+#: ../plugins/gaimrc.c:287
 #, c-format
 msgid "Select Color for %s"
 msgstr "為%s選擇顏色"
 
-#: plugins/gaimrc.c:288
+#: ../plugins/gaimrc.c:289
 msgid "Select Color"
 msgstr "選擇顏色"
 
-#: plugins/gaimrc.c:323
+#: ../plugins/gaimrc.c:324
 #, c-format
 msgid "Select Font for %s"
 msgstr "為%s選擇字型"
 
-#: plugins/gaimrc.c:361
+#: ../plugins/gaimrc.c:364
 msgid "Select Interface Font"
 msgstr "選擇介面字型"
 
-#: plugins/gaimrc.c:419
+#: ../plugins/gaimrc.c:420
+msgid "General"
+msgstr "一般"
+
+#: ../plugins/gaimrc.c:425
 msgid "GTK+ Interface Font"
 msgstr "GTK+介面字型"
 
-#: plugins/gaimrc.c:439
+#: ../plugins/gaimrc.c:445
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
-#: plugins/gaimrc.c:528
-#, c-format
-msgid "Write settings to %s/gtkrc-2.0"
-msgstr ""
-
-#: plugins/gaimrc.c:536
+#: ../plugins/gaimrc.c:480
+msgid "Interface colors"
+msgstr "介面顏色"
+
+#: ../plugins/gaimrc.c:504
+msgid "Widget Sizes"
+msgstr "Widget 大小"
+
+#: ../plugins/gaimrc.c:525
+msgid "Fonts"
+msgstr "字型"
+
+#: ../plugins/gaimrc.c:548
+msgid "Tools"
+msgstr "工具"
+
+#: ../plugins/gaimrc.c:553
+#, c-format
+msgid "Write settings to %s%sgtkrc-2.0"
+msgstr "將設定寫入%s%sgtkrc-2.0"
+
+#: ../plugins/gaimrc.c:561
 msgid "Re-read gtkrc files"
 msgstr "重新讀取gtkrc檔案"
 
-#: plugins/gaimrc.c:562
+#: ../plugins/gaimrc.c:588
 msgid "Gaim GTK+ Theme Control"
-msgstr ""
-
-#: plugins/gaimrc.c:564
-#: plugins/gaimrc.c:565
+msgstr "Gaim GTK+ 佈景主題設定"
+
+#: ../plugins/gaimrc.c:590
+#: ../plugins/gaimrc.c:591
 msgid "Provides access to commonly used gtkrc settings."
-msgstr ""
+msgstr "提供一般 gtkrc 設定的存取"
 
 #. Configuration frame
-#: plugins/gestures/gestures.c:243
+#: ../plugins/gestures/gestures.c:235
 msgid "Mouse Gestures Configuration"
 msgstr "滑鼠動作設定"
 
-#: plugins/gestures/gestures.c:250
+#: ../plugins/gestures/gestures.c:242
 msgid "Middle mouse button"
 msgstr "滑鼠中鍵"
 
-#: plugins/gestures/gestures.c:255
+#: ../plugins/gestures/gestures.c:247
 msgid "Right mouse button"
 msgstr "滑鼠右鍵"
 
 #. "Visual gesture display" checkbox
-#: plugins/gestures/gestures.c:267
+#: ../plugins/gestures/gestures.c:259
 msgid "_Visual gesture display"
 msgstr "顯示動作路徑(_V)"
 
@@ -549,19 +634,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gestures/gestures.c:296
+#: ../plugins/gestures/gestures.c:289
 msgid "Mouse Gestures"
 msgstr "滑鼠動作"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gestures/gestures.c:299
+#: ../plugins/gestures/gestures.c:292
 msgid "Provides support for mouse gestures"
 msgstr "提供滑鼠動作的支援"
 
 #. *  description
-#: plugins/gestures/gestures.c:301
+#: ../plugins/gestures/gestures.c:294
 msgid ""
 "Allows support for mouse gestures in conversation windows.\n"
 "Drag the middle mouse button to perform certain actions:\n"
@@ -578,128 +663,146 @@
 "往上後向右拖曳為切換到下一個交談。"
 
 # NOTE 只能譯「名稱」,因為同時解作「人名」及「模組名稱」
-#: plugins/gevolution/add_buddy_dialog.c:131
-#: plugins/gevolution/assoc-buddy.c:119
-#: src/gtkplugin.c:424
-#: src/gtkroomlist.c:572
-#: src/protocols/jabber/jabber.c:686
-#: src/protocols/msn/msn.c:1513
+#. 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:771
+#: ../src/protocols/msn/msn.c:1529
+#: ../src/protocols/msn/msn.c:1582
+#: ../src/protocols/msn/msn.c:1603
 msgid "Name"
 msgstr "名稱"
 
 #  NOTE 原始碼指這個解「(即時訊息系統的)帳別」,我覺得有點離譜
 #  NOTE 譯文更動 by Ambrose
-#: plugins/gevolution/add_buddy_dialog.c:142
+#: ../plugins/gevolution/add_buddy_dialog.c:142
 msgid "Instant Messaging"
 msgstr "即時傳訊帳號"
 
+#: ../plugins/gevolution/add_buddy_dialog.c:442
+#: ../src/gtkblist.c:4570
+#: ../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:2984
+msgid "Add Buddy"
+msgstr "新增好友"
+
 #  Add the label.
 #. Add the label.
-#: plugins/gevolution/add_buddy_dialog.c:458
+#: ../plugins/gevolution/add_buddy_dialog.c:455
 msgid "Select a person from your address book below, or add a new person."
 msgstr "請在下面從目錄服務選擇連絡人,或新增一個連絡人。"
 
 #. "Search"
-#: plugins/gevolution/add_buddy_dialog.c:471
-#: plugins/gevolution/assoc-buddy.c:353
-#: src/protocols/jabber/buddy.c:1357
-#: src/protocols/oscar/oscar.c:8198
+#: ../plugins/gevolution/add_buddy_dialog.c:468
+#: ../plugins/gevolution/assoc-buddy.c:353
+#: ../src/protocols/jabber/buddy.c:1720
+#: ../src/protocols/oscar/oscar.c:6068
+#: ../src/protocols/sametime/sametime.c:5529
 msgid "Search"
 msgstr "搜尋"
 
-#: plugins/gevolution/add_buddy_dialog.c:552
-#: plugins/gevolution/new_person_dialog.c:306
-#: src/gtkblist.c:4453
-#: src/gtkblist.c:4833
+#: ../plugins/gevolution/add_buddy_dialog.c:549
+#: ../plugins/gevolution/new_person_dialog.c:307
+#: ../src/gtkblist.c:4654
+#: ../src/gtkblist.c:5018
 msgid "Group:"
 msgstr "群組:"
 
 #  NOTE 對應 evolution PO 檔之譯法,詳見上面「Local Addressbook」條
 #. "New Person" button
-#: plugins/gevolution/add_buddy_dialog.c:578
-#: plugins/gevolution/assoc-buddy.c:464
+#: ../plugins/gevolution/add_buddy_dialog.c:575
+#: ../plugins/gevolution/assoc-buddy.c:464
+#: ../plugins/gevolution/new_person_dialog.c:251
 msgid "New Person"
 msgstr "新增連絡人"
 
 #. "Select Buddy" button
-#: plugins/gevolution/add_buddy_dialog.c:595
+#: ../plugins/gevolution/add_buddy_dialog.c:592
 msgid "Select Buddy"
 msgstr "選擇好友"
 
 #  NOTE 對應 evolution PO 檔之譯法,詳見上面「Local Addressbook」條
 #. Add the label.
-#: plugins/gevolution/assoc-buddy.c:340
+#: ../plugins/gevolution/assoc-buddy.c:340
 msgid "Select a person from your address book to add this buddy to, or create a new person."
 msgstr "請從你的目錄服務選擇一個連絡人,好把這個好友加進去;你亦可以選擇新增一個連絡人。"
 
 # XXX 暫譯
 #. Add the expander
-#: plugins/gevolution/assoc-buddy.c:428
+#: ../plugins/gevolution/assoc-buddy.c:428
 msgid "User _details"
 msgstr "使用者細節 (_D)"
 
 # XXX 暫譯
 #. "Associate Buddy" button
-#: plugins/gevolution/assoc-buddy.c:481
+#: ../plugins/gevolution/assoc-buddy.c:481
 msgid "_Associate Buddy"
 msgstr "聯結好友 (_A)"
 
-#: plugins/gevolution/eds-utils.c:73
-#: plugins/gevolution/eds-utils.c:86
-#: src/protocols/jabber/jabber.c:1037
-#: src/protocols/yahoo/yahoo.c:2802
+#: ../plugins/gevolution/eds-utils.c:73
+#: ../plugins/gevolution/eds-utils.c:86
+#: ../src/protocols/jabber/jabber.c:1134
 msgid "None"
 msgstr "無"
 
-#: plugins/gevolution/gevo-util.c:64
-#: plugins/gevolution/gevolution.c:96
-#: src/blist.c:518
-#: src/blist.c:1275
-#: src/blist.c:1500
-#: src/gtkblist.c:4261
-#: src/protocols/jabber/roster.c:65
+#: ../plugins/gevolution/gevo-util.c:64
+#: ../plugins/gevolution/gevolution.c:96
+#: ../src/blist.c:516
+#: ../src/blist.c:1281
+#: ../src/blist.c:1508
+#: ../src/gtkblist.c:4460
+#: ../src/protocols/jabber/roster.c:67
 msgid "Buddies"
 msgstr "好友"
 
-#: plugins/gevolution/gevolution.c:262
-#: plugins/gevolution/gevolution.c:268
+#: ../plugins/gevolution/gevolution.c:262
+#: ../plugins/gevolution/gevolution.c:268
 msgid "Unable to send e-mail"
 msgstr "無法送出電子郵件"
 
-#: plugins/gevolution/gevolution.c:263
+#: ../plugins/gevolution/gevolution.c:263
 msgid "The evolution executable was not found in the PATH."
-msgstr ""
-
-#: plugins/gevolution/gevolution.c:269
+msgstr "在 PATH 裡找不到可執行的 Evolution 程式。"
+
+#: ../plugins/gevolution/gevolution.c:269
 msgid "The specified buddy was not found in the Evolution Contacts."
-msgstr ""
+msgstr "指定的好友不在 Evolution 聯絡人清單中。"
 
 #  NOTE 注意!evolution 本身的譯法是「目錄服務」而非「通訊錄」
-#: plugins/gevolution/gevolution.c:286
+#: ../plugins/gevolution/gevolution.c:286
 msgid "Add to Address Book"
 msgstr "增加到通訊錄"
 
-#: plugins/gevolution/gevolution.c:290
+#: ../plugins/gevolution/gevolution.c:290
 msgid "Send E-Mail"
 msgstr "傳送電子郵件"
 
 #. Configuration frame
-#: plugins/gevolution/gevolution.c:417
+#: ../plugins/gevolution/gevolution.c:417
 msgid "Evolution Integration Configuration"
 msgstr "Evolution 整合設定"
 
-# NOTE (00:38:50) LSchiere: wing: the statement quotes only makes sense in terms of the realization that there is no inherent correlation between im of any type and e-mail
+# NOTE (00:38:50) LSchiere: wing: the statement quotes only makes sense in terms of the realization that there is no inherent correlation between im of any type and email
 # NOTE (00:39:19) LSchiere: wing: apparently when adding a contact to your address book, if you fill in the screenname/im field, it is auto adding it to your list.
 # NOTE (00:39:46) LSchiere: wing: so its asking you to select what account(s) it'll be added to. now if there were an inherent correlation it would just know, but there isn't so it doesn't
 #. Label
-#: plugins/gevolution/gevolution.c:420
+#: ../plugins/gevolution/gevolution.c:420
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr "請選擇新增好友至那幾個帳號。"
 
-#: plugins/gevolution/gevolution.c:450
-#: plugins/idle.c:112
-#: plugins/idle.c:147
-#: src/gtkpounce.c:1167
+#: ../plugins/gevolution/gevolution.c:450
+#: ../plugins/idle.c:153
+#: ../plugins/idle.c:189
+#: ../src/gtknotify.c:402
+#: ../src/gtkpounce.c:1255
 msgid "Account"
 msgstr "帳號"
 
@@ -709,7 +812,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gevolution/gevolution.c:534
+#: ../plugins/gevolution/gevolution.c:527
 msgid "Evolution Integration"
 msgstr "Evolution 整合"
 
@@ -720,51 +823,52 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/gevolution/gevolution.c:537
-#: plugins/gevolution/gevolution.c:539
+#: ../plugins/gevolution/gevolution.c:530
+#: ../plugins/gevolution/gevolution.c:532
 msgid "Provides integration with Evolution."
 msgstr "提供和 Evolution 的整合。"
 
-#: plugins/gevolution/new_person_dialog.c:266
+#: ../plugins/gevolution/new_person_dialog.c:267
 msgid "Please enter the person's information below."
 msgstr "請在下面輸入這個使用者的資訊。"
 
-#: plugins/gevolution/new_person_dialog.c:270
+#: ../plugins/gevolution/new_person_dialog.c:271
 msgid "Please enter the buddy's screen name and account type below."
 msgstr "請在下面輸入好友的帳號及其類別。"
 
-#: plugins/gevolution/new_person_dialog.c:290
+#: ../plugins/gevolution/new_person_dialog.c:291
 msgid "Account type:"
 msgstr "帳號類型:"
 
-#: plugins/gevolution/new_person_dialog.c:294
-#: src/gtkaccount.c:764
+#: ../plugins/gevolution/new_person_dialog.c:295
+#: ../src/gtkaccount.c:784
+#: ../src/gtkblist.c:4616
 msgid "Screen name:"
 msgstr "帳號:"
 
 #  NOTE 選擇性資訊
 #. Optional Information section
-#: plugins/gevolution/new_person_dialog.c:314
+#: ../plugins/gevolution/new_person_dialog.c:315
 msgid "Optional information:"
 msgstr "其他資訊:"
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:337
-#: src/gtkaccount.c:407
-#: src/gtkaccount.c:429
-#: src/protocols/oscar/oscar.c:613
+#: ../plugins/gevolution/new_person_dialog.c:338
+#: ../src/gtkaccount.c:424
+#: ../src/gtkaccount.c:446
+#: ../src/protocols/oscar/oscar.c:625
 msgid "Buddy Icon"
 msgstr "好友圖示"
 
-#: plugins/gevolution/new_person_dialog.c:349
+#: ../plugins/gevolution/new_person_dialog.c:350
 msgid "First name:"
 msgstr "名:"
 
-#: plugins/gevolution/new_person_dialog.c:361
+#: ../plugins/gevolution/new_person_dialog.c:362
 msgid "Last name:"
 msgstr "姓:"
 
-#: plugins/gevolution/new_person_dialog.c:381
+#: ../plugins/gevolution/new_person_dialog.c:382
 msgid "E-mail:"
 msgstr "電子郵件:"
 
@@ -774,7 +878,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gtk-signals-test.c:107
+#: ../plugins/gtk-signals-test.c:160
 msgid "GTK Signals Test"
 msgstr "GTK信號測試"
 
@@ -782,36 +886,41 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/gtk-signals-test.c:110
-#: plugins/gtk-signals-test.c:112
+#: ../plugins/gtk-signals-test.c:163
+#: ../plugins/gtk-signals-test.c:165
 msgid "Test to see that all ui signals are working properly."
 msgstr "檢查使用者介面的各種信號是否都能正常運作。"
 
-#: plugins/history.c:146
+#: ../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:147
+#: ../plugins/history.c:148
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
 "Enabling logs for instant messages and/or chats will activate history for the same conversation type(s)."
 msgstr ""
-
-#: plugins/history.c:186
+"日誌功能可以從「工具」->「偏好設定」->「日誌」來啟動。\n"
+"\n"
+"開啟即時訊息及聊天室的日誌功能將會為相同類別的交談留下歷史記錄。"
+
+#: ../plugins/history.c:188
 msgid "History"
 msgstr "歷史記錄"
 
-#: plugins/history.c:188
+#: ../plugins/history.c:190
 msgid "Shows recently logged conversations in new conversations."
 msgstr "顯示最近所記錄的交談到新的交談視窗中"
 
-#: plugins/history.c:189
-msgid ""
-"When a new conversation is opened this plugin will insert the last conversation into the current conversation.\n"
-"\n"
-"The history plugin requires logging be enabled. Logging can be enabled from Tools -> Preferences -> Logging. Enabling logs for instant messages and/or chats will activate history for the same conversation type(s)."
-msgstr ""
+#: ../plugins/history.c:191
+msgid "When a new conversation is opened this plugin will insert the last conversation into the current conversation."
+msgstr "當新的交談開啟時,這個模組將會把上次的交談內容也顯示出來。"
 
 #. *< type
 #. *< ui_requirement
@@ -819,7 +928,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/iconaway.c:101
+#: ../plugins/iconaway.c:82
 msgid "Iconify on Away"
 msgstr "離開時最小化"
 
@@ -827,56 +936,67 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/iconaway.c:104
-#: plugins/iconaway.c:106
+#: ../plugins/iconaway.c:85
+#: ../plugins/iconaway.c:87
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "在您離開時,最小化好友清單及各交談視窗。"
 
 #  NOTE 這是是輸入欄位左邊的標籤,「幾多分鐘」、「分鐘數」的意思
 #  FIXME 譯文有待改進
-#: plugins/idle.c:116
+#: ../plugins/idle.c:158
+#: ../plugins/idle.c:216
 msgid "Minutes"
 msgstr "分鐘數"
 
-#: plugins/idle.c:123
-#: plugins/idle.c:156
-#: plugins/idle.c:222
+#. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
+#. If that doesn't translate well into your language, drop the 's before translating.
+#: ../plugins/idle.c:165
+#: ../plugins/idle.c:198
+#: ../plugins/idle.c:223
+#: ../plugins/idle.c:315
 msgid "I'dle Mak'er"
 msgstr "I'dle Mak'er"
 
-#: plugins/idle.c:124
-#: plugins/idle.c:188
+#: ../plugins/idle.c:166
+#: ../plugins/idle.c:255
 msgid "Set Account Idle Time"
 msgstr "自定個別帳號的閒置時間"
 
-#: plugins/idle.c:127
+#: ../plugins/idle.c:169
+#: ../plugins/idle.c:227
 msgid "_Set"
 msgstr "設定(_S)"
 
-#: plugins/idle.c:128
-#: plugins/idle.c:161
+#: ../plugins/idle.c:170
+#: ../plugins/idle.c:203
+#: ../plugins/idle.c:228
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: plugins/idle.c:141
+#: ../plugins/idle.c:183
 msgid "None of your accounts are idle."
 msgstr "您的帳號都不是閒置狀態。"
 
-#: plugins/idle.c:157
-#: plugins/idle.c:192
+#: ../plugins/idle.c:199
+#: ../plugins/idle.c:259
 msgid "Unset Account Idle Time"
 msgstr "取消帳號閒置時間設定"
 
-#: plugins/idle.c:160
+#: ../plugins/idle.c:202
 msgid "_Unset"
 msgstr "取消設定(_U)"
 
-#: plugins/idle.c:197
+#: ../plugins/idle.c:224
+#: ../plugins/idle.c:263
+msgid "Set Idle Time for All Accounts"
+msgstr "設定所有帳號的閒置時間"
+
+#: ../plugins/idle.c:268
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr "取消所有已閒置帳號的閒置時間"
 
-#: plugins/idle.c:224
-#: plugins/idle.c:225
+#: ../plugins/idle.c:317
+#: ../plugins/idle.c:318
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr "允許您手動設定您已閒置了多久時間"
 
@@ -886,14 +1006,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ipc-test-client.c:87
+#: ../plugins/ipc-test-client.c:87
 msgid "IPC Test Client"
 msgstr "IPC 測試用戶端"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ipc-test-client.c:90
+#: ../plugins/ipc-test-client.c:90
 msgid "Test plugin IPC support, as a client."
 msgstr "以用戶端身份測試插件系統的 IPC 支援。"
 
@@ -901,7 +1021,7 @@
 # NOTE 譯文更動 by Paladin
 # NOTE Patch by Kevin Leung
 #. *  description
-#: plugins/ipc-test-client.c:92
+#: ../plugins/ipc-test-client.c:92
 msgid "Test plugin IPC support, as a client. This locates the server plugin and calls the commands registered."
 msgstr "以用戶端身份測試模組系統的 IPC 支援,即是找尋伺服器模組後呼叫事先掛載的指令。"
 
@@ -911,14 +1031,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ipc-test-server.c:74
+#: ../plugins/ipc-test-server.c:74
 msgid "IPC Test Server"
 msgstr "IPC 測試伺服器"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ipc-test-server.c:77
+#: ../plugins/ipc-test-server.c:77
 msgid "Test plugin IPC support, as a server."
 msgstr "以伺服器身份測試插件系統的 IPC 支援。"
 
@@ -926,88 +1046,107 @@
 # NOTE 譯文更動 by Paladin
 # NOTE Patch by Kevin Leung
 #. *  description
-#: plugins/ipc-test-server.c:79
+#: ../plugins/ipc-test-server.c:79
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr "以伺服器身份測試模組系統的 IPC 支援,即是掛載測試用的 IPC 指令。"
 
-#: plugins/log_reader.c:1403
+#: ../plugins/log_reader.c:1405
 msgid "User is offline."
 msgstr "使用者是離線的。"
 
-#: plugins/log_reader.c:1409
+#: ../plugins/log_reader.c:1411
 msgid "Auto-response sent:"
 msgstr "自動回應送出:"
 
-#: plugins/log_reader.c:1419
-#: plugins/log_reader.c:1422
-#, c-format
-msgid "%s logged out."
-msgstr "%s 登出。"
-
-#: plugins/log_reader.c:1436
+#: ../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:1446
-#: 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:1454
+#: ../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:1469
+msgstr "您目前是離線狀態。在您重新登入前,將無法收到任何訊息。"
+
+#: ../plugins/log_reader.c:1471
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr "由於達到長度上限,所以訊息無法送出。"
 
-#: plugins/log_reader.c:1474
+#: ../plugins/log_reader.c:1476
 msgid "Message could not be sent."
 msgstr "訊息無法送出。"
 
+# #NOTE 根據「plugins/log_reader.c#1971」的訊息來判斷,應該是指一種新式的通訊協定。
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../plugins/log_reader.c:1838
+#: ../plugins/log_reader.c:1943
+msgid "Adium"
+msgstr "Adium"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../plugins/log_reader.c:1850
+#: ../plugins/log_reader.c:1947
+msgid "Fire"
+msgstr "Fire"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../plugins/log_reader.c:1862
+#: ../plugins/log_reader.c:1951
+msgid "Messenger Plus!"
+msgstr "Messenger Plus!"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../plugins/log_reader.c:1874
+#: ../plugins/log_reader.c:1955
+msgid "MSN Messenger"
+msgstr "MSN Messenger"
+
+# #NOTE 根據「plugins/log_reader.c#1971」的訊息來判斷,應該是指一種新式的通訊協定。
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+#: ../plugins/log_reader.c:1886
+#: ../plugins/log_reader.c:1959
+msgid "Trillian"
+msgstr "Trillian"
+
 #. Add general preferences.
-#: plugins/log_reader.c:1908
-#, fuzzy
+#: ../plugins/log_reader.c:1925
 msgid "General Log Reading Configuration"
-msgstr "滑鼠動作設定"
-
-#: plugins/log_reader.c:1912
+msgstr "基本日誌讀取設定"
+
+#: ../plugins/log_reader.c:1929
 msgid "Fast size calculations"
 msgstr "快速計算日誌大小"
 
-#: plugins/log_reader.c:1916
+#: ../plugins/log_reader.c:1933
 msgid "Use name heuristics"
 msgstr ""
 
 #. Add Log Directory preferences.
-#: plugins/log_reader.c:1922
-#, fuzzy
+#: ../plugins/log_reader.c:1939
 msgid "Log Directory"
-msgstr "搜尋(_S):"
-
-# #NOTE 根據「plugins/log_reader.c#1971」的訊息來判斷,應該是指一種新式的通訊協定。
-#: plugins/log_reader.c:1926
-msgid "Adium"
-msgstr "Adium"
-
-#: plugins/log_reader.c:1930
-msgid "Fire"
-msgstr "Fire"
-
-#: plugins/log_reader.c:1934
-msgid "Messenger Plus!"
-msgstr "Messenger Plus!"
-
-#: plugins/log_reader.c:1938
-msgid "MSN Messenger"
-msgstr "MSN Messenger"
-
-# #NOTE 根據「plugins/log_reader.c#1971」的訊息來判斷,應該是指一種新式的通訊協定。
-#: plugins/log_reader.c:1942
-msgid "Trillian"
-msgstr "Trillian"
+msgstr "日誌目錄"
 
 #. *< type
 #. *< ui_requirement
@@ -1015,82 +1154,136 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/log_reader.c:1963
-#, fuzzy
+#: ../plugins/log_reader.c:1982
 msgid "Log Reader"
 msgstr "日誌檢視器"
 
 #. *< name
 #. *< version
 #. * summary
-#: plugins/log_reader.c:1967
+#: ../plugins/log_reader.c:1986
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "在日誌瀏覽器中包含其他即時訊息用戶端日誌。"
 
 #. * description
-#: plugins/log_reader.c:1971
+#: ../plugins/log_reader.c:1990
 msgid "When viewing logs, this plugin will include logs from other IM clients. Currently, this includes Adium, Fire, Messenger Plus!, MSN Messenger, and Trillian."
 msgstr "當瀏覽日誌時,這個模組會把其他即時訊息用戶端的日誌也包含進來。目前支援 Adium、Fire、Messenger Plus!、MSN Messenger,以及 Trillian。"
 
-#: plugins/mailchk.c:160
+#: ../plugins/mailchk.c:160
 msgid "Mail Checker"
 msgstr "郵件檢查"
 
-#: plugins/mailchk.c:162
+#: ../plugins/mailchk.c:162
 msgid "Checks for new local mail."
 msgstr "檢查本地端的新郵件。"
 
-#: plugins/mailchk.c:163
+#: ../plugins/mailchk.c:163
 msgid "Adds a small box to the buddy list that shows if you have new mail."
 msgstr "在好友清單內加一小格,用來顯示您有沒有新郵件。"
 
-#: plugins/mono/loader/mono.c:213
+#: ../plugins/mono/loader/mono.c:213
 msgid "Mono Plugin Loader"
 msgstr "Mono 模組載入器"
 
-#: plugins/mono/loader/mono.c:215
-#: plugins/mono/loader/mono.c:216
+#: ../plugins/mono/loader/mono.c:215
+#: ../plugins/mono/loader/mono.c:216
 msgid "Loads .NET plugins with Mono."
 msgstr "使用Mono讀取.NET模組"
 
+#: ../plugins/musicmessaging/musicmessaging.c:44
+msgid "A music messaging session has been requested. Please click the MM icon to accept."
+msgstr ""
+
+#: ../plugins/musicmessaging/musicmessaging.c:45
+#, fuzzy
+msgid "Music messaging session confirmed."
+msgstr "滑鼠動作設定"
+
+#  NOTE 原始碼指這個解「(即時訊息系統的)帳別」,我覺得有點離譜
+#  NOTE 譯文更動 by Ambrose
+#: ../plugins/musicmessaging/musicmessaging.c:416
+#, fuzzy
+msgid "Music Messaging"
+msgstr "即時傳訊帳號"
+
+#: ../plugins/musicmessaging/musicmessaging.c:417
+msgid "There was a conflict in running the command:"
+msgstr "執行下列指令時發生衝突:"
+
+#: ../plugins/musicmessaging/musicmessaging.c:525
+#, fuzzy
+msgid "Error Running Editor"
+msgstr "執行 %s 時發生錯誤"
+
+#: ../plugins/musicmessaging/musicmessaging.c:526
+#, fuzzy
+msgid "The following error has occured:"
+msgstr "發生了一個未知的登入錯誤:%s。"
+
 #. Configuration frame
-#: plugins/musicmessaging/musicmessaging.c:622
+#: ../plugins/musicmessaging/musicmessaging.c:625
 #, fuzzy
 msgid "Music Messaging Configuration"
 msgstr "滑鼠動作設定"
 
-#: plugins/musicmessaging/musicmessaging.c:627
+#: ../plugins/musicmessaging/musicmessaging.c:629
+msgid "Score Editor Path"
+msgstr ""
+
+#: ../plugins/musicmessaging/musicmessaging.c:630
 msgid "_Apply"
 msgstr "套用(_A)"
 
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: ../plugins/musicmessaging/musicmessaging.c:665
+msgid "Music Messaging Plugin for collaborative composition."
+msgstr ""
+
+#. *  summary
+#: ../plugins/musicmessaging/musicmessaging.c:667
+msgid "The Music Messaging Plugin allows a number of users to simultaneously work on a piece of music by editting a common score in real-time."
+msgstr ""
+
 #. ---------- "Notify For" ----------
-#: plugins/notify.c:639
+#: ../plugins/notify.c:638
 msgid "Notify For"
 msgstr "通知種類"
 
-#: plugins/notify.c:643
+#: ../plugins/notify.c:642
 msgid "_IM windows"
 msgstr "即時訊息視窗(_I)"
 
-#: plugins/notify.c:650
+#: ../plugins/notify.c:649
 msgid "C_hat windows"
 msgstr "聊天視窗(_H)"
 
-#: plugins/notify.c:657
+#: ../plugins/notify.c:657
+msgid "\t_Only when someone says your screen name"
+msgstr "\t只當有人提到您的名字(_O)"
+
+#: ../plugins/notify.c:667
 msgid "_Focused windows"
 msgstr "焦點視窗(_F)"
 
 #. ---------- "Notification Methods" ----------
-#: plugins/notify.c:665
+#: ../plugins/notify.c:675
 msgid "Notification Methods"
 msgstr "通知方式"
 
-#: plugins/notify.c:672
+#: ../plugins/notify.c:682
 msgid "Prepend _string into window title:"
 msgstr "加入字串到視窗標題之前(_S):"
 
 #. Count method button
-#: plugins/notify.c:691
+#: ../plugins/notify.c:701
 msgid "Insert c_ount of new messages into window title"
 msgstr "加入新訊息數目到視窗標題中(_O)"
 
@@ -1098,43 +1291,42 @@
 # NOTE「URGENT」一字大概應該保留,因為絕大多數的視窗管理員都不支援,而且會引致奇怪的後果
 # NOTE 譯文更動 by Ambrose
 #. Urgent method button
-#: plugins/notify.c:699
+#: ../plugins/notify.c:710
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "設定視窗的「URGENT」(緊急資訊)提示(_U)"
 
 #. Raise window method button
-#: plugins/notify.c:707
-#, fuzzy
+#: ../plugins/notify.c:719
 msgid "R_aise conversation window"
-msgstr "即時訊息交談視窗"
+msgstr "浮現交談視窗(_A)"
 
 #. ---------- "Notification Removals" ----------
-#: plugins/notify.c:715
+#: ../plugins/notify.c:727
 msgid "Notification Removal"
 msgstr "通知移除"
 
 #. Remove on focus button
-#: plugins/notify.c:720
+#: ../plugins/notify.c:732
 msgid "Remove when conversation window _gains focus"
 msgstr "當交談取得輸入焦點時移除通知(_G)"
 
 #. Remove on click button
-#: plugins/notify.c:727
+#: ../plugins/notify.c:739
 msgid "Remove when conversation window _receives click"
 msgstr "當交談視窗被點選時移除通知(_R)"
 
 #. Remove on type button
-#: plugins/notify.c:735
+#: ../plugins/notify.c:747
 msgid "Remove when _typing in conversation window"
 msgstr "當在交談視窗中輸入時移除通知(_T)"
 
 #. Remove on message send button
-#: plugins/notify.c:743
+#: ../plugins/notify.c:755
 msgid "Remove when a _message gets sent"
 msgstr "送出訊息後移除通知(_M)"
 
 #. Remove on conversation switch button
-#: plugins/notify.c:752
+#: ../plugins/notify.c:764
 msgid "Remove on switch to conversation ta_b"
 msgstr "當視窗標籤被點選後移除通知(_B)"
 
@@ -1144,7 +1336,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/notify.c:842
+#: ../plugins/notify.c:853
 msgid "Message Notification"
 msgstr "訊息通知"
 
@@ -1152,8 +1344,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/notify.c:845
-#: plugins/notify.c:847
+#: ../plugins/notify.c:856
+#: ../plugins/notify.c:858
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "提供多種方式來通知您有未讀取的訊息。"
 
@@ -1163,40 +1355,76 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/perl/perl.c:587
+#: ../plugins/perl/perl.c:583
 msgid "Perl Plugin Loader"
 msgstr "Perl 模組載入器"
 
 #. *< name
 #. *< version
 #. *< summary
-#: plugins/perl/perl.c:589
-#: plugins/perl/perl.c:590
+#: ../plugins/perl/perl.c:585
+#: ../plugins/perl/perl.c:586
 msgid "Provides support for loading perl plugins."
 msgstr "提供讀入 Perl 模組的支援。"
 
+#: ../plugins/psychic.c:19
+msgid "Psychic Mode"
+msgstr ""
+
+#: ../plugins/psychic.c:20
+#, fuzzy
+msgid "Psychic mode for incoming conversation"
+msgstr "無法接收連入的即時訊息連線\n"
+
+#: ../plugins/psychic.c:21
+msgid "Causes conversation windows to appear as other users begin to message you.  This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+msgstr ""
+
+#. This is a quote from Star Wars.  You should
+#. probably not translate it literally.  If
+#. you can't find a fitting cultural reference
+#. in your language, consider translating
+#. something like this instead:
+#. "You feel a new message coming."
+#: ../plugins/psychic.c:63
+msgid "You feel a disturbance in the force..."
+msgstr "您感受到了原力的擾動..."
+
+#: ../plugins/psychic.c:82
+#, fuzzy
+msgid "Only enable for users on the buddy list"
+msgstr "只允許好友清單中的使用者"
+
+#: ../plugins/psychic.c:87
+msgid "Disable when away"
+msgstr "離開時停用"
+
+#: ../plugins/psychic.c:91
+msgid "Display notification message in conversations"
+msgstr ""
+
 # TODO Untranslated
 # TODO 微軟視窗的Adobe印表機驅動程式可以找到一個「Raw」的譯法 (但我忘了)
-#: plugins/raw.c:175
+#: ../plugins/raw.c:175
 msgid "Raw"
 msgstr ""
 
 # NOTE: 舊的譯文不清楚,而且唸起來怪怪的。
-#: plugins/raw.c:177
+#: ../plugins/raw.c:177
 msgid "Lets you send raw input to text-based protocols."
 msgstr "讓您直接輸入指令對各種文字模式的通訊協定進行操作。"
 
-#: plugins/raw.c:178
+#: ../plugins/raw.c:178
 msgid "Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit 'Enter' in the entry box to send. Watch the debug window."
 msgstr "讓您直接輸入指令對各種文字模式的通訊協定(例如 Jabber、MSN、IRC 及 TOC)進行操作。在輸入欄位輸入指令,按 Enter 後鍵送出;相關資訊會在除錯視窗顯示。"
 
 # XXX 暫譯
-#: plugins/relnot.c:63
+#: ../plugins/relnot.c:63
 #, c-format
 msgid "You are using Gaim version %s.  The current version is %s.<hr>"
 msgstr "您目前使用的 Gaim 版本為 %s ,最新的版本是 %s。<hr>"
 
-#: plugins/relnot.c:69
+#: ../plugins/relnot.c:69
 #, c-format
 msgid ""
 "<b>ChangeLog:</b>\n"
@@ -1205,13 +1433,13 @@
 "<b>功能說明:</b>\n"
 "%s<br><br>"
 
-#: plugins/relnot.c:74
+#: ../plugins/relnot.c:74
 #, c-format
 msgid "You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/\">http://gaim.sourceforge.net</a>."
 msgstr "您可以由下列網址,取得最新的 Gaim %s 版:<br><a href=\"http://gaim.sourceforge.net/\">http://gaim.sourceforge.net</a>."
 
-#: plugins/relnot.c:78
-#: plugins/relnot.c:79
+#: ../plugins/relnot.c:78
+#: ../plugins/relnot.c:79
 msgid "New Version Available"
 msgstr "有新版本"
 
@@ -1221,19 +1449,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/relnot.c:137
+#: ../plugins/relnot.c:137
 msgid "Release Notification"
 msgstr "新版本通知"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/relnot.c:140
+#: ../plugins/relnot.c:140
 msgid "Checks periodically for new releases."
 msgstr "不時查看有沒有新版本。"
 
 #. *  description
-#: plugins/relnot.c:142
+#: ../plugins/relnot.c:142
 msgid "Checks periodically for new releases and notifies the user with the ChangeLog."
 msgstr "不時查看有沒有新版本。一發現有,就隨即連同該版本的功能說明一併通知使用者。"
 
@@ -1243,7 +1471,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:732
+#: ../plugins/signals-test.c:684
 msgid "Signals Test"
 msgstr "信號測試"
 
@@ -1251,8 +1479,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/signals-test.c:735
-#: plugins/signals-test.c:737
+#: ../plugins/signals-test.c:687
+#: ../plugins/signals-test.c:689
 msgid "Test to see that all signals are working properly."
 msgstr "檢查各種信號是否都能正常運作。"
 
@@ -1262,7 +1490,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/simple.c:34
+#: ../plugins/simple.c:37
 msgid "Simple Plugin"
 msgstr "簡易模組"
 
@@ -1270,57 +1498,74 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/simple.c:37
-#: plugins/simple.c:39
+#: ../plugins/simple.c:40
+#: ../plugins/simple.c:42
 msgid "Tests to see that most things are working."
 msgstr "用來測試是否大部份的東西都能正常運作。"
 
-#: plugins/spellchk.c:1800
+#: ../plugins/spellchk.c:1945
 msgid "Duplicate Correction"
 msgstr ""
 
-#: plugins/spellchk.c:1801
+#: ../plugins/spellchk.c:1946
 msgid "The specified word already exists in the correction list."
 msgstr ""
 
-#: plugins/spellchk.c:1981
+#: ../plugins/spellchk.c:2154
 msgid "Text Replacements"
 msgstr "文字取代"
 
-#: plugins/spellchk.c:2005
+#: ../plugins/spellchk.c:2177
 msgid "You type"
 msgstr "當您輸入"
 
-#: plugins/spellchk.c:2017
+#: ../plugins/spellchk.c:2191
 msgid "You send"
 msgstr "將會送出"
 
-#: plugins/spellchk.c:2029
+#: ../plugins/spellchk.c:2205
 msgid "Whole words only"
 msgstr ""
 
-#: plugins/spellchk.c:2055
+#: ../plugins/spellchk.c:2217
+msgid "Case sensitive"
+msgstr "區分大小寫"
+
+#: ../plugins/spellchk.c:2243
 msgid "Add a new text replacement"
 msgstr "加入一個新的文字取代規則"
 
-#: plugins/spellchk.c:2065
+#: ../plugins/spellchk.c:2259
 msgid "You _type:"
 msgstr "當您輸入(_T):"
 
-#: plugins/spellchk.c:2081
+#: ../plugins/spellchk.c:2276
 msgid "You _send:"
 msgstr "將會送出(_S):"
 
-#: plugins/spellchk.c:2093
+#. Created here so it can be passed to whole_words_button_toggled.
+#: ../plugins/spellchk.c:2288
+msgid "_Exact case match (uncheck for automatic case handling)"
+msgstr "大小寫完全相同(不選取為自動大小寫處理)"
+
+#: ../plugins/spellchk.c:2290
 msgid "Only replace _whole words"
-msgstr ""
-
-#: plugins/spellchk.c:2130
+msgstr "只取代完整的字(_W)"
+
+#: ../plugins/spellchk.c:2315
+msgid "General Text Replacement Options"
+msgstr "一般文字取代選項"
+
+#: ../plugins/spellchk.c:2316
+msgid "Enable replacement of last word on send"
+msgstr ""
+
+#: ../plugins/spellchk.c:2341
 msgid "Text replacement"
 msgstr "文字取代"
 
-#: plugins/spellchk.c:2132
-#: plugins/spellchk.c:2133
+#: ../plugins/spellchk.c:2343
+#: ../plugins/spellchk.c:2344
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "依照使用者所定義的規則來取代送出訊息中的文字。"
 
@@ -1330,7 +1575,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-gnutls.c:227
+#: ../plugins/ssl/ssl-gnutls.c:256
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -1338,8 +1583,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ssl/ssl-gnutls.c:230
-#: plugins/ssl/ssl-gnutls.c:232
+#: ../plugins/ssl/ssl-gnutls.c:259
+#: ../plugins/ssl/ssl-gnutls.c:261
 msgid "Provides SSL support through GNUTLS."
 msgstr "透過 GNUTLS 提供 SSL 的支援。"
 
@@ -1349,7 +1594,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-nss.c:319
+#: ../plugins/ssl/ssl-nss.c:412
 msgid "NSS"
 msgstr "NSS"
 
@@ -1357,8 +1602,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ssl/ssl-nss.c:322
-#: plugins/ssl/ssl-nss.c:324
+#: ../plugins/ssl/ssl-nss.c:415
+#: ../plugins/ssl/ssl-nss.c:417
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "透過 Mozilla 的 NSS 提供 SSL 的支援。"
 
@@ -1368,7 +1613,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl.c:94
+#: ../plugins/ssl/ssl.c:94
 msgid "SSL"
 msgstr "SSL"
 
@@ -1376,54 +1621,49 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ssl/ssl.c:97
-#: plugins/ssl/ssl.c:99
+#: ../plugins/ssl/ssl.c:97
+#: ../plugins/ssl/ssl.c:99
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "為支援 SSL 的函式庫提供一個 Wrapper。"
 
-#: 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)"
 
@@ -1433,7 +1673,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/statenotify.c:139
+#: ../plugins/statenotify.c:142
 msgid "Buddy State Notification"
 msgstr "好友狀態通知"
 
@@ -1441,17 +1681,17 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/statenotify.c:142
-#: plugins/statenotify.c:145
+#: ../plugins/statenotify.c:145
+#: ../plugins/statenotify.c:148
 msgid "Notifies in a conversation window when a buddy goes or returns from away or idle."
 msgstr "在交談視窗中顯示好友離開或是由離開(閒置)返回的通知訊息。"
 
-#: plugins/tcl/tcl.c:363
+#: ../plugins/tcl/tcl.c:413
 msgid "Tcl Plugin Loader"
 msgstr "Tcl 模組載入器"
 
-#: plugins/tcl/tcl.c:365
-#: plugins/tcl/tcl.c:366
+#: ../plugins/tcl/tcl.c:415
+#: ../plugins/tcl/tcl.c:416
 msgid "Provides support for loading Tcl plugins"
 msgstr "提供讀入 Tcl 模組的支援"
 
@@ -1461,8 +1701,8 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ticker/ticker.c:75
-#: plugins/ticker/ticker.c:324
+#: ../plugins/ticker/ticker.c:77
+#: ../plugins/ticker/ticker.c:355
 msgid "Buddy Ticker"
 msgstr "好友跑馬燈"
 
@@ -1470,20 +1710,20 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ticker/ticker.c:327
-#: plugins/ticker/ticker.c:329
+#: ../plugins/ticker/ticker.c:358
+#: ../plugins/ticker/ticker.c:360
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "好友清單的水平捲動版本"
 
-#: plugins/timestamp.c:198
+#: ../plugins/timestamp.c:186
 msgid "iChat Timestamp"
 msgstr "iChat 時間戳記"
 
-#: plugins/timestamp.c:205
+#: ../plugins/timestamp.c:193
 msgid "Delay"
 msgstr "延遲"
 
-#: plugins/timestamp.c:212
+#: ../plugins/timestamp.c:200
 msgid "minutes."
 msgstr "分鐘。"
 
@@ -1493,7 +1733,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/timestamp.c:275
+#: ../plugins/timestamp.c:256
 msgid "Timestamp"
 msgstr "時間戳記"
 
@@ -1501,54 +1741,40 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/timestamp.c:278
-#: plugins/timestamp.c:280
+#: ../plugins/timestamp.c:259
+#: ../plugins/timestamp.c:261
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "每隔 N 分鐘加入 iChat 風格的時間戳記到交談中。"
 
-#: plugins/win32/transparency/win2ktrans.c:183
-#: plugins/win32/transparency/win2ktrans.c:569
-#: plugins/win32/transparency/win2ktrans.c:616
-msgid "Opacity:"
-msgstr "不透明度:"
-
-#. IM Convo trans options
-#: plugins/win32/transparency/win2ktrans.c:533
-msgid "IM Conversation Windows"
-msgstr "即時訊息交談視窗"
-
-#: plugins/win32/transparency/win2ktrans.c:534
-msgid "_IM window transparency"
-msgstr "即時訊息視窗透明度(_I)"
-
-#: plugins/win32/transparency/win2ktrans.c:548
-msgid "_Show slider bar in IM window"
-msgstr "在即時訊息視窗中顯示 Slider Bar(_S)"
-
-#: plugins/win32/transparency/win2ktrans.c:555
-#, fuzzy
-msgid "Remove IM window transparency on focus"
-msgstr "即時訊息視窗透明度"
-
-# XXX 應該是指W32程式中「將視窗保持於桌面最上層」功能。
-#: plugins/win32/transparency/win2ktrans.c:558
-#: plugins/win32/transparency/win2ktrans.c:606
-msgid "Always on top"
-msgstr "總是在最上層"
-
-#. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:590
-msgid "Buddy List Window"
-msgstr "好友清單視窗"
-
-#: plugins/win32/transparency/win2ktrans.c:591
-msgid "_Buddy List window transparency"
-msgstr "好友清單視窗透明度(_B)"
-
-#: plugins/win32/transparency/win2ktrans.c:604
-#, fuzzy
-msgid "Remove Buddy List window transparency on focus"
-msgstr "好友清單視窗透明度(_B)"
+#: ../plugins/timestamp_format.c:22
+msgid "Timestamp Format Options"
+msgstr "時間戳記格式選項"
+
+#: ../plugins/timestamp_format.c:27
+msgid "_Force (traditional Gaim) 24-hour time format"
+msgstr "強制24小時時間格式(傳統Gaim)(_F)"
+
+#: ../plugins/timestamp_format.c:30
+msgid "Show dates in..."
+msgstr "顯示日期於..."
+
+#: ../plugins/timestamp_format.c:35
+msgid "Co_nversations:"
+msgstr "交談(_N):"
+
+#: ../plugins/timestamp_format.c:37
+#: ../plugins/timestamp_format.c:46
+msgid "For delayed messages"
+msgstr "未讀訊息"
+
+#: ../plugins/timestamp_format.c:38
+#: ../plugins/timestamp_format.c:47
+msgid "For delayed messages and in chats"
+msgstr ""
+
+#: ../plugins/timestamp_format.c:44
+msgid "_Message Logs:"
+msgstr "訊息日誌(_M):"
 
 #. *< type
 #. *< ui_requirement
@@ -1556,19 +1782,83 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/win32/transparency/win2ktrans.c:657
+#: ../plugins/timestamp_format.c:149
+msgid "Message Timestamp Formats"
+msgstr "訊息時間戳記格式"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../plugins/timestamp_format.c:152
+msgid "Customizes the message timestamp formats."
+msgstr "使用者自定的訊息時間戳記格式。"
+
+#. *  description
+#: ../plugins/timestamp_format.c:154
+msgid "This plugin allows the user to customize conversation and logging message timestamp formats."
+msgstr "這個模組允許使用者自行設定交談與日誌的訊息時間戳記格式。"
+
+#: ../plugins/win32/transparency/win2ktrans.c:183
+#: ../plugins/win32/transparency/win2ktrans.c:569
+#: ../plugins/win32/transparency/win2ktrans.c:616
+msgid "Opacity:"
+msgstr "不透明度:"
+
+#. IM Convo trans options
+#: ../plugins/win32/transparency/win2ktrans.c:533
+msgid "IM Conversation Windows"
+msgstr "即時訊息交談視窗"
+
+#: ../plugins/win32/transparency/win2ktrans.c:534
+msgid "_IM window transparency"
+msgstr "即時訊息視窗透明度(_I)"
+
+#: ../plugins/win32/transparency/win2ktrans.c:548
+msgid "_Show slider bar in IM window"
+msgstr "在即時訊息視窗中顯示 Slider Bar(_S)"
+
+#: ../plugins/win32/transparency/win2ktrans.c:555
+msgid "Remove IM window transparency on focus"
+msgstr "在即時訊息視窗取得焦點時移除透明度"
+
+# XXX 應該是指W32程式中「將視窗保持於桌面最上層」功能。
+#: ../plugins/win32/transparency/win2ktrans.c:558
+#: ../plugins/win32/transparency/win2ktrans.c:606
+msgid "Always on top"
+msgstr "總是在最上層"
+
+#. Buddy List trans options
+#: ../plugins/win32/transparency/win2ktrans.c:590
+msgid "Buddy List Window"
+msgstr "好友清單視窗"
+
+#: ../plugins/win32/transparency/win2ktrans.c:591
+msgid "_Buddy List window transparency"
+msgstr "好友清單視窗透明度(_B)"
+
+#: ../plugins/win32/transparency/win2ktrans.c:604
+msgid "Remove Buddy List window transparency on focus"
+msgstr "取得輸入焦點時移除好友清單視窗透明度"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../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
 #, fuzzy
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and the buddy list.\n"
@@ -1579,308 +1869,316 @@
 "\n"
 "* 請注意:這個模組需要 Win2000 或 WinXP 才能產生效果。"
 
-#: plugins/win32/winprefs/winprefs.c:385
+#: ../plugins/win32/winprefs/winprefs.c:434
 msgid "GTK+ Runtime Version"
 msgstr "GTK+ Runtime 版本"
 
 #. Autostart
-#: plugins/win32/winprefs/winprefs.c:393
+#: ../plugins/win32/winprefs/winprefs.c:442
 msgid "Startup"
 msgstr "啟動"
 
-#: plugins/win32/winprefs/winprefs.c:394
+#: ../plugins/win32/winprefs/winprefs.c:443
 msgid "_Start Gaim on Windows startup"
 msgstr "當 Windows 啟動時同時執行 Gaim(_S)"
 
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:405
-#: src/gtkblist.c:3498
+#: ../plugins/win32/winprefs/winprefs.c:455
+#: ../src/gtkblist.c:3695
 msgid "Buddy List"
 msgstr "好友清單"
 
-#: plugins/win32/winprefs/winprefs.c:406
+#: ../plugins/win32/winprefs/winprefs.c:456
 msgid "_Dockable Buddy List"
 msgstr "可停駐的好友清單(_D)"
 
 #. Blist On Top
-#: plugins/win32/winprefs/winprefs.c:410
-#, fuzzy
+#: ../plugins/win32/winprefs/winprefs.c:460
 msgid "_Keep Buddy List window on top:"
-msgstr "將好友清單視窗保持在桌面的最上層(_K)"
+msgstr "好友清單視窗保持在桌面最上層(_K);"
 
 #. XXX: Did this ever work?
-#: plugins/win32/winprefs/winprefs.c:415
+#: ../plugins/win32/winprefs/winprefs.c:465
 msgid "Only when docked"
 msgstr ""
 
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:419
-#: src/gtkprefs.c:812
-#: src/gtkprefs.c:1745
+#: ../plugins/win32/winprefs/winprefs.c:469
+#: ../src/gtkprefs.c:819
+#: ../src/gtkprefs.c:1879
 msgid "Conversations"
 msgstr "交談"
 
-#: plugins/win32/winprefs/winprefs.c:420
+#: ../plugins/win32/winprefs/winprefs.c:470
 #, fuzzy
 msgid "_Flash window when messages are received"
 msgstr "收到訊息後閃動視窗(_F)"
 
-#: plugins/win32/winprefs/winprefs.c:443
+#: ../plugins/win32/winprefs/winprefs.c:494
 msgid "WinGaim Options"
 msgstr "WinGaim 選項"
 
-#: plugins/win32/winprefs/winprefs.c:445
+#: ../plugins/win32/winprefs/winprefs.c:496
 msgid "Options specific to Windows Gaim."
 msgstr "Windows Gaim 的相關選項。"
 
-#: plugins/win32/winprefs/winprefs.c:446
+#: ../plugins/win32/winprefs/winprefs.c:497
 msgid "Provides options specific to Windows Gaim, such as buddy list docking and conversation flashing."
 msgstr ""
 
-#: src/account.c:773
+#: ../src/account.c:773
 msgid "accounts"
 msgstr "帳號清單"
 
-#: src/account.c:923
+#: ../src/account.c:918
 msgid "Password is required to sign on."
 msgstr "登入時需要密碼。"
 
-#: src/account.c:948
+#: ../src/account.c:943
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "輸入 %s (%s) 的密碼"
 
-#: src/account.c:955
+#: ../src/account.c:950
 msgid "Enter Password"
 msgstr "輸入密碼"
 
-#: src/account.c:960
+#: ../src/account.c:955
 msgid "Save password"
 msgstr "儲存密碼"
 
 #. *
-#. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
+#. * A wrapper for gaim_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: src/account.c:968
-#: src/account.c:1139
-#: src/gtkdialogs.c:545
-#: src/gtkdialogs.c:682
-#: src/gtkdialogs.c:750
-#: src/gtkrequest.c:287
-#: src/protocols/gg/gg.c:463
-#: src/protocols/gg/gg.c:604
-#: src/protocols/gg/gg.c:740
-#: src/protocols/jabber/jabber.c:1217
-#: 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:2890
-#: src/protocols/oscar/oscar.c:4392
-#: src/protocols/oscar/oscar.c:4473
-#: src/protocols/oscar/oscar.c:7927
-#: src/protocols/oscar/oscar.c:8052
-#: src/protocols/oscar/oscar.c:8077
-#: src/protocols/oscar/oscar.c:8129
-#: src/protocols/silc/buddy.c:466
-#: src/protocols/silc/buddy.c:1147
-#: 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:739
-#: src/protocols/yahoo/yahoo.c:2987
-#: src/protocols/yahoo/yahoo.c:2996
-#: src/request.h:1340
+#: ../src/account.c:963
+#: ../src/account.c:1134
+#: ../src/gtkblist.c:3579
+#: ../src/gtkdialogs.c:613
+#: ../src/gtkdialogs.c:750
+#: ../src/gtkdialogs.c:824
+#: ../src/gtkrequest.c:269
+#: ../src/protocols/gg/gg.c:497
+#: ../src/protocols/gg/gg.c:655
+#: ../src/protocols/gg/gg.c:791
+#: ../src/protocols/jabber/jabber.c:1331
+#: ../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:1417
+#: ../src/protocols/oscar/oscar.c:2176
+#: ../src/protocols/oscar/oscar.c:2263
+#: ../src/protocols/oscar/oscar.c:5716
+#: ../src/protocols/oscar/oscar.c:5918
+#: ../src/protocols/oscar/oscar.c:5943
+#: ../src/protocols/oscar/oscar.c:5999
+#: ../src/protocols/silc/buddy.c:466
+#: ../src/protocols/silc/buddy.c:1182
+#: ../src/protocols/silc/chat.c:424
+#: ../src/protocols/silc/chat.c:462
+#: ../src/protocols/silc/chat.c:725
+#: ../src/protocols/silc/ops.c:1297
+#: ../src/protocols/silc/ops.c:1910
+#: ../src/protocols/silc/silc.c:755
+#: ../src/protocols/yahoo/yahoo.c:3069
+#: ../src/protocols/yahoo/yahoo.c:3078
+#: ../src/request.h:1344
 msgid "OK"
 msgstr "確定"
 
-#: src/account.c:969
-#: src/account.c:1140
-#: src/account.c:1178
-#: src/gtkaccount.c:2155
-#: src/gtkaccount.c:2626
-#: src/gtkblist.c:4874
-#: src/gtkdialogs.c:546
-#: src/gtkdialogs.c:683
-#: src/gtkdialogs.c:751
-#: src/gtkdialogs.c:770
-#: src/gtkdialogs.c:792
-#: src/gtkdialogs.c:812
-#: src/gtkdialogs.c:856
-#: src/gtkdialogs.c:918
-#: src/gtkdialogs.c:960
-#: src/gtkdialogs.c:1002
-#: src/gtkimhtmltoolbar.c:419
-#: src/gtkpounce.c:1000
-#: src/gtkprivacy.c:595
-#: src/gtkprivacy.c:608
-#: src/gtkprivacy.c:633
-#: src/gtkprivacy.c:644
-#: src/gtkrequest.c:288
-#: src/gtksavedstatuses.c:298
-#: src/protocols/gg/gg.c:464
-#: src/protocols/gg/gg.c:605
-#: src/protocols/gg/gg.c:741
-#: src/protocols/gg/gg.c:830
-#: src/protocols/jabber/buddy.c:573
-#: src/protocols/jabber/buddy.c:1358
-#: src/protocols/jabber/buddy.c:1392
-#: src/protocols/jabber/chat.c:780
-#: src/protocols/jabber/jabber.c:755
-#: src/protocols/jabber/jabber.c:1218
-#: 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:1584
-#: src/protocols/oscar/oscar.c:2891
-#: src/protocols/oscar/oscar.c:4350
-#: src/protocols/oscar/oscar.c:4393
-#: src/protocols/oscar/oscar.c:4430
-#: src/protocols/oscar/oscar.c:4474
-#: src/protocols/oscar/oscar.c:7928
-#: src/protocols/oscar/oscar.c:8053
-#: src/protocols/oscar/oscar.c:8078
-#: src/protocols/oscar/oscar.c:8130
-#: src/protocols/oscar/oscar.c:8199
-#: src/protocols/sametime/sametime.c:3338
-#: src/protocols/sametime/sametime.c:3421
-#: src/protocols/sametime/sametime.c:3548
-#: src/protocols/sametime/sametime.c:4392
-#: src/protocols/sametime/sametime.c:5394
-#: src/protocols/sametime/sametime.c:5480
-#: src/protocols/silc/buddy.c:467
-#: src/protocols/silc/buddy.c:1043
-#: src/protocols/silc/buddy.c:1148
-#: src/protocols/silc/chat.c:596
-#: src/protocols/silc/chat.c:725
-#: src/protocols/silc/ops.c:1911
-#: src/protocols/silc/silc.c:740
-#: src/protocols/silc/silc.c:945
-#: src/protocols/yahoo/yahoo.c:2988
-#: src/protocols/yahoo/yahoo.c:2997
-#: src/request.h:1340
-#: src/request.h:1350
+#: ../src/account.c:964
+#: ../src/account.c:1135
+#: ../src/account.c:1172
+#: ../src/gtkaccount.c:2182
+#: ../src/gtkaccount.c:2655
+#: ../src/gtkblist.c:5059
+#: ../src/gtkdialogs.c:614
+#: ../src/gtkdialogs.c:751
+#: ../src/gtkdialogs.c:825
+#: ../src/gtkdialogs.c:844
+#: ../src/gtkdialogs.c:866
+#: ../src/gtkdialogs.c:886
+#: ../src/gtkdialogs.c:930
+#: ../src/gtkdialogs.c:985
+#: ../src/gtkdialogs.c:1022
+#: ../src/gtkdialogs.c:1047
+#: ../src/gtkimhtmltoolbar.c:419
+#: ../src/gtkplugin.c:296
+#: ../src/gtkpounce.c:1088
+#: ../src/gtkprivacy.c:568
+#: ../src/gtkprivacy.c:581
+#: ../src/gtkprivacy.c:606
+#: ../src/gtkprivacy.c:617
+#: ../src/gtkrequest.c:270
+#: ../src/gtksavedstatuses.c:296
+#: ../src/protocols/gg/gg.c:498
+#: ../src/protocols/gg/gg.c:656
+#: ../src/protocols/gg/gg.c:792
+#: ../src/protocols/gg/gg.c:871
+#: ../src/protocols/jabber/buddy.c:594
+#: ../src/protocols/jabber/buddy.c:1721
+#: ../src/protocols/jabber/buddy.c:1755
+#: ../src/protocols/jabber/chat.c:778
+#: ../src/protocols/jabber/jabber.c:840
+#: ../src/protocols/jabber/jabber.c:1332
+#: ../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:1418
+#: ../src/protocols/oscar/oscar.c:2177
+#: ../src/protocols/oscar/oscar.c:2216
+#: ../src/protocols/oscar/oscar.c:2264
+#: ../src/protocols/oscar/oscar.c:5717
+#: ../src/protocols/oscar/oscar.c:5769
+#: ../src/protocols/oscar/oscar.c:5919
+#: ../src/protocols/oscar/oscar.c:5944
+#: ../src/protocols/oscar/oscar.c:6000
+#: ../src/protocols/oscar/oscar.c:6069
+#: ../src/protocols/oscar/peer.c:942
+#: ../src/protocols/sametime/sametime.c:3368
+#: ../src/protocols/sametime/sametime.c:3453
+#: ../src/protocols/sametime/sametime.c:3623
+#: ../src/protocols/sametime/sametime.c:5317
+#: ../src/protocols/sametime/sametime.c:5406
+#: ../src/protocols/sametime/sametime.c:5530
+#: ../src/protocols/silc/buddy.c:467
+#: ../src/protocols/silc/buddy.c:1078
+#: ../src/protocols/silc/buddy.c:1183
+#: ../src/protocols/silc/chat.c:597
+#: ../src/protocols/silc/chat.c:726
+#: ../src/protocols/silc/ops.c:1911
+#: ../src/protocols/silc/silc.c:756
+#: ../src/protocols/silc/silc.c:961
+#: ../src/protocols/yahoo/yahoo.c:3070
+#: ../src/protocols/yahoo/yahoo.c:3079
+#: ../src/request.h:1344
+#: ../src/request.h:1354
 msgid "Cancel"
 msgstr "取消"
 
-#: src/account.c:994
-#: src/connection.c:96
+#: ../src/account.c:989
+#: ../src/connection.c:96
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "找不到 %s 的協定模組"
 
-#: src/account.c:996
-#: src/connection.c:99
+#: ../src/account.c:991
+#: ../src/connection.c:99
+#: ../src/gtkblist.c:3577
 msgid "Connection Error"
 msgstr "連線錯誤"
 
-#: src/account.c:1076
-#: src/protocols/gg/gg.c:645
-#: src/protocols/jabber/jabber.c:1170
+#: ../src/account.c:1071
+#: ../src/protocols/gg/gg.c:696
+#: ../src/protocols/jabber/jabber.c:1284
 msgid "New passwords do not match."
 msgstr "新密碼並不相符。"
 
 # NOTE 譯文更動 by Ambrose
-#: src/account.c:1085
+#: ../src/account.c:1080
 msgid "Fill out all fields completely."
 msgstr "請填妥整份表格所有的欄位。"
 
-#: src/account.c:1108
+#: ../src/account.c:1103
 msgid "Original password"
 msgstr "舊密碼"
 
-#: src/account.c:1115
+#: ../src/account.c:1110
 msgid "New password"
 msgstr "新密碼"
 
-#: src/account.c:1122
+#: ../src/account.c:1117
 msgid "New password (again)"
 msgstr "新密碼(再次確認)"
 
-#: src/account.c:1128
+#: ../src/account.c:1123
 #, c-format
 msgid "Change password for %s"
 msgstr "修改 %s 的密碼"
 
-#: src/account.c:1136
+#: ../src/account.c:1131
 msgid "Please enter your current password and your new password."
 msgstr "請輸入您目前的密碼以及希望使用的新密碼。"
 
-#: src/account.c:1169
+#: ../src/account.c:1164
 #, c-format
 msgid "Change user information for %s"
 msgstr "更改 %s 的個人資訊"
 
-#: src/account.c:1177
-#: src/gtkdebug.c:684
-#: src/gtkrequest.c:294
-#: src/protocols/jabber/buddy.c:572
+#: ../src/account.c:1167
+#: ../src/protocols/toc/toc.c:1684
+msgid "Set User Info"
+msgstr "設定使用者資訊"
+
+#: ../src/account.c:1171
+#: ../src/gtkdebug.c:684
+#: ../src/gtkrequest.c:276
+#: ../src/protocols/jabber/buddy.c:593
 msgid "Save"
 msgstr "儲存"
 
-#: src/account.c:1672
-#: src/gtkft.c:157
-#: src/protocols/jabber/buddy.c:633
-#: src/protocols/jabber/buddy.c:1083
-#: src/protocols/jabber/buddy.c:1100
-#: src/protocols/novell/novell.c:2861
+#: ../src/account.c:1681
+#: ../src/gtkft.c:159
+#: ../src/protocols/gg/gg.c:1002
+#: ../src/protocols/jabber/buddy.c:636
+#: ../src/protocols/jabber/buddy.c:1357
+#: ../src/protocols/jabber/buddy.c:1374
+#: ../src/protocols/novell/novell.c:2858
 msgid "Unknown"
 msgstr "未知"
 
-#: src/blist.c:545
+#: ../src/blist.c:543
 msgid "buddy list"
 msgstr "好友清單"
 
-#: src/blist.c:1178
+#: ../src/blist.c:1182
 msgid "Chats"
 msgstr "聊天"
 
-#: src/blist.c:1881
-#, c-format
-msgid "%d buddy from group %s was not removed because its account was not logged in.  This buddy and the group were not removed.\n"
-msgid_plural "%d buddies from group %s were not removed because their accounts were not logged in.  These buddies and the group were not removed.\n"
+#: ../src/blist.c:1904
+#, fuzzy, c-format
+msgid "%d buddy from group %s was not removed because it belongs to an account which is disabled or offline.  This buddy and the group were not removed.\n"
+msgid_plural "%d buddies from group %s were not removed because they belong to accounts which are currently disabled or offline.  These buddies and the group were not removed.\n"
 msgstr[0] "%d 個在 %s 群組的好友並沒有被移除,因為他(她)所對應的帳號並沒有登入。這個好友及群組沒有被移除。\n"
 msgstr[1] "%d 個在 %s 群組的好友並沒有被移除,因為他們所對應的帳號並沒有登入。這些好友及群組沒有被移除。\n"
 
-#: src/blist.c:1890
+#: ../src/blist.c:1914
 msgid "Group not removed"
 msgstr "群組未被移除"
 
-#: src/connection.c:98
+#: ../src/connection.c:98
 msgid "Registration Error"
 msgstr "註冊錯誤"
 
-#: src/connection.c:280
+#: ../src/connection.c:277
 #, c-format
 msgid "+++ %s signed on"
 msgstr "+++ %s 登入"
 
-#: src/connection.c:322
+#: ../src/connection.c:310
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s 登出"
 
-#: src/conversation.c:196
+#: ../src/conversation.c:164
 msgid "Unable to send message: The message is too large."
 msgstr "無法送出訊息:這個訊息太大了。"
 
-#: src/conversation.c:199
-#: src/conversation.c:212
+#: ../src/conversation.c:167
+#: ../src/conversation.c:180
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "無法送出訊息給 %s。"
 
-#: src/conversation.c:200
+#: ../src/conversation.c:168
 msgid "The message is too large."
 msgstr "這個訊息太大了。"
 
-#: src/conversation.c:209
+#: ../src/conversation.c:177
 msgid "Unable to send message."
 msgstr "無法送出訊息。"
 
@@ -1889,7 +2187,7 @@
 # #, c-format
 # msgid "%d %s in room"
 # msgstr "聊天室有 %d 家伙"
-#: src/conversation.c:1503
+#: ../src/conversation.c:1546
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 進入聊天室。"
@@ -1899,49 +2197,39 @@
 # #, c-format
 # msgid "%d %s in room"
 # msgstr "聊天室有 %d 家伙"
-#: src/conversation.c:1505
+#: ../src/conversation.c:1549
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 進入聊天室。"
 
-#: src/conversation.c:1608
+#: ../src/conversation.c:1654
 #, c-format
 msgid "You are now known as %s"
 msgstr "你改變暱稱為 %s"
 
-#: src/conversation.c:1623
+#: ../src/conversation.c:1674
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 改變暱稱為 %s"
 
-#: src/conversation.c:1679
+#: ../src/conversation.c:1747
+#, c-format
+msgid "%s left the room."
+msgstr "%s 離開聊天室。"
+
+#: ../src/conversation.c:1750
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 離開聊天室 (%s)。"
 
-#: src/conversation.c:1681
-#, c-format
-msgid "%s left the room."
-msgstr "%s 離開聊天室。"
-
-#: src/conversation.c:1758
-#, c-format
-msgid "(+%d more)"
-msgstr "(以及另外 %d 個)"
-
-#: src/conversation.c:1760
-#, c-format
-msgid " left the room (%s)."
-msgstr " 離開聊天室 (%s)。"
-
 # NOTE 暫譯,或許有其他意義
-#: src/desktopitem.c:286
-#: src/desktopitem.c:875
+#: ../src/desktopitem.c:286
+#: ../src/desktopitem.c:877
 msgid "No name"
 msgstr "未命名"
 
-#: src/ft.c:189
-#: src/protocols/msn/msn.c:412
+#: ../src/ft.c:189
+#: ../src/protocols/msn/msn.c:410
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1950,7 +2238,7 @@
 "讀取 %s 途中發生了錯誤:\n"
 "%s。\n"
 
-#: src/ft.c:193
+#: ../src/ft.c:193
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -1959,7 +2247,7 @@
 "寫入 %s 途中發生了錯誤:\n"
 "%s。\n"
 
-#: src/ft.c:197
+#: ../src/ft.c:197
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -1968,36 +2256,36 @@
 "存取 %s 途中發生了錯誤:\n"
 "%s。\n"
 
-#: src/ft.c:230
+#: ../src/ft.c:230
 msgid "Cannot send a file of 0 bytes."
 msgstr "無法傳送空的檔案。"
 
-#: src/ft.c:240
+#: ../src/ft.c:240
 msgid "Cannot send a directory."
 msgstr "無法傳送目錄。"
 
-#: src/ft.c:249
+#: ../src/ft.c:249
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s 不是一般檔案,因此不會覆蓋它。\n"
 
-#: src/ft.c:307
+#: ../src/ft.c:307
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s 想要送 %s (%s) 給您"
 
-#: src/ft.c:314
+#: ../src/ft.c:314
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s 想要傳送個檔案給您"
 
-#: src/ft.c:355
+#: ../src/ft.c:355
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "接受來自於「%s」的檔案傳輸要求嗎?"
 
 #  XXX 暫譯
-#: src/ft.c:359
+#: ../src/ft.c:359
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -2008,65 +2296,65 @@
 "遠端主機 :%s\n"
 "遠端通訊埠:%d"
 
-#: src/ft.c:383
+#: ../src/ft.c:392
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s 提出傳送檔案「%s」"
 
-#: src/ft.c:427
+#: ../src/ft.c:444
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s 不是一個有效的檔案名稱。\n"
 
-#: src/ft.c:448
+#: ../src/ft.c:465
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "向 %2$s 提出傳送 %1$s 中"
 
-#: src/ft.c:459
+#: ../src/ft.c:477
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "開始自 %2$s 傳送 %1$s"
 
-#: src/ft.c:613
+#: ../src/ft.c:631
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "檔案 %s 傳送完畢"
 
-#: src/ft.c:616
+#: ../src/ft.c:634
 msgid "File transfer complete"
 msgstr "檔案傳輸完畢"
 
-#: src/ft.c:1000
+#: ../src/ft.c:1031
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "你取消了 %s 的傳送"
 
-#: src/ft.c:1005
+#: ../src/ft.c:1036
 msgid "File transfer cancelled"
 msgstr "檔案傳輸已取消"
 
-#: src/ft.c:1062
+#: ../src/ft.c:1094
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s 取消了 %s 的傳送"
 
-#: src/ft.c:1067
+#: ../src/ft.c:1099
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s 取消了檔案傳輸"
 
-#: src/ft.c:1124
+#: ../src/ft.c:1156
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "傳送檔案到 %s 失敗。"
 
-#: src/ft.c:1126
+#: ../src/ft.c:1158
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "自 %s 傳送檔案失敗。"
 
-#: src/gtkaccount.c:357
+#: ../src/gtkaccount.c:374
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -2078,412 +2366,420 @@
 "<b>圖像尺寸:</b> %d×%d"
 
 #. Build the login options frame.
-#: src/gtkaccount.c:742
+#: ../src/gtkaccount.c:762
 msgid "Login Options"
 msgstr "登入選項"
 
-#: src/gtkaccount.c:759
-#: src/gtkft.c:639
+#: ../src/gtkaccount.c:779
+#: ../src/gtkft.c:642
 msgid "Protocol:"
 msgstr "通訊協定:"
 
-#: src/gtkaccount.c:838
+#: ../src/gtkaccount.c:858
 msgid "Password:"
 msgstr "密碼:"
 
-#: src/gtkaccount.c:843
-#: src/gtkblist.c:4436
-#: src/gtkblist.c:4818
+#: ../src/gtkaccount.c:863
+#: ../src/gtkblist.c:4637
+#: ../src/gtkblist.c:5003
 msgid "Alias:"
 msgstr "別名:"
 
-#: src/gtkaccount.c:847
+#: ../src/gtkaccount.c:867
 msgid "Remember password"
 msgstr "記住密碼"
 
 #. Build the user options frame.
-#: src/gtkaccount.c:899
+#: ../src/gtkaccount.c:919
 msgid "User Options"
 msgstr "使用者自定選項"
 
-#: src/gtkaccount.c:912
+#: ../src/gtkaccount.c:932
 msgid "New mail notifications"
 msgstr "新郵件通知"
 
-#: src/gtkaccount.c:921
+#: ../src/gtkaccount.c:941
 msgid "Buddy icon:"
 msgstr "好友圖示:"
 
 #. Build the protocol options frame.
-#: src/gtkaccount.c:1012
+#: ../src/gtkaccount.c:1032
 #, c-format
 msgid "%s Options"
 msgstr "%s 選項"
 
-#: src/gtkaccount.c:1213
+#: ../src/gtkaccount.c:1233
 msgid "Use Global Proxy Settings"
 msgstr "使用全域的代理伺服器設定"
 
 # NOTE 可以有代理伺服器但毋須用
 # NOTE 香港普遍用「毋須」,但講國語「毋須」會不通順,「不使用」較好
-#: src/gtkaccount.c:1219
+#: ../src/gtkaccount.c:1239
 msgid "No Proxy"
 msgstr "不使用代理伺服器"
 
-#: src/gtkaccount.c:1225
+#: ../src/gtkaccount.c:1245
 msgid "HTTP"
 msgstr "HTTP"
 
-#: src/gtkaccount.c:1231
+#: ../src/gtkaccount.c:1251
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: src/gtkaccount.c:1237
+#: ../src/gtkaccount.c:1257
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: src/gtkaccount.c:1243
-#: src/gtkprefs.c:1032
+#: ../src/gtkaccount.c:1263
+#: ../src/gtkprefs.c:1058
 msgid "Use Environmental Settings"
 msgstr "使用環境變數設定"
 
-#: src/gtkaccount.c:1277
+#. This is an easter egg.
+#. It means one of two things, both intended as humourus:
+#. A) your network is really slow and you have nothing better to do than
+#. look at butterflies.
+#. B)You are looking really closely at something that shouldn't matter.
+#: ../src/gtkaccount.c:1302
+msgid "If you look real closely"
+msgstr "如果您看得夠仔細"
+
+#. This is an easter egg. See the comment on the previous line in the source.
+#: ../src/gtkaccount.c:1305
 msgid "you can see the butterflies mating"
 msgstr "鴛鴦蝴蝶也看得見耶"
 
-#: src/gtkaccount.c:1281
-msgid "If you look real closely"
-msgstr "如果您看得夠仔細"
-
-#: src/gtkaccount.c:1297
+#: ../src/gtkaccount.c:1326
 msgid "Proxy Options"
 msgstr "代理伺服器選項"
 
-#: src/gtkaccount.c:1311
-#: src/gtkprefs.c:1026
+#: ../src/gtkaccount.c:1340
+#: ../src/gtkprefs.c:1052
 msgid "Proxy _type:"
 msgstr "代理伺服器型態(_T):"
 
-#: src/gtkaccount.c:1320
-#: src/gtkprefs.c:1047
+#: ../src/gtkaccount.c:1349
+#: ../src/gtkprefs.c:1073
 msgid "_Host:"
 msgstr "主機位址(_H):"
 
-#: src/gtkaccount.c:1324
-#: src/gtkprefs.c:1065
+#: ../src/gtkaccount.c:1353
+#: ../src/gtkprefs.c:1091
 msgid "_Port:"
 msgstr "通訊埠(_P):"
 
-#: src/gtkaccount.c:1332
+#: ../src/gtkaccount.c:1361
 msgid "_Username:"
 msgstr "使用者(_U):"
 
-#: src/gtkaccount.c:1338
-#: src/gtkprefs.c:1102
+#: ../src/gtkaccount.c:1367
+#: ../src/gtkprefs.c:1128
 msgid "Pa_ssword:"
 msgstr "密碼(_S):"
 
-#: src/gtkaccount.c:1716
+#: ../src/gtkaccount.c:1747
 msgid "Add Account"
 msgstr "新增帳號"
 
-#: src/gtkaccount.c:1718
+#: ../src/gtkaccount.c:1749
+#: ../src/gtkblist.c:3580
 msgid "Modify Account"
 msgstr "修改帳號"
 
-#: src/gtkaccount.c:1740
+#: ../src/gtkaccount.c:1771
 msgid "_Basic"
 msgstr "基本設定(_B)"
 
-#: src/gtkaccount.c:1751
+#: ../src/gtkaccount.c:1782
 msgid "_Advanced"
 msgstr "進階設定(_A)"
 
 #. Register button
-#: src/gtkaccount.c:1766
-#: src/protocols/jabber/jabber.c:754
+#: ../src/gtkaccount.c:1797
+#: ../src/protocols/jabber/jabber.c:839
 msgid "Register"
 msgstr "註冊"
 
-#: src/gtkaccount.c:2149
-#: src/gtksavedstatuses.c:295
+#: ../src/gtkaccount.c:2176
+#: ../src/gtksavedstatuses.c:293
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "您確定要刪除 %s?"
 
-#: src/gtkaccount.c:2154
-#: src/gtkpounce.c:999
-#: src/gtkrequest.c:291
-#: src/gtksavedstatuses.c:297
+#: ../src/gtkaccount.c:2181
+#: ../src/gtkpounce.c:1087
+#: ../src/gtkrequest.c:273
+#: ../src/gtksavedstatuses.c:295
 msgid "Delete"
 msgstr "刪除"
 
-#: src/gtkaccount.c:2212
-#: src/gtksavedstatuses.c:873
-#: src/protocols/oscar/oscar.c:5037
+#: ../src/gtkaccount.c:2245
+#: ../src/gtksavedstatuses.c:893
+#: ../src/protocols/oscar/oscar.c:2828
 msgid "Screen Name"
 msgstr "帳號"
 
-#: src/gtkaccount.c:2243
+#: ../src/gtkaccount.c:2276
 msgid "Protocol"
 msgstr "通訊協定"
 
-#: src/gtkaccount.c:2574
+#: ../src/gtkaccount.c:2603
 #, fuzzy, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s 加入了 %s 為他(她)的好友 %s%s%s"
 
-#: src/gtkaccount.c:2623
+#: ../src/gtkaccount.c:2652
 msgid "Add buddy to your list?"
 msgstr "將使用者加入您的好友清單?"
 
-#: src/gtkaccount.c:2625
-#: src/gtkblist.c:4873
-#: src/gtkconv.c:1574
-#: src/gtkrequest.c:292
-#: src/protocols/gg/gg.c:829
-#: src/protocols/oscar/oscar.c:4662
-#: src/protocols/sametime/sametime.c:5479
-#: src/protocols/silc/chat.c:595
+#: ../src/gtkaccount.c:2654
+#: ../src/gtkblist.c:5058
+#: ../src/gtkconv.c:1624
+#: ../src/gtkrequest.c:274
+#: ../src/protocols/gg/gg.c:870
+#: ../src/protocols/oscar/oscar.c:2454
+#: ../src/protocols/sametime/sametime.c:5405
+#: ../src/protocols/silc/chat.c:596
 msgid "Add"
 msgstr "加入"
 
 # TODO 看起來應該為加一個新的聊天室,並把聊天室歸類到某個群組。
 # NOTE 譯文更動 by Paladin
-#: src/gtkblist.c:662
+#: ../src/gtkblist.c:685
 msgid "Join a Chat"
 msgstr "加入聊天室"
 
-#: src/gtkblist.c:683
+#: ../src/gtkblist.c:706
 msgid "Please enter the appropriate information about the chat you would like to join.\n"
 msgstr "請輸入關於您所想加入好友清單的聊天室的適當資訊。\n"
 
-#: src/gtkblist.c:694
-#: src/gtkpounce.c:500
-#: src/gtkroomlist.c:354
+#: ../src/gtkblist.c:717
+#: ../src/gtkpounce.c:523
+#: ../src/gtkroomlist.c:377
 msgid "_Account:"
 msgstr "帳號(_A):"
 
-#: src/gtkblist.c:1002
+#: ../src/gtkblist.c:960
 msgid "Get _Info"
 msgstr "取得資訊(_I)"
 
-#: src/gtkblist.c:1005
+#: ../src/gtkblist.c:963
+#: ../src/gtkstock.c:141
 msgid "I_M"
 msgstr "即時訊息(_M)"
 
-#: src/gtkblist.c:1011
+#: ../src/gtkblist.c:969
 msgid "_Send File"
 msgstr "傳送檔案(_S)"
 
-#: src/gtkblist.c:1019
-msgid "Start _Voice Chat"
-msgstr "開啟語音聊天"
-
-#: src/gtkblist.c:1025
+#: ../src/gtkblist.c:976
 msgid "Add Buddy _Pounce"
 msgstr "加入好友狀態捕捉(_P)"
 
-#: src/gtkblist.c:1029
-#: src/gtkblist.c:1033
-#: src/gtkblist.c:1131
-#: src/gtkblist.c:1154
+#: ../src/gtkblist.c:980
+#: ../src/gtkblist.c:984
+#: ../src/gtkblist.c:1083
+#: ../src/gtkblist.c:1106
 msgid "View _Log"
 msgstr "觀看日誌(_L)"
 
-#: src/gtkblist.c:1044
+#: ../src/gtkblist.c:995
 msgid "Alias..."
 msgstr "別名..."
 
-#: src/gtkblist.c:1047
-#: src/gtkconv.c:1571
-#: src/gtkrequest.c:293
+#: ../src/gtkblist.c:998
+#: ../src/gtkconv.c:1621
+#: ../src/gtkrequest.c:275
 msgid "Remove"
 msgstr "移除"
 
-#: src/gtkblist.c:1053
-#: src/gtkblist.c:1139
-#: src/gtkblist.c:1160
+#: ../src/gtkblist.c:1004
+#: ../src/gtkblist.c:1091
+#: ../src/gtkblist.c:1112
 msgid "_Alias..."
 msgstr "別名(_A)..."
 
-#: src/gtkblist.c:1055
-#: src/gtkblist.c:1141
-#: src/gtkblist.c:1162
+#: ../src/gtkblist.c:1006
+#: ../src/gtkblist.c:1093
+#: ../src/gtkblist.c:1114
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: src/gtkblist.c:1102
+#: ../src/gtkblist.c:1054
 msgid "Add a _Buddy"
 msgstr "新增一個好友(_B)"
 
-#: src/gtkblist.c:1104
+#: ../src/gtkblist.c:1056
 msgid "Add a C_hat"
 msgstr "新增一個聊天室(_H)"
 
-#: src/gtkblist.c:1107
+#: ../src/gtkblist.c:1059
 msgid "_Delete Group"
 msgstr "刪除群組(_D)"
 
-#: src/gtkblist.c:1109
+#: ../src/gtkblist.c:1061
 msgid "_Rename"
 msgstr "重命名(_R)"
 
 #. join button
-#: src/gtkblist.c:1127
-#: src/gtkroomlist.c:264
-#: src/gtkroomlist.c:409
-#: src/gtkstock.c:139
+#: ../src/gtkblist.c:1079
+#: ../src/gtkroomlist.c:285
+#: ../src/gtkroomlist.c:441
+#: ../src/gtkstock.c:139
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: src/gtkblist.c:1129
+#: ../src/gtkblist.c:1081
 msgid "Auto-Join"
 msgstr "自動加入"
 
-#: src/gtkblist.c:1167
-#: src/gtkblist.c:1190
+#: ../src/gtkblist.c:1119
+#: ../src/gtkblist.c:1142
 msgid "_Collapse"
 msgstr "收起(_C)"
 
-#: src/gtkblist.c:1195
+#: ../src/gtkblist.c:1147
 msgid "_Expand"
 msgstr "展開(_E)"
 
-#: src/gtkblist.c:1426
-#: src/gtkblist.c:1436
-#: src/gtkblist.c:3668
-#: src/gtkblist.c:3673
+#: ../src/gtkblist.c:1393
+#: ../src/gtkblist.c:1405
+#: ../src/gtkblist.c:3840
+#: ../src/gtkblist.c:3850
 msgid "/Tools/Mute Sounds"
 msgstr "/工具/靜音"
 
 # XXX 暫譯
-#: src/gtkblist.c:1895
-#: src/gtkconv.c:3909
-#: src/gtkpounce.c:399
+#: ../src/gtkblist.c:1870
+#: ../src/gtkconv.c:4292
+#: ../src/gtkpounce.c:422
 msgid "You are not currently signed on with an account that can add that buddy."
 msgstr "您並未登入任何一個可供您新增哪個好友的通訊協定。"
 
 #. Buddies menu
-#: src/gtkblist.c:2460
+#: ../src/gtkblist.c:2444
 msgid "/_Buddies"
 msgstr "/好友(_B)"
 
-#: src/gtkblist.c:2461
+#: ../src/gtkblist.c:2445
 msgid "/Buddies/New Instant _Message..."
 msgstr "/好友/新即時訊息(_M)"
 
-#: src/gtkblist.c:2462
+#: ../src/gtkblist.c:2446
 msgid "/Buddies/Join a _Chat..."
 msgstr "/好友/加入聊天室(_C)"
 
-#: src/gtkblist.c:2463
+#: ../src/gtkblist.c:2447
 msgid "/Buddies/Get User _Info..."
 msgstr "/好友/取得使用者資訊(_I)..."
 
 #  NOTE 此處譯「讀取」似乎較「取得」好一點
-#: src/gtkblist.c:2464
+#: ../src/gtkblist.c:2448
 msgid "/Buddies/View User _Log..."
 msgstr "/好友/讀取使用者日誌(_L)..."
 
-#: src/gtkblist.c:2466
+#: ../src/gtkblist.c:2450
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/好友/顯示離線好友(_O)"
 
-#: src/gtkblist.c:2467
+#: ../src/gtkblist.c:2451
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/好友/顯示空白的群組(_E)"
 
-#: src/gtkblist.c:2468
+#: ../src/gtkblist.c:2452
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/好友/顯示好友細節(_D)"
 
-#: src/gtkblist.c:2469
+#: ../src/gtkblist.c:2453
+msgid "/Buddies/Show Idle _Times"
+msgstr "/好友/顯示閒置時間(_T)"
+
+#: ../src/gtkblist.c:2454
 msgid "/Buddies/_Sort Buddies"
 msgstr "/好友/好友清單排序(_S)"
 
-#: src/gtkblist.c:2471
+#: ../src/gtkblist.c:2456
 msgid "/Buddies/_Add Buddy..."
 msgstr "/好友/新增好友(_A)..."
 
-#: src/gtkblist.c:2472
+#: ../src/gtkblist.c:2457
 msgid "/Buddies/Add C_hat..."
 msgstr "/好友/新增聊天室(_H)..."
 
-#: src/gtkblist.c:2473
+#: ../src/gtkblist.c:2458
 msgid "/Buddies/Add _Group..."
 msgstr "/好友/新增群組(_G)..."
 
-#: src/gtkblist.c:2475
+#: ../src/gtkblist.c:2460
 msgid "/Buddies/_Quit"
 msgstr "/好友/結束程式(_Q)"
 
 #. Accounts menu
-#: src/gtkblist.c:2478
+#: ../src/gtkblist.c:2463
 msgid "/_Accounts"
 msgstr "/帳號(_A)"
 
-#: src/gtkblist.c:2479
-#: src/gtkblist.c:5453
+#: ../src/gtkblist.c:2464
+#: ../src/gtkblist.c:5635
 msgid "/Accounts/Add\\/Edit"
 msgstr "/帳號(_A)/新增\\/編輯"
 
 #. Tools
-#: src/gtkblist.c:2482
+#: ../src/gtkblist.c:2467
 msgid "/_Tools"
 msgstr "工具(_T)"
 
-#: src/gtkblist.c:2483
+#: ../src/gtkblist.c:2468
 msgid "/Tools/Buddy _Pounces"
 msgstr "/工具/好友狀態捕捉(_P)"
 
-#: src/gtkblist.c:2484
+#: ../src/gtkblist.c:2469
 msgid "/Tools/Plu_gins"
 msgstr "/工具/模組(_G)"
 
-#: src/gtkblist.c:2485
+#: ../src/gtkblist.c:2470
 msgid "/Tools/Pr_eferences"
 msgstr "/工具/偏好設定(_E)"
 
-#: src/gtkblist.c:2486
+#: ../src/gtkblist.c:2471
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具/隱私設定(_I)"
 
-#: src/gtkblist.c:2488
+#: ../src/gtkblist.c:2473
 msgid "/Tools/_File Transfers"
 msgstr "/工具/檔案傳輸(_F)"
 
-#: src/gtkblist.c:2489
+#: ../src/gtkblist.c:2474
 msgid "/Tools/R_oom List"
 msgstr "/工具/聊天室清單(_O)"
 
-#: src/gtkblist.c:2490
+#: ../src/gtkblist.c:2475
 msgid "/Tools/System _Log"
 msgstr "/工具/系統日誌(_L)"
 
-#: src/gtkblist.c:2492
+#: ../src/gtkblist.c:2477
 msgid "/Tools/Mute _Sounds"
 msgstr "/工具/靜音(_S)"
 
 #. Help
-#: src/gtkblist.c:2495
+#: ../src/gtkblist.c:2480
 msgid "/_Help"
 msgstr "說明(_H)"
 
-#: src/gtkblist.c:2496
+#: ../src/gtkblist.c:2481
 msgid "/Help/Online _Help"
 msgstr "線上說明(_H)"
 
-#: src/gtkblist.c:2497
+#: ../src/gtkblist.c:2482
 msgid "/Help/_Debug Window"
 msgstr "/說明/除錯視窗(_D)"
 
-#: src/gtkblist.c:2498
+#: ../src/gtkblist.c:2483
 msgid "/Help/_About"
 msgstr "/說明/關於(_A)"
 
-#: src/gtkblist.c:2530
-#: src/gtkblist.c:2597
+#: ../src/gtkblist.c:2515
+#: ../src/gtkblist.c:2584
 #, c-format
 msgid ""
 "\n"
@@ -2492,25 +2788,16 @@
 "\n"
 "<b>帳號:</b>%s"
 
-#: src/gtkblist.c:2606
-#, fuzzy, c-format
-msgid ""
-"\n"
-"<b>Contact Alias:</b> %s"
-msgstr ""
-"\n"
-"<b>別名:</b>"
-
-#: src/gtkblist.c:2614
+#: ../src/gtkblist.c:2596
 #, c-format
 msgid ""
 "\n"
-"<b>Alias:</b> %s"
+"<b>Buddy Alias:</b> %s"
 msgstr ""
 "\n"
-"<b>別名:</b>%s"
-
-#: src/gtkblist.c:2622
+"<b>好友別名:</b>%s"
+
+#: ../src/gtkblist.c:2608
 #, c-format
 msgid ""
 "\n"
@@ -2519,7 +2806,7 @@
 "\n"
 "<b>暱稱:</b>%s"
 
-#: src/gtkblist.c:2631
+#: ../src/gtkblist.c:2617
 #, c-format
 msgid ""
 "\n"
@@ -2528,7 +2815,7 @@
 "\n"
 "<b>登入時間:</b>%s"
 
-#: src/gtkblist.c:2643
+#: ../src/gtkblist.c:2628
 #, c-format
 msgid ""
 "\n"
@@ -2537,16 +2824,16 @@
 "\n"
 "<b>閒置:</b>%s"
 
-#: src/gtkblist.c:2678
-#, fuzzy, c-format
+#: ../src/gtkblist.c:2663
+#, c-format
 msgid ""
 "\n"
 "<b>Last Seen:</b> %s ago"
 msgstr ""
 "\n"
-"<b>%s:</b>%s"
-
-#: src/gtkblist.c:2686
+"<b>最後見到:</b>%s 前"
+
+#: ../src/gtkblist.c:2672
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
@@ -2554,7 +2841,7 @@
 "\n"
 "<b>狀態:</b>離線"
 
-#: src/gtkblist.c:2709
+#: ../src/gtkblist.c:2683
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
@@ -2562,7 +2849,7 @@
 "\n"
 "<b>介紹:</b>幽靈似的"
 
-#: src/gtkblist.c:2711
+#: ../src/gtkblist.c:2685
 #, fuzzy
 msgid ""
 "\n"
@@ -2571,7 +2858,7 @@
 "\n"
 "<b>狀態:</b>頂呱呱"
 
-#: src/gtkblist.c:2713
+#: ../src/gtkblist.c:2687
 #, fuzzy
 msgid ""
 "\n"
@@ -2580,287 +2867,211 @@
 "\n"
 "<b>狀態:</b>頂呱呱"
 
-#: src/gtkblist.c:2981
-#, fuzzy, c-format
+#: ../src/gtkblist.c:2982
+#, c-format
 msgid "Idle %dh %02dm"
-msgstr "閒置(%d 小時 %02d 分)"
-
-#: src/gtkblist.c:2983
-#, fuzzy, c-format
+msgstr "閒置 %d 小時 %02d 分"
+
+#: ../src/gtkblist.c:2984
+#, c-format
 msgid "Idle %dm"
-msgstr "閒置(%d 分)"
-
-#: src/gtkblist.c:2986
-#: src/protocols/bonjour/bonjour.c:323
-#: src/protocols/msn/msn.c:554
-#: src/protocols/msn/state.c:32
-#: src/protocols/novell/novell.c:2855
-#: src/protocols/oscar/oscar.c:5058
-#: src/protocols/yahoo/yahoo.c:2660
-#: src/protocols/yahoo/yahoo_profile.c:660
+msgstr "閒置 %d 分"
+
+#. Idle stuff
+#: ../src/gtkblist.c:2987
+#: ../src/gtkprefs.c:1760
+#: ../src/protocols/bonjour/bonjour.c:333
+#: ../src/protocols/jabber/buddy.c:641
+#: ../src/protocols/jabber/buddy.c:672
+#: ../src/protocols/msn/msn.c:548
+#: ../src/protocols/msn/state.c:32
+#: ../src/protocols/novell/novell.c:2852
+#: ../src/protocols/oscar/oscar.c:2849
+#: ../src/protocols/yahoo/yahoo.c:2737
+#: ../src/protocols/yahoo/yahoo_profile.c:691
 msgid "Idle"
 msgstr "閒置"
 
-#: src/gtkblist.c:2990
-msgid "Offline "
-msgstr "離線 "
-
-#: src/gtkblist.c:3108
+#: ../src/gtkblist.c:3120
 msgid "/Buddies/New Instant Message..."
 msgstr "/好友/新即時訊息..."
 
-#: src/gtkblist.c:3109
-#: src/gtkblist.c:3142
+#: ../src/gtkblist.c:3121
+#: ../src/gtkblist.c:3154
 msgid "/Buddies/Join a Chat..."
 msgstr "/好友/加入聊天室(_C)..."
 
-#: src/gtkblist.c:3110
+#: ../src/gtkblist.c:3122
 msgid "/Buddies/Get User Info..."
 msgstr "/好友/取得使用者資訊..."
 
-#: src/gtkblist.c:3111
+#: ../src/gtkblist.c:3123
 msgid "/Buddies/Add Buddy..."
 msgstr "/好友/新增好友..."
 
-#: src/gtkblist.c:3112
-#: src/gtkblist.c:3145
+#: ../src/gtkblist.c:3124
+#: ../src/gtkblist.c:3157
 msgid "/Buddies/Add Chat..."
 msgstr "/好友/新增聊天室..."
 
-#: src/gtkblist.c:3113
+#: ../src/gtkblist.c:3125
 msgid "/Buddies/Add Group..."
 msgstr "/好友/新增群組..."
 
-#: src/gtkblist.c:3148
+#: ../src/gtkblist.c:3160
 msgid "/Tools/Buddy Pounces"
 msgstr "/工具/好友狀態捕捉"
 
-#: src/gtkblist.c:3151
+#: ../src/gtkblist.c:3163
 msgid "/Tools/Privacy"
 msgstr "/工具/隱私設定"
 
-#: src/gtkblist.c:3154
+#: ../src/gtkblist.c:3166
 msgid "/Tools/Room List"
 msgstr "/工具/聊天室清單"
 
-#: src/gtkblist.c:3339
+#: ../src/gtkblist.c:3360
 msgid "Manually"
 msgstr "使用者自定"
 
-#: src/gtkblist.c:3341
+#: ../src/gtkblist.c:3362
 msgid "Alphabetically"
 msgstr "依照字母"
 
-#: src/gtkblist.c:3342
+#: ../src/gtkblist.c:3363
 msgid "By status"
 msgstr "依照狀態"
 
-#: src/gtkblist.c:3343
+#: ../src/gtkblist.c:3364
 msgid "By log size"
 msgstr "依照日誌大小"
 
-#: src/gtkblist.c:3532
+#: ../src/gtkblist.c:3572
+#: ../src/gtkconn.c:186
+#, c-format
+msgid "%s disconnected"
+msgstr "%s 結束連線"
+
+#: ../src/gtkblist.c:3581
+#: ../src/protocols/sametime/sametime.c:3622
+msgid "Connect"
+msgstr "連線"
+
+#: ../src/gtkblist.c:3581
+msgid "Re-enable Account"
+msgstr "重新啟動帳號"
+
+#: ../src/gtkblist.c:3602
+#, c-format
+msgid "<span color=\"red\">%s disconnected: %s</span>"
+msgstr ""
+
+#: ../src/gtkblist.c:3729
 msgid "/Accounts"
 msgstr "/帳號"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3664
+#: ../src/gtkblist.c:3834
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/好友/顯示離線好友"
 
-#: src/gtkblist.c:3666
+#: ../src/gtkblist.c:3837
 msgid "/Buddies/Show Empty Groups"
 msgstr "/好友/顯示空的好的群組"
 
-#: src/gtkblist.c:3670
+#: ../src/gtkblist.c:3843
 msgid "/Buddies/Show Buddy Details"
 msgstr "/好友/顯示好友細節"
 
-#: src/gtkblist.c:4369
-#: src/protocols/silc/buddy.c:737
-#: src/protocols/silc/buddy.c:995
-#: src/protocols/silc/buddy.c:1040
-#: src/protocols/silc/buddy.c:1139
-#: src/protocols/yahoo/yahoo.c:2908
-msgid "Add Buddy"
-msgstr "新增好友"
-
-#: src/gtkblist.c:4393
+#: ../src/gtkblist.c:3846
+msgid "/Buddies/Show Idle Times"
+msgstr "/好友/顯示閒置時間"
+
+#: ../src/gtkblist.c:4594
 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. The alias will be displayed in place of the screen name whenever possible.\n"
 msgstr "請輸入您所想要加入好友的帳號。您可以為這個好友設定別名或暱稱,而這個設定將會在好友清單中顯示。\n"
 
-#: src/gtkblist.c:4415
-msgid "Screen Name:"
-msgstr "帳號:"
-
 #. Set up stuff for the account box
-#: src/gtkblist.c:4463
-#: src/gtkblist.c:4798
+#: ../src/gtkblist.c:4664
+#: ../src/gtkblist.c:4983
 msgid "Account:"
 msgstr "帳號:"
 
-#: src/gtkblist.c:4731
+#: ../src/gtkblist.c:4916
 msgid "This protocol does not support chat rooms."
 msgstr "這個通訊協定不支援聊天室。"
 
-#: src/gtkblist.c:4747
+#: ../src/gtkblist.c:4932
 msgid "You are not currently signed on with any protocols that have the ability to chat."
 msgstr "您並未登入任何一個可供您加入聊天室的通訊協定。"
 
-#: src/gtkblist.c:4764
+#: ../src/gtkblist.c:4949
 msgid "Add Chat"
 msgstr "新增聊天室"
 
-#: src/gtkblist.c:4788
+#: ../src/gtkblist.c:4973
 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:4870
-#: src/protocols/sametime/sametime.c:5393
-#: src/protocols/sametime/sametime.c:5477
+#: ../src/gtkblist.c:5055
+#: ../src/protocols/sametime/sametime.c:5316
+#: ../src/protocols/sametime/sametime.c:5403
 msgid "Add Group"
 msgstr "加入群組"
 
-#: src/gtkblist.c:4871
+#: ../src/gtkblist.c:5056
 msgid "Please enter the name of the group to be added."
 msgstr "請給您新增的群組輸入名稱。"
 
-#: src/gtkblist.c:5495
+#: ../src/gtkblist.c:5675
 msgid "_Edit Account"
 msgstr "編輯帳號(_E)"
 
 #  NOTE 這不是「不允許」而是「沒有」,尤其是在新的「模組相關指令」清單,
 #  NOTE 譯成「不允許」會非常怪
-#: src/gtkblist.c:5528
-#: src/gtkblist.c:5534
+#: ../src/gtkblist.c:5708
+#: ../src/gtkblist.c:5714
+#: ../src/gtkconv.c:2750
 msgid "No actions available"
 msgstr "沒有相關指令"
 
-# #NOTE 實際測試過系統功能後,發現這個「Disable」指的是結束帳號的連線狀態,所以翻譯成「離線」應該是蠻合適的。
-#: src/gtkblist.c:5542
+# #NOTE 和下一個「Enable Account」對應。
+#: ../src/gtkblist.c:5722
 msgid "_Disable"
-msgstr "離線(_D)"
-
-#: src/gtkblist.c:5554
+msgstr "停用帳號(_D)"
+
+#: ../src/gtkblist.c:5734
 msgid "Enable Account"
 msgstr "啟動帳號"
 
-#: src/gtkblist.c:5609
+#: ../src/gtkblist.c:5787
 msgid "/Tools"
 msgstr "/工具"
 
-#: src/gtkblist.c:5704
+#: ../src/gtkblist.c:5873
 msgid "/Buddies/Sort Buddies"
 msgstr "/好友/好友清單排序"
 
-#: src/gtkcellview.c:198
-#, fuzzy
-msgid "Background color name"
-msgstr "背景顏色"
-
-#: src/gtkcellview.c:199
-#, fuzzy
-msgid "Background color as a string"
-msgstr "背景顏色"
-
-#: src/gtkcellview.c:205
-#: src/gtkimhtmltoolbar.c:1007
-msgid "Background color"
-msgstr "背景顏色"
-
-#: src/gtkcellview.c:206
-#, fuzzy
-msgid "Background color as a GdkColor"
-msgstr "背景顏色"
-
-#: src/gtkcellview.c:213
-#, fuzzy
-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 "Combo Box的樣式"
-
-#: src/gtkcombobox.c:498
-msgid "Wrap width"
-msgstr "換行寬度"
-
-#: src/gtkcombobox.c:499
-msgid "Wrap width for layouting the items in a grid"
-msgstr "控制項在 Grid 中顯示的換行寬度"
-
-#: src/gtkcombobox.c:508
-msgid "Row span column"
-msgstr "橫向跨欄"
-
-#: src/gtkcombobox.c:509
-msgid "TreeModel column containing the row span values"
-msgstr ""
-
-#: src/gtkcombobox.c:518
-msgid "Column span column"
-msgstr "縱向跨欄"
-
-#: src/gtkcombobox.c:520
-msgid "TreeModel column containing the column span values"
-msgstr ""
-
-#  XXX 這個有點怪,譯錯?
-#: src/gtkcombobox.c:529
-#, fuzzy
-msgid "Active item"
-msgstr "啟動"
-
-#: src/gtkcombobox.c:530
-#, fuzzy
-msgid "The item which is currently active"
-msgstr "目前無法使用聊天室"
-
-#  NOTE 這是「看來是離線」。其他協定的「離線」狀態也不一定真的是離線,我想只譯「離線」也不太離譜
-#: src/gtkcombobox.c:538
-#, fuzzy
-msgid "Appears as list"
-msgstr "離線"
-
-#: src/gtkcombobox.c:539
-msgid "Whether combobox dropdowns should look like lists rather than menus"
-msgstr ""
-
-#: src/gtkconn.c:226
-#, c-format
-msgid "%s disconnected"
-msgstr "%s 結束連線"
-
-#: src/gtkconn.c:227
-#, c-format
-msgid "%s was disconnected due to an error. %s The account has been disabled. Correct the error and re-enable the account to connect."
-msgstr ""
-
-#: src/gtkconv.c:349
-#, c-format
-msgid "me is using Gaim v%s."
-msgstr "我在用 Gaim v%s。"
-
-#: src/gtkconv.c:358
+#: ../src/gtkconn.c:187
+#, c-format
+msgid ""
+"%s was disconnected due to an error: %s\n"
+"Gaim will not attempt to reconnect the account until you correct the error and re-enable the account."
+msgstr ""
+"%s 因為下列原因而離線:%s\n"
+"在您更正這個錯誤並重新啟動這個帳號前,Gaim 將不會再試著重新連線。"
+
+#: ../src/gtkconv.c:372
 msgid "Supported debug options are:  version"
 msgstr "支援的除錯選項有:version"
 
-#: src/gtkconv.c:394
+#: ../src/gtkconv.c:408
 msgid "No such command (in this context)."
 msgstr "沒有這個指令(可在這裏使用)"
 
-#: src/gtkconv.c:397
+#: ../src/gtkconv.c:411
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -2868,565 +3079,654 @@
 "要獲得某一指令的說明,輸入「/help &lt;指令&gt;」即可。\n"
 "在這裏,可用的指令有:\n"
 
-#: src/gtkconv.c:469
+#: ../src/gtkconv.c:478
 msgid "No such command."
 msgstr "無此指令。"
 
-#: src/gtkconv.c:476
+#: ../src/gtkconv.c:485
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr "語法錯誤:輸入的參數少於指令所需的參數數量。"
 
-#: src/gtkconv.c:481
+#: ../src/gtkconv.c:490
 msgid "Your command failed for an unknown reason."
 msgstr "指令執行失敗,原因不明。"
 
-#: src/gtkconv.c:488
+#: ../src/gtkconv.c:497
 msgid "That command only works in chats, not IMs."
 msgstr "這個指令只在聊天室內有效,在即時訊息中無效。"
 
-#: src/gtkconv.c:491
+#: ../src/gtkconv.c:500
 msgid "That command only works in IMs, not chats."
 msgstr "這個指令只在即時訊息中有效,在聊天室內無效。"
 
-#: src/gtkconv.c:495
+#: ../src/gtkconv.c:504
 msgid "That command doesn't work on this protocol."
 msgstr "這個指令在這個通訊協定內無效。"
 
-#: src/gtkconv.c:729
-#: src/gtkconv.c:755
+#: ../src/gtkconv.c:739
+#: ../src/gtkconv.c:765
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "該個好友與這個聊天並非使用同一種的通訊協定"
 
 # XXX 暫譯
-#: src/gtkconv.c:749
+#: ../src/gtkconv.c:759
 msgid "You are not currently signed on with an account that can invite that buddy."
 msgstr "您並未登入任何一個可供您邀請哪個好友的通訊協定。"
 
-#: src/gtkconv.c:802
+#: ../src/gtkconv.c:812
 msgid "Invite Buddy Into Chat Room"
 msgstr "邀請好友進入聊天室"
 
 #. Put our happy label in it.
-#: src/gtkconv.c:832
+#: ../src/gtkconv.c:842
 msgid "Please enter the name of the user you wish to invite, along with an optional invite message."
 msgstr "請輸入您想邀請的使用者名稱,以及邀請的訊息。"
 
-#: src/gtkconv.c:853
+#: ../src/gtkconv.c:863
 msgid "_Buddy:"
 msgstr "好友(_B):"
 
-#: src/gtkconv.c:873
-#: src/gtksavedstatuses.c:1077
-#: src/gtksavedstatuses.c:1395
+#: ../src/gtkconv.c:883
+#: ../src/gtksavedstatuses.c:1111
+#: ../src/gtksavedstatuses.c:1447
 msgid "_Message:"
 msgstr "訊息(_M):"
 
-#: src/gtkconv.c:930
-#: src/gtkconv.c:2275
-#: src/gtkdebug.c:217
-#: src/gtkft.c:487
+#: ../src/gtkconv.c:940
+#: ../src/gtkconv.c:2367
+#: ../src/gtkdebug.c:217
+#: ../src/gtkft.c:490
 msgid "Unable to open file."
 msgstr "無法開啟檔案。"
 
-#: src/gtkconv.c:936
+#: ../src/gtkconv.c:946
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>與 %s 的交談</h1>\n"
 
-#: src/gtkconv.c:960
+#: ../src/gtkconv.c:970
 msgid "Save Conversation"
 msgstr "儲存聊天內容"
 
-#: src/gtkconv.c:1077
-#: src/gtkdebug.c:165
-#: src/gtkdebug.c:678
+#: ../src/gtkconv.c:1091
+#: ../src/gtkdebug.c:165
+#: ../src/gtkdebug.c:678
 msgid "Find"
 msgstr "搜尋"
 
-#: src/gtkconv.c:1103
-#: src/gtkdebug.c:193
+#: ../src/gtkconv.c:1117
+#: ../src/gtkdebug.c:193
 msgid "_Search for:"
 msgstr "搜尋(_S):"
 
-#: src/gtkconv.c:1274
+#: ../src/gtkconv.c:1288
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr "日誌系統啟動。未來在這個交談中的訊息都將被記錄於日誌中。"
 
-#: src/gtkconv.c:1282
+#: ../src/gtkconv.c:1296
 msgid "Logging stopped. Future messages in this conversation will not be logged."
 msgstr "日誌系統關閉。未來在這個交談中的訊息都將不會被記錄於日誌中。"
 
-#: src/gtkconv.c:1536
+#: ../src/gtkconv.c:1561
 msgid "IM"
 msgstr "即時訊息"
 
-#: src/gtkconv.c:1542
-#: src/protocols/oscar/oscar.c:628
+#: ../src/gtkconv.c:1572
+#: ../src/protocols/oscar/oscar.c:640
 msgid "Send File"
 msgstr "傳送檔案"
 
-#: src/gtkconv.c:1549
+#: ../src/gtkconv.c:1587
 msgid "Un-Ignore"
 msgstr "取消忽略使用者"
 
 #  NOTE「Ignore」原譯「忽略使用者」,但 gtkprefs.c 中的「Ignore」
 #  NOTE 乃「忽略格式」的意思,故只能譯成「忽略」
-#: src/gtkconv.c:1552
+#: ../src/gtkconv.c:1590
 msgid "Ignore"
 msgstr "忽略"
 
 # XXX「Info」的作用似乎係取得使用者資訊,但不肯定,看了其他po檔仍是不肯定這是什麼
 # XXX javajsp (Ka-Hing CHEUNG) 見過的「Info」按紐全都是「取得使用者資訊」
-#: src/gtkconv.c:1558
+#: ../src/gtkconv.c:1600
 msgid "Info"
 msgstr "取得資訊"
 
-#: src/gtkconv.c:1564
+#: ../src/gtkconv.c:1610
 msgid "Get Away Message"
 msgstr "取得離開訊息"
 
-#: src/gtkconv.c:2283
+#: ../src/gtkconv.c:1633
+#, fuzzy
+msgid "Last said"
+msgstr "更新日期"
+
+#: ../src/gtkconv.c:2375
 msgid "Unable to save icon file to disk."
 msgstr "無法儲存圖示檔案至磁碟上。"
 
-#: src/gtkconv.c:2306
+#: ../src/gtkconv.c:2399
 msgid "Save Icon"
 msgstr "儲存圖示"
 
-#: src/gtkconv.c:2355
+#: ../src/gtkconv.c:2448
 msgid "Animate"
 msgstr "動畫"
 
-#: src/gtkconv.c:2360
+#: ../src/gtkconv.c:2453
 msgid "Hide Icon"
 msgstr "隱藏圖示"
 
 #  NOTE 這是Right-Click圖示時顯示的指令,譯「As」為「為」會很奇怪
-#: src/gtkconv.c:2366
+#: ../src/gtkconv.c:2459
 msgid "Save Icon As..."
 msgstr "儲存圖示..."
 
 #. Conversation menu
-#: src/gtkconv.c:2507
+#: ../src/gtkconv.c:2599
 msgid "/_Conversation"
 msgstr "/交談(_C)"
 
-#: src/gtkconv.c:2509
+#: ../src/gtkconv.c:2601
 msgid "/Conversation/New Instant _Message..."
 msgstr "/好友/新即時訊息(_M)..."
 
-#: src/gtkconv.c:2514
+#: ../src/gtkconv.c:2606
 msgid "/Conversation/_Find..."
 msgstr "/交談/搜尋(_F)..."
 
-#: src/gtkconv.c:2516
+#: ../src/gtkconv.c:2608
 msgid "/Conversation/View _Log"
 msgstr "/交談/觀看歷史記錄(_L)"
 
-#: src/gtkconv.c:2517
+#: ../src/gtkconv.c:2609
 msgid "/Conversation/_Save As..."
 msgstr "/交談/另存新檔(_S)..."
 
-#: src/gtkconv.c:2519
-msgid "/Conversation/Clea_r"
-msgstr "/交談/清空(_R)"
-
-#: src/gtkconv.c:2523
+#: ../src/gtkconv.c:2611
+msgid "/Conversation/Clea_r Scrollback"
+msgstr "/交談/清空交談內容(_R)"
+
+#: ../src/gtkconv.c:2615
 msgid "/Conversation/Se_nd File..."
 msgstr "/交談/傳送檔案(_N)..."
 
-#: src/gtkconv.c:2524
+#: ../src/gtkconv.c:2616
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/交談/新增好友狀態捕捉(_P)..."
 
-#: src/gtkconv.c:2526
+#: ../src/gtkconv.c:2618
 msgid "/Conversation/_Get Info"
 msgstr "/交談/取得資訊(_G)"
 
-#: src/gtkconv.c:2528
+#: ../src/gtkconv.c:2620
 msgid "/Conversation/In_vite..."
 msgstr "/交談/邀請(_V)..."
 
-#: src/gtkconv.c:2533
+#: ../src/gtkconv.c:2622
+msgid "/Conversation/M_ore"
+msgstr "/交談/更多(_O)"
+
+#: ../src/gtkconv.c:2626
 msgid "/Conversation/Al_ias..."
 msgstr "/交談/別名(_I)..."
 
-#: src/gtkconv.c:2535
+#: ../src/gtkconv.c:2628
 msgid "/Conversation/_Block..."
 msgstr "/交談/封鎖(_B)..."
 
-#: src/gtkconv.c:2537
+#: ../src/gtkconv.c:2630
 msgid "/Conversation/_Add..."
 msgstr "/交談/新增(_A)..."
 
-#: src/gtkconv.c:2539
+#: ../src/gtkconv.c:2632
 msgid "/Conversation/_Remove..."
 msgstr "/交談/移除(_R)..."
 
-#: src/gtkconv.c:2544
+#: ../src/gtkconv.c:2637
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/交談/插入連結(_k)..."
 
-#: src/gtkconv.c:2546
+#: ../src/gtkconv.c:2639
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/交談/插入影像(_E)..."
 
-#: src/gtkconv.c:2551
+#: ../src/gtkconv.c:2644
 msgid "/Conversation/_Close"
 msgstr "/交談/關閉(_C)"
 
 #. Options
-#: src/gtkconv.c:2555
+#: ../src/gtkconv.c:2648
 msgid "/_Options"
 msgstr "/選項(_O)"
 
-#: src/gtkconv.c:2556
+#: ../src/gtkconv.c:2649
 msgid "/Options/Enable _Logging"
 msgstr "/選項/開始記錄日誌(_L)"
 
-#: src/gtkconv.c:2557
+#: ../src/gtkconv.c:2650
 msgid "/Options/Enable _Sounds"
 msgstr "/選項/開啟音效(_S)"
 
-#: src/gtkconv.c:2558
+#: ../src/gtkconv.c:2651
 msgid "/Options/Show Buddy _Icon"
 msgstr "/選項/顯示好友圖示(_I)"
 
-#: src/gtkconv.c:2560
+#: ../src/gtkconv.c:2653
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/選項/顯示格式工具列(_T)"
 
-#: src/gtkconv.c:2561
+#: ../src/gtkconv.c:2654
 msgid "/Options/Show Ti_mestamps"
 msgstr "/選項/顯示時間戳記(_M)"
 
-#: src/gtkconv.c:2601
+#: ../src/gtkconv.c:2729
+msgid "/Conversation/More"
+msgstr "/交談/更多"
+
+#: ../src/gtkconv.c:2767
+#: ../src/gtkconv.c:2794
+msgid "/Conversation"
+msgstr "/交談"
+
+#: ../src/gtkconv.c:2804
 msgid "/Conversation/View Log"
 msgstr "/交談/觀看歷史記錄"
 
-#: src/gtkconv.c:2607
+#: ../src/gtkconv.c:2810
 msgid "/Conversation/Send File..."
 msgstr "/交談/傳送檔案..."
 
-#: src/gtkconv.c:2611
+#: ../src/gtkconv.c:2814
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/交談/新增好友狀態捕捉..."
 
-#: src/gtkconv.c:2617
+#: ../src/gtkconv.c:2820
 msgid "/Conversation/Get Info"
 msgstr "/交談/取得資訊"
 
-#: src/gtkconv.c:2621
+#: ../src/gtkconv.c:2824
 msgid "/Conversation/Invite..."
 msgstr "/交談/邀請..."
 
-#: src/gtkconv.c:2627
+#: ../src/gtkconv.c:2830
 msgid "/Conversation/Alias..."
 msgstr "/交談/別名..."
 
-#: src/gtkconv.c:2631
+#: ../src/gtkconv.c:2834
 msgid "/Conversation/Block..."
 msgstr "/交談/封鎖..."
 
-#: src/gtkconv.c:2635
+#: ../src/gtkconv.c:2838
 msgid "/Conversation/Add..."
 msgstr "/交談/新增..."
 
-#: src/gtkconv.c:2639
+#: ../src/gtkconv.c:2842
 msgid "/Conversation/Remove..."
 msgstr "/交談/移除..."
 
-#: src/gtkconv.c:2645
+#: ../src/gtkconv.c:2848
 msgid "/Conversation/Insert Link..."
 msgstr "/交談/插入連結..."
 
-#: src/gtkconv.c:2649
+#: ../src/gtkconv.c:2852
 msgid "/Conversation/Insert Image..."
 msgstr "/交談/插入影像..."
 
-#: src/gtkconv.c:2655
+#: ../src/gtkconv.c:2858
 msgid "/Options/Enable Logging"
 msgstr "/選項/開始記錄日誌"
 
-#: src/gtkconv.c:2658
+#: ../src/gtkconv.c:2861
 msgid "/Options/Enable Sounds"
 msgstr "/選項/開啟音效"
 
-#: src/gtkconv.c:2661
+#: ../src/gtkconv.c:2874
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/選項/顯示格式工具列"
 
-#: src/gtkconv.c:2664
+#: ../src/gtkconv.c:2877
 msgid "/Options/Show Timestamps"
 msgstr "/選項/顯示時間戳記"
 
-#: src/gtkconv.c:2667
+#: ../src/gtkconv.c:2880
 msgid "/Options/Show Buddy Icon"
 msgstr "/選項/顯示好友圖示"
 
-#: src/gtkconv.c:2739
+#: ../src/gtkconv.c:2956
 msgid "User is typing..."
 msgstr "使用者正在輸入..."
 
-#: src/gtkconv.c:2742
-#, fuzzy
+#: ../src/gtkconv.c:2959
 msgid "User has typed something and stopped"
-msgstr "使用者開始了輸入,不過暫停了"
+msgstr "使用者輸入了一些東西,不過暫停了"
 
 #. Build the Send To menu
-#: src/gtkconv.c:2890
+#: ../src/gtkconv.c:3142
 msgid "_Send To"
 msgstr "傳送到(_S)"
 
-#: src/gtkconv.c:3537
-#: src/protocols/sametime/sametime.c:3490
+#: ../src/gtkconv.c:3849
+msgid "_Send"
+msgstr "傳送(_S)"
+
+#: ../src/gtkconv.c:3904
+#: ../src/protocols/sametime/sametime.c:3564
 msgid "Topic:"
 msgstr "主題:"
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:3585
+#: ../src/gtkconv.c:3956
 msgid "0 people in room"
 msgstr "沒有人在這個房間"
 
-#: src/gtkconv.c:3664
+#: ../src/gtkconv.c:4034
 msgid "IM the user"
 msgstr "送出即時訊息給使用者"
 
-#: src/gtkconv.c:3677
+#: ../src/gtkconv.c:4047
 msgid "Ignore the user"
 msgstr "忽略使用者"
 
-#: src/gtkconv.c:3689
+#: ../src/gtkconv.c:4059
 msgid "Get the user's information"
 msgstr "取得使用者資訊"
 
-#: src/gtkconv.c:4580
-#: src/gtkconv.c:4685
-#: src/gtkconv.c:4740
+#: ../src/gtkconv.c:5048
+#: ../src/gtkconv.c:5167
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d 個人在這個房間"
 msgstr[1] "%d 個人在這個房間"
 
-#: src/gtkconv.c:5979
+#: ../src/gtkconv.c:5727
+#: ../src/gtkstatusbox.c:366
+msgid "Typing"
+msgstr "輸入中"
+
+#: ../src/gtkconv.c:5733
+msgid "Stopped Typing"
+msgstr "停止輸入"
+
+#: ../src/gtkconv.c:5738
+#, fuzzy
+msgid "Nick Said"
+msgstr "暱稱"
+
+#: ../src/gtkconv.c:5748
+msgid "New Event"
+msgstr "新事件"
+
+#: ../src/gtkconv.c:6650
 msgid "say &lt;message&gt;:  Send a message normally as if you weren't using a command."
 msgstr "say &lt;訊息&gt;:將指定的訊息當成一般訊息正常送出,而非當為指令處理。"
 
-#: src/gtkconv.c:5982
+#: ../src/gtkconv.c:6653
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;要執行的動作&gt;:模仿IRC,執行一個動作。"
 
-#: src/gtkconv.c:5985
+#: ../src/gtkconv.c:6656
 msgid "debug &lt;option&gt;:  Send various debug information to the current conversation."
 msgstr "debug &lt;選項&gt;:向目前的交談送出一些除錯資訊。"
 
 # XXX
-#: src/gtkconv.c:5988
+#: ../src/gtkconv.c:6659
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear:清空交談的回捲緩衝區"
 
-#: src/gtkconv.c:5991
+#: ../src/gtkconv.c:6662
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;指令&gt;:顯示某一指令的說明。"
 
-#: src/gtkconv.c:6124
+#: ../src/gtkconv.c:6821
 msgid "Confirm close"
 msgstr "確認關閉"
 
-#: src/gtkconv.c:6156
+#: ../src/gtkconv.c:6853
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "您還有未讀取的訊息。您確定要關閉這個視窗嗎?"
 
-#: src/gtkconv.c:6952
+#: ../src/gtkconv.c:7375
+msgid "Close other tabs"
+msgstr "關閉其他分頁"
+
+#: ../src/gtkconv.c:7381
+msgid "Close all tabs"
+msgstr "關閉所有分頁"
+
+#: ../src/gtkconv.c:7389
+msgid "Detach this tab"
+msgstr "分離這個分頁"
+
+#: ../src/gtkconv.c:7395
+msgid "Close this tab"
+msgstr "關閉這個分頁"
+
+#: ../src/gtkconv.c:7655
 msgid "Close conversation"
 msgstr "關閉交談"
 
-#: src/gtkconv.c:7416
+#: ../src/gtkconv.c:8119
 msgid "Last created window"
 msgstr "上一個開啟的視窗"
 
-#: src/gtkconv.c:7418
+#: ../src/gtkconv.c:8121
 msgid "Separate IM and Chat windows"
 msgstr "以不同的視窗顯示即時訊息和聊天"
 
-#: src/gtkconv.c:7420
-#: src/gtkprefs.c:1232
+#: ../src/gtkconv.c:8123
+#: ../src/gtkprefs.c:1258
 msgid "New window"
 msgstr "新視窗"
 
-#: src/gtkconv.c:7422
+#: ../src/gtkconv.c:8125
 msgid "By group"
 msgstr "依群組"
 
-#: src/gtkconv.c:7424
+#: ../src/gtkconv.c:8127
 msgid "By account"
 msgstr "依帳號"
 
 #  NOTE「除錯日誌」很怪,「除錯紀錄」較順口,而且已經有人用
-#: src/gtkdebug.c:232
+#: ../src/gtkdebug.c:232
 msgid "Save Debug Log"
 msgstr "儲存除錯紀錄"
 
 # NOTE 可能是指「反向選取」
-#: src/gtkdebug.c:586
+#: ../src/gtkdebug.c:586
 msgid "Invert"
 msgstr "反向"
 
-#: src/gtkdebug.c:589
+#: ../src/gtkdebug.c:589
 msgid "Highlight matches"
 msgstr ""
 
-#: src/gtkdebug.c:636
+#: ../src/gtkdebug.c:636
 msgid "Debug Window"
 msgstr "除錯視窗"
 
-#: src/gtkdebug.c:689
+#: ../src/gtkdebug.c:689
 msgid "Clear"
 msgstr "清除"
 
-#: src/gtkdebug.c:698
+#: ../src/gtkdebug.c:698
 msgid "Pause"
 msgstr "暫停"
 
-#: src/gtkdebug.c:705
-#: src/gtkdebug.c:706
+#: ../src/gtkdebug.c:705
+#: ../src/gtkdebug.c:706
 msgid "Timestamps"
 msgstr "時間戳記"
 
-#: src/gtkdebug.c:724
+#: ../src/gtkdebug.c:724
 msgid "Filter"
 msgstr "過濾器"
 
-#  NOTE 譯文更動 by Ambrose
-#: src/gtkdebug.c:743
-#, fuzzy
+#: ../src/gtkdebug.c:743
 msgid "Right click for more options."
-msgstr "顯示細節"
-
-#: src/gtkdialogs.c:61
-#: src/gtkdialogs.c:99
+msgstr "按右鍵以顯示更多選項。"
+
+#: ../src/gtkdialogs.c:61
+#: ../src/gtkdialogs.c:104
 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:62
+#: ../src/gtkdialogs.c:63
+#: ../src/gtkdialogs.c:65
+#: ../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 "開發者"
 
-#: src/gtkdialogs.c:64
+#: ../src/gtkdialogs.c:64
 msgid "win32 port"
 msgstr "Windows 版本移植"
 
-#: 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:93
-#: src/gtkdialogs.c:94
+#: ../src/gtkdialogs.c:97
+#: ../src/gtkdialogs.c:98
 msgid "maintainer"
 msgstr "維護者"
 
-#: src/gtkdialogs.c:95
+#: ../src/gtkdialogs.c:99
 msgid "libfaim maintainer"
 msgstr "libfaim 維護者"
 
-#: src/gtkdialogs.c:96
+#. If "lazy bum" translates literally into a serious insult, use something else or omit it.
+#: ../src/gtkdialogs.c:101
 msgid "hacker and designated driver [lazy bum]"
 msgstr "程式編寫者兼指定司機 [懶人]"
 
-#: src/gtkdialogs.c:97
+#: ../src/gtkdialogs.c:102
 msgid "Jabber developer"
 msgstr "Jabber 開發者"
 
-#: src/gtkdialogs.c:98
+#: ../src/gtkdialogs.c:103
 msgid "original author"
 msgstr "原作者"
 
-#: src/gtkdialogs.c:105
-#: src/gtkdialogs.c:106
-#: src/gtkdialogs.c:154
+#: ../src/gtkdialogs.c:110
+#: ../src/gtkdialogs.c:111
+#: ../src/gtkdialogs.c:174
 msgid "Bulgarian"
 msgstr "保加利亞文"
 
-#: src/gtkdialogs.c:107
-#, fuzzy
+#: ../src/gtkdialogs.c:112
+#: ../src/gtkdialogs.c:113
+msgid "Bengali"
+msgstr "孟加拉文"
+
+#: ../src/gtkdialogs.c:114
 msgid "Bosnian"
-msgstr "愛沙尼亞文"
-
-#: src/gtkdialogs.c:108
-#: src/gtkdialogs.c:155
-#: src/gtkdialogs.c:156
+msgstr "波士尼亞文"
+
+#: ../src/gtkdialogs.c:115
+#: ../src/gtkdialogs.c:175
+#: ../src/gtkdialogs.c:176
 msgid "Catalan"
 msgstr "加泰隆文"
 
-#: src/gtkdialogs.c:109
-#: src/gtkdialogs.c:157
+#: ../src/gtkdialogs.c:116
+#: ../src/gtkdialogs.c:117
+#, fuzzy
+msgid "Valencian-Catalan"
+msgstr "瓦倫西亞文"
+
+#: ../src/gtkdialogs.c:118
+#: ../src/gtkdialogs.c:177
 msgid "Czech"
 msgstr "捷克文"
 
-#: src/gtkdialogs.c:110
+#: ../src/gtkdialogs.c:119
 msgid "Danish"
 msgstr "丹麥文"
 
-#: src/gtkdialogs.c:111
-#: src/gtkdialogs.c:158
+#: ../src/gtkdialogs.c:120
+#: ../src/gtkdialogs.c:121
+#: ../src/gtkdialogs.c:178
 msgid "German"
 msgstr "德文"
 
-#: src/gtkdialogs.c:112
-#: src/gtkdialogs.c:113
+#: ../src/gtkdialogs.c:122
+#: ../src/gtkdialogs.c:123
 msgid "Greek"
 msgstr "希臘文"
 
-#: src/gtkdialogs.c:114
+#: ../src/gtkdialogs.c:124
 msgid "Australian English"
 msgstr "澳洲式英文"
 
-#: src/gtkdialogs.c:115
+#: ../src/gtkdialogs.c:125
 msgid "Canadian English"
 msgstr "加拿大式英文"
 
-#: src/gtkdialogs.c:116
+#: ../src/gtkdialogs.c:126
 msgid "British English"
 msgstr "英式英文"
 
-#: src/gtkdialogs.c:117
-#: src/gtkdialogs.c:159
+#: ../src/gtkdialogs.c:127
+#: ../src/gtkdialogs.c:179
+#: ../src/gtkdialogs.c:180
+#: ../src/gtkdialogs.c:181
+#: ../src/gtkdialogs.c:182
 msgid "Spanish"
 msgstr "西班牙文"
 
-#: src/gtkdialogs.c:118
-#: src/gtkdialogs.c:160
+#: ../src/gtkdialogs.c:128
+#: ../src/gtkdialogs.c:129
+msgid "Euskera(Basque)"
+msgstr ""
+
+#: ../src/gtkdialogs.c:130
+#: ../src/gtkdialogs.c:131
+msgid "Persian"
+msgstr "波斯文"
+
+#: ../src/gtkdialogs.c:132
+#: ../src/gtkdialogs.c:183
+#: ../src/gtkdialogs.c:184
 msgid "Finnish"
 msgstr "芬蘭文"
 
-#: src/gtkdialogs.c:119
-#: src/gtkdialogs.c:161
+#: ../src/gtkdialogs.c:133
+#: ../src/gtkdialogs.c:185
+#: ../src/gtkdialogs.c:186
+#: ../src/gtkdialogs.c:187
+#: ../src/gtkdialogs.c:188
 msgid "French"
 msgstr "法文"
 
-#: src/gtkdialogs.c:120
+#: ../src/gtkdialogs.c:134
+msgid "Galician"
+msgstr "加里西亞語"
+
+#: ../src/gtkdialogs.c:135
+#: ../src/gtkdialogs.c:189
 msgid "Hebrew"
 msgstr "希伯來文"
 
-#: src/gtkdialogs.c:121
+#: ../src/gtkdialogs.c:136
 msgid "Hindi"
 msgstr "北印度文"
 
-#: src/gtkdialogs.c:122
+#: ../src/gtkdialogs.c:137
 msgid "Hungarian"
 msgstr "匈牙利文"
 
@@ -3434,247 +3734,262 @@
 #  NOTE 國語去聲不分陰陽,廣東話兩聲卻相差甚遠。臺灣有網站寫「意大利」,
 #  NOTE 臺灣的中國圖書分類法亦有「意大利」條,譯「意大利」應該比較好。
 #  NOTE【參見「Slovenian」】
-#: src/gtkdialogs.c:123
-#: src/gtkdialogs.c:162
+#: ../src/gtkdialogs.c:138
+#: ../src/gtkdialogs.c:190
 msgid "Italian"
 msgstr "意大利文"
 
-#: src/gtkdialogs.c:124
-#: src/gtkdialogs.c:163
+#: ../src/gtkdialogs.c:139
+#: ../src/gtkdialogs.c:191
+#: ../src/gtkdialogs.c:192
+#: ../src/gtkdialogs.c:193
 msgid "Japanese"
 msgstr "日文"
 
-#: src/gtkdialogs.c:125
+#: ../src/gtkdialogs.c:140
+#: ../src/gtkdialogs.c:194
 msgid "Georgian"
 msgstr "喬治亞文"
 
-#: src/gtkdialogs.c:126
-#: src/gtkdialogs.c:164
+#: ../src/gtkdialogs.c:141
+#: ../src/gtkdialogs.c:195
 msgid "Korean"
 msgstr "韓文"
 
-#: src/gtkdialogs.c:127
-#, fuzzy
+#: ../src/gtkdialogs.c:142
+#: ../src/gtkdialogs.c:143
+#: ../src/gtkdialogs.c:144
 msgid "Kurdish"
-msgstr "土耳其文"
-
-#: src/gtkdialogs.c:128
+msgstr "庫德文"
+
+#: ../src/gtkdialogs.c:145
+#: ../src/gtkdialogs.c:196
+#: ../src/gtkdialogs.c:197
 msgid "Lithuanian"
 msgstr "立陶宛文"
 
 #  NOTE「馬其頓文」是一種東歐語文,跟希臘的馬其頓並無關係
-#: src/gtkdialogs.c:129
+#: ../src/gtkdialogs.c:146
 msgid "Macedonian"
 msgstr "馬其頓文"
 
 # NOTE Flemish 譯法是跟了http://www.ee.tku.edu.tw/~rexchen/cdict/
 # XXX Dutch 和 Flemish 是同一種語言,是否應該只寫「荷蘭文」,刪去「法蘭德斯文」?
-#: src/gtkdialogs.c:130
-#, fuzzy
+#: ../src/gtkdialogs.c:147
 msgid "Dutch, Flemish"
 msgstr "荷蘭文/法蘭德斯文"
 
-#: src/gtkdialogs.c:131
+#: ../src/gtkdialogs.c:148
 msgid "Norwegian"
 msgstr "挪威文"
 
-#: src/gtkdialogs.c:132
-#: src/gtkdialogs.c:133
-#: src/gtkdialogs.c:165
+#: ../src/gtkdialogs.c:149
+#: ../src/gtkdialogs.c:150
+#: ../src/gtkdialogs.c:198
 msgid "Polish"
 msgstr "波蘭文"
 
-#: src/gtkdialogs.c:134
+#: ../src/gtkdialogs.c:151
 msgid "Portuguese"
 msgstr "標準萄文"
 
-#: src/gtkdialogs.c:135
+#: ../src/gtkdialogs.c:152
 msgid "Portuguese-Brazil"
 msgstr "巴西萄文"
 
-#: src/gtkdialogs.c:136
+#: ../src/gtkdialogs.c:153
 msgid "Romanian"
 msgstr "羅馬尼亞文"
 
-#: src/gtkdialogs.c:137
-#: src/gtkdialogs.c:166
-#: src/gtkdialogs.c:167
+#: ../src/gtkdialogs.c:154
+#: ../src/gtkdialogs.c:199
+#: ../src/gtkdialogs.c:200
 msgid "Russian"
 msgstr "俄文"
 
-#: src/gtkdialogs.c:138
-#: src/gtkdialogs.c:139
+#: ../src/gtkdialogs.c:155
+#: ../src/gtkdialogs.c:156
 msgid "Serbian"
 msgstr "塞爾維亞文"
 
+#: ../src/gtkdialogs.c:157
+#: ../src/gtkdialogs.c:201
+msgid "Slovak"
+msgstr "斯洛伐克文"
+
 #  NOTE 港譯「斯洛文尼亞」,臺譯「斯洛維尼亞」。粵語「文」字為M起音,
 #  NOTE 以粵語發音,跟臺譯反而發音較準;況且,這至少名義上也是zh_TW;
 #  NOTE 所以不跟港譯(其實是大陸譯法),跟臺譯。
 #  NOTE【參見「Italian」】
-#: src/gtkdialogs.c:140
+#: ../src/gtkdialogs.c:158
 msgid "Slovenian"
 msgstr "斯洛維尼亞文"
 
-#: src/gtkdialogs.c:141
-#: src/gtkdialogs.c:169
+#: ../src/gtkdialogs.c:159
+#: ../src/gtkdialogs.c:202
 msgid "Swedish"
 msgstr "瑞典文"
 
-#: src/gtkdialogs.c:142
+#: ../src/gtkdialogs.c:160
 msgid "Tamil"
 msgstr "終端機"
 
-#: src/gtkdialogs.c:143
+#: ../src/gtkdialogs.c:161
 msgid "Telugu"
-msgstr ""
-
-#: src/gtkdialogs.c:144
+msgstr "特魯固文"
+
+#: ../src/gtkdialogs.c:162
+msgid "Thai"
+msgstr "泰語"
+
+#: ../src/gtkdialogs.c:163
+msgid "Turkish"
+msgstr "土耳其文"
+
+#: ../src/gtkdialogs.c:164
 msgid "Vietnamese"
 msgstr "越南文"
 
-#: src/gtkdialogs.c:144
+#: ../src/gtkdialogs.c:164
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh 及 Gnome 越南文翻譯小組之其他組員"
 
-#: src/gtkdialogs.c:145
-#: src/gtkdialogs.c:170
+#: ../src/gtkdialogs.c:165
+#: ../src/gtkdialogs.c:203
 msgid "Simplified Chinese"
 msgstr "簡體中文"
 
-#: src/gtkdialogs.c:146
-#: src/gtkdialogs.c:147
-#: src/gtkdialogs.c:171
+#: ../src/gtkdialogs.c:166
+#: ../src/gtkdialogs.c:167
+#: ../src/gtkdialogs.c:204
 msgid "Traditional Chinese"
 msgstr "正體中文"
 
 # XXX Yahoo譯法
-#: src/gtkdialogs.c:153
+#: ../src/gtkdialogs.c:173
 msgid "Amharic"
 msgstr "阿姆哈拉文"
 
-#: src/gtkdialogs.c:168
-msgid "Slovak"
-msgstr "斯洛伐克文"
-
-#: src/gtkdialogs.c:212
+#: ../src/gtkdialogs.c:245
 msgid "About Gaim"
 msgstr "關於 Gaim"
 
-#: src/gtkdialogs.c:236
-msgid "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, and Gadu-Gadu all at once.  It is written using GTK+ and is licensed under the GNU GPL.<BR><BR>"
+#: ../src/gtkdialogs.c:269
+#, fuzzy
+msgid "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, and Gadu-Gadu all at once.  It is written using GTK+.<BR><BR>You may modify and redistribute the program under the terms of the GPL (version 2 or later).  A copy of the GPL is contained in the 'COPYING' file distributed with Gaim.  Gaim is copyrighted by its contributors.  See the 'COPYRIGHT' file for the complete list of contributors.  We provide no warranty for this program.<BR><BR>"
 msgstr "Gaim 是一個模組化的訊息程式,同時提供 AIM、MSN、Yahoo!、Jabber、ICQ、IRC、SILC、Novell GroupWise、Lotus Sametime、Napster、Zephyr,以及 Gadu-Gadu 等功能。它是以 GTK+ 開發,並以 GPL 的方式發佈。<BR><BR>"
 
-#: src/gtkdialogs.c:245
+#: ../src/gtkdialogs.c:283
 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>"
 
 # NOTE  contains zh_TW-specific info here!!
-#: src/gtkdialogs.c:248
+#: ../src/gtkdialogs.c:286
 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><FONT SIZE=\"4\">正體中文化資訊:</FONT> <A HREF=\"http://gaim.myweb.hinet.net/\">http://gaim.myweb.hinet.net/</A><BR><BR>"
 
-#: src/gtkdialogs.c:254
+#: ../src/gtkdialogs.c:292
 msgid "Current Developers"
 msgstr "現任開發者"
 
 # NOTE LSchiere2: wing: it means they must be crazy or they wouldn't work on gaim ;-)
 # NOTE Luke Schierer 說:「這些人一個是瘋了,否則不會為 gaim 賣力」
 # NOTE 不過,翻成「狂熱的模組作者」會比較好
-#: src/gtkdialogs.c:269
+#: ../src/gtkdialogs.c:307
 msgid "Crazy Patch Writers"
 msgstr "狂熱的模組作者"
 
-#: src/gtkdialogs.c:284
+#: ../src/gtkdialogs.c:322
 msgid "Retired Developers"
 msgstr "前任開發者"
 
-#: src/gtkdialogs.c:299
+#: ../src/gtkdialogs.c:337
 msgid "Current Translators"
 msgstr "現任譯者"
 
-#: src/gtkdialogs.c:319
+#: ../src/gtkdialogs.c:357
 msgid "Past Translators"
 msgstr "前任譯者"
 
-#: src/gtkdialogs.c:337
+#: ../src/gtkdialogs.c:375
 msgid "Debugging Information"
 msgstr "除錯訊息"
 
 # NOTE 只能譯「名稱」,因為同時解作「人名」及「模組名稱」
-#: src/gtkdialogs.c:527
-#: src/gtkdialogs.c:664
-#: src/gtkdialogs.c:731
+#: ../src/gtkdialogs.c:595
+#: ../src/gtkdialogs.c:732
+#: ../src/gtkdialogs.c:795
 msgid "_Name"
 msgstr "名稱(_N)"
 
-#: src/gtkdialogs.c:532
-#: src/gtkdialogs.c:669
-#: src/gtkdialogs.c:736
+#: ../src/gtkdialogs.c:600
+#: ../src/gtkdialogs.c:737
+#: ../src/gtkdialogs.c:800
 msgid "_Account"
 msgstr "帳號(_A)"
 
-#: src/gtkdialogs.c:540
+#: ../src/gtkdialogs.c:608
 msgid "New Instant Message"
 msgstr "新即時訊息"
 
-#: src/gtkdialogs.c:542
+#: ../src/gtkdialogs.c:610
 msgid "Please enter the screen name or alias of the person you would like to IM."
 msgstr "請輸入您所想要發送即時訊息對象的帳號。"
 
-#: src/gtkdialogs.c:677
+#: ../src/gtkdialogs.c:745
 msgid "Get User Info"
 msgstr "取得使用者資訊"
 
-#: src/gtkdialogs.c:679
+#: ../src/gtkdialogs.c:747
 msgid "Please enter the screen name or alias of the person whose info you would like to view."
 msgstr "請輸入您所想要查詢對象的帳號。"
 
 #  NOTE 此處譯「讀取」似乎較「取得」好一點
-#: src/gtkdialogs.c:745
+#: ../src/gtkdialogs.c:819
 msgid "View User Log"
 msgstr "觀看使用者日誌"
 
-#: src/gtkdialogs.c:747
+#: ../src/gtkdialogs.c:821
 #, fuzzy
 msgid "Please enter the screen name or alias of the person whose log you would like to view."
 msgstr "請輸入您所想要讀取日誌的使用者的帳號。"
 
 # XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#: src/gtkdialogs.c:766
+#: ../src/gtkdialogs.c:840
 msgid "Alias Contact"
 msgstr "為這組好友加上別名"
 
 # XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
-#: src/gtkdialogs.c:767
+#: ../src/gtkdialogs.c:841
 msgid "Enter an alias for this contact."
 msgstr "請為這組好友輸入一個別名。"
 
-#: src/gtkdialogs.c:769
-#: src/gtkdialogs.c:791
-#: src/gtkdialogs.c:811
-#: src/gtkrequest.c:295
-#: src/protocols/silc/chat.c:586
+#: ../src/gtkdialogs.c:843
+#: ../src/gtkdialogs.c:865
+#: ../src/gtkdialogs.c:885
+#: ../src/gtkrequest.c:277
+#: ../src/protocols/silc/chat.c:587
 msgid "Alias"
 msgstr "別名"
 
-#: src/gtkdialogs.c:787
+#: ../src/gtkdialogs.c:861
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "請為 %s 輸入一個別名"
 
-#: src/gtkdialogs.c:789
+#: ../src/gtkdialogs.c:863
 msgid "Alias Buddy"
 msgstr "為這個好友加上別名"
 
-#: src/gtkdialogs.c:808
+#: ../src/gtkdialogs.c:882
 msgid "Alias Chat"
 msgstr "給聊天室改別名"
 
-#: src/gtkdialogs.c:809
+#: ../src/gtkdialogs.c:883
 msgid "Enter an alias for this chat."
 msgstr "請為這個聊天室輸入一個別名。"
 
-#: src/gtkdialogs.c:846
+#: ../src/gtkdialogs.c:920
 #, c-format
 msgid "You are about to remove the contact containing %s and %d other buddy from your buddy list.  Do you want to continue?"
 msgid_plural "You are about to remove the contact containing %s and %d other buddies from your buddy list.  Do you want to continue?"
@@ -3682,211 +3997,237 @@
 msgstr[1] "您正試著將好友 %s 及相關的其他 %d 個好友從您的好友清單中移除。您要繼續這個動作嗎?"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Gaim無法析別;可能有改進的空間
-#: src/gtkdialogs.c:854
-#: src/gtkdialogs.c:855
+#: ../src/gtkdialogs.c:928
 msgid "Remove Contact"
 msgstr "移除這組好友"
 
-#: src/gtkdialogs.c:913
+# XXX「Remove Buddy」和「Remove Contact」在中文版Gaim無法析別;可能有改進的空間
+#: ../src/gtkdialogs.c:929
+msgid "_Remove Contact"
+msgstr "移除聯絡人(_R)"
+
+#: ../src/gtkdialogs.c:980
 #, 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:916
-#: src/gtkdialogs.c:917
+#: ../src/gtkdialogs.c:983
 msgid "Remove Group"
 msgstr "移除群組"
 
-#: src/gtkdialogs.c:955
+#: ../src/gtkdialogs.c:984
+msgid "_Remove Group"
+msgstr "移除群組(_R)"
+
+#: ../src/gtkdialogs.c:1017
 #, c-format
 msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "您正試著將 %s  從您的好友清單中移除。您要繼續這個動作嗎?"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Gaim無法析別;可能有改進的空間
-#: src/gtkdialogs.c:958
-#: src/gtkdialogs.c:959
+#: ../src/gtkdialogs.c:1020
 msgid "Remove Buddy"
 msgstr "移除這個好友"
 
-#: src/gtkdialogs.c:997
+# XXX「Remove Buddy」和「Remove Contact」在中文版Gaim無法析別;可能有改進的空間
+#: ../src/gtkdialogs.c:1021
+msgid "_Remove Buddy"
+msgstr "移除這個好友(_R)"
+
+#: ../src/gtkdialogs.c:1042
 #, 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:1000
-#: src/gtkdialogs.c:1001
+#: ../src/gtkdialogs.c:1045
 msgid "Remove Chat"
 msgstr "移除聊天室"
 
-#: src/gtkft.c:139
+#: ../src/gtkdialogs.c:1046
+msgid "_Remove Chat"
+msgstr "移除聊天室(_R)"
+
+#: ../src/gtkft.c:133
 #, c-format
 msgid "%.2f KB/s"
 msgstr "%.2f kB/s"
 
-#: src/gtkft.c:160
-#: src/gtkft.c:1063
+#  XXX 這個太奇怪了 (^^;)
+#: ../src/gtkft.c:153
+msgid "Not started"
+msgstr "未啟動"
+
+#: ../src/gtkft.c:162
+#: ../src/gtkft.c:1063
 msgid "Finished"
 msgstr "已完成"
 
-#: src/gtkft.c:163
-#: src/gtkft.c:1003
+#: ../src/gtkft.c:165
+#: ../src/gtkft.c:1003
 msgid "Canceled"
 msgstr "已取消"
 
 #  XXX 暫譯
-#: src/gtkft.c:166
-#: src/gtkft.c:922
+#: ../src/gtkft.c:168
+#: ../src/gtkft.c:922
 msgid "Waiting for transfer to begin"
 msgstr "等待開始傳輸檔案中..."
 
 # XXX 暫譯
-#: src/gtkft.c:219
+#: ../src/gtkft.c:221
 msgid "<b>Receiving As:</b>"
 msgstr "<b>以何身分接收:</b>"
 
-#: src/gtkft.c:221
+#: ../src/gtkft.c:223
 msgid "<b>Receiving From:</b>"
 msgstr "<b>接收自:</b>"
 
-#: src/gtkft.c:225
+#: ../src/gtkft.c:227
 msgid "<b>Sending To:</b>"
 msgstr "<b>傳送到:</b>"
 
 # XXX 暫譯
-#: src/gtkft.c:227
+#: ../src/gtkft.c:229
 msgid "<b>Sending As:</b>"
 msgstr "<b>以何身分傳送:</b>"
 
-#: src/gtkft.c:442
+#: ../src/gtkft.c:445
 msgid "There is no application configured to open this type of file."
 msgstr "沒有設定任何應用程式可以開啟這類檔案。"
 
-#: src/gtkft.c:447
+#: ../src/gtkft.c:450
 msgid "An error occurred while opening the file."
 msgstr "開啟檔案途中發生錯誤。"
 
-#: src/gtkft.c:484
+#: ../src/gtkft.c:487
 #, c-format
 msgid "Error launching %s: %s"
 msgstr "啟動 %s 時發生錯誤:%s"
 
-#: src/gtkft.c:493
+#: ../src/gtkft.c:496
 #, c-format
 msgid "Error running %s"
 msgstr "執行 %s 時發生錯誤"
 
-#: src/gtkft.c:494
+#: ../src/gtkft.c:497
 #, c-format
 msgid "Process returned error code %d"
 msgstr "回應處理錯誤代碼 %d"
 
-#: src/gtkft.c:588
+#: ../src/gtkft.c:591
 msgid "Progress"
 msgstr "進度"
 
-#: src/gtkft.c:595
+#: ../src/gtkft.c:598
 msgid "Filename"
 msgstr "檔名"
 
-#: src/gtkft.c:602
+#: ../src/gtkft.c:605
 msgid "Size"
 msgstr "大小"
 
-#: src/gtkft.c:609
+#: ../src/gtkft.c:612
 msgid "Remaining"
 msgstr "剩餘"
 
-#: src/gtkft.c:640
+#: ../src/gtkft.c:643
 msgid "Filename:"
 msgstr "檔名:"
 
 # NOTE Debian 譯「local」為「本地端」
 # XXX
-#: src/gtkft.c:641
+#: ../src/gtkft.c:644
 msgid "Local File:"
 msgstr "本地端檔案:"
 
-#: src/gtkft.c:642
+#: ../src/gtkft.c:645
 msgid "Status:"
 msgstr "狀態:"
 
-#: src/gtkft.c:643
+#: ../src/gtkft.c:646
 msgid "Speed:"
 msgstr "速度:"
 
-#: src/gtkft.c:644
+#: ../src/gtkft.c:647
 msgid "Time Elapsed:"
 msgstr "經過時間:"
 
-#: src/gtkft.c:645
+#: ../src/gtkft.c:648
 msgid "Time Remaining:"
 msgstr "尚需時間:"
 
-#: src/gtkft.c:731
-#, fuzzy
+#: ../src/gtkft.c:710
+msgid "File Transfers"
+msgstr "檔案傳輸"
+
+#: ../src/gtkft.c:733
 msgid "Close this window when all transfers _finish"
-msgstr "所有的檔案傳牏完畢時,關閉這個視窗 [_C]"
-
-#: src/gtkft.c:741
+msgstr "所有的檔案傳牏完畢時,關閉這個視窗(_F)"
+
+#: ../src/gtkft.c:743
 msgid "C_lear finished transfers"
 msgstr "清除已完成的傳輸(_C)"
 
 # XXX 暫譯
 #. "Download Details" arrow
-#: src/gtkft.c:750
+#: ../src/gtkft.c:752
 msgid "File transfer _details"
 msgstr "檔案傳輸細節(_D)"
 
 #. Pause button
-#: src/gtkft.c:780
-#: src/gtkstock.c:143
+#: ../src/gtkft.c:782
+#: ../src/gtkstock.c:146
 msgid "_Pause"
 msgstr "暫停(_P)"
 
 #. Resume button
-#: src/gtkft.c:790
+#: ../src/gtkft.c:792
 msgid "_Resume"
 msgstr "恢復(_R)"
 
-#: src/gtkft.c:1005
+#: ../src/gtkft.c:1005
 msgid "Failed"
 msgstr "失敗"
 
 #  NOTE Nautilus譯「貼上文本」,Abiword譯「未格式化貼上」,聽來都有些怪
-#: src/gtkimhtml.c:816
-msgid "Pa_ste as Plain Text"
-msgstr "貼上純文字(_S)"
-
-#: src/gtkimhtml.c:1313
+#: ../src/gtkimhtml.c:821
+msgid "Paste as Plain _Text"
+msgstr "貼上純文字(_T)"
+
+#: ../src/gtkimhtml.c:833
+msgid "_Reset formatting"
+msgstr "清除格式化(_R)"
+
+#: ../src/gtkimhtml.c:1327
 msgid "Hyperlink color"
 msgstr "連結顏色"
 
-#: src/gtkimhtml.c:1314
+#: ../src/gtkimhtml.c:1328
 msgid "Color to draw hyperlinks."
 msgstr "顯示連結時所用的顏色。"
 
-#: src/gtkimhtml.c:1317
+#: ../src/gtkimhtml.c:1331
 msgid "Hyperlink prelight color"
 msgstr "連結顏色"
 
-#: src/gtkimhtml.c:1318
+#: ../src/gtkimhtml.c:1332
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "當滑鼠經過連結時的連結顏色。"
 
-#: src/gtkimhtml.c:1537
+#: ../src/gtkimhtml.c:1553
 msgid "_Copy E-Mail Address"
 msgstr "複製電子郵件地址(_C)"
 
-#: src/gtkimhtml.c:1549
+#: ../src/gtkimhtml.c:1565
 msgid "_Open Link in Browser"
 msgstr "在瀏覽器中打開連結(_O)"
 
-#: src/gtkimhtml.c:1559
+#: ../src/gtkimhtml.c:1575
 msgid "_Copy Link Location"
 msgstr "複製連結位址(_C)"
 
 # NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
-#: src/gtkimhtml.c:3259
+#: ../src/gtkimhtml.c:3275
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -3897,7 +4238,7 @@
 "暫且當成 PNG 檔處理。"
 
 # NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
-#: src/gtkimhtml.c:3262
+#: ../src/gtkimhtml.c:3278
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -3907,7 +4248,7 @@
 "\n"
 "暫且當成 PNG 檔處理。"
 
-#: src/gtkimhtml.c:3275
+#: ../src/gtkimhtml.c:3291
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -3918,7 +4259,7 @@
 "\n"
 "%s"
 
-#: src/gtkimhtml.c:3278
+#: ../src/gtkimhtml.c:3294
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -3929,166 +4270,174 @@
 "\n"
 "%s"
 
-#: src/gtkimhtml.c:3358
-#: src/gtkimhtml.c:3370
+#: ../src/gtkimhtml.c:3374
+#: ../src/gtkimhtml.c:3386
 msgid "Save Image"
 msgstr "儲存影像"
 
-#: src/gtkimhtml.c:3398
+#: ../src/gtkimhtml.c:3414
 msgid "_Save Image..."
 msgstr "儲存影像(_S)..."
 
-#: src/gtkimhtmltoolbar.c:147
+#: ../src/gtkimhtmltoolbar.c:147
 msgid "Select Font"
 msgstr "選擇字型"
 
-#: src/gtkimhtmltoolbar.c:226
+#: ../src/gtkimhtmltoolbar.c:226
 msgid "Select Text Color"
 msgstr "設定文字顏色"
 
-#: src/gtkimhtmltoolbar.c:305
+#: ../src/gtkimhtmltoolbar.c:305
 msgid "Select Background Color"
 msgstr "設定背景顏色"
 
-#: src/gtkimhtmltoolbar.c:394
+#: ../src/gtkimhtmltoolbar.c:394
 msgid "_URL"
 msgstr "_URL"
 
-#: src/gtkimhtmltoolbar.c:402
+#: ../src/gtkimhtmltoolbar.c:402
 msgid "_Description"
 msgstr "描述(_D)"
 
-#: src/gtkimhtmltoolbar.c:405
+#: ../src/gtkimhtmltoolbar.c:405
 msgid "Please enter the URL and description of the link that you want to insert. The description is optional."
 msgstr "請輸入您所要插入的 URL 及它的描述,描述是選擇性的,可不用輸入。"
 
-#: src/gtkimhtmltoolbar.c:409
+#: ../src/gtkimhtmltoolbar.c:409
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "請輸入您所要插入的 URL。"
 
-#: src/gtkimhtmltoolbar.c:414
+#: ../src/gtkimhtmltoolbar.c:414
 msgid "Insert Link"
 msgstr "加入連結"
 
-#: src/gtkimhtmltoolbar.c:418
+#: ../src/gtkimhtmltoolbar.c:418
 msgid "_Insert"
 msgstr "插入(_I)"
 
-#: src/gtkimhtmltoolbar.c:487
+#: ../src/gtkimhtmltoolbar.c:487
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "無法儲存影像:%s\n"
 
-#: src/gtkimhtmltoolbar.c:513
-#: src/gtkimhtmltoolbar.c:523
+#: ../src/gtkimhtmltoolbar.c:513
+#: ../src/gtkimhtmltoolbar.c:523
 msgid "Insert Image"
 msgstr "插入影像"
 
 #  XXX 譯文不通順
-#: src/gtkimhtmltoolbar.c:721
+#: ../src/gtkimhtmltoolbar.c:721
 msgid "This theme has no available smileys."
 msgstr "這個表情主題不含任何表情。"
 
 #. show everything
-#: src/gtkimhtmltoolbar.c:735
+#: ../src/gtkimhtmltoolbar.c:735
 msgid "Smile!"
 msgstr "笑一個!"
 
-#: src/gtkimhtmltoolbar.c:916
+#: ../src/gtkimhtmltoolbar.c:923
 msgid "Bold"
 msgstr "粗體"
 
-#: src/gtkimhtmltoolbar.c:927
+#: ../src/gtkimhtmltoolbar.c:934
 msgid "Italic"
 msgstr "斜體"
 
-#: src/gtkimhtmltoolbar.c:938
+#: ../src/gtkimhtmltoolbar.c:945
 msgid "Underline"
 msgstr "底線"
 
-#: src/gtkimhtmltoolbar.c:954
+#: ../src/gtkimhtmltoolbar.c:961
 msgid "Larger font size"
 msgstr "放大字體"
 
-#: src/gtkimhtmltoolbar.c:966
+#: ../src/gtkimhtmltoolbar.c:973
 msgid "Smaller font size"
 msgstr "縮小字體"
 
-#: src/gtkimhtmltoolbar.c:983
+#: ../src/gtkimhtmltoolbar.c:990
 msgid "Font Face"
 msgstr "字型"
 
-#: src/gtkimhtmltoolbar.c:995
+#: ../src/gtkimhtmltoolbar.c:1002
 msgid "Foreground font color"
 msgstr "前景顏色"
 
-#: src/gtkimhtmltoolbar.c:1023
-msgid "Clear formatting"
+#: ../src/gtkimhtmltoolbar.c:1014
+msgid "Background color"
+msgstr "背景顏色"
+
+#: ../src/gtkimhtmltoolbar.c:1030
+msgid "Reset formatting"
 msgstr "清除格式化"
 
-#: src/gtkimhtmltoolbar.c:1038
+#: ../src/gtkimhtmltoolbar.c:1045
 msgid "Insert link"
 msgstr "插入連結"
 
-#: src/gtkimhtmltoolbar.c:1048
+#: ../src/gtkimhtmltoolbar.c:1055
 msgid "Insert image"
 msgstr "插入影像"
 
-#: src/gtkimhtmltoolbar.c:1059
+#: ../src/gtkimhtmltoolbar.c:1066
 msgid "Insert smiley"
 msgstr "插入表情"
 
-#: src/gtklog.c:212
-#, fuzzy, c-format
-msgid "Conversation in %s on %s"
-msgstr "與 %s 的交談"
-
-#: src/gtklog.c:214
-#, fuzzy, c-format
-msgid "Conversation with %s on %s"
-msgstr "與 %s 的交談"
-
-#: src/gtklog.c:324
+#: ../src/gtklog.c:207
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
+msgstr ""
+
+#: ../src/gtklog.c:212
+#, 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:261
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: ../src/gtklog.c:308
 msgid "System events will only be logged if the \"Log all status changes to system log\" preference is enabled."
 msgstr "只有在「記錄所有狀態改變至系統日誌」選項被啟動時,系統事件才會被記錄到系統日誌中。"
 
-#: src/gtklog.c:328
+#: ../src/gtklog.c:312
 msgid "Instant messages will only be logged if the \"Log all instant messages\" preference is enabled."
-msgstr ""
-
-#: src/gtklog.c:331
+msgstr "即時訊息只有在「記錄所有即時訊息」選項被開啟時才會被記錄。"
+
+#: ../src/gtklog.c:315
 msgid "Chats will only be logged if the \"Log all chats\" preference is enabled."
-msgstr ""
-
-#: src/gtklog.c:335
+msgstr "聊天室的內容將只有在「記錄所有的聊天室」選項被啟動時才會被記錄。"
+
+#: ../src/gtklog.c:319
 msgid "No logs were found"
 msgstr "找不到日誌"
 
-#: src/gtklog.c:411
+#: ../src/gtklog.c:398
 msgid "Total log size:"
 msgstr "全部日誌小大:"
 
-#: src/gtklog.c:487
-#, fuzzy, c-format
+#: ../src/gtklog.c:464
+#, c-format
 msgid "Conversations in %s"
-msgstr "與 %s 的交談"
-
-#: src/gtklog.c:495
-#: src/gtklog.c:546
+msgstr "於 %s 的交談"
+
+#: ../src/gtklog.c:472
+#: ../src/gtklog.c:523
 #, c-format
 msgid "Conversations with %s"
 msgstr "與 %s 的交談"
 
-#: src/gtklog.c:571
+#: ../src/gtklog.c:548
 msgid "System Log"
 msgstr "系統日誌"
 
-#: src/gtkmain.c:306
+#: ../src/gtkmain.c:307
 #, c-format
 msgid "Gaim %s. Try `%s -h' for more information.\n"
 msgstr "Gaim %s。執行「%s -h」以獲得更進一步的資訊。\n"
 
-#: src/gtkmain.c:308
+#: ../src/gtkmain.c:309
 #, c-format
 msgid ""
 "Gaim %s\n"
@@ -4102,109 +4451,69 @@
 "                      account(s) to use, separated by commas)\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
-
-#: src/gtkmain.c:480
+"Gaim %s\n"
+"使用方法: %s [選項]...\n"
+"\n"
+"  -c, --config=DIR    設定檔所在目錄\n"
+"  -d, --debug         在標準輸出中顯示除錯訊息\n"
+"  -h, --help          顯示輔助訊息並離開\n"
+"  -n, --nologin       不自動登入\n"
+"  -l, --login[=NAME]  自動登入 (透過 NAME 參數來指定要使用\n"
+"哪些帳號,並使用逗號分隔) \n"
+"  -v, --version       顯示版本訊息並離開\n"
+
+#: ../src/gtkmain.c:493
+#, c-format
 msgid ""
 "Gaim has segfaulted and attempted to dump a core file.\n"
 "This is a bug in the software and has happened through\n"
 "no fault of your own.\n"
 "\n"
-"It is possible that this bug is already fixed in CVS.\n"
 "If you can reproduce the crash, please notify the gaim\n"
 "developers by reporting a bug at\n"
-msgstr ""
-
-#: src/gtkmain.c:486
-msgid ""
-"bug.php\n"
+"%sbug.php\n"
 "\n"
 "Please make sure to specify what you were doing at the time\n"
 "and post the backtrace from the core file.  If you do not know\n"
 "how to get the backtrace, please read the instructions at\n"
-msgstr ""
-
-#: src/gtkmain.c:490
-msgid ""
-"gdb.php.  If you need further\n"
-"assistance, please IM either SeanEgn or LSchiere (via AIM).\n"
-"Contact information for Sean and Luke on other protocols is at\n"
-msgstr ""
-
-#: src/gtkmain.c:493
-msgid "contactinfo.php.\n"
-msgstr ""
-
-#: src/gtkmain.c:698
-#: src/gtkmain.c:700
-msgid "Default"
-msgstr "預設"
-
-#: src/gtkmedia.c:52
-msgid "Call ended."
-msgstr "結束呼叫。"
-
-#: src/gtkmedia.c:69
-#, c-format
-msgid "Calling %s"
-msgstr "呼叫 %s"
-
-#: src/gtkmedia.c:73
-#: src/gtkmedia.c:108
-msgid "End Call"
-msgstr "結束呼叫"
-
-#: src/gtkmedia.c:81
-#, c-format
-msgid "Receiving call from %s"
-msgstr "收到來息 %s 的呼叫"
-
-#: src/gtkmedia.c:89
-msgid "Reject Call"
-msgstr "拒絕呼叫"
-
-#: src/gtkmedia.c:95
-msgid "Accept call"
-msgstr "接受呼叫"
-
-#: src/gtkmedia.c:102
-#, c-format
-msgid "Connected to %s"
-msgstr "已連結到 %s"
-
-#: src/gtkmedia.c:113
-msgid "_Mute"
-msgstr "靜音(_M)"
-
-#. Descriptive label
-#: src/gtknotify.c:269
+"%sgdb.php\n"
+"\n"
+"If you need further assistance, please IM either SeanEgn or \n"
+"LSchiere (via AIM).  Contact information for Sean and Luke \n"
+"on other protocols is at\n"
+"%scontactinfo.php\n"
+msgstr ""
+
+#: ../src/gtknotify.c:332
+msgid "New Mail"
+msgstr "新郵件"
+
+#: ../src/gtknotify.c:348
+msgid "Open All Messages"
+msgstr "開啟所有訊息"
+
+#  NOTE Jabber 術語,見上
+#: ../src/gtknotify.c:414
+#: ../src/protocols/jabber/jabber.c:1127
+msgid "From"
+msgstr "已認證對方"
+
+#: ../src/gtknotify.c:423
+msgid "Subject"
+msgstr ""
+
+#: ../src/gtknotify.c:432
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">您有郵件!</span>"
+
+#: ../src/gtknotify.c:498
 #, 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:283
-#, c-format
-msgid "<span weight=\"bold\">From:</span> %s\n"
-msgstr "<span weight=\"bold\">來自:</span> %s\n"
-
-#: src/gtknotify.c:292
-#, c-format
-msgid "<span weight=\"bold\">Subject:</span> %s\n"
-msgstr "<span weight=\"bold\">主題:</span> %s\n"
-
-#: src/gtknotify.c:297
-#, c-format
-msgid ""
-"<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
-"\n"
-"%s%s%s%s"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">您收到了郵件!</span>\n"
-"\n"
-"%s%s%s%s"
-
-#: src/gtknotify.c:313
+#: ../src/gtknotify.c:503
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -4215,443 +4524,498 @@
 "\n"
 "%s"
 
-#: src/gtknotify.c:500
+#: ../src/gtknotify.c:692
+#: ../src/protocols/sametime/sametime.c:5456
 msgid "Search Results"
 msgstr "搜尋結果"
 
-#: src/gtknotify.c:638
-#: src/protocols/oscar/oscar.c:4846
+#: ../src/gtknotify.c:849
+#: ../src/protocols/oscar/oscar.c:2635
 #, c-format
 msgid "Info for %s"
 msgstr "%s 的資訊"
 
-#: src/gtknotify.c:639
-#: src/protocols/toc/toc.c:470
+#: ../src/gtknotify.c:850
+#: ../src/protocols/toc/toc.c:470
 msgid "Buddy Information"
 msgstr "好友資訊"
 
-#: src/gtknotify.c:681
-#, c-format
-msgid "The browser command <b>%s</b> is invalid."
+#: ../src/gtknotify.c:890
+#, c-format
+msgid "The browser command \"%s\" is invalid."
 msgstr "瀏覽器指令「%s」是無效的。"
 
-#: src/gtknotify.c:683
-#: src/gtknotify.c:695
-#: src/gtknotify.c:708
-#: src/gtknotify.c:833
+#: ../src/gtknotify.c:892
+#: ../src/gtknotify.c:904
+#: ../src/gtknotify.c:917
+#: ../src/gtknotify.c:1040
 msgid "Unable to open URL"
 msgstr "無法開啟網頁"
 
-#: src/gtknotify.c:693
-#: src/gtknotify.c:706
-#, c-format
-msgid "Error launching <b>%s</b>: %s"
-msgstr "執行「%s」時發生了錯誤:%s"
-
-#: src/gtknotify.c:834
+#: ../src/gtknotify.c:902
+#: ../src/gtknotify.c:915
+#, c-format
+msgid "Error launching \"%s\": %s"
+msgstr "啟動 \"%s\" 時發生錯誤:%s"
+
+#: ../src/gtknotify.c:1041
 msgid "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "您選用了「使用者自定瀏覽器」,卻未有設定指令。"
 
-#: src/gtkplugin.c:268
+#: ../src/gtkplugin.c:274
+msgid "The following plugins will be unloaded."
+msgstr "以下的模組將會被卸載。"
+
+#: ../src/gtkplugin.c:293
+msgid "Multiple plugins will be unloaded."
+msgstr "多個模組將會被卸載。"
+
+#: ../src/gtkplugin.c:295
+msgid "Unload Plugins"
+msgstr "卸載模組"
+
+#: ../src/gtkplugin.c:407
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
-"<span weight=\"bold\">Web site:</span>\t\t%s\n"
-"<span weight=\"bold\">File name:</span>\t%s"
+"<span weight=\"bold\">Website:</span>\t\t%s\n"
+"<span weight=\"bold\">Filename:</span>\t\t%s"
 msgstr ""
 "%s%s<span weight=\"bold\">作者:</span>\t%s\n"
 "<span weight=\"bold\">網站:</span>\t\t%s\n"
 "<span weight=\"bold\">檔名:</span>\t%s"
 
-#: src/gtkplugin.c:388
+#: ../src/gtkplugin.c:417
+#, c-format
+msgid ""
+"%s\n"
+"<span foreground=\"#ff0000\" weight=\"bold\">Error: %s\n"
+"Check the plugin website for an update.</span>"
+msgstr ""
+"%s\n"
+"<span foreground=\"#ff0000\" weight=\"bold\">錯誤: %s\n"
+"檢查模組的網站以獲得更新。</span>"
+
+#: ../src/gtkplugin.c:543
 msgid "Configure Pl_ugin"
 msgstr "設定模組(_U)"
 
-#: src/gtkplugin.c:437
+#: ../src/gtkplugin.c:601
 msgid "<b>Plugin Details</b>"
 msgstr "<b>模組明細</b>"
 
-#: src/gtkpounce.c:157
+#: ../src/gtkpounce.c:155
 msgid "Select a file"
 msgstr "選擇檔案"
 
-#: src/gtkpounce.c:254
+#: ../src/gtkpounce.c:252
 msgid "Please enter a buddy to pounce."
 msgstr "請輸入一個好友以進行捕捉。"
 
-#: src/gtkpounce.c:476
+#: ../src/gtkpounce.c:499
 msgid "New Buddy Pounce"
 msgstr "新增好友狀態捕捉"
 
-#: src/gtkpounce.c:476
+#: ../src/gtkpounce.c:499
 msgid "Edit Buddy Pounce"
 msgstr "編輯好友狀態捕捉"
 
-#. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:493
-msgid "Pounce Who"
-msgstr "要捕捉誰的狀態"
-
-#: src/gtkpounce.c:520
+#. Create the "Pounce on Whom" frame.
+#: ../src/gtkpounce.c:516
+msgid "Pounce on Whom"
+msgstr "捕捉誰的狀態"
+
+#: ../src/gtkpounce.c:543
 msgid "_Buddy name:"
 msgstr "好友名稱(_B):"
 
-#. Create the "Pounce When" frame.
-#: src/gtkpounce.c:544
+#. Create the "Pounce When Buddy..." frame.
+#: ../src/gtkpounce.c:569
 msgid "Pounce When Buddy..."
 msgstr "捕捉狀態..."
 
-#: src/gtkpounce.c:552
+#: ../src/gtkpounce.c:577
 msgid "Si_gns on"
 msgstr "登入(_G)"
 
-#: src/gtkpounce.c:554
+#: ../src/gtkpounce.c:579
 msgid "Signs o_ff"
 msgstr "登出(_F)"
 
-#: src/gtkpounce.c:556
+#: ../src/gtkpounce.c:581
 msgid "Goes a_way"
 msgstr "離開(_W)"
 
-#: src/gtkpounce.c:558
+#: ../src/gtkpounce.c:583
 msgid "Ret_urns from away"
 msgstr "返回(_U)"
 
-#: src/gtkpounce.c:560
+#: ../src/gtkpounce.c:585
 msgid "Becomes _idle"
 msgstr "閒置(_I)"
 
-#: src/gtkpounce.c:562
+#: ../src/gtkpounce.c:587
 msgid "Is no longer i_dle"
 msgstr "不再閒置(_D)"
 
-#: src/gtkpounce.c:564
+#: ../src/gtkpounce.c:589
 msgid "Starts _typing"
 msgstr "開始輸入(_T)"
 
-#: src/gtkpounce.c:566
+#: ../src/gtkpounce.c:591
+msgid "P_auses while typing"
+msgstr ""
+
+#: ../src/gtkpounce.c:593
 msgid "Stops t_yping"
 msgstr "停止輸入(_Y)"
 
-#. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:595
-msgid "Pounce Action"
-msgstr "捕捉動作"
-
-#: src/gtkpounce.c:603
+#: ../src/gtkpounce.c:595
+msgid "Sends a _message"
+msgstr "送出一個訊息(_M)"
+
+#. Create the "Action" frame.
+#: ../src/gtkpounce.c:630
+msgid "Action"
+msgstr "執行動作"
+
+#: ../src/gtkpounce.c:638
 msgid "Ope_n an IM window"
 msgstr "開啟即時訊息視窗(_N)"
 
-#: src/gtkpounce.c:605
+#: ../src/gtkpounce.c:640
 msgid "_Pop up a notification"
 msgstr "彈出通知(_P)"
 
-#: src/gtkpounce.c:607
+#: ../src/gtkpounce.c:642
 msgid "Send a _message"
 msgstr "送出訊息(_M)"
 
-#: src/gtkpounce.c:609
+#: ../src/gtkpounce.c:644
 msgid "E_xecute a command"
 msgstr "執行指令(_X)"
 
-#: src/gtkpounce.c:611
+#: ../src/gtkpounce.c:646
 msgid "P_lay a sound"
 msgstr "播放音效(_L)"
 
-#: src/gtkpounce.c:615
+#: ../src/gtkpounce.c:651
 msgid "Brows_e..."
 msgstr "瀏覽(_E)..."
 
-#: src/gtkpounce.c:617
+#: ../src/gtkpounce.c:653
 msgid "Br_owse..."
 msgstr "瀏覽(_O)..."
 
-#: src/gtkpounce.c:618
+#: ../src/gtkpounce.c:654
 msgid "Pre_view"
 msgstr "預覽(_V)"
 
-#: src/gtkpounce.c:701
+#. Create the "Options" frame.
+#: ../src/gtkpounce.c:766
+msgid "Options"
+msgstr "選項"
+
+#: ../src/gtkpounce.c:774
+msgid "P_ounce only when my status is not available"
+msgstr "只在我的狀態不為「上線」時啟用(_O)"
+
+#: ../src/gtkpounce.c:779
 msgid "_Recurring"
-msgstr "再次呼叫(_R)"
-
-#: src/gtkpounce.c:997
+msgstr "重覆發生(_R)"
+
+#: ../src/gtkpounce.c:1085
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "您確定您要刪除對 %2$s 的 %1$s 捕捉?"
 
-#: src/gtkpounce.c:1145
+#: ../src/gtkpounce.c:1233
 msgid "Pounce Target"
 msgstr "捕捉目標"
 
-#: src/gtkpounce.c:1180
+#: ../src/gtkpounce.c:1268
 msgid "Recurring"
-msgstr "再次呼叫"
-
-#: src/gtkpounce.c:1227
+msgstr "重覆發生"
+
+#: ../src/gtkpounce.c:1315
 msgid "Buddy Pounces"
 msgstr "好友狀態捕捉"
 
-#: src/gtkpounce.c:1345
+#: ../src/gtkpounce.c:1442
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s 開始輸入訊息給您 (%s)"
 
-#: src/gtkpounce.c:1347
+#: ../src/gtkpounce.c:1444
+#, c-format
+msgid "%s has paused while typing to you (%s)"
+msgstr "%s 暫停輸入訊息給您 (%s)"
+
+#: ../src/gtkpounce.c:1446
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s 已經登入 (%s)"
 
-#: src/gtkpounce.c:1349
+#: ../src/gtkpounce.c:1448
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s 由閒置返回 (%s)"
 
-#: src/gtkpounce.c:1351
+#: ../src/gtkpounce.c:1450
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s 由離開返回 (%s)"
 
-#: src/gtkpounce.c:1353
+#: ../src/gtkpounce.c:1452
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s 停止輸入訊息給您 (%s)"
 
-#: src/gtkpounce.c:1355
+#: ../src/gtkpounce.c:1454
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s 已經登出 (%s)"
 
-#: src/gtkpounce.c:1357
+#: ../src/gtkpounce.c:1456
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s 變更狀態為閒置 (%s)"
 
-#: src/gtkpounce.c:1359
+#: ../src/gtkpounce.c:1458
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s 已經離開。 (%s)"
 
-#: src/gtkpounce.c:1360
+#: ../src/gtkpounce.c:1460
+#, c-format
+msgid "%s has sent you a message. (%s)"
+msgstr "%s 送出一個訊息給您。 (%s)"
+
+#: ../src/gtkpounce.c:1461
 msgid "Unknown pounce event. Please report this!"
 msgstr "未知的捕捉事件。請回報這個問題!"
 
-#: src/gtkprefs.c:511
+#: ../src/gtkprefs.c:512
 msgid "Smiley theme failed to unpack."
 msgstr ""
 
-#: src/gtkprefs.c:630
+#: ../src/gtkprefs.c:638
 msgid "Select a smiley theme that you would like to use from the list below. New themes can be installed by dragging and dropping them onto the theme list."
 msgstr "在下面的清單中選取一個您所想喜歡的表情主題。您可以用拖曳的方式將新的表情主題安裝到清單中。"
 
-#: src/gtkprefs.c:665
+#: ../src/gtkprefs.c:673
 msgid "Icon"
 msgstr "圖示"
 
-#: src/gtkprefs.c:672
-#: src/protocols/jabber/buddy.c:267
-#: src/protocols/jabber/buddy.c:811
-#: src/protocols/jabber/chat.c:769
+#: ../src/gtkprefs.c:680
+#: ../src/protocols/jabber/buddy.c:286
+#: ../src/protocols/jabber/buddy.c:926
+#: ../src/protocols/jabber/chat.c:767
 msgid "Description"
 msgstr "描述"
 
-#: src/gtkprefs.c:814
+#: ../src/gtkprefs.c:821
 msgid "_Hide new IM conversations"
 msgstr "隱藏新的即時訊息交談(_H)"
 
-#: src/gtkprefs.c:817
-#: src/gtkprefs.c:1668
+#: ../src/gtkprefs.c:824
+#: ../src/gtkprefs.c:1779
 msgid "When away"
 msgstr "離開期間"
 
-#: src/gtkprefs.c:821
+#: ../src/gtkprefs.c:828
 msgid "Send unknown \"_slash\" commands as messages"
 msgstr "不明的「斜線」指令,一律當成訊息送出(_S)"
 
-#: src/gtkprefs.c:823
+#: ../src/gtkprefs.c:830
 msgid "Show _formatting on incoming messages"
 msgstr "顯示所收訊息的格式化(_F)"
 
-#: src/gtkprefs.c:826
+#: ../src/gtkprefs.c:833
 msgid "Show buddy _icons"
 msgstr "顯示好友圖示(_I)"
 
-#: src/gtkprefs.c:828
+#: ../src/gtkprefs.c:835
 msgid "Enable buddy ic_on animation"
 msgstr "啟動好友圖示動畫(_O)"
 
-#: src/gtkprefs.c:835
+#: ../src/gtkprefs.c:842
 msgid "_Notify buddies that you are typing to them"
 msgstr "通知您的好友您正在發訊息給他們(_N)"
 
-#: src/gtkprefs.c:838
+#: ../src/gtkprefs.c:845
 msgid "Highlight _misspelled words"
 msgstr "標示出拼錯的字(_M)"
 
-#: src/gtkprefs.c:842
+#: ../src/gtkprefs.c:849
 msgid "Use smooth-scrolling"
-msgstr ""
-
-#: src/gtkprefs.c:858
+msgstr "使用平滑捲軸"
+
+#: ../src/gtkprefs.c:865
 msgid "This is how your outgoing message text will appear when you use protocols that support formatting. :)"
 msgstr "假如您使用的協定支援格式化,送出訊息的式樣將會類似以下的樣本:"
 
 #. All the tab options!
-#: src/gtkprefs.c:880
+#: ../src/gtkprefs.c:887
 msgid "Tab Options"
-msgstr "標籤選項"
-
-#: src/gtkprefs.c:882
+msgstr "分頁選項"
+
+#: ../src/gtkprefs.c:889
 msgid "Show IMs and chats in _tabbed windows"
-msgstr "使用標籤視窗顯示即時訊息和聊天(_T)"
-
-#: src/gtkprefs.c:896
+msgstr "使用分頁視窗顯示即時訊息和聊天(_T)"
+
+#: ../src/gtkprefs.c:903
 msgid "Show close b_utton on tabs"
-msgstr "在標籤上顯示關閉鍵(_U)"
-
-#: src/gtkprefs.c:902
+msgstr "在分頁上顯示關閉鍵(_U)"
+
+#: ../src/gtkprefs.c:909
 msgid "_Placement:"
 msgstr "視窗位置額外選項(_P):"
 
-#: src/gtkprefs.c:904
+#: ../src/gtkprefs.c:911
 msgid "Top"
 msgstr "視窗上方"
 
-#: src/gtkprefs.c:905
+#: ../src/gtkprefs.c:912
 msgid "Bottom"
 msgstr "視窗下方"
 
-#: src/gtkprefs.c:906
+#: ../src/gtkprefs.c:913
 msgid "Left"
 msgstr "視窗左側"
 
-#: src/gtkprefs.c:907
+#: ../src/gtkprefs.c:914
 msgid "Right"
 msgstr "視窗右側"
 
-#: src/gtkprefs.c:909
+#: ../src/gtkprefs.c:916
 msgid "Left Vertical"
 msgstr "左邊垂直"
 
-#: src/gtkprefs.c:910
+#: ../src/gtkprefs.c:917
 msgid "Right Vertical"
 msgstr "右邊垂直"
 
-#: src/gtkprefs.c:915
+#: ../src/gtkprefs.c:922
 msgid "N_ew conversations:"
 msgstr "新交談(_E):"
 
-#: src/gtkprefs.c:966
-#: src/protocols/oscar/oscar.c:779
-#: src/protocols/oscar/oscar.c:6001
+#: ../src/gtkprefs.c:973
+#: ../src/protocols/oscar/oscar.c:804
+#: ../src/protocols/oscar/oscar.c:3652
 msgid "IP Address"
 msgstr "IP 位址"
 
-#: src/gtkprefs.c:968
+#: ../src/gtkprefs.c:975
 msgid "ST_UN server:"
 msgstr "STUN 伺服器(_S):"
 
-#: src/gtkprefs.c:970
+#: ../src/gtkprefs.c:987
+msgid "<span style=\"italic\">Example: stunserver.org</span>"
+msgstr ""
+
+#: ../src/gtkprefs.c:991
 msgid "_Autodetect IP address"
 msgstr "自動偵測 IP 位址(_A)"
 
-#: src/gtkprefs.c:979
+#: ../src/gtkprefs.c:1000
 msgid "Public _IP:"
 msgstr "公共IP (_I):"
 
-#: src/gtkprefs.c:1003
+#: ../src/gtkprefs.c:1029
 msgid "Ports"
 msgstr "通訊埠"
 
-#: src/gtkprefs.c:1006
+#: ../src/gtkprefs.c:1032
 msgid "_Manually specify range of ports to listen on"
 msgstr "自定通訊埠監聽範圍(_M)"
 
-#: src/gtkprefs.c:1009
+#: ../src/gtkprefs.c:1035
 msgid "_Start port:"
 msgstr "啟始通訊埠(_S):"
 
-#: src/gtkprefs.c:1016
+#: ../src/gtkprefs.c:1042
 msgid "_End port:"
 msgstr "結束通訊埠(_E):"
 
-#: src/gtkprefs.c:1024
+#: ../src/gtkprefs.c:1050
 msgid "Proxy Server"
 msgstr "代理伺服器"
 
 # NOTE 理由同前,不用「毋須」,改為「不使用」
-#: src/gtkprefs.c:1028
+#: ../src/gtkprefs.c:1054
 msgid "No proxy"
 msgstr "不使用代理伺服器"
 
-#: src/gtkprefs.c:1084
+#: ../src/gtkprefs.c:1110
 msgid "_User:"
 msgstr "使用者(_U):"
 
-#: src/gtkprefs.c:1146
+#: ../src/gtkprefs.c:1172
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: src/gtkprefs.c:1147
+#: ../src/gtkprefs.c:1173
 msgid "Firebird"
 msgstr "Firebird"
 
-#: src/gtkprefs.c:1148
+#: ../src/gtkprefs.c:1174
 msgid "Firefox"
 msgstr "Firefox"
 
-#: src/gtkprefs.c:1149
+#: ../src/gtkprefs.c:1175
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/gtkprefs.c:1150
+#: ../src/gtkprefs.c:1176
 msgid "GNOME Default"
 msgstr "GNOME預設"
 
-#: src/gtkprefs.c:1151
+#: ../src/gtkprefs.c:1177
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/gtkprefs.c:1152
+#: ../src/gtkprefs.c:1178
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: src/gtkprefs.c:1153
+#: ../src/gtkprefs.c:1179
 msgid "Netscape"
 msgstr "Netscape"
 
-#: src/gtkprefs.c:1154
+#: ../src/gtkprefs.c:1180
 msgid "Opera"
 msgstr "Opera"
 
-#: src/gtkprefs.c:1163
+#: ../src/gtkprefs.c:1189
 msgid "Manual"
 msgstr "使用者自定"
 
-#: src/gtkprefs.c:1216
+#: ../src/gtkprefs.c:1242
 msgid "Browser Selection"
 msgstr "選擇瀏覽器"
 
-#: src/gtkprefs.c:1220
+#: ../src/gtkprefs.c:1246
 msgid "_Browser:"
 msgstr "瀏覽器(_B):"
 
-#: src/gtkprefs.c:1228
+#: ../src/gtkprefs.c:1254
 msgid "_Open link in:"
 msgstr "在瀏覽器中打開連結(_O):"
 
-#: src/gtkprefs.c:1230
+#: ../src/gtkprefs.c:1256
 msgid "Browser default"
 msgstr "瀏覽器預設"
 
-#: src/gtkprefs.c:1231
+#: ../src/gtkprefs.c:1257
 msgid "Existing window"
 msgstr "既有的視窗"
 
-#: src/gtkprefs.c:1233
+#: ../src/gtkprefs.c:1259
 msgid "New tab"
-msgstr "新標籤"
-
-#: src/gtkprefs.c:1247
+msgstr "新分頁"
+
+#: ../src/gtkprefs.c:1273
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -4660,56 +5024,85 @@
 "使用者自定(_M):\n"
 "(請以 %s 代表網址)"
 
-#: src/gtkprefs.c:1283
-#: src/gtkprefs.c:1756
+#: ../src/gtkprefs.c:1309
+#: ../src/gtkprefs.c:1890
 msgid "Logging"
 msgstr "日誌"
 
-#: src/gtkprefs.c:1286
+#: ../src/gtkprefs.c:1312
 msgid "Log _format:"
 msgstr "日誌格式(_F):"
 
-#: src/gtkprefs.c:1291
+#: ../src/gtkprefs.c:1317
 msgid "Log all _instant messages"
 msgstr "記錄所有即時訊息(_I)"
 
-#: src/gtkprefs.c:1293
+#: ../src/gtkprefs.c:1319
 msgid "Log all c_hats"
 msgstr "記錄所有聊天內容(_H)"
 
-#: src/gtkprefs.c:1295
+#: ../src/gtkprefs.c:1321
 msgid "Log all _status changes to system log"
 msgstr "記錄所有的狀態改變至系統日誌"
 
-#: src/gtkprefs.c:1427
+#: ../src/gtkprefs.c:1469
 msgid "Sound Selection"
 msgstr "選取音效"
 
-#: src/gtkprefs.c:1481
+#: ../src/gtkprefs.c:1477
+msgid "Quietest"
+msgstr "最小聲"
+
+#: ../src/gtkprefs.c:1479
+msgid "Quieter"
+msgstr "再小聲"
+
+#: ../src/gtkprefs.c:1481
+msgid "Quiet"
+msgstr "小聲"
+
+#: ../src/gtkprefs.c:1483
+#: ../src/protocols/silc/silc.c:672
+msgid "Normal"
+msgstr "正常"
+
+#: ../src/gtkprefs.c:1485
+msgid "Loud"
+msgstr "大聲"
+
+#: ../src/gtkprefs.c:1487
+msgid "Louder"
+msgstr "再大聲"
+
+#: ../src/gtkprefs.c:1489
+msgid "Loudest"
+msgstr "最大聲"
+
+#: ../src/gtkprefs.c:1552
 msgid "Sound Method"
 msgstr "音效播放方式"
 
-#: src/gtkprefs.c:1482
+#: ../src/gtkprefs.c:1553
 msgid "_Method:"
 msgstr "播放方式(_M):"
 
-#: src/gtkprefs.c:1484
+#: ../src/gtkprefs.c:1555
 msgid "Console beep"
 msgstr "嗶一聲"
 
-#: src/gtkprefs.c:1486
+#: ../src/gtkprefs.c:1557
 msgid "Automatic"
 msgstr "自動"
 
-#: src/gtkprefs.c:1491
+#: ../src/gtkprefs.c:1562
 msgid "Command"
 msgstr "指令"
 
-#: src/gtkprefs.c:1492
+#: ../src/gtkprefs.c:1563
 msgid "No sounds"
 msgstr "無音效"
 
-#: src/gtkprefs.c:1500
+#: ../src/gtkprefs.c:1571
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -4718,602 +5111,537 @@
 "音效指令(_C):\n"
 "(請以 %s 代表檔名)"
 
-#: src/gtkprefs.c:1526
+#: ../src/gtkprefs.c:1597
 msgid "Sound Options"
 msgstr "音效選項"
 
-#: src/gtkprefs.c:1527
+#: ../src/gtkprefs.c:1598
 msgid "Sounds when conversation has _focus"
 msgstr "當交談取得輸入焦點發出音效(_F)"
 
-#: src/gtkprefs.c:1529
+#: ../src/gtkprefs.c:1600
 msgid "_Sounds while away"
 msgstr "離開時仍發出音效(_S)"
 
-#: src/gtkprefs.c:1539
+#: ../src/gtkprefs.c:1607
+msgid "Volume:"
+msgstr "音量:"
+
+#: ../src/gtkprefs.c:1635
 msgid "Sound Events"
 msgstr "事件音效"
 
-#: src/gtkprefs.c:1590
+#: ../src/gtkprefs.c:1686
 msgid "Play"
 msgstr "播放"
 
-#: src/gtkprefs.c:1597
+#: ../src/gtkprefs.c:1693
 msgid "Event"
 msgstr "事件"
 
-#: src/gtkprefs.c:1616
+#: ../src/gtkprefs.c:1712
 msgid "Test"
 msgstr "測試"
 
-#: src/gtkprefs.c:1620
+#: ../src/gtkprefs.c:1716
 msgid "Reset"
 msgstr "重置"
 
-#: src/gtkprefs.c:1624
+#: ../src/gtkprefs.c:1720
 msgid "Choose..."
 msgstr "選擇..."
 
-#: src/gtkprefs.c:1663
-#: src/gtkstatusbox.c:439
-#: src/protocols/bonjour/bonjour.c:258
-#: src/protocols/irc/irc.c:175
-#: src/protocols/irc/irc.c:457
-#: src/protocols/irc/msgs.c:221
-#: src/protocols/jabber/buddy.c:1093
-#: src/protocols/jabber/jabber.c:1110
-#: src/protocols/msn/msn.c:585
-#: src/protocols/novell/novell.c:2849
-#: src/protocols/novell/novell.c:2984
-#: src/protocols/oscar/oscar.c:707
-#: src/protocols/oscar/oscar.c:6621
-#: src/protocols/oscar/oscar.c:7677
-#: src/protocols/oscar/oscar.c:7834
-#: src/protocols/sametime/sametime.c:3247
-#: src/protocols/silc/buddy.c:1431
-#: src/protocols/silc/silc.c:53
-#: src/protocols/yahoo/yahoo.c:3113
-#: src/protocols/yahoo/yahoo.c:3212
-#: src/protocols/zephyr/zephyr.c:2260
-#: src/status.c:157
-msgid "Away"
-msgstr "離開"
-
-#: src/gtkprefs.c:1665
+#: ../src/gtkprefs.c:1762
+msgid "_Report idle time:"
+msgstr "閒置時間基準(_R)"
+
+#: ../src/gtkprefs.c:1765
+msgid "From last sent message"
+msgstr "從上次送出訊息時為基準"
+
+#: ../src/gtkprefs.c:1767
+msgid "Based on keyboard or mouse use"
+msgstr "以鍵盤及滑鼠的使用為基準"
+
+#: ../src/gtkprefs.c:1776
 msgid "_Auto-reply:"
 msgstr "何時送出自動回應:"
 
-#: src/gtkprefs.c:1669
+#: ../src/gtkprefs.c:1780
 msgid "When both away and idle"
 msgstr "當離開並同時閒置時"
 
-#: src/gtkprefs.c:1672
-msgid "_Report idle time"
-msgstr "回報閒置時間(_R)"
-
-#: src/gtkprefs.c:1675
+#. Auto-away stuff
+#: ../src/gtkprefs.c:1786
 msgid "Auto-away"
 msgstr "自動離開"
 
-#: src/gtkprefs.c:1676
+#: ../src/gtkprefs.c:1788
 msgid "Change status when _idle"
 msgstr "閒置時更改狀態(_I)"
 
 # NOTE 譯文更動 by Ambrose
-#: src/gtkprefs.c:1680
+#: ../src/gtkprefs.c:1792
 msgid "_Minutes before changing status:"
 msgstr "閒置多少分鐘設為離開(_M):"
 
-#: src/gtkprefs.c:1688
+#: ../src/gtkprefs.c:1800
 msgid "Change _status to:"
 msgstr "更改狀態為(_S):"
 
-#: src/gtkprefs.c:1746
+#. Signon status stuff
+#: ../src/gtkprefs.c:1821
+msgid "Status at Startup"
+msgstr "啟動時狀態"
+
+#: ../src/gtkprefs.c:1823
+msgid "Use status from last _exit at startup"
+msgstr "使用上次結束前的狀態"
+
+#: ../src/gtkprefs.c:1829
+msgid "Status to a_pply at startup:"
+msgstr "啟動時套用的狀態:"
+
+#: ../src/gtkprefs.c:1880
 msgid "Smiley Themes"
 msgstr "表情主題"
 
-#: src/gtkprefs.c:1747
+#: ../src/gtkprefs.c:1881
 msgid "Sounds"
 msgstr "音效"
 
-#: src/gtkprefs.c:1748
-#: src/protocols/silc/silc.c:1828
+#: ../src/gtkprefs.c:1882
+#: ../src/protocols/silc/silc.c:1852
 msgid "Network"
 msgstr "網路"
 
-#: src/gtkprefs.c:1753
+#: ../src/gtkprefs.c:1887
 msgid "Browser"
 msgstr "瀏覽器"
 
-#: src/gtkprefs.c:1757
+#: ../src/gtkprefs.c:1891
 msgid "Away / Idle"
 msgstr "離開 / 閒置"
 
-#: src/gtkprivacy.c:79
+#: ../src/gtkprivacy.c:79
 msgid "Allow all users to contact me"
 msgstr "允許所有的使用者和我聯絡"
 
-#: src/gtkprivacy.c:80
+#: ../src/gtkprivacy.c:80
 msgid "Allow only the users on my buddy list"
 msgstr "只允許好友清單中的使用者"
 
-#: src/gtkprivacy.c:81
+#: ../src/gtkprivacy.c:81
 msgid "Allow only the users below"
 msgstr "允許下列的使用者和我聯絡"
 
-#: src/gtkprivacy.c:82
+#: ../src/gtkprivacy.c:82
 msgid "Block all users"
 msgstr "拒絕所有使用者"
 
-#: src/gtkprivacy.c:83
+#: ../src/gtkprivacy.c:83
 msgid "Block only the users below"
 msgstr "封鎖以下的使用者"
 
-#: src/gtkprivacy.c:398
+#: ../src/gtkprivacy.c:372
 msgid "Privacy"
 msgstr "隱私設定"
 
-#: src/gtkprivacy.c:411
+#: ../src/gtkprivacy.c:385
 msgid "Changes to privacy settings take effect immediately."
 msgstr "隱私設定將立刻生效。"
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:423
+#: ../src/gtkprivacy.c:397
 msgid "Set privacy for:"
 msgstr "帳號:"
 
-#: src/gtkprivacy.c:589
-#: src/gtkprivacy.c:605
+#: ../src/gtkprivacy.c:562
+#: ../src/gtkprivacy.c:578
 msgid "Permit User"
 msgstr "許可使用者"
 
-#: src/gtkprivacy.c:590
+#: ../src/gtkprivacy.c:563
 msgid "Type a user you permit to contact you."
 msgstr "輸入您所許可聯絡您的使用者。"
 
-#: src/gtkprivacy.c:591
+#: ../src/gtkprivacy.c:564
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "請輸入您所許可聯絡您的使用者的名稱。"
 
-#: src/gtkprivacy.c:594
-#: src/gtkprivacy.c:607
-msgid "Permit"
-msgstr "許可"
-
-#: src/gtkprivacy.c:599
+#: ../src/gtkprivacy.c:567
+#: ../src/gtkprivacy.c:580
+msgid "_Permit"
+msgstr "許可(_P)"
+
+#: ../src/gtkprivacy.c:572
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "許可 %s 聯絡您?"
 
-#: src/gtkprivacy.c:601
+#: ../src/gtkprivacy.c:574
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "您確定許可 %s 聯絡您嗎?"
 
-#: src/gtkprivacy.c:628
-#: src/gtkprivacy.c:641
+#: ../src/gtkprivacy.c:601
+#: ../src/gtkprivacy.c:614
 msgid "Block User"
 msgstr "拒絕使用者"
 
-#: src/gtkprivacy.c:629
+#: ../src/gtkprivacy.c:602
 msgid "Type a user to block."
 msgstr "輸入被拒絕的使用者。"
 
-#: src/gtkprivacy.c:630
+#: ../src/gtkprivacy.c:603
 msgid "Please enter the name of the user you wish to block."
 msgstr "請輸入被您拒絕的使用者的名稱。"
 
-#: src/gtkprivacy.c:632
-#: src/gtkprivacy.c:643
-#: src/protocols/gg/gg.c:1481
-msgid "Block"
+#: ../src/gtkprivacy.c:605
+#: ../src/gtkprivacy.c:616
+msgid "_Block"
 msgstr "封鎖"
 
-#: src/gtkprivacy.c:637
+#: ../src/gtkprivacy.c:610
 #, c-format
 msgid "Block %s?"
 msgstr "拒絕 %s?"
 
-#: src/gtkprivacy.c:639
+#: ../src/gtkprivacy.c:612
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "您確定要拒絕 %s?"
 
 #. *
-#. * A wrapper for gaim_request_action() that uses Yes and No buttons.
+#. * A wrapper for gaim_request_action() that uses @c Yes and @c No buttons.
 #.
-#: src/gtkrequest.c:285
-#: src/protocols/msn/dialog.c:114
-#: src/protocols/msn/msn.c:561
-#: src/protocols/msn/msn.c:564
-#: 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:1331
+#: ../src/gtkrequest.c:267
+#: ../src/protocols/msn/dialog.c:132
+#: ../src/protocols/msn/msn.c:555
+#: ../src/protocols/msn/msn.c:564
+#: ../src/protocols/novell/novell.c:1919
+#: ../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 "是"
 
-#: src/gtkrequest.c:286
-#: src/protocols/msn/dialog.c:115
-#: src/protocols/msn/msn.c:561
-#: src/protocols/msn/msn.c:564
-#: 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:1331
+#: ../src/gtkrequest.c:268
+#: ../src/protocols/msn/dialog.c:133
+#: ../src/protocols/msn/msn.c:555
+#: ../src/protocols/msn/msn.c:564
+#: ../src/protocols/novell/novell.c:1920
+#: ../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 "否"
 
-#: src/gtkrequest.c:289
+#: ../src/gtkrequest.c:271
 msgid "Apply"
 msgstr "套用"
 
-#: src/gtkrequest.c:290
-#: src/protocols/msn/msn.c:357
-#: src/protocols/silc/util.c:336
+#: ../src/gtkrequest.c:272
+#: ../src/protocols/msn/msn.c:357
+#: ../src/protocols/silc/util.c:350
 msgid "Close"
 msgstr "關閉"
 
-#: src/gtkrequest.c:1832
+#: ../src/gtkrequest.c:1467
 msgid "That file already exists"
 msgstr "那個檔案已經存在"
 
-#: src/gtkrequest.c:1833
+#: ../src/gtkrequest.c:1468
 msgid "Would you like to overwrite it?"
 msgstr "您要覆蓋它嗎?"
 
-#: src/gtkrequest.c:1877
-#: src/gtkrequest.c:1918
+#: ../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:1878
-#: src/gtkrequest.c:1919
+#: ../src/gtkrequest.c:1513
+#: ../src/gtkrequest.c:1554
 msgid "Open File..."
 msgstr "開啟檔案..."
 
-#: src/gtkroomlist.c:331
+#: ../src/gtkrequest.c:1601
+#: ../src/gtkrequest.c:1615
+msgid "Select Folder..."
+msgstr "選擇資料匣..."
+
+#: ../src/gtkroomlist.c:287
+msgid "_Add"
+msgstr "加入(_A)"
+
+#: ../src/gtkroomlist.c:354
 msgid "Room List"
 msgstr "聊天室清單"
 
 #  list button
 #. list button
-#: src/gtkroomlist.c:402
+#: ../src/gtkroomlist.c:424
 msgid "_Get List"
 msgstr "取得清單(_G)"
 
-#: src/gtksavedstatuses.c:436
-#: src/protocols/jabber/buddy.c:264
-#: src/protocols/jabber/buddy.c:805
-#: src/protocols/novell/novell.c:1486
+#. add button
+#: ../src/gtkroomlist.c:432
+msgid "_Add Chat"
+msgstr "新增聊天室(_A)"
+
+#: ../src/gtksavedstatuses.c:433
+#: ../src/protocols/jabber/buddy.c:283
+#: ../src/protocols/jabber/buddy.c:920
+#: ../src/protocols/novell/novell.c:1484
 msgid "Title"
 msgstr "職銜"
 
 # NOTE 應指除存時的格式
-#: src/gtksavedstatuses.c:451
+#: ../src/gtksavedstatuses.c:448
 msgid "Type"
 msgstr "格式"
 
-#: src/gtksavedstatuses.c:462
-#: src/gtksavedstatuses.c:903
-#: src/protocols/bonjour/bonjour.c:252
-#: src/protocols/bonjour/bonjour.c:259
-#: src/protocols/gg/gg.c:1432
-#: src/protocols/gg/gg.c:1437
-#: src/protocols/gg/gg.c:1446
-#: src/protocols/gg/gg.c:1451
-#: src/protocols/gg/gg.c:1456
-#: src/protocols/irc/irc.c:176
-#: src/protocols/jabber/jabber.c:1087
-#: src/protocols/jabber/jabber.c:1095
-#: src/protocols/jabber/jabber.c:1103
-#: src/protocols/jabber/jabber.c:1111
-#: src/protocols/jabber/jabber.c:1119
-#: src/protocols/jabber/jabber.c:1127
-#: src/protocols/novell/novell.c:2869
-#: src/protocols/novell/novell.c:2980
-#: src/protocols/novell/novell.c:2986
-#: src/protocols/novell/novell.c:2992
-#: src/protocols/oscar/oscar.c:7828
-#: src/protocols/oscar/oscar.c:7835
-#: src/protocols/sametime/sametime.c:3242
-#: src/protocols/sametime/sametime.c:3248
-#: src/protocols/sametime/sametime.c:3254
-#: src/protocols/sametime/sametime.c:3327
-#: src/protocols/simple/simple.c:256
-#: src/protocols/yahoo/yahoo.c:3207
-#: src/protocols/yahoo/yahoo.c:3213
-#: src/protocols/zephyr/zephyr.c:2261
+#: ../src/gtksavedstatuses.c:459
+#: ../src/gtksavedstatuses.c:923
+#: ../src/protocols/bonjour/bonjour.c:256
+#: ../src/protocols/bonjour/bonjour.c:263
+#: ../src/protocols/gg/gg.c:1591
+#: ../src/protocols/gg/gg.c:1601
+#: ../src/protocols/gg/gg.c:1607
+#: ../src/protocols/gg/gg.c:1616
+#: ../src/protocols/gg/gg.c:1621
+#: ../src/protocols/irc/irc.c:227
+#: ../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:1234
+#: ../src/protocols/jabber/jabber.c:1246
+#: ../src/protocols/novell/novell.c:2866
+#: ../src/protocols/novell/novell.c:2972
+#: ../src/protocols/novell/novell.c:2978
+#: ../src/protocols/novell/novell.c:2984
+#: ../src/protocols/oscar/oscar.c:5388
+#: ../src/protocols/oscar/oscar.c:5403
+#: ../src/protocols/oscar/oscar.c:5408
+#: ../src/protocols/oscar/oscar.c:5616
+#: ../src/protocols/oscar/oscar.c:5628
+#: ../src/protocols/sametime/sametime.c:3266
+#: ../src/protocols/sametime/sametime.c:3272
+#: ../src/protocols/sametime/sametime.c:3278
+#: ../src/protocols/sametime/sametime.c:3357
+#: ../src/protocols/silc/buddy.c:1544
+#: ../src/protocols/simple/simple.c:242
+#: ../src/protocols/yahoo/yahoo.c:3308
+#: ../src/protocols/yahoo/yahoo.c:3314
+#: ../src/protocols/zephyr/zephyr.c:2281
 msgid "Message"
 msgstr "訊息"
 
-#: src/gtksavedstatuses.c:525
+#: ../src/gtksavedstatuses.c:526
 msgid "Saved Statuses"
 msgstr "儲存狀態"
 
 #. Use button
-#: src/gtksavedstatuses.c:550
-#: src/gtksavedstatuses.c:1150
+#: ../src/gtksavedstatuses.c:549
+#: ../src/gtksavedstatuses.c:1183
 msgid "_Use"
 msgstr "使用(_U)"
 
-#: src/gtksavedstatuses.c:660
+#: ../src/gtksavedstatuses.c:695
 msgid "Title already in use.  You must choose a unique title."
 msgstr "目前標題正在使用中。您必須選取一個唯一的標題。"
 
-#: src/gtksavedstatuses.c:862
+#: ../src/gtksavedstatuses.c:883
 msgid "Different"
 msgstr "差異"
 
-#: src/gtksavedstatuses.c:892
-#: src/gtksavedstatuses.c:1019
-#: src/protocols/gg/gg.c:1413
-#: src/protocols/gg/gg.c:1418
-#: src/protocols/jabber/buddy.c:626
-#: src/protocols/jabber/buddy.c:633
-#: src/protocols/jabber/buddy.c:644
-#: src/protocols/jabber/jabber.c:1060
-#: src/protocols/msn/msn.c:552
-#: src/protocols/novell/novell.c:2868
-#: src/protocols/novell/novell.c:2872
-#: src/protocols/oscar/oscar.c:762
-#: src/protocols/oscar/oscar.c:767
-#: src/protocols/oscar/oscar.c:769
-#: src/protocols/yahoo/yahoo.c:2809
+#: ../src/gtksavedstatuses.c:912
+#: ../src/gtksavedstatuses.c:1059
+#: ../src/protocols/gg/gg.c:1024
+#: ../src/protocols/gg/gg.c:1574
+#: ../src/protocols/gg/gg.c:1578
+#: ../src/protocols/jabber/buddy.c:629
+#: ../src/protocols/jabber/buddy.c:636
+#: ../src/protocols/jabber/buddy.c:662
+#: ../src/protocols/jabber/jabber.c:1165
+#: ../src/protocols/msn/msn.c:546
+#: ../src/protocols/novell/novell.c:2865
+#: ../src/protocols/novell/novell.c:2869
+#: ../src/protocols/oscar/oscar.c:784
+#: ../src/protocols/oscar/oscar.c:790
+#: ../src/protocols/oscar/oscar.c:793
+#: ../src/protocols/yahoo/yahoo.c:2888
 msgid "Status"
 msgstr "狀態"
 
-#: src/gtksavedstatuses.c:1038
+#: ../src/gtksavedstatuses.c:1076
 msgid "_Title:"
-msgstr "職銜(_T):"
-
-#: src/gtksavedstatuses.c:1058
-#: src/gtksavedstatuses.c:1360
+msgstr "標題(_T):"
+
+#: ../src/gtksavedstatuses.c:1095
+#: ../src/gtksavedstatuses.c:1416
 msgid "_Status:"
 msgstr "狀態(_S):"
 
 #. Different status message expander
-#: src/gtksavedstatuses.c:1093
+#: ../src/gtksavedstatuses.c:1127
 msgid "Use a _different status for some accounts"
-msgstr ""
+msgstr "為部份帳號設定不同的狀態(_D)"
 
 #. Save & Use button
-#: src/gtksavedstatuses.c:1159
+#: ../src/gtksavedstatuses.c:1191
 msgid "Sa_ve & Use"
-msgstr ""
-
-#: src/gtksavedstatuses.c:1339
+msgstr "儲存並使用(_V)"
+
+#: ../src/gtksavedstatuses.c:1397
 #, c-format
 msgid "Status for %s"
 msgstr "狀態:%s"
 
-#: src/gtksound.c:61
+#: ../src/gtksound.c:59
 msgid "Buddy logs in"
 msgstr "好友登入"
 
-#: src/gtksound.c:62
+#: ../src/gtksound.c:60
 msgid "Buddy logs out"
 msgstr "好友登出"
 
-#: src/gtksound.c:63
+#: ../src/gtksound.c:61
 msgid "Message received"
 msgstr "收到訊息"
 
-#: src/gtksound.c:64
+#: ../src/gtksound.c:62
 msgid "Message received begins conversation"
 msgstr "訊息收到,開始進行交談"
 
-#: src/gtksound.c:65
+#: ../src/gtksound.c:63
 msgid "Message sent"
 msgstr "訊息送出"
 
-#: src/gtksound.c:66
+#: ../src/gtksound.c:64
 msgid "Person enters chat"
 msgstr "有人進入聊天室"
 
-#: src/gtksound.c:67
+#: ../src/gtksound.c:65
 msgid "Person leaves chat"
 msgstr "有人離開聊天室"
 
-#: src/gtksound.c:68
+#: ../src/gtksound.c:66
 msgid "You talk in chat"
 msgstr "您在聊天室說話"
 
-#: src/gtksound.c:69
+#: ../src/gtksound.c:67
 msgid "Others talk in chat"
 msgstr "其他人進入聊天室"
 
-#: src/gtksound.c:72
-msgid "Someone says your name in chat"
+#: ../src/gtksound.c:70
+msgid "Someone says your screen name in chat"
 msgstr "有人在聊天室中提到您的名字"
 
-#: src/gtksound.c:414
-#, c-format
-msgid "Unable to play sound because the chosen file (%s) does not exist."
-msgstr "無法播放音效,因為所選取的檔案 (%s) 不存在。"
-
-#: src/gtksound.c:430
-msgid "Unable to play sound because the 'Command' sound method has been chosen, but no command has been set."
-msgstr "無法播放音效,因為選取了「指令」為播放模式,可是並沒有設定任何指令。"
-
-#: src/gtksound.c:442
-#, c-format
-msgid "Unable to play sound because the configured sound command could not be launched: %s"
-msgstr "無法播放音效,因為無法執行所設定的音效指令:%s"
-
-#: src/gtkstatusbox.c:287
-msgid "Typing"
-msgstr "輸入中"
-
 #. connect to the server
-#: src/gtkstatusbox.c:290
-#: src/protocols/irc/irc.c:257
-#: src/protocols/jabber/jabber.c:893
-#: src/protocols/msn/session.c:349
-#: src/protocols/napster/napster.c:531
-#: src/protocols/novell/novell.c:2183
-#: src/protocols/oscar/oscar.c:1804
-#: src/protocols/sametime/sametime.c:3610
-#: src/protocols/simple/simple.c:1294
-#: src/protocols/yahoo/yahoo.c:2510
-#: src/protocols/zephyr/zephyr.c:1547
+#: ../src/gtkstatusbox.c:368
+#: ../src/protocols/irc/irc.c:313
+#: ../src/protocols/jabber/jabber.c:992
+#: ../src/protocols/msn/session.c:344
+#: ../src/protocols/napster/napster.c:536
+#: ../src/protocols/novell/novell.c:2181
+#: ../src/protocols/oscar/oscar.c:1259
+#: ../src/protocols/sametime/sametime.c:3685
+#: ../src/protocols/simple/simple.c:1615
+#: ../src/protocols/yahoo/yahoo.c:2580
+#: ../src/protocols/zephyr/zephyr.c:1565
 msgid "Connecting"
 msgstr "連線中"
 
-#. hacks
-#. zephyr has several exposures
-#. NONE (where you are hidden, and zephyrs to you are in practice silently dropped -- yes this is wrong)
-#. OPSTAFF "hidden"
-#. REALM-VISIBLE visible to people in local realm
-#. REALM-ANNOUNCED REALM-VISIBLE+ plus your logins/logouts are announced to <login,username,*>
-#. NET-VISIBLE REALM-ANNOUNCED, plus visible to people in foreign realm
-#. NET-ANNOUNCED NET-VISIBLE, plus logins/logouts are announced	 to <login,username,*>
-#.
-#. Online will set the user to the exposure they have in their options (defaulting to REALM-VISIBLE),
-#. Hidden, will set the user's exposure to OPSTAFF
-#.
-#. Away won't change their exposure but will set an auto away message (for IMs only)
-#.
-#: src/gtkstatusbox.c:438
-#: src/protocols/bonjour/bonjour.c:251
-#: src/protocols/gg/gg.c:1437
-#: src/protocols/irc/irc.c:171
-#: src/protocols/jabber/buddy.c:1089
-#: src/protocols/jabber/jabber.c:1094
-#: src/protocols/msn/msn.c:581
-#: 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/napster/napster.c:584
-#: src/protocols/novell/novell.c:2846
-#: src/protocols/novell/novell.c:2978
-#: src/protocols/oscar/oscar.c:7827
-#: src/protocols/silc/silc.c:49
-#: src/protocols/simple/simple.c:254
-#: src/protocols/yahoo/yahoo.c:2664
-#: src/protocols/zephyr/zephyr.c:2253
-#: src/status.c:154
-msgid "Available"
-msgstr "上線"
-
-#: src/gtkstatusbox.c:440
-#: src/protocols/gg/gg.c:1446
-#: src/protocols/oscar/oscar.c:711
-#: src/protocols/oscar/oscar.c:7841
-#: src/protocols/yahoo/yahoo.c:2658
-#: src/protocols/yahoo/yahoo.c:3245
-msgid "Invisible"
-msgstr "隱身"
-
-#: src/gtkstatusbox.c:441
-#: src/protocols/bonjour/bonjour.c:246
-#: src/protocols/gg/gg.c:1432
-#: src/protocols/irc/irc.c:167
-#: src/protocols/jabber/buddy.c:1087
-#: src/protocols/jabber/jabber.c:1087
-#: src/protocols/msn/msn.c:577
-#: src/protocols/napster/napster.c:579
-#: src/protocols/novell/novell.c:2858
-#: src/protocols/novell/novell.c:2975
-#: src/protocols/oscar/oscar.c:769
-#: src/protocols/oscar/oscar.c:7649
-#: src/protocols/oscar/oscar.c:7822
-#: src/protocols/sametime/sametime.c:3237
-#: src/protocols/silc/silc.c:47
-#: src/protocols/simple/simple.c:250
-#: src/protocols/yahoo/yahoo.c:2662
-#: src/protocols/yahoo/yahoo.c:3202
-#: src/status.c:153
-msgid "Offline"
-msgstr "離線"
-
-#: src/gtkstatusbox.c:443
-msgid "Custom..."
-msgstr "使用者自定..."
-
-# XXX 要覆查
-#: src/gtkstatusbox.c:444
-msgid "Saved..."
-msgstr "已儲存..."
-
-#: src/gtkstock.c:138
+#: ../src/gtkstock.c:138
 msgid "_Alias"
 msgstr "別名(_A)"
 
-#: src/gtkstock.c:140
+#: ../src/gtkstock.c:140
+msgid "Close _tabs"
+msgstr "關閉分頁(_T)"
+
+#: ../src/gtkstock.c:142
+msgid "_Get Info"
+msgstr "取得資訊"
+
+#: ../src/gtkstock.c:143
 msgid "_Invite"
 msgstr "邀請(_I)"
 
-#: src/gtkstock.c:141
+#: ../src/gtkstock.c:144
 msgid "_Modify"
 msgstr "修改(_M)"
 
-#: src/gtkstock.c:142
+#: ../src/gtkstock.c:145
 msgid "_Open Mail"
 msgstr "開啟郵件(_O)"
 
-#: src/gtkstock.c:144
-msgid "_Warn"
-msgstr "警告(_W)"
-
-#: src/gtkutils.c:1309
-#: src/gtkutils.c:1334
-#, fuzzy, c-format
+#: ../src/gtkutils.c:1306
+#: ../src/gtkutils.c:1331
+#, c-format
 msgid "The following error has occurred loading %s: %s"
-msgstr "發生了一個未知的登入錯誤:%s。"
-
-#: src/gtkutils.c:1311
-#: src/gtkutils.c:1336
+msgstr "載入 %s 時發生以下錯誤:%s"
+
+#: ../src/gtkutils.c:1308
+#: ../src/gtkutils.c:1333
 msgid "Failed to load image"
 msgstr "讀取影像失敗"
 
-#: src/gtkutils.c:1411
-#, fuzzy, c-format
+#: ../src/gtkutils.c:1408
+#, c-format
 msgid "Cannot send folder %s."
-msgstr "無法傳送檔案"
-
-#: src/gtkutils.c:1413
+msgstr "無法傳送目錄 %s。"
+
+#: ../src/gtkutils.c:1410
 msgid "Gaim cannot transfer a folder. You will need to send the files within individually"
 msgstr "Gaim 沒有辦法傳送目錄。您需要個別傳送檔案"
 
-#: src/gtkutils.c:1441
-#: src/gtkutils.c:1450
-#: src/gtkutils.c:1455
-#, fuzzy
+#: ../src/gtkutils.c:1438
+#: ../src/gtkutils.c:1447
+#: ../src/gtkutils.c:1452
 msgid "You have dragged an image"
-msgstr "您輸入了無效的使用者名稱"
-
-#: src/gtkutils.c:1442
+msgstr "您拖曳了一個影像"
+
+#: ../src/gtkutils.c:1439
 msgid "You can send this image as a file transfer, embed it into this message, or use it as the buddy icon for this user."
 msgstr "您可以透過檔案傳輸、插入訊息,或者把它當成是你的好友圖示等方式,來傳送影像檔給這個使用者。"
 
-#: src/gtkutils.c:1446
-#: src/gtkutils.c:1461
+#: ../src/gtkutils.c:1443
+#: ../src/gtkutils.c:1458
 msgid "Set as buddy icon"
 msgstr "設為好友圖示"
 
-#: src/gtkutils.c:1447
-#: src/gtkutils.c:1462
+#: ../src/gtkutils.c:1444
+#: ../src/gtkutils.c:1459
 msgid "Send image file"
 msgstr "傳送影像檔"
 
-#: src/gtkutils.c:1448
-#: src/gtkutils.c:1462
+#: ../src/gtkutils.c:1445
+#: ../src/gtkutils.c:1459
 msgid "Insert in message"
 msgstr "插入到訊息"
 
-#: src/gtkutils.c:1451
+#: ../src/gtkutils.c:1448
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "您要把它設為這個使用者的好友圖示嗎?"
 
-#: src/gtkutils.c:1456
+#: ../src/gtkutils.c:1453
 msgid "You can send this image as a file transfer or embed it into this message, or use it as the buddy icon for this user."
 msgstr "您可以透過檔案傳輸、插入訊息,或者把它當成是你的好友圖示等方式,來傳送影像檔給這個使用者。"
 
-#: src/gtkutils.c:1458
+#: ../src/gtkutils.c:1455
 msgid "You can insert this image into this message, or use it as the buddy icon for this user"
 msgstr "您可以透過插入訊息,或者把它當成是你的好友圖示等方式,來傳送影像檔給這個使用者。"
 
@@ -5322,101 +5650,137 @@
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: src/gtkutils.c:1512
+#: ../src/gtkutils.c:1509
 #, fuzzy
 msgid "Cannot send launcher"
 msgstr "無法傳送檔案"
 
-#: src/gtkutils.c:1512
+#: ../src/gtkutils.c:1509
 msgid "You dragged a desktop launcher. Most likely you wanted to send whatever this launcher points to instead of this launcher itself."
 msgstr ""
 
-#. 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 ""
-
-#: src/log.c:129
+#: ../src/gtkwhiteboard.c:756
+#: ../src/gtkwhiteboard.c:775
+msgid "Save File"
+msgstr "儲存檔案"
+
+#: ../src/gtkwhiteboard.c:863
+msgid "Select color"
+msgstr "選擇顏色"
+
+#: ../src/log.c:181
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">這個日誌模組沒有定義「讀取」函數</font></b>"
 
-#: src/log.c:497
+#: ../src/log.c:562
 msgid "HTML"
 msgstr "HTML"
 
 # NOTE Nautilus譯「貼上文本」,Abiword譯「未格式化貼上」,聽來都有些怪
 # ANS 直譯「純文字」
-#: src/log.c:508
+#: ../src/log.c:573
 msgid "Plain text"
 msgstr "純文字"
 
-#: src/log.c:519
+#: ../src/log.c:584
 msgid "Old Gaim"
 msgstr "舊版 Gaim"
 
-#: src/log.c:577
+#: ../src/log.c:691
 msgid "Logging of this conversation failed."
-msgstr ""
-
-#: src/log.c:839
+msgstr "無法記錄這個交談。"
+
+#: ../src/log.c:1041
 msgid "XML"
 msgstr "XML"
 
-#: src/log.c:904
+#: ../src/log.c:1115
 #, c-format
 msgid "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
 msgstr "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;自動回應&gt;:</b></font> %s<br/>\n"
 
-#: src/log.c:906
+#: ../src/log.c:1117
 #, c-format
 msgid "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
 msgstr "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;自動回應&gt;:</b></font> %s<br/>\n"
 
 # XXX 暫譯
-#: src/log.c:957
-#: src/log.c:1074
+#: ../src/log.c:1175
+#: ../src/log.c:1307
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>找不到日誌檔案!</b></font>"
 
-#: src/log.c:967
-#: src/log.c:1086
+#: ../src/log.c:1187
+#: ../src/log.c:1321
 #, 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:1019
+#: ../src/log.c:1249
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <自動回應>:%s\n"
 
-#: src/plugin.c:362
+#: ../src/plugin.c:281
+#: ../src/protocols/jabber/buddy.c:1645
+#: ../src/protocols/msn/servconn.c:141
+#: ../src/protocols/msn/session.c:321
+#: ../src/protocols/oscar/oscar.c:2702
+msgid "Unknown error"
+msgstr "未知錯誤"
+
+#: ../src/plugin.c:424
+#, c-format
+msgid "Plugin magic mismatch %d (need %d)"
+msgstr "模組不符 %d (需要 %d)"
+
+#: ../src/plugin.c:441
+#, c-format
+msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
+msgstr "ABI 版本不符 %d.%d.x (需要%d.%d.x)"
+
+#: ../src/plugin.c:458
+msgid "Plugin does not implement all required functions"
+msgstr "模組並未實作所有必要的功能"
+
+#: ../src/plugin.c:523
 #, c-format
 msgid "The required plugin %s was not found. Please install this plugin and try again."
 msgstr "找不到需要的模組「%s」。請重新安裝這個模組之後重試。"
 
-#: src/plugin.c:367
-#: src/plugin.c:395
-msgid "Gaim was unable to load your plugin."
-msgstr "Gaim 無法讀入您所提供的模組。"
-
-#: src/plugin.c:391
+#: ../src/plugin.c:528
+msgid "Gaim encountered errors loading the plugin."
+msgstr "Gaim 讀入模組時發生錯誤。"
+
+#: ../src/plugin.c:551
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "無法載入需要的模組「%s」。"
 
+#: ../src/plugin.c:555
+msgid "Gaim was unable to load your plugin."
+msgstr "Gaim 無法讀入您所提供的模組。"
+
+#: ../src/plugin.c:657
+#, c-format
+msgid "The dependent plugin %s failed to unload."
+msgstr "關聯模組 %s 卸載失敗。"
+
+#: ../src/plugin.c:662
+msgid "Gaim encountered errors unloading the plugin."
+msgstr "Gaim 遭遇錯誤並卸載相關模組。"
+
 #. Send a message about the connection error
-#: src/protocols/bonjour/bonjour.c:107
+#: ../src/protocols/bonjour/bonjour.c:111
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "無法接收連入的即時訊息連線\n"
 
-#: src/protocols/bonjour/bonjour.c:142
+#: ../src/protocols/bonjour/bonjour.c:146
 msgid "Unable to establish connection with the local mDNS server.  Is it running?"
-msgstr ""
-
-#: src/protocols/bonjour/bonjour.c:328
+msgstr "無法與近端的 mDNS 伺服器建立連線。它在執行中嗎?"
+
+#: ../src/protocols/bonjour/bonjour.c:337
+#: ../src/protocols/sametime/sametime.c:3243
 #, c-format
 msgid ""
 "\n"
@@ -5425,7 +5789,7 @@
 "\n"
 "<b>狀態:</b>%s"
 
-#: src/protocols/bonjour/bonjour.c:330
+#: ../src/protocols/bonjour/bonjour.c:339
 #, c-format
 msgid ""
 "\n"
@@ -5444,419 +5808,433 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/bonjour/bonjour.c:424
-#: src/protocols/bonjour/bonjour.c:426
+#: ../src/protocols/bonjour/bonjour.c:434
+#: ../src/protocols/bonjour/bonjour.c:436
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour 協定模組"
 
-#: src/protocols/bonjour/bonjour.c:458
-#: src/protocols/bonjour/bonjour.c:515
+#: ../src/protocols/bonjour/bonjour.c:472
+#: ../src/protocols/bonjour/bonjour.c:480
+#: ../src/protocols/bonjour/bonjour.c:538
+#: ../src/protocols/silc/silc.c:307
 msgid "Gaim User"
 msgstr "Gaim 使用者"
 
 #. Creating the user splits
-#: src/protocols/bonjour/bonjour.c:553
-#: src/protocols/silc/silc.c:921
+#: ../src/protocols/bonjour/bonjour.c:576
+#: ../src/protocols/silc/silc.c:937
 msgid "Hostname"
 msgstr "主機名稱"
 
 #. Creating the options for the protocol
-#. port to connect to
-#: src/protocols/bonjour/bonjour.c:557
-#: src/protocols/irc/irc.c:820
-#: src/protocols/msn/msn.c:1943
-#: src/protocols/napster/napster.c:719
-#: src/protocols/sametime/sametime.c:5586
-#: src/protocols/silc/silc.c:1836
-msgid "Port"
-msgstr "通訊埠"
-
-#: src/protocols/bonjour/bonjour.c:560
-#: src/protocols/gg/gg.c:571
-#: src/protocols/gg/gg.c:986
+#: ../src/protocols/bonjour/bonjour.c:580
+#: ../src/protocols/gg/gg.c:622
+#: ../src/protocols/jabber/jabber.c:786
 msgid "First name"
 msgstr "名"
 
-#: src/protocols/bonjour/bonjour.c:563
-#: src/protocols/gg/gg.c:566
+#: ../src/protocols/bonjour/bonjour.c:583
+#: ../src/protocols/gg/gg.c:617
+#: ../src/protocols/jabber/jabber.c:791
 msgid "Last name"
 msgstr "姓"
 
-#: src/protocols/bonjour/bonjour.c:566
-#: src/protocols/jabber/buddy.c:261
-#: src/protocols/jabber/buddy.c:772
-#: src/protocols/jabber/buddy.c:780
-#: src/protocols/silc/silc.c:685
-#: src/protocols/silc/silc.c:925
-#: src/protocols/silc/util.c:512
-#: src/protocols/yahoo/yahoo_profile.c:999
-msgid "Email"
+#: ../src/protocols/bonjour/bonjour.c:586
+#: ../src/protocols/gg/gg.c:468
+#: ../src/protocols/jabber/jabber.c:776
+#: ../src/protocols/silc/silc.c:701
+#: ../src/protocols/silc/silc.c:941
+msgid "E-mail"
 msgstr "電子郵件"
 
+#: ../src/protocols/bonjour/bonjour.c:589
+msgid "AIM Account"
+msgstr "AIM 帳號"
+
+#: ../src/protocols/bonjour/bonjour.c:592
+msgid "Jabber Account"
+msgstr "Jabber 帳號"
+
 # NOTE 法文「日安」
-#: src/protocols/bonjour/bonjour.h:35
+#: ../src/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
 msgstr "您好"
 
-#: src/protocols/gg/gg.c:89
-#: src/protocols/gg/gg.c:111
-#: src/protocols/gg/gg.c:146
+#: ../src/protocols/bonjour/jabber.c:374
+#, c-format
+msgid "%s has closed the conversation."
+msgstr "%s 已經關閉這個交談。"
+
+#: ../src/protocols/bonjour/jabber.c:461
+msgid "Cannot open socket"
+msgstr "無法開啟Socket"
+
+#: ../src/protocols/bonjour/jabber.c:469
+msgid "Error setting socket options"
+msgstr "設定 Socket 選項時錯誤"
+
+#: ../src/protocols/bonjour/jabber.c:493
+#, fuzzy
+msgid "Could not bind socket to port"
+msgstr "無法聯結 Socket 到通訊埠"
+
+#: ../src/protocols/bonjour/jabber.c:501
 #, fuzzy
+msgid "Could not listen on socket"
+msgstr "無法監聽 Socket"
+
+#: ../src/protocols/bonjour/jabber.c:594
+msgid "Unable to send the message, the conversation couldn't be started."
+msgstr "無法送出訊息,交談無法開始。"
+
+#: ../src/protocols/gg/gg.c:76
+#: ../src/proxy.c:2350
+msgid "Invalid proxy settings"
+msgstr "無效的代理伺服器設定"
+
+#: ../src/protocols/gg/gg.c:77
+#: ../src/proxy.c:2350
+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:90
-#: src/protocols/gg/gg.c:112
-#: src/protocols/gg/gg.c:147
-#, fuzzy
+msgstr "Token 錯誤"
+
+#: ../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 "無法取得聊天室清單。"
-
-#: src/protocols/gg/gg.c:235
-#: src/protocols/gg/gg.c:254
+msgstr "無法取得 Token。\n"
+
+#: ../src/protocols/gg/gg.c:269
+#: ../src/protocols/gg/gg.c:288
 msgid "Save Buddylist..."
 msgstr "儲存好友清單..."
 
-#: src/protocols/gg/gg.c:236
+#: ../src/protocols/gg/gg.c:270
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "您的好友清單是空的,所以沒有資料被寫入檔案中。"
 
-#: src/protocols/gg/gg.c:242
-#: src/protocols/gg/gg.c:244
+#: ../src/protocols/gg/gg.c:276
+#: ../src/protocols/gg/gg.c:278
 msgid "Couldn't open file"
 msgstr "無法開啟檔案"
 
-#: src/protocols/gg/gg.c:255
+#: ../src/protocols/gg/gg.c:289
 msgid "Buddylist saved successfully!"
 msgstr "好友清單儲存成功!"
 
-#: src/protocols/gg/gg.c:273
-#: src/protocols/gg/gg.c:274
+#: ../src/protocols/gg/gg.c:307
+#: ../src/protocols/gg/gg.c:308
 msgid "Couldn't load buddylist"
 msgstr "無法讀入好友清單"
 
-#: src/protocols/gg/gg.c:290
+#: ../src/protocols/gg/gg.c:324
 msgid "Load Buddylist..."
 msgstr "讀取好友清單..."
 
-#: src/protocols/gg/gg.c:291
+#: ../src/protocols/gg/gg.c:325
 msgid "Buddylist loaded successfully!"
 msgstr "好友清單讀取成功!"
 
-#: src/protocols/gg/gg.c:302
+#: ../src/protocols/gg/gg.c:336
 msgid "Save buddylist..."
 msgstr "儲存好友清單..."
 
-#: src/protocols/gg/gg.c:346
+#: ../src/protocols/gg/gg.c:380
 msgid "Fill in the registration fields."
-msgstr ""
-
-#: src/protocols/gg/gg.c:351
+msgstr "填寫註冊資料欄位。"
+
+#: ../src/protocols/gg/gg.c:385
 msgid "Passwords do not match."
 msgstr "新密碼並不相符。"
 
-#: src/protocols/gg/gg.c:360
+#: ../src/protocols/gg/gg.c:394
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "無法註冊新帳號。錯誤發生。\n"
 
-#: src/protocols/gg/gg.c:373
+#: ../src/protocols/gg/gg.c:407
 msgid "New Gadu-Gadu Account Registered"
 msgstr "新的 Gadu-Gadu 帳號已註冊"
 
-#: src/protocols/gg/gg.c:374
+#: ../src/protocols/gg/gg.c:408
 msgid "Registration completed successfully!"
 msgstr "註冊成功!"
 
-#: src/protocols/gg/gg.c:434
-msgid "e-Mail"
-msgstr "電子郵件"
-
-#: src/protocols/gg/gg.c:439
-#: src/protocols/gg/gg.c:713
-#: src/protocols/jabber/jabber.c:680
-#: src/protocols/jabber/jabber.c:1205
+#: ../src/protocols/gg/gg.c:473
+#: ../src/protocols/gg/gg.c:764
+#: ../src/protocols/jabber/jabber.c:765
+#: ../src/protocols/jabber/jabber.c:1319
 msgid "Password"
 msgstr "密碼"
 
-#: src/protocols/gg/gg.c:444
-#: src/protocols/gg/gg.c:718
+#: ../src/protocols/gg/gg.c:478
+#: ../src/protocols/gg/gg.c:769
 msgid "Password (retype)"
 msgstr "密碼(再次輸入)"
 
-#: src/protocols/gg/gg.c:449
-#: src/protocols/gg/gg.c:723
+#: ../src/protocols/gg/gg.c:483
+#: ../src/protocols/gg/gg.c:774
 msgid "Enter current token"
 msgstr "輸入目前的密碼"
 
-#: src/protocols/gg/gg.c:455
-#: src/protocols/gg/gg.c:729
+#: ../src/protocols/gg/gg.c:489
+#: ../src/protocols/gg/gg.c:780
 msgid "Current token"
 msgstr "目前密碼"
 
-#: src/protocols/gg/gg.c:459
-#: src/protocols/gg/gg.c:460
+#: ../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:461
+#: ../src/protocols/gg/gg.c:495
 msgid "Please, fill in the following fields"
 msgstr "請輸入以下的欄位"
 
-#: src/protocols/gg/gg.c:556
-#: src/protocols/gg/gg.c:1605
-msgid "Unable to initiate a new search"
-msgstr "無法啟始一個新的搜尋"
-
-#: src/protocols/gg/gg.c:557
-#: src/protocols/gg/gg.c:1606
-msgid "You have a pending search. Please wait for it to finish."
-msgstr "您有一個處理中的搜尋。請等候它完成。"
-
-#: src/protocols/gg/gg.c:576
-#: src/protocols/gg/gg.c:989
-#: src/protocols/gg/gg.c:1985
-#: src/protocols/jabber/buddy.c:252
-#: src/protocols/jabber/buddy.c:698
-#: src/protocols/jabber/buddy.c:1341
-#: src/protocols/jabber/jabber.c:696
-#: src/protocols/msn/msn.c:1368
-#: src/protocols/silc/buddy.c:1494
-#: src/protocols/silc/ops.c:1036
-#: src/protocols/silc/ops.c:1179
-#: src/protocols/silc/ops.c:1328
-#: src/protocols/yahoo/yahoo_profile.c:1004
+#. General
+#: ../src/protocols/gg/gg.c:627
+#: ../src/protocols/gg/gg.c:1038
+#: ../src/protocols/gg/gg.c:1104
+#: ../src/protocols/gg/gg.c:2175
+#: ../src/protocols/jabber/buddy.c:271
+#: ../src/protocols/jabber/buddy.c:803
+#: ../src/protocols/jabber/buddy.c:1522
+#: ../src/protocols/jabber/buddy.c:1704
+#: ../src/protocols/jabber/jabber.c:781
+#: ../src/protocols/msn/msn.c:1370
+#: ../src/protocols/msn/msn.c:1532
+#: ../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:581
-#: src/protocols/gg/gg.c:992
-#: src/protocols/jabber/jabber.c:716
-#: src/protocols/oscar/oscar.c:6048
-#: src/protocols/oscar/oscar.c:6056
+#: ../src/protocols/gg/gg.c:632
+#: ../src/protocols/gg/gg.c:1043
+#: ../src/protocols/gg/gg.c:1107
+#: ../src/protocols/jabber/jabber.c:801
+#: ../src/protocols/oscar/oscar.c:3708
+#: ../src/protocols/oscar/oscar.c:3716
 msgid "City"
 msgstr "城市"
 
-#: src/protocols/gg/gg.c:586
+#: ../src/protocols/gg/gg.c:637
 msgid "Year of birth"
 msgstr "出生年"
 
-#: src/protocols/gg/gg.c:589
-#: src/protocols/msn/msn.c:1527
-#: src/protocols/oscar/oscar.c:6021
-#: src/protocols/yahoo/yahoo_profile.c:1029
+#: ../src/protocols/gg/gg.c:640
+#: ../src/protocols/msn/msn.c:1534
+#: ../src/protocols/oscar/oscar.c:3672
+#: ../src/protocols/yahoo/yahoo_profile.c:1066
 msgid "Gender"
 msgstr "性別"
 
-#: src/protocols/gg/gg.c:590
+#: ../src/protocols/gg/gg.c:641
 msgid "Male or female"
 msgstr "男性或女性"
 
-#: src/protocols/gg/gg.c:591
-#: src/protocols/oscar/oscar.c:6021
+#: ../src/protocols/gg/gg.c:642
+#: ../src/protocols/oscar/oscar.c:3672
 msgid "Male"
 msgstr "男"
 
-#: src/protocols/gg/gg.c:592
-#: src/protocols/oscar/oscar.c:6021
+#: ../src/protocols/gg/gg.c:643
+#: ../src/protocols/oscar/oscar.c:3672
 msgid "Female"
 msgstr "女"
 
-#: src/protocols/gg/gg.c:596
+#: ../src/protocols/gg/gg.c:647
 msgid "Only online"
 msgstr "只有上線"
 
-#: src/protocols/gg/gg.c:600
-#: src/protocols/gg/gg.c:601
+#: ../src/protocols/gg/gg.c:651
+#: ../src/protocols/gg/gg.c:652
 msgid "Find buddies"
 msgstr "搜尋好友"
 
-#: src/protocols/gg/gg.c:602
+#: ../src/protocols/gg/gg.c:653
 msgid "Please, enter your search criteria below"
 msgstr "請在下方輸入您的搜尋條件"
 
-#: src/protocols/gg/gg.c:639
+#: ../src/protocols/gg/gg.c:690
 msgid "Fill in the fields."
 msgstr "填到欄位中。"
 
-#: src/protocols/gg/gg.c:651
+#: ../src/protocols/gg/gg.c:702
 msgid "Your current password is different from the one that you specified."
-msgstr ""
-
-#: src/protocols/gg/gg.c:665
+msgstr "您目前所提供的密碼與指定的帳號不符。"
+
+#: ../src/protocols/gg/gg.c:716
 msgid "Unable to change password. Error occured.\n"
 msgstr "無法修改密碼。錯誤發生。\n"
 
-#: src/protocols/gg/gg.c:674
+#: ../src/protocols/gg/gg.c:725
 msgid "Change password for the Gadu-Gadu account"
 msgstr "變更 Gadu-Gadu 帳號的密碼"
 
-#: src/protocols/gg/gg.c:675
+#: ../src/protocols/gg/gg.c:726
 msgid "Password was changed successfully!"
 msgstr "密碼修改成功!"
 
-#: src/protocols/gg/gg.c:708
+#: ../src/protocols/gg/gg.c:759
 msgid "Current password"
 msgstr "舊密碼"
 
-#: src/protocols/gg/gg.c:733
+#: ../src/protocols/gg/gg.c:784
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "請輸您的舊密碼及你的新密碼:"
 
-#: src/protocols/gg/gg.c:737
-#: src/protocols/gg/gg.c:738
+#: ../src/protocols/gg/gg.c:788
+#: ../src/protocols/gg/gg.c:789
 msgid "Change Gadu-Gadu Password"
 msgstr "變更 Gadu-Gadu 密碼"
 
-#: src/protocols/gg/gg.c:822
-#, fuzzy, c-format
+#: ../src/protocols/gg/gg.c:863
+#, c-format
 msgid "Select a chat for buddy: %s"
-msgstr "將這個聊天室自您的好友清單中移除"
-
-#: src/protocols/gg/gg.c:825
-#: src/protocols/gg/gg.c:826
-#, fuzzy
+msgstr "選取一個聊天室給好友;%s"
+
+#: ../src/protocols/gg/gg.c:866
+#: ../src/protocols/gg/gg.c:867
 msgid "Add to chat..."
-msgstr "新增一個聊天室(_H)"
-
-#: src/protocols/gg/gg.c:965
+msgstr "新增到聊天室..."
+
+#: ../src/protocols/gg/gg.c:1029
+#: ../src/protocols/gg/gg.c:1098
+#: ../src/protocols/oscar/oscar.c:3644
+msgid "UIN"
+msgstr "帳號"
+
+#: ../src/protocols/gg/gg.c:1033
+#: ../src/protocols/gg/gg.c:1101
+#: ../src/protocols/jabber/buddy.c:1518
+#: ../src/protocols/jabber/buddy.c:1694
+#: ../src/protocols/oscar/oscar.c:3655
+#: ../src/protocols/silc/ops.c:1024
+msgid "First Name"
+msgstr "名"
+
+#: ../src/protocols/gg/gg.c:1052
+#: ../src/protocols/gg/gg.c:1110
+msgid "Birth Year"
+msgstr "出生年"
+
+#: ../src/protocols/gg/gg.c:1092
+#: ../src/protocols/gg/gg.c:1161
+#: ../src/protocols/oscar/oscar.c:3819
+msgid "Unable to display the search results."
+msgstr "無法顯示搜尋結果。"
+
+#: ../src/protocols/gg/gg.c:1152
+msgid "Gadu-Gadu Public Directory"
+msgstr "Gadu-Gadu 公共字典"
+
+#: ../src/protocols/gg/gg.c:1153
+msgid "Search results"
+msgstr "搜尋結果"
+
+#: ../src/protocols/gg/gg.c:1197
 msgid "No matching users found"
 msgstr "找不到符合的使用者"
 
-#: src/protocols/gg/gg.c:966
+#: ../src/protocols/gg/gg.c:1198
 msgid "There are no users matching your search criteria."
 msgstr "無法依照搜尋條件找到相符的使用者。"
 
-#: src/protocols/gg/gg.c:977
-#: src/protocols/gg/gg.c:1044
-#: src/protocols/oscar/oscar.c:6158
-msgid "Unable to display the search results."
-msgstr "無法顯示搜尋結果。"
-
-#: src/protocols/gg/gg.c:983
-#: src/protocols/oscar/oscar.c:5993
-msgid "UIN"
-msgstr "帳號"
-
-#: src/protocols/gg/gg.c:995
-msgid "Birth year"
-msgstr "生日"
-
-#: src/protocols/gg/gg.c:1035
-msgid "Gadu-Gadu Public Directory"
-msgstr "Gadu-Gadu 公共字典"
-
-#: src/protocols/gg/gg.c:1036
-msgid "Search results"
-msgstr "搜尋結果"
-
-#: src/protocols/gg/gg.c:1132
-#: src/protocols/gg/gg.c:1279
+#: ../src/protocols/gg/gg.c:1292
+#: ../src/protocols/gg/gg.c:1439
 msgid "Unable to read socket"
 msgstr "無法讀取 Socket"
 
-#: src/protocols/gg/gg.c:1215
+#: ../src/protocols/gg/gg.c:1375
 msgid "Buddy list downloaded"
 msgstr "下載好友清單"
 
-#: src/protocols/gg/gg.c:1216
+#: ../src/protocols/gg/gg.c:1376
 msgid "Your buddy list was downloaded from the server."
 msgstr "您已從伺服器下載好友清單。"
 
-#: src/protocols/gg/gg.c:1223
+#: ../src/protocols/gg/gg.c:1383
 msgid "Buddy list uploaded"
 msgstr "上傳好友清單"
 
-#: src/protocols/gg/gg.c:1224
+#: ../src/protocols/gg/gg.c:1384
 msgid "Your buddy list was stored on the server."
 msgstr "您的好友清單已被存放於伺服器上。"
 
-#: src/protocols/gg/gg.c:1313
-#: src/protocols/gg/gg.c:1531
+#: ../src/protocols/gg/gg.c:1485
+#: ../src/protocols/gg/gg.c:1709
 msgid "Connection failed."
 msgstr "連線失敗。"
 
-#: src/protocols/gg/gg.c:1451
-#: src/protocols/msn/msn.c:593
-#: src/protocols/msn/state.c:31
-#: src/protocols/novell/novell.c:2852
-#: src/protocols/novell/novell.c:2990
-#: src/protocols/silc/buddy.c:1435
-#: src/protocols/silc/silc.c:55
-#: src/protocols/yahoo/yahoo.c:2642
-#: src/protocols/yahoo/yahoo.c:3220
-msgid "Busy"
-msgstr "忙碌"
-
-#: src/protocols/gg/gg.c:1456
-#: src/protocols/msn/msn.c:562
+#: ../src/protocols/gg/gg.c:1615
+#: ../src/protocols/msn/msn.c:562
 msgid "Blocked"
 msgstr "封鎖"
 
-#: src/protocols/gg/gg.c:1473
-#, fuzzy
+#: ../src/protocols/gg/gg.c:1638
 msgid "Add to chat"
-msgstr "新增聊天室"
-
-#: src/protocols/gg/gg.c:1478
-#, fuzzy
+msgstr "新增到聊天室"
+
+#: ../src/protocols/gg/gg.c:1647
 msgid "Unblock"
+msgstr "解除封鎖"
+
+#: ../src/protocols/gg/gg.c:1651
+msgid "Block"
 msgstr "封鎖"
 
-#: src/protocols/gg/gg.c:1497
+#: ../src/protocols/gg/gg.c:1668
 #, fuzzy
 msgid "Chat _name:"
 msgstr "姓:"
 
-# NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
-#: src/protocols/gg/gg.c:1716
+#: ../src/protocols/gg/gg.c:1896
 #, fuzzy
 msgid "Chat error"
 msgstr "讀取錯誤"
 
-#: src/protocols/gg/gg.c:1717
-#, fuzzy
+#: ../src/protocols/gg/gg.c:1897
 msgid "This chat name is already in use"
-msgstr "那個檔案已經存在"
-
-#: src/protocols/gg/gg.c:1799
-#, fuzzy
+msgstr "聊天室名稱正在使用中"
+
+#: ../src/protocols/gg/gg.c:1980
 msgid "Not connected to the server."
-msgstr "您已經停止與伺服器的連線。"
-
-#: src/protocols/gg/gg.c:1822
-#, fuzzy
+msgstr "尚未連線到伺服器。"
+
+#: ../src/protocols/gg/gg.c:2003
 msgid "Find buddies..."
-msgstr "把閒置的好友設為灰色(_D)"
-
-#: src/protocols/gg/gg.c:1828
-#, fuzzy
+msgstr "尋找好友..."
+
+#: ../src/protocols/gg/gg.c:2009
 msgid "Change password..."
 msgstr "修改密碼..."
 
-#: src/protocols/gg/gg.c:1834
-#, fuzzy
+#: ../src/protocols/gg/gg.c:2015
 msgid "Upload buddylist to Server"
-msgstr "匯出好友名單到伺服器上"
-
-#: src/protocols/gg/gg.c:1838
-#, fuzzy
+msgstr "上傳好友清單到伺服器"
+
+#: ../src/protocols/gg/gg.c:2019
 msgid "Download buddylist from Server"
-msgstr "將伺服器上的好友名單刪除"
-
-#: src/protocols/gg/gg.c:1842
-#, fuzzy
+msgstr "自伺服器下載好友清單"
+
+#: ../src/protocols/gg/gg.c:2023
 msgid "Delete buddylist from Server"
-msgstr "將伺服器上的好友名單刪除"
-
-#: src/protocols/gg/gg.c:1846
-#, fuzzy
+msgstr "將伺服器上的好友清單刪除"
+
+#: ../src/protocols/gg/gg.c:2027
 msgid "Save buddylist to file..."
-msgstr "儲存好友清單到檔案中"
-
-#: src/protocols/gg/gg.c:1850
-#, fuzzy
+msgstr "儲存好友清單到檔案中..."
+
+#: ../src/protocols/gg/gg.c:2031
 msgid "Load buddylist from file..."
-msgstr "自伺服器上匯入好友名單"
+msgstr "自檔案讀取好友清單..."
 
 #. magic
 #. major_version
@@ -5869,142 +6247,142 @@
 #. id
 #. name
 #. version
-#: src/protocols/gg/gg.c:1937
+#: ../src/protocols/gg/gg.c:2127
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu 協定模組"
 
 #. summary
-#: src/protocols/gg/gg.c:1938
+#: ../src/protocols/gg/gg.c:2128
 msgid "Polish popular IM"
 msgstr "波蘭廣受歡迎的即時通訊程式"
 
-#: src/protocols/gg/gg.c:1986
-#, fuzzy
+#: ../src/protocols/gg/gg.c:2176
 msgid "Gadu-Gadu User"
-msgstr "Gadu-Gadu 搜尋引擎"
-
-#: src/protocols/irc/cmds.c:43
-#: src/protocols/silc/silc.c:1572
+msgstr "Gadu-Gadu 使用者"
+
+#: ../src/protocols/irc/cmds.c:43
+#: ../src/protocols/silc/silc.c:1587
 #, c-format
 msgid "Unknown command: %s"
 msgstr "未知的指令:%s"
 
-#: src/protocols/irc/cmds.c:485
-#: src/protocols/jabber/chat.c:592
-#: src/protocols/silc/silc.c:1280
+#: ../src/protocols/irc/cmds.c:501
+#: ../src/protocols/jabber/chat.c:590
+#: ../src/protocols/silc/silc.c:1295
 #, c-format
 msgid "current topic is: %s"
 msgstr "現在的主題為:%s"
 
-#: src/protocols/irc/cmds.c:489
-#: src/protocols/jabber/chat.c:596
-#: src/protocols/silc/silc.c:1284
+#: ../src/protocols/irc/cmds.c:505
+#: ../src/protocols/jabber/chat.c:594
+#: ../src/protocols/silc/silc.c:1299
 msgid "No topic is set"
 msgstr "沒有設定主題"
 
-#: src/protocols/irc/dcc_send.c:272
-#: src/protocols/yahoo/yahoo_filexfer.c:173
-#: src/protocols/yahoo/yahoo_filexfer.c:182
-#: src/protocols/yahoo/yahoo_filexfer.c:191
-#, fuzzy
+#: ../src/protocols/irc/dcc_send.c:287
+#: ../src/protocols/irc/dcc_send.c:326
+#: ../src/protocols/yahoo/yahoo_filexfer.c:252
+#: ../src/protocols/yahoo/yahoo_filexfer.c:261
+#: ../src/protocols/yahoo/yahoo_filexfer.c:270
 msgid "File Transfer Failed"
-msgstr "檔案傳輸已取消"
-
-#: src/protocols/irc/dcc_send.c:273
+msgstr "檔案傳輸失敗"
+
+#: ../src/protocols/irc/dcc_send.c:288
+#: ../src/protocols/irc/dcc_send.c:327
 msgid "Gaim could not open a listening port."
 msgstr "Gaim 無法開啟監聽埠。"
 
-#: src/protocols/irc/irc.c:78
+#: ../src/protocols/irc/irc.c:78
 msgid "Error displaying MOTD"
 msgstr "顯示是日訊息時發生了錯誤"
 
-#: src/protocols/irc/irc.c:78
+#: ../src/protocols/irc/irc.c:78
 msgid "No MOTD available"
 msgstr "沒有是日訊息"
 
-#: src/protocols/irc/irc.c:79
+#: ../src/protocols/irc/irc.c:79
 msgid "There is no MOTD associated with this connection."
 msgstr "這個連結沒有相關的是日訊息。"
 
-#: src/protocols/irc/irc.c:82
+#: ../src/protocols/irc/irc.c:82
 #, c-format
 msgid "MOTD for %s"
 msgstr "%s 的是日訊息"
 
-#: src/protocols/irc/irc.c:102
-#: src/protocols/irc/irc.c:529
-#: src/protocols/irc/irc.c:551
+#: ../src/protocols/irc/irc.c:119
+#: ../src/protocols/irc/irc.c:149
+#: ../src/protocols/irc/irc.c:604
+#: ../src/protocols/irc/irc.c:629
 msgid "Server has disconnected"
 msgstr "伺服器已停止連線"
 
-#: src/protocols/irc/irc.c:187
+#: ../src/protocols/irc/irc.c:242
 msgid "View MOTD"
 msgstr "顯示是日訊息 (MOTD)"
 
-#: src/protocols/irc/irc.c:199
-#: src/protocols/silc/chat.c:33
+#: ../src/protocols/irc/irc.c:254
+#: ../src/protocols/silc/chat.c:33
 msgid "_Channel:"
 msgstr "頻道(_C):"
 
-#: src/protocols/irc/irc.c:205
-#: src/protocols/jabber/chat.c:59
+#: ../src/protocols/irc/irc.c:260
+#: ../src/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "密碼(_P):"
 
-#: src/protocols/irc/irc.c:237
+#: ../src/protocols/irc/irc.c:292
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC 暱稱不可含有空白字元"
 
 # XXX 暫譯
-#: src/protocols/irc/irc.c:265
-#: src/protocols/jabber/jabber.c:481
-#: src/protocols/jabber/jabber.c:818
+#: ../src/protocols/irc/irc.c:321
+#: ../src/protocols/jabber/jabber.c:566
+#: ../src/protocols/jabber/jabber.c:905
 msgid "SSL support unavailable"
 msgstr "沒有 SSL 支援"
 
-#: src/protocols/irc/irc.c:276
-#: src/protocols/simple/simple.c:392
-#: src/protocols/simple/simple.c:1237
+#: ../src/protocols/irc/irc.c:333
+#: ../src/protocols/simple/simple.c:452
+#: ../src/protocols/simple/simple.c:1527
 msgid "Couldn't create socket"
 msgstr "無法建立 Socket"
 
-#: src/protocols/irc/irc.c:347
-#: src/protocols/jabber/jabber.c:354
-#: src/protocols/oscar/oscar.c:1732
-#: src/protocols/oscar/oscar.c:1800
+#: ../src/protocols/irc/irc.c:404
+#: ../src/protocols/jabber/jabber.c:427
+#: ../src/protocols/oscar/oscar.c:1255
 msgid "Couldn't connect to host"
 msgstr "無法連到伺服器"
 
 # NOTE Jabber 協定 Stream Error 的一種,即 <remote-connection-failed/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
 # XXX 真正的意思是「無法連線至認證所需的遠端資源」,不是「連線失敗」(見上列文章)
-#: src/protocols/irc/irc.c:372
-#: src/protocols/jabber/jabber.c:381
+#: ../src/protocols/irc/irc.c:429
+#: ../src/protocols/jabber/jabber.c:454
 msgid "Connection Failed"
 msgstr "無法連線至認證所需的遠端資源"
 
-#: src/protocols/irc/irc.c:375
-#: src/protocols/jabber/jabber.c:384
+#: ../src/protocols/irc/irc.c:432
+#: ../src/protocols/jabber/jabber.c:457
 msgid "SSL Handshake Failed"
 msgstr "SSL 交談失敗"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
-#: src/protocols/irc/irc.c:526
-#: src/protocols/irc/irc.c:548
+#: ../src/protocols/irc/irc.c:601
+#: ../src/protocols/irc/irc.c:626
 msgid "Read error"
 msgstr "讀取錯誤"
 
-#: src/protocols/irc/irc.c:687
-#: src/protocols/silc/chat.c:1419
-#: src/protocols/yahoo/yahoochat.c:1378
+#: ../src/protocols/irc/irc.c:765
+#: ../src/protocols/silc/chat.c:1421
+#: ../src/protocols/yahoo/yahoochat.c:1431
 msgid "Users"
 msgstr "使用者"
 
-#: src/protocols/irc/irc.c:690
-#: src/protocols/sametime/sametime.c:3324
-#: src/protocols/silc/chat.c:1422
-#: src/protocols/silc/ops.c:1380
-#: src/protocols/yahoo/yahoochat.c:1387
+#: ../src/protocols/irc/irc.c:768
+#: ../src/protocols/sametime/sametime.c:3354
+#: ../src/protocols/silc/chat.c:1424
+#: ../src/protocols/silc/ops.c:1380
+#: ../src/protocols/yahoo/yahoochat.c:1440
 msgid "Topic"
 msgstr "主題"
 
@@ -6016,44 +6394,60 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:797
+#: ../src/protocols/irc/irc.c:877
 msgid "IRC Protocol Plugin"
 msgstr "IRC 協定模組"
 
 #. *  summary
-#: src/protocols/irc/irc.c:798
+#: ../src/protocols/irc/irc.c:878
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "較好的 IRC 協定模組"
 
 #. host to connect to
-#: src/protocols/irc/irc.c:817
-#: src/protocols/irc/msgs.c:233
-#: src/protocols/jabber/jabber.c:1765
-#: src/protocols/napster/napster.c:714
-#: src/protocols/sametime/sametime.c:5581
-#: src/protocols/silc/ops.c:1242
-#: src/protocols/silc/ops.c:1344
-#: src/protocols/simple/simple.c:1448
+#: ../src/protocols/irc/irc.c:897
+#: ../src/protocols/irc/msgs.c:235
+#: ../src/protocols/jabber/jabber.c:1917
+#: ../src/protocols/msn/msn.c:2046
+#: ../src/protocols/napster/napster.c:719
+#: ../src/protocols/oscar/oscar.c:6511
+#: ../src/protocols/sametime/sametime.c:5635
+#: ../src/protocols/silc/ops.c:1242
+#: ../src/protocols/silc/ops.c:1344
+#: ../src/protocols/simple/simple.c:1775
+#: ../src/protocols/toc/toc.c:2340
 msgid "Server"
 msgstr "伺服器"
 
-#: src/protocols/irc/irc.c:823
+#. port to connect to
+#: ../src/protocols/irc/irc.c:900
+#: ../src/protocols/msn/msn.c:2051
+#: ../src/protocols/napster/napster.c:724
+#: ../src/protocols/oscar/oscar.c:6514
+#: ../src/protocols/sametime/sametime.c:5640
+#: ../src/protocols/silc/silc.c:1860
+#: ../src/protocols/toc/toc.c:2344
+msgid "Port"
+msgstr "通訊埠"
+
+#: ../src/protocols/irc/irc.c:903
 msgid "Encodings"
 msgstr "編碼"
 
-#: src/protocols/irc/irc.c:826
-#: src/protocols/irc/msgs.c:227
-#: src/protocols/jabber/jabber.c:676
-#: src/protocols/silc/buddy.c:1497
-#: 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:919
+#: ../src/protocols/irc/irc.c:906
+#: ../src/protocols/irc/msgs.c:229
+#: ../src/protocols/jabber/jabber.c:761
+#: ../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:935
 msgid "Username"
 msgstr "使用者"
 
-#: src/protocols/irc/irc.c:829
+#: ../src/protocols/irc/irc.c:909
+#: ../src/protocols/irc/msgs.c:230
+#: ../src/protocols/silc/silc.c:939
 msgid "Real name"
 msgstr "姓名"
 
@@ -6061,586 +6455,606 @@
 #. option = gaim_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: src/protocols/irc/irc.c:837
-#, fuzzy
+#: ../src/protocols/irc/irc.c:917
 msgid "Use SSL"
-msgstr "SSL"
-
-#: src/protocols/irc/msgs.c:105
+msgstr "使用 SSL"
+
+#: ../src/protocols/irc/msgs.c:107
 msgid "Bad mode"
 msgstr "模式無效"
 
 # FIXME 這是暫譯
-#: src/protocols/irc/msgs.c:116
+#: ../src/protocols/irc/msgs.c:118
 #, c-format
 msgid "You are banned from %s."
 msgstr "您被禁於 %s 了。"
 
 # FIXME 這是暫譯
 # NOTE 譯文更動 by Paladin
-#: src/protocols/irc/msgs.c:117
+#: ../src/protocols/irc/msgs.c:119
 msgid "Banned"
 msgstr "被禁止"
 
-#: src/protocols/irc/msgs.c:134
+#: ../src/protocols/irc/msgs.c:136
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "無法禁止 %s:禁止清單已滿"
 
-#: src/protocols/irc/msgs.c:213
-#: src/protocols/irc/msgs.c:233
-#: src/protocols/irc/msgs.c:246
+#: ../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:213
-#: src/protocols/oscar/oscar.c:5994
-#: src/protocols/silc/ops.c:1412
+#: ../src/protocols/irc/msgs.c:215
+#: ../src/protocols/oscar/oscar.c:3645
+#: ../src/protocols/silc/ops.c:1412
 msgid "Nick"
 msgstr "暱稱"
 
-#: src/protocols/irc/msgs.c:216
+#: ../src/protocols/irc/msgs.c:218
 msgid " <i>(ircop)</i>"
 msgstr " <i>(IRC 操作者)</i>"
 
-#: src/protocols/irc/msgs.c:217
+#: ../src/protocols/irc/msgs.c:219
 msgid " <i>(identified)</i>"
 msgstr " <i>(已驗證)</i>"
 
-#: src/protocols/irc/msgs.c:221
-#: src/protocols/irc/msgs.c:227
-#: src/protocols/irc/msgs.c:228
-#: src/protocols/irc/msgs.c:239
-#: src/protocols/yahoo/yahoo_profile.c:660
+#: ../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:228
-#: src/protocols/silc/ops.c:1183
-#: src/protocols/silc/ops.c:1332
-#: src/protocols/yahoo/yahoo_profile.c:1009
-msgid "Realname"
-msgstr "姓名"
-
-#: src/protocols/irc/msgs.c:239
-#: 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:244
+#: ../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:246
+#: ../src/protocols/irc/msgs.c:248
 msgid "Online since"
 msgstr "上線自"
 
-#: src/protocols/irc/msgs.c:249
+#: ../src/protocols/irc/msgs.c:252
 msgid "<br><b>Defining adjective:</b> Glorious<br>"
 msgstr "<br><b>描述:</b>光宗耀祖<br>"
 
 # NOTE 新版的IRC prpl起動時不顯示這個;直譯「修改」沒有問題
-#: src/protocols/irc/msgs.c:317
+#: ../src/protocols/irc/msgs.c:329
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s 把聊天主題修改為:%s"
 
-#: src/protocols/irc/msgs.c:322
+# NOTE 新版的IRC prpl起動時不顯示這個;直譯「修改」沒有問題
+#: ../src/protocols/irc/msgs.c:331
+#, c-format
+msgid "%s has cleared the topic."
+msgstr "%s 已經把主題清除。"
+
+#: ../src/protocols/irc/msgs.c:339
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "%s 的主題為:%s"
 
-#: src/protocols/irc/msgs.c:339
+#: ../src/protocols/irc/msgs.c:357
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "不明的訊息「%s」"
 
-#: src/protocols/irc/msgs.c:340
+#: ../src/protocols/irc/msgs.c:358
 msgid "Unknown message"
 msgstr "不明的訊息"
 
-#: src/protocols/irc/msgs.c:340
+#: ../src/protocols/irc/msgs.c:358
 msgid "Gaim has sent a message the IRC server did not understand."
 msgstr "Gaim 傳送了一個 IRC 伺服器不明白的訊息。"
 
-#: src/protocols/irc/msgs.c:363
+#: ../src/protocols/irc/msgs.c:381
 #, c-format
 msgid "Users on %s: %s"
 msgstr "在 %s 內的使用者:%s"
 
 #  XXX
-#: src/protocols/irc/msgs.c:491
+#: ../src/protocols/irc/msgs.c:509
 msgid "Time Response"
 msgstr "時間回應"
 
 #  XXX
-#: src/protocols/irc/msgs.c:492
+#: ../src/protocols/irc/msgs.c:510
 msgid "The IRC server's local time is:"
 msgstr "IRC 伺服器端之時間為:"
 
-#: src/protocols/irc/msgs.c:503
+#: ../src/protocols/irc/msgs.c:521
 msgid "No such channel"
 msgstr "沒有那個頻道"
 
 #. does this happen?
-#: src/protocols/irc/msgs.c:514
+#: ../src/protocols/irc/msgs.c:532
 msgid "no such channel"
 msgstr "沒有那個頻道"
 
-#: src/protocols/irc/msgs.c:517
+#: ../src/protocols/irc/msgs.c:535
 msgid "User is not logged in"
 msgstr "使用者沒有登入"
 
-#: src/protocols/irc/msgs.c:522
+#: ../src/protocols/irc/msgs.c:540
 msgid "No such nick or channel"
 msgstr "沒有那個暱稱或頻道"
 
-#: src/protocols/irc/msgs.c:542
+#: ../src/protocols/irc/msgs.c:560
 msgid "Could not send"
 msgstr "無法送出"
 
-#: src/protocols/irc/msgs.c:598
+#: ../src/protocols/irc/msgs.c:616
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "只有被邀請者才可加入 %s。"
 
-#: src/protocols/irc/msgs.c:599
+#: ../src/protocols/irc/msgs.c:617
 msgid "Invitation only"
 msgstr "只限被邀請者"
 
-#: src/protocols/irc/msgs.c:701
+#: ../src/protocols/irc/msgs.c:726
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "您被 %s 踢出:(%s)"
 
-#: src/protocols/irc/msgs.c:706
+#. Remove user from channel
+#: ../src/protocols/irc/msgs.c:731
+#: ../src/protocols/silc/ops.c:721
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "被 %s 踢出 (%s)"
 
-#: src/protocols/irc/msgs.c:730
+#: ../src/protocols/irc/msgs.c:754
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "模式 (%s %s) 被 %s 設定"
 
-#: src/protocols/irc/msgs.c:814
+#: ../src/protocols/irc/msgs.c:839
+#: ../src/protocols/irc/msgs.c:840
+msgid "Invalid nickname"
+msgstr "無效的暱稱"
+
+#: ../src/protocols/irc/msgs.c:841
+#, fuzzy
+msgid "Your selected nickname was rejected by the server.  It probably contains invalid characters."
+msgstr "伺服器拒絕了您所指定的帳號名稱,名稱中大概含有無效字元。"
+
+#: ../src/protocols/irc/msgs.c:845
 msgid "Your selected account name was rejected by the server.  It probably contains invalid characters."
 msgstr "伺服器拒絕了您所指定的帳號名稱,名稱中大概含有無效字元。"
 
-#: src/protocols/irc/msgs.c:853
+#: ../src/protocols/irc/msgs.c:884
 msgid "Cannot change nick"
 msgstr "無法更改暱稱"
 
-#: src/protocols/irc/msgs.c:853
+#: ../src/protocols/irc/msgs.c:884
 msgid "Could not change nick"
 msgstr "無法更改暱稱"
 
-#: src/protocols/irc/msgs.c:874
+#: ../src/protocols/irc/msgs.c:905
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "您離開了頻道%s%s"
 
-#: src/protocols/irc/msgs.c:916
+#: ../src/protocols/irc/msgs.c:947
 msgid "Error: invalid PONG from server"
 msgstr "錯誤:來自伺服器的 PONG 無效"
 
-#: src/protocols/irc/msgs.c:918
+#: ../src/protocols/irc/msgs.c:949
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING 回答──延遲:%lu秒"
 
-#: src/protocols/irc/msgs.c:993
+#: ../src/protocols/irc/msgs.c:1030
 #, c-format
 msgid "Cannot join %s:"
 msgstr "無法加入 %s:"
 
-#: src/protocols/irc/msgs.c:994
-#: src/protocols/silc/ops.c:1128
+#: ../src/protocols/irc/msgs.c:1031
+#: ../src/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "無法加入頻道"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
 #  NOTE 譯文更動 by Ambrose
-#: src/protocols/irc/msgs.c:1028
+#: ../src/protocols/irc/msgs.c:1065
 #, fuzzy
 msgid "Nick or channel is temporarily unavailable."
 msgstr "暫時無法使用該項服務。"
 
-#: src/protocols/irc/msgs.c:1040
+#: ../src/protocols/irc/msgs.c:1077
 #, c-format
 msgid "Wallops from %s"
 msgstr "來自 %s 的 Wallops"
 
-#: src/protocols/irc/parse.c:114
+#: ../src/protocols/irc/parse.c:114
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;要執行的動作&gt;:執行一個動作。"
 
-#: src/protocols/irc/parse.c:115
+#: ../src/protocols/irc/parse.c:115
 msgid "away [message]:  Set an away message, or use no message to return from being away."
 msgstr "away [訊息]:設定一個離開訊息,或者在離開時不指定任何訊息。"
 
-# XXX 暫譯
-#: src/protocols/irc/parse.c:116
-#, fuzzy
+#: ../src/protocols/irc/parse.c:116
 msgid "chanserv: Send a command to chanserv"
-msgstr "quote [...]:送出一個 RAW 指令到伺服器。"
-
-# XXX 暫譯
-#: src/protocols/irc/parse.c:117
-msgid "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from someone. You must be a channel operator to do this."
-msgstr "deop &lt;暱稱1&gt; [暱稱2] ...:移除某個人的「頻道管理者」權限。您必須具有「頻道管理者」的權限才能夠執行這個動作。"
-
-#: src/protocols/irc/parse.c:118
-msgid "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from someone, preventing them from speaking if the channel is moderated (+m). You must be a channel operator to do this."
-msgstr "devoice &lt;暱稱1&gt; [暱稱2] ...:移除某個人的「發言」權限。禁止某些人在頻道中發表不當的言論。您必須具有「頻道管理者」的權限才能夠執行這個動作。"
-
-#: src/protocols/irc/parse.c:119
-msgid "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified channel, or the current channel."
-msgstr "invite &lt暱稱&gt; [聊天室]:邀請某個人來加入您所指定的頻道,或是目前您所在的頻道。"
-
-#: src/protocols/irc/parse.c:120
-msgid "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more channels, optionally providing a channel key for each if needed."
-msgstr "j &lt;聊天室1&gt;[,聊天室2][,...] [密鑰1[,密鑰2][,...]]:以指定的密鑰(如有給予並有需要)加入所指定的聊天室。"
-
-#: src/protocols/irc/parse.c:121
-msgid "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more channels, optionally providing a channel key for each if needed."
-msgstr "join &lt;聊天室1&gt;[,聊天室2][,...] [密鑰1[,密鑰2][,...]]:以指定的密鑰(如有給予並有需要)加入所指定的聊天室。"
-
-#: src/protocols/irc/parse.c:122
-msgid "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a channel operator to do this."
-msgstr "kick &lt;暱稱&gt; [訊息]:將某個使用者踢出頻道。您必需具有「頻道管理者」權限才能夠執行這個動作。"
-
-#: src/protocols/irc/parse.c:123
-msgid "list:  Display a list of chat rooms on the network. <i>Warning, some servers may disconnect you upon doing this.</i>"
-msgstr "list:列出目前在網絡上的聊天室清單。<i>請注意,有些伺服器會在您執行了這個動作之後,強行中止您的連線。</i>"
-
-#: src/protocols/irc/parse.c:124
-msgid "me &lt;action to perform&gt;:  Perform an action."
-msgstr "me &lt;要執行的動作&gt;:執行一個動作。"
+msgstr "chanserv:送出一個指令到 chanserv"
 
 # XXX 暫譯
-#: src/protocols/irc/parse.c:125
-#, fuzzy
+#: ../src/protocols/irc/parse.c:117
+msgid "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from someone. You must be a channel operator to do this."
+msgstr "deop &lt;暱稱1&gt; [暱稱2] ...:移除某個人的「頻道管理者」權限。您必須具有「頻道管理者」的權限才能夠執行這個動作。"
+
+#: ../src/protocols/irc/parse.c:118
+msgid "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from someone, preventing them from speaking if the channel is moderated (+m). You must be a channel operator to do this."
+msgstr "devoice &lt;暱稱1&gt; [暱稱2] ...:移除某個人的「發言」權限。禁止某些人在頻道中發表不當的言論。您必須具有「頻道管理者」的權限才能夠執行這個動作。"
+
+#: ../src/protocols/irc/parse.c:119
+msgid "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified channel, or the current channel."
+msgstr "invite &lt暱稱&gt; [聊天室]:邀請某個人來加入您所指定的頻道,或是目前您所在的頻道。"
+
+#: ../src/protocols/irc/parse.c:120
+msgid "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more channels, optionally providing a channel key for each if needed."
+msgstr "j &lt;聊天室1&gt;[,聊天室2][,...] [密鑰1[,密鑰2][,...]]:以指定的密鑰(如有給予並有需要)加入所指定的聊天室。"
+
+#: ../src/protocols/irc/parse.c:121
+msgid "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more channels, optionally providing a channel key for each if needed."
+msgstr "join &lt;聊天室1&gt;[,聊天室2][,...] [密鑰1[,密鑰2][,...]]:以指定的密鑰(如有給予並有需要)加入所指定的聊天室。"
+
+#: ../src/protocols/irc/parse.c:122
+msgid "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a channel operator to do this."
+msgstr "kick &lt;暱稱&gt; [訊息]:將某個使用者踢出頻道。您必需具有「頻道管理者」權限才能夠執行這個動作。"
+
+#: ../src/protocols/irc/parse.c:123
+msgid "list:  Display a list of chat rooms on the network. <i>Warning, some servers may disconnect you upon doing this.</i>"
+msgstr "list:列出目前在網絡上的聊天室清單。<i>請注意,有些伺服器會在您執行了這個動作之後,強行中止您的連線。</i>"
+
+#: ../src/protocols/irc/parse.c:124
+msgid "me &lt;action to perform&gt;:  Perform an action."
+msgstr "me &lt;要執行的動作&gt;:執行一個動作。"
+
+#: ../src/protocols/irc/parse.c:125
 msgid "memoserv: Send a command to memoserv"
-msgstr "quote [...]:送出一個 RAW 指令到伺服器。"
-
-#: src/protocols/irc/parse.c:126
+msgstr "memoserv:送出一個指令到 memoserv"
+
+#: ../src/protocols/irc/parse.c:126
 msgid "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel or user mode."
 msgstr "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;暱稱|頻道&gt;:設定或解除頻道╱使用者模式。"
 
-#: src/protocols/irc/parse.c:127
+#: ../src/protocols/irc/parse.c:127
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as opposed to a channel)."
 msgstr "msg &lt;暱稱&gt; &lt;訊息&gt;:送出一個私人訊息給指定的使用者(避免傳送到公眾頻道中)。"
 
-#: src/protocols/irc/parse.c:128
+#: ../src/protocols/irc/parse.c:128
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [頻道]:列出目前在頻道中的使用者清單。"
 
-#: src/protocols/irc/parse.c:129
-#: src/protocols/jabber/jabber.c:1610
+#: ../src/protocols/irc/parse.c:129
+#: ../src/protocols/jabber/jabber.c:1755
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;新暱稱&gt;:改變您的暱稱。"
 
-# XXX 暫譯
-#: src/protocols/irc/parse.c:130
-#, fuzzy
+#: ../src/protocols/irc/parse.c:130
 msgid "nickserv: Send a command to nickserv"
-msgstr "quote [...]:送出一個 RAW 指令到伺服器。"
-
-#: src/protocols/irc/parse.c:131
+msgstr "nickserv:送出一個指令到 nickserv"
+
+#: ../src/protocols/irc/parse.c:131
 msgid "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You must be a channel operator to do this."
 msgstr "op &lt;暱稱&gt; [暱稱] ...:賦與某個使用者「頻道管理者」權限。您必須具有「頻道管理者」權限才能執行這個動作。"
 
-#: src/protocols/irc/parse.c:132
+#: ../src/protocols/irc/parse.c:132
 msgid "operwall &lt;message&gt;:  If you don't know what this is, you probably can't use it."
 msgstr "operwall &lt;訊息&gt;:如果您不知道這是幹什麼用的,您可能沒有辦法使用這個指令。"
 
-# XXX 暫譯
-#: src/protocols/irc/parse.c:133
-#, fuzzy
+#: ../src/protocols/irc/parse.c:133
 msgid "operserv: Send a command to operserv"
-msgstr "quote [...]:送出一個 RAW 指令到伺服器。"
-
-#: src/protocols/irc/parse.c:134
+msgstr "operserv:送出一個指令到 operserv"
+
+#: ../src/protocols/irc/parse.c:134
 msgid "part [room] [message]:  Leave the current channel, or a specified channel, with an optional message."
 msgstr "part [頻道] [訊息]:離開目前的頻道或指定的頻道。指定頻道時可同時指定送出的訊息。"
 
-#: src/protocols/irc/parse.c:135
+#: ../src/protocols/irc/parse.c:135
 msgid "ping [nick]:  Asks how much lag a user (or the server if no user specified) has."
 msgstr "ping [暱稱]:查詢某一個使用者的網路回應速度(或在沒有指定使用者時,查詢伺服器的回應速度)。"
 
-#: src/protocols/irc/parse.c:136
+#: ../src/protocols/irc/parse.c:136
 msgid "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as opposed to a channel)."
 msgstr "query &lt;暱稱&gt; &lt;訊息&gt;:送出一個私人訊息給指定的使用者(避免發送到公眾頻道)。"
 
-#: src/protocols/irc/parse.c:137
+#: ../src/protocols/irc/parse.c:137
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [訊息]:自伺服器離線,並送出指定的訊息。"
 
 # XXX 暫譯
-#: src/protocols/irc/parse.c:138
+#: ../src/protocols/irc/parse.c:138
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:送出一個 RAW 指令到伺服器。"
 
-#: src/protocols/irc/parse.c:139
+#: ../src/protocols/irc/parse.c:139
 msgid "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a channel operator to do this."
 msgstr "remove &lt;暱稱&gt; [訊息]:將某個使用者踢出頻道。您必須具有「頻道管理者」的權限才能夠執行這個動作。"
 
-#: src/protocols/irc/parse.c:140
+#: ../src/protocols/irc/parse.c:140
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time:顯示 IRC 伺服器所在地之本地時間。"
 
-#: src/protocols/irc/parse.c:141
+#: ../src/protocols/irc/parse.c:141
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [新主題]:檢視或修改頻道主題"
 
-#: src/protocols/irc/parse.c:142
+#: ../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;:設定或解除使用者模式。"
 
-#: src/protocols/irc/parse.c:143
+#: ../src/protocols/irc/parse.c:143
+msgid "version [nick]: send CTCP VERSION request to a user"
+msgstr "version [暱稱]:送出 CTCP VERSION 要求給使用者"
+
+#: ../src/protocols/irc/parse.c:144
 msgid "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You must be a channel operator to do this."
 msgstr "voice &lt;暱稱&gt; [暱稱] ...:賦與使用者的「發言」權限。您必須具有「頻道管理者」的權限才能執行這個動作。"
 
-#: src/protocols/irc/parse.c:144
+#: ../src/protocols/irc/parse.c:145
 msgid "wallops &lt;message&gt;:  If you don't know what this is, you probably can't use it."
 msgstr "wallops &lt;message&gt;:如果您不知道這是幹什麼用的,您可能就沒有辦法使用它了。"
 
-#: src/protocols/irc/parse.c:145
+#: ../src/protocols/irc/parse.c:146
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [伺服器名稱] &lt;暱稱&gt;:取得使用者資訊。"
 
-#: src/protocols/irc/parse.c:439
+#: ../src/protocols/irc/parse.c:440
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "%s 回答需時:%lu 秒"
 
-#: src/protocols/irc/parse.c:440
+#: ../src/protocols/irc/parse.c:441
 msgid "PONG"
 msgstr "PONG"
 
-#: src/protocols/irc/parse.c:440
+#: ../src/protocols/irc/parse.c:441
 msgid "CTCP PING reply"
 msgstr "CTCP PING 回答"
 
-#: src/protocols/irc/parse.c:543
-#: src/protocols/irc/parse.c:547
-#: src/protocols/oscar/oscar.c:1641
-#: src/protocols/toc/toc.c:190
-#: src/protocols/toc/toc.c:688
-#: src/protocols/toc/toc.c:704
-#: src/protocols/toc/toc.c:780
+#: ../src/protocols/irc/parse.c:543
+#: ../src/protocols/irc/parse.c:547
+#: ../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."
 msgstr "停止連線。"
 
-#: src/protocols/jabber/auth.c:51
+#: ../src/protocols/jabber/auth.c:51
 msgid "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in account properties"
 msgstr "登入這個伺服器需要使用 TLS/SSL。請在帳號清單的「修改帳號」視窗點選「TLS 可用則用」選項。"
 
-#: src/protocols/jabber/auth.c:53
+#: ../src/protocols/jabber/auth.c:53
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr "登入這個伺服器需要使用 TLS/SSL,但找不到 TLS/SSL 支援。"
 
-#: src/protocols/jabber/auth.c:114
+#: ../src/protocols/jabber/auth.c:114
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "伺服器需要經由未經加密的串流進行明文認證"
 
-#: src/protocols/jabber/auth.c:232
+#: ../src/protocols/jabber/auth.c:234
 msgid "Server couldn't authenticate you without a password"
-msgstr ""
-
-#: src/protocols/jabber/auth.c:235
-#: src/protocols/jabber/auth.c:236
-#: src/protocols/jabber/auth.c:396
-#: src/protocols/jabber/auth.c:397
-#: src/protocols/jabber/auth.c:478
-#: src/protocols/jabber/auth.c:479
+msgstr "沒有提供密碼,伺服器無法為你進行認證"
+
+#: ../src/protocols/jabber/auth.c:237
+#: ../src/protocols/jabber/auth.c:238
+#: ../src/protocols/jabber/auth.c:398
+#: ../src/protocols/jabber/auth.c:399
+#: ../src/protocols/jabber/auth.c:480
+#: ../src/protocols/jabber/auth.c:481
 msgid "Plaintext Authentication"
 msgstr "明文認證"
 
-#: src/protocols/jabber/auth.c:237
-#: src/protocols/jabber/auth.c:398
-#: src/protocols/jabber/auth.c:480
+#: ../src/protocols/jabber/auth.c:239
+#: ../src/protocols/jabber/auth.c:400
+#: ../src/protocols/jabber/auth.c:482
 msgid "This server requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"
 msgstr "伺服器需要經由未經加密的串流進行明文認證。允許並繼續進行認證?"
 
-#: src/protocols/jabber/auth.c:243
-#: src/protocols/jabber/auth.c:406
-#: src/protocols/jabber/auth.c:488
+#: ../src/protocols/jabber/auth.c:245
+#: ../src/protocols/jabber/auth.c:408
+#: ../src/protocols/jabber/auth.c:490
 msgid "Server does not use any supported authentication method"
 msgstr "伺服器並不提供任何一種被支援的認證方式"
 
 #. This should never happen!
-#: src/protocols/jabber/auth.c:319
-#: src/protocols/jabber/auth.c:441
-#: src/protocols/jabber/auth.c:609
-#: src/protocols/jabber/auth.c:742
-#: src/protocols/jabber/auth.c:754
-#: src/protocols/jabber/auth.c:773
-#: src/protocols/jabber/jabber.c:110
+#: ../src/protocols/jabber/auth.c:321
+#: ../src/protocols/jabber/auth.c:443
+#: ../src/protocols/jabber/auth.c:611
+#: ../src/protocols/jabber/auth.c:744
+#: ../src/protocols/jabber/auth.c:756
+#: ../src/protocols/jabber/auth.c:775
+#: ../src/protocols/jabber/jabber.c:110
 msgid "Invalid response from server."
 msgstr "無效的伺服器回應。"
 
 # XXX 好像有些怪,譯文有待改進
-#: src/protocols/jabber/auth.c:630
+#: ../src/protocols/jabber/auth.c:632
 msgid "Invalid challenge from server"
 msgstr "伺服器送來了無效的驗證挑戰"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
-#: src/protocols/jabber/auth.c:717
-#, fuzzy
+#: ../src/protocols/jabber/auth.c:719
 msgid "SASL error"
-msgstr "讀取錯誤"
-
-#: src/protocols/jabber/buddy.c:249
-#: src/protocols/jabber/buddy.c:667
-#: src/protocols/silc/ops.c:1020
+msgstr "SASL 錯誤"
+
+#: ../src/protocols/jabber/buddy.c:268
+#: ../src/protocols/jabber/buddy.c:772
+#: ../src/protocols/silc/ops.c:1020
 msgid "Full Name"
 msgstr "全名"
 
-#: src/protocols/jabber/buddy.c:250
-#: src/protocols/jabber/buddy.c:680
-#: src/protocols/silc/ops.c:1032
+#: ../src/protocols/jabber/buddy.c:269
+#: ../src/protocols/jabber/buddy.c:785
+#: ../src/protocols/silc/ops.c:1032
 msgid "Family Name"
 msgstr "姓"
 
-#: src/protocols/jabber/buddy.c:251
-#: src/protocols/jabber/buddy.c:684
+#: ../src/protocols/jabber/buddy.c:270
+#: ../src/protocols/jabber/buddy.c:789
 msgid "Given Name"
 msgstr "名"
 
-#: src/protocols/jabber/buddy.c:253
-#: src/protocols/jabber/jabber.c:736
+#: ../src/protocols/jabber/buddy.c:272
+#: ../src/protocols/jabber/jabber.c:821
 msgid "URL"
 msgstr "URL"
 
-#: src/protocols/jabber/buddy.c:254
-#: src/protocols/jabber/buddy.c:726
+#: ../src/protocols/jabber/buddy.c:273
+#: ../src/protocols/jabber/buddy.c:841
 msgid "Street Address"
 msgstr "街道地址"
 
-#: src/protocols/jabber/buddy.c:255
-#: src/protocols/jabber/buddy.c:722
+#: ../src/protocols/jabber/buddy.c:274
+#: ../src/protocols/jabber/buddy.c:837
 msgid "Extended Address"
 msgstr "地址(續)"
 
-#: src/protocols/jabber/buddy.c:256
-#: src/protocols/jabber/buddy.c:730
+#: ../src/protocols/jabber/buddy.c:275
+#: ../src/protocols/jabber/buddy.c:845
 msgid "Locality"
 msgstr "市/村"
 
-#: src/protocols/jabber/buddy.c:257
-#: src/protocols/jabber/buddy.c:734
+#: ../src/protocols/jabber/buddy.c:276
+#: ../src/protocols/jabber/buddy.c:849
 msgid "Region"
 msgstr "省/州"
 
-#: src/protocols/jabber/buddy.c:258
-#: src/protocols/jabber/buddy.c:738
-#: src/protocols/jabber/jabber.c:726
+#: ../src/protocols/jabber/buddy.c:277
+#: ../src/protocols/jabber/buddy.c:853
 msgid "Postal Code"
 msgstr "郵遞區號"
 
-#: src/protocols/jabber/buddy.c:259
-#: src/protocols/jabber/buddy.c:743
-#: src/protocols/silc/silc.c:929
+#: ../src/protocols/jabber/buddy.c:278
+#: ../src/protocols/jabber/buddy.c:858
+#: ../src/protocols/silc/silc.c:945
 msgid "Country"
 msgstr "國家"
 
-#: src/protocols/jabber/buddy.c:260
-#: src/protocols/jabber/buddy.c:754
-#: src/protocols/jabber/buddy.c:761
+#: ../src/protocols/jabber/buddy.c:279
+#: ../src/protocols/jabber/buddy.c:869
+#: ../src/protocols/jabber/buddy.c:876
 msgid "Telephone"
 msgstr "電話"
 
-#: src/protocols/jabber/buddy.c:262
-#: src/protocols/jabber/buddy.c:795
+#: ../src/protocols/jabber/buddy.c:280
+#: ../src/protocols/jabber/buddy.c:887
+#: ../src/protocols/jabber/buddy.c:895
+#: ../src/protocols/jabber/buddy.c:1524
+#: ../src/protocols/silc/ops.c:1075
+#: ../src/protocols/silc/util.c:526
+#: ../src/protocols/yahoo/yahoo_profile.c:1036
+msgid "E-Mail"
+msgstr "電子郵件"
+
+#: ../src/protocols/jabber/buddy.c:281
+#: ../src/protocols/jabber/buddy.c:910
 msgid "Organization Name"
 msgstr "所屬機構"
 
-#: src/protocols/jabber/buddy.c:263
-#: src/protocols/jabber/buddy.c:799
+#: ../src/protocols/jabber/buddy.c:282
+#: ../src/protocols/jabber/buddy.c:914
 msgid "Organization Unit"
 msgstr "所屬部門"
 
-#: src/protocols/jabber/buddy.c:265
-#: src/protocols/jabber/buddy.c:808
+#: ../src/protocols/jabber/buddy.c:284
+#: ../src/protocols/jabber/buddy.c:923
 msgid "Role"
 msgstr "職責"
 
-#: src/protocols/jabber/buddy.c:266
-#: src/protocols/jabber/buddy.c:701
-#: src/protocols/oscar/oscar.c:6029
+#: ../src/protocols/jabber/buddy.c:285
+#: ../src/protocols/jabber/buddy.c:806
+#: ../src/protocols/msn/msn.c:1591
+#: ../src/protocols/oscar/oscar.c:3688
 msgid "Birthday"
 msgstr "生日"
 
-#: src/protocols/jabber/buddy.c:567
-#: src/protocols/jabber/buddy.c:568
+#: ../src/protocols/jabber/buddy.c:588
+#: ../src/protocols/jabber/buddy.c:589
 msgid "Edit Jabber vCard"
 msgstr "編輯 Jabber vCard"
 
-#: src/protocols/jabber/buddy.c:569
+#: ../src/protocols/jabber/buddy.c:590
 msgid "All items below are optional. Enter only the information with which you feel comfortable."
 msgstr "以下所有的欄位都是選擇性的。您只要輸入您想輸入您想填入的訊息即可。"
 
-#: src/protocols/jabber/buddy.c:616
-msgid "Jabber ID"
-msgstr "Jabber 帳號"
+#: ../src/protocols/jabber/buddy.c:646
+#: ../src/protocols/jabber/buddy.c:677
+msgid "Client:"
+msgstr ""
+
+#: ../src/protocols/jabber/buddy.c:650
+#: ../src/protocols/jabber/buddy.c:681
+msgid "Operating System"
+msgstr "作業系統"
 
 # TODO Untranslated
 # NOTE 譯文刪除 by Ambrose
 # NOTE Jabber 協定的「Resource」一詞通常係指一種使用者自定的字串,
 # NOTE 用以表示在多處地方同時登入了的情形下,目前的實在位置
 # NOTE 見 http://www.jabber.org/user/userguide.html
-#: src/protocols/jabber/buddy.c:642
-#: src/protocols/jabber/jabber.c:1768
+#: ../src/protocols/jabber/buddy.c:660
+#: ../src/protocols/jabber/jabber.c:1920
 msgid "Resource"
 msgstr ""
 
 # NOTE: 法、德文均譯「第二個名」,芬蘭文譯「其他名」,日文音譯了事
 # NOTE: 在網上幾間台灣大學寫「英文別名」,現套用,也跟芬蘭文PO檔處理手法相同
-#: src/protocols/jabber/buddy.c:688
-#: src/protocols/silc/ops.c:1028
+#: ../src/protocols/jabber/buddy.c:793
+#: ../src/protocols/silc/ops.c:1028
 msgid "Middle Name"
 msgstr "英文別名"
 
-#: src/protocols/jabber/buddy.c:706
-#: src/protocols/jabber/jabber.c:711
-#: src/protocols/oscar/oscar.c:6047
-#: src/protocols/oscar/oscar.c:6055
-#: src/protocols/silc/ops.c:1064
+#: ../src/protocols/jabber/buddy.c:826
+#: ../src/protocols/jabber/jabber.c:796
+#: ../src/protocols/oscar/oscar.c:3707
+#: ../src/protocols/oscar/oscar.c:3715
+#: ../src/protocols/silc/ops.c:1064
 msgid "Address"
 msgstr "地址"
 
-#: src/protocols/jabber/buddy.c:718
+#: ../src/protocols/jabber/buddy.c:833
 msgid "P.O. Box"
 msgstr "郵政信箱"
 
-#: src/protocols/jabber/buddy.c:832
+#: ../src/protocols/jabber/buddy.c:947
 msgid "Photo"
 msgstr "照片"
 
 # NOTE 見 http://www.jabber.org/jeps/jep-0054.html
-#: src/protocols/jabber/buddy.c:832
+#: ../src/protocols/jabber/buddy.c:947
 msgid "Logo"
 msgstr "標誌"
 
-#: src/protocols/jabber/buddy.c:1035
+#: ../src/protocols/jabber/buddy.c:1304
 msgid "Un-hide From"
 msgstr "現身給"
 
-#: src/protocols/jabber/buddy.c:1038
+#: ../src/protocols/jabber/buddy.c:1308
 msgid "Temporarily Hide From"
 msgstr "暫時隱身於"
 
 #. && NOT ME
-#: src/protocols/jabber/buddy.c:1045
+#: ../src/protocols/jabber/buddy.c:1316
 msgid "Cancel Presence Notification"
 msgstr "取消出現通知"
 
-#: src/protocols/jabber/buddy.c:1051
+#: ../src/protocols/jabber/buddy.c:1323
 msgid "(Re-)Request authorization"
 msgstr "要求或重新要求認證"
 
@@ -6649,288 +7063,304 @@
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: src/protocols/jabber/buddy.c:1059
+#: ../src/protocols/jabber/buddy.c:1332
 msgid "Unsubscribe"
 msgstr "從好友名單中移除"
 
-#: src/protocols/jabber/buddy.c:1085
-#: src/protocols/jabber/chat.c:677
-#: src/protocols/jabber/chat.c:688
-#: src/protocols/jabber/jabber.c:1073
-#: src/protocols/silc/ops.c:1449
+#: ../src/protocols/jabber/buddy.c:1359
+#: ../src/protocols/jabber/chat.c:675
+#: ../src/protocols/jabber/chat.c:686
+#: ../src/protocols/jabber/jabber.c:1177
+#: ../src/protocols/silc/ops.c:1449
 msgid "Error"
 msgstr "錯誤"
 
-#: src/protocols/jabber/buddy.c:1091
-#: src/protocols/jabber/jabber.c:1102
+#: ../src/protocols/jabber/buddy.c:1365
+#: ../src/protocols/jabber/jabber.c:1202
 msgid "Chatty"
 msgstr "想聊天"
 
-#: src/protocols/jabber/buddy.c:1095
-#: src/protocols/jabber/jabber.c:1118
-#: src/status.c:158
+#: ../src/protocols/jabber/buddy.c:1369
+#: ../src/status.c:159
 msgid "Extended Away"
 msgstr "長時間離開"
 
-#: src/protocols/jabber/buddy.c:1097
-#: src/protocols/jabber/jabber.c:1126
-#: src/protocols/oscar/oscar.c:701
-#: src/protocols/oscar/oscar.c:7861
-#: src/protocols/sametime/sametime.c:3253
+#: ../src/protocols/jabber/buddy.c:1371
+#: ../src/protocols/jabber/jabber.c:1232
+#: ../src/protocols/oscar/oscar.c:713
+#: ../src/protocols/oscar/oscar.c:5645
+#: ../src/protocols/sametime/sametime.c:3277
 msgid "Do Not Disturb"
 msgstr "請勿打擾"
 
-#: src/protocols/jabber/buddy.c:1235
-msgid "The following are the results of your search"
-msgstr ""
-
-#: src/protocols/jabber/buddy.c:1327
-msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr ""
-
-#: src/protocols/jabber/buddy.c:1331
-#: src/protocols/jabber/jabber.c:701
-#: src/protocols/oscar/oscar.c:6004
-#: src/protocols/silc/ops.c:1024
-msgid "First Name"
-msgstr "名"
-
-#: src/protocols/jabber/buddy.c:1336
-#: src/protocols/jabber/jabber.c:706
-#: src/protocols/oscar/oscar.c:6005
+#: ../src/protocols/jabber/buddy.c:1516
+msgid "JID"
+msgstr "JID"
+
+#: ../src/protocols/jabber/buddy.c:1520
+#: ../src/protocols/jabber/buddy.c:1699
+#: ../src/protocols/oscar/oscar.c:3656
 msgid "Last Name"
 msgstr "姓"
 
-#: src/protocols/jabber/buddy.c:1346
+#: ../src/protocols/jabber/buddy.c:1552
+msgid "The following are the results of your search"
+msgstr "以下為搜尋結果"
+
+#. current comment from Jabber User Directory users.jabber.org
+#: ../src/protocols/jabber/buddy.c:1627
+msgid "Find a contact by entering the search criteria in the given fields. Note: Each field supports wild card searches (%)"
+msgstr ""
+
+#: ../src/protocols/jabber/buddy.c:1647
+#, fuzzy
+msgid "Directory Query Failed"
+msgstr "直接連線失敗"
+
+#: ../src/protocols/jabber/buddy.c:1648
+#, fuzzy
+msgid "Could not query the directory server."
+msgstr "無法開始檔案傳輸"
+
+#. Try to translate the message (see static message
+#. list in jabber_user_dir_comments[])
+#: ../src/protocols/jabber/buddy.c:1682
+#, c-format
+msgid "Server Instructions: %s"
+msgstr "伺服器指令:%s"
+
+#: ../src/protocols/jabber/buddy.c:1689
+msgid "Fill in one or more fields to search for any matching Jabber users."
+msgstr "填入一個或多個欄位,以搜尋Jabber使用者。"
+
+#: ../src/protocols/jabber/buddy.c:1709
+#: ../src/protocols/novell/novell.c:1488
+#: ../src/protocols/oscar/oscar.c:3658
+#: ../src/protocols/oscar/oscar.c:3665
 msgid "E-Mail Address"
 msgstr "電子郵件"
 
-#: src/protocols/jabber/buddy.c:1355
-#: src/protocols/jabber/buddy.c:1356
-#, fuzzy
+#: ../src/protocols/jabber/buddy.c:1718
+#: ../src/protocols/jabber/buddy.c:1719
 msgid "Search for Jabber users"
-msgstr "使用電子郵件地址搜尋好友"
+msgstr "搜尋Jabber使用者"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
-#: src/protocols/jabber/buddy.c:1370
-#, fuzzy
+#: ../src/protocols/jabber/buddy.c:1733
 msgid "Invalid Directory"
-msgstr "無效錯誤"
-
-#: src/protocols/jabber/buddy.c:1387
-#, fuzzy
+msgstr "無效目錄"
+
+#: ../src/protocols/jabber/buddy.c:1750
 msgid "Enter a User Directory"
-msgstr "無法傳送目錄。"
-
-#: src/protocols/jabber/buddy.c:1388
-#, fuzzy
+msgstr "進入使用者目錄。"
+
+#: ../src/protocols/jabber/buddy.c:1751
 msgid "Select a user directory to search"
-msgstr "選擇查詢的會議伺服器"
-
-#: src/protocols/jabber/buddy.c:1391
-#, fuzzy
+msgstr "選擇一個使用者目錄以進行搜尋"
+
+#: ../src/protocols/jabber/buddy.c:1754
 msgid "Search Directory"
-msgstr "搜尋(_S):"
-
-#: src/protocols/jabber/chat.c:41
-#: src/protocols/oscar/oscar.c:7350
-#: src/protocols/yahoo/yahoochat.c:979
+msgstr "搜尋目錄"
+
+#: ../src/protocols/jabber/chat.c:41
+#: ../src/protocols/oscar/oscar.c:5130
+#: ../src/protocols/yahoo/yahoochat.c:999
 msgid "_Room:"
 msgstr "聊天室(_R):"
 
-#: src/protocols/jabber/chat.c:47
+#: ../src/protocols/jabber/chat.c:47
 msgid "_Server:"
 msgstr "伺服器(_S):"
 
-#: src/protocols/jabber/chat.c:53
+#: ../src/protocols/jabber/chat.c:53
 msgid "_Handle:"
 msgstr "暱稱(_H):"
 
-#: src/protocols/jabber/chat.c:223
+#: ../src/protocols/jabber/chat.c:223
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s 不是一個有效的聊天室名稱"
 
-#: src/protocols/jabber/chat.c:224
+#: ../src/protocols/jabber/chat.c:224
 msgid "Invalid Room Name"
 msgstr "聊天室名稱無效"
 
-#: src/protocols/jabber/chat.c:229
+#: ../src/protocols/jabber/chat.c:229
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s 不是一個有效的伺服器名稱"
 
-#: src/protocols/jabber/chat.c:230
-#: src/protocols/jabber/chat.c:231
+#: ../src/protocols/jabber/chat.c:230
+#: ../src/protocols/jabber/chat.c:231
 msgid "Invalid Server Name"
 msgstr "伺服器名稱無效"
 
 # NOTE Arto Alakulju 發現「room handle」即是聊天室內使用者所用的暱稱而已
-#: src/protocols/jabber/chat.c:235
+#: ../src/protocols/jabber/chat.c:235
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s 不是一個有效的暱稱"
 
 # NOTE Arto Alakulju 發現「room handle」即是聊天室內使用者所用的暱稱而已
-#: src/protocols/jabber/chat.c:236
-#: src/protocols/jabber/chat.c:237
+#: ../src/protocols/jabber/chat.c:236
+#: ../src/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
 msgstr "暱稱無效"
 
-#: src/protocols/jabber/chat.c:395
+#: ../src/protocols/jabber/chat.c:395
 msgid "Configuration error"
 msgstr "設定錯誤"
 
-#: src/protocols/jabber/chat.c:404
-#: src/protocols/jabber/chat.c:549
+#: ../src/protocols/jabber/chat.c:404
+#: ../src/protocols/jabber/chat.c:547
 msgid "Unable to configure"
 msgstr "無法設定"
 
-#: src/protocols/jabber/chat.c:420
+#: ../src/protocols/jabber/chat.c:419
 msgid "Room Configuration Error"
 msgstr "聊天室設定錯誤"
 
 # XXX 暫譯,譯文有問題,要改善
-#: src/protocols/jabber/chat.c:421
+#: ../src/protocols/jabber/chat.c:420
 msgid "This room is not capable of being configured"
 msgstr "這個聊天室不支援設定"
 
-#: src/protocols/jabber/chat.c:471
-#: src/protocols/jabber/chat.c:540
+#: ../src/protocols/jabber/chat.c:469
+#: ../src/protocols/jabber/chat.c:538
 msgid "Registration error"
 msgstr "註冊錯誤"
 
 # XXX 暫譯
 # NOTE 據 faceprint (模組作者) 稱,MUC 是一種新的聊天室協定,
 # NOTE 較舊式的「Group Chat」有更多功能
-#: src/protocols/jabber/chat.c:628
+#: ../src/protocols/jabber/chat.c:626
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "在非 MUC 模式的聊天室內不支援修改暱稱"
 
-#: src/protocols/jabber/chat.c:678
-#: src/protocols/jabber/chat.c:689
-#: src/protocols/silc/ops.c:1449
-#, fuzzy
+#: ../src/protocols/jabber/chat.c:676
+#: ../src/protocols/jabber/chat.c:687
+#: ../src/protocols/silc/ops.c:1449
 msgid "Error retrieving room list"
 msgstr "讀取聊天室清單時發生錯誤"
 
-#: src/protocols/jabber/chat.c:737
+#: ../src/protocols/jabber/chat.c:735
 msgid "Invalid Server"
 msgstr "無效的伺服器名"
 
 # NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
 # XXX
-#: src/protocols/jabber/chat.c:775
+#: ../src/protocols/jabber/chat.c:773
 msgid "Enter a Conference Server"
 msgstr "登入會議伺服器"
 
-#: src/protocols/jabber/chat.c:776
+#: ../src/protocols/jabber/chat.c:774
 msgid "Select a conference server to query"
 msgstr "選擇查詢的會議伺服器"
 
-#: src/protocols/jabber/chat.c:779
+#: ../src/protocols/jabber/chat.c:777
 msgid "Find Rooms"
 msgstr "尋找聊天室"
 
 # XXX 譯文有待改進
-#: src/protocols/jabber/jabber.c:79
+#: ../src/protocols/jabber/jabber.c:79
 msgid "Error initializing session"
 msgstr "對工作階段進行初始化時發生了錯誤"
 
-#: src/protocols/jabber/jabber.c:236
-#: src/protocols/jabber/jabber.c:251
+#: ../src/protocols/jabber/jabber.c:232
+#: ../src/protocols/jabber/jabber.c:281
+#: ../src/protocols/jabber/jabber.c:309
 msgid "Write error"
 msgstr "寫入錯誤"
 
-#: src/protocols/jabber/jabber.c:289
-#: src/protocols/jabber/jabber.c:321
+#: ../src/protocols/jabber/jabber.c:362
+#: ../src/protocols/jabber/jabber.c:395
 msgid "Read Error"
 msgstr "讀取錯誤"
 
-#: src/protocols/jabber/jabber.c:407
-#: src/protocols/jabber/jabber.c:828
+#: ../src/protocols/jabber/jabber.c:480
+#: ../src/protocols/jabber/jabber.c:915
 msgid "Unable to create socket"
 msgstr "無法建立 Socket"
 
-#: src/protocols/jabber/jabber.c:451
-#: src/protocols/jabber/jabber.c:788
+#: ../src/protocols/jabber/jabber.c:536
+#: ../src/protocols/jabber/jabber.c:873
 msgid "Invalid Jabber ID"
 msgstr "Jabber 帳號無效"
 
-#: src/protocols/jabber/jabber.c:521
+#: ../src/protocols/jabber/jabber.c:606
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "成功註冊 %s@%s"
 
-#: src/protocols/jabber/jabber.c:523
-#: src/protocols/jabber/jabber.c:524
+#: ../src/protocols/jabber/jabber.c:608
+#: ../src/protocols/jabber/jabber.c:609
 msgid "Registration Successful"
 msgstr "註冊成功"
 
-#: src/protocols/jabber/jabber.c:530
-#: src/protocols/jabber/jabber.c:1354
+#: ../src/protocols/jabber/jabber.c:615
+#: ../src/protocols/jabber/jabber.c:1468
 msgid "Unknown Error"
 msgstr "未知錯誤"
 
-#: src/protocols/jabber/jabber.c:532
-#: src/protocols/jabber/jabber.c:533
+#: ../src/protocols/jabber/jabber.c:617
+#: ../src/protocols/jabber/jabber.c:618
 msgid "Registration Failed"
 msgstr "註冊失敗"
 
-#: src/protocols/jabber/jabber.c:644
-#: src/protocols/jabber/jabber.c:645
+#: ../src/protocols/jabber/jabber.c:729
+#: ../src/protocols/jabber/jabber.c:730
 msgid "Already Registered"
 msgstr "已經註冊"
 
-#: src/protocols/jabber/jabber.c:691
-msgid "E-Mail"
-msgstr "電子郵件"
-
-#: src/protocols/jabber/jabber.c:721
-#: src/protocols/oscar/oscar.c:6049
-#: src/protocols/oscar/oscar.c:6057
+#: ../src/protocols/jabber/jabber.c:806
+#: ../src/protocols/oscar/oscar.c:3709
+#: ../src/protocols/oscar/oscar.c:3717
 msgid "State"
 msgstr "省/州"
 
-#: src/protocols/jabber/jabber.c:731
-#: src/protocols/silc/ops.c:1069
-#: src/protocols/silc/silc.c:687
-#: src/protocols/silc/util.c:514
+#: ../src/protocols/jabber/jabber.c:811
+msgid "Postal code"
+msgstr "郵遞區號"
+
+#: ../src/protocols/jabber/jabber.c:816
+#: ../src/protocols/silc/ops.c:1069
+#: ../src/protocols/silc/silc.c:703
+#: ../src/protocols/silc/util.c:528
 msgid "Phone"
 msgstr "電話"
 
-#: src/protocols/jabber/jabber.c:741
+#: ../src/protocols/jabber/jabber.c:826
 msgid "Date"
 msgstr "日期"
 
-#: src/protocols/jabber/jabber.c:749
+#: ../src/protocols/jabber/jabber.c:834
 msgid "Please fill out the information below to register your new account."
 msgstr "為您的新帳戶註冊,請填寫下列資料:"
 
-#: src/protocols/jabber/jabber.c:752
-#: src/protocols/jabber/jabber.c:753
+#: ../src/protocols/jabber/jabber.c:837
+#: ../src/protocols/jabber/jabber.c:838
 msgid "Register New Jabber Account"
 msgstr "註冊新的 Jabber 帳戶"
 
-#: src/protocols/jabber/jabber.c:897
+#: ../src/protocols/jabber/jabber.c:996
 msgid "Initializing Stream"
 msgstr "串流初始中"
 
-#: src/protocols/jabber/jabber.c:903
-#: src/protocols/msn/session.c:355
+#: ../src/protocols/jabber/jabber.c:1001
+#: ../src/protocols/msn/session.c:350
 msgid "Authenticating"
 msgstr "認證中"
 
-#: src/protocols/jabber/jabber.c:912
+#: ../src/protocols/jabber/jabber.c:1010
 msgid "Re-initializing Stream"
 msgstr "串流重新初始中"
 
-#: src/protocols/jabber/jabber.c:983
-#: src/protocols/jabber/jabber.c:1332
-#: src/protocols/jabber/jabber.c:1373
-#: src/protocols/jabber/jabber.c:1406
-#: src/protocols/oscar/oscar.c:767
-#: src/protocols/oscar/oscar.c:7647
+#: ../src/protocols/jabber/jabber.c:1081
+#: ../src/protocols/jabber/jabber.c:1446
+#: ../src/protocols/jabber/jabber.c:1487
+#: ../src/protocols/jabber/jabber.c:1521
+#: ../src/protocols/oscar/oscar.c:791
+#: ../src/protocols/oscar/oscar.c:5436
 msgid "Not Authorized"
 msgstr "未認證"
 
@@ -6939,90 +7369,84 @@
 # NOTE in jabber each user has control over both who is in his/her buddy list and who has him/her in that other person's buddy list
 # NOTE ie each "subscription" represents the fact that either you send status notifications to someone, or that you recieve them, or both
 # NOTE thus "from" means you only recieve status notification, "to" means you only send status notification and "both" is thus obviously that you both send and recieve status notification
-#: src/protocols/jabber/jabber.c:1026
+#: ../src/protocols/jabber/jabber.c:1123
 msgid "Both"
 msgstr "已互相認證"
 
 #  NOTE Jabber 術語,見上
-#: src/protocols/jabber/jabber.c:1028
+#: ../src/protocols/jabber/jabber.c:1125
 msgid "From (To pending)"
 msgstr "已認證對方(但仍等待對方認證您)"
 
 #  NOTE Jabber 術語,見上
-#: src/protocols/jabber/jabber.c:1030
-msgid "From"
-msgstr "已認證對方"
-
-#  NOTE Jabber 術語,見上
-#: src/protocols/jabber/jabber.c:1033
+#: ../src/protocols/jabber/jabber.c:1130
 msgid "To"
 msgstr "已獲對方認證"
 
 #  NOTE Jabber 術語,見上
-#: src/protocols/jabber/jabber.c:1035
+#: ../src/protocols/jabber/jabber.c:1132
 msgid "None (To pending)"
 msgstr "無(但正等待對方認證您)"
 
 #  NOTE Jabber 術語,見上
-#: src/protocols/jabber/jabber.c:1039
+#: ../src/protocols/jabber/jabber.c:1136
 msgid "Subscription"
 msgstr "認證狀態"
 
-#: src/protocols/jabber/jabber.c:1094
-#: src/protocols/jabber/jabber.c:1102
-#: src/protocols/jabber/jabber.c:1110
-#: src/protocols/jabber/jabber.c:1118
-#: src/protocols/jabber/jabber.c:1126
+#: ../src/protocols/jabber/jabber.c:1193
+#: ../src/protocols/jabber/jabber.c:1203
+#: ../src/protocols/jabber/jabber.c:1213
+#: ../src/protocols/jabber/jabber.c:1223
+#: ../src/protocols/jabber/jabber.c:1233
 msgid "Priority"
 msgstr "優先次序"
 
-#: src/protocols/jabber/jabber.c:1148
+#: ../src/protocols/jabber/jabber.c:1262
 msgid "Password Changed"
 msgstr "密碼修改成功"
 
-#: src/protocols/jabber/jabber.c:1149
+#: ../src/protocols/jabber/jabber.c:1263
 msgid "Your password has been changed."
 msgstr "成功修改了您的密碼。"
 
-#: src/protocols/jabber/jabber.c:1153
-#: src/protocols/jabber/jabber.c:1154
+#: ../src/protocols/jabber/jabber.c:1267
+#: ../src/protocols/jabber/jabber.c:1268
 msgid "Error changing password"
 msgstr "修改密碼期間出現錯誤"
 
-#: src/protocols/jabber/jabber.c:1210
+#: ../src/protocols/jabber/jabber.c:1324
 msgid "Password (again)"
 msgstr "舊密碼(再次確認)"
 
-#: src/protocols/jabber/jabber.c:1215
-#: src/protocols/jabber/jabber.c:1216
+#: ../src/protocols/jabber/jabber.c:1329
+#: ../src/protocols/jabber/jabber.c:1330
 msgid "Change Jabber Password"
 msgstr "修改 Jabber 密碼"
 
-#: src/protocols/jabber/jabber.c:1216
+#: ../src/protocols/jabber/jabber.c:1330
 msgid "Please enter your new password"
 msgstr "請輸入您的新密碼"
 
-#: src/protocols/jabber/jabber.c:1226
-#: src/protocols/oscar/oscar.c:8282
-#: src/protocols/silc/silc.c:1009
+#: ../src/protocols/jabber/jabber.c:1340
+#: ../src/protocols/oscar/oscar.c:6228
+#: ../src/protocols/silc/silc.c:1025
 msgid "Set User Info..."
 msgstr "設定使用者資訊..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: src/protocols/jabber/jabber.c:1231
-#: src/protocols/oscar/oscar.c:8293
-#: src/protocols/silc/silc.c:1005
+#: ../src/protocols/jabber/jabber.c:1345
+#: ../src/protocols/oscar/oscar.c:6239
+#: ../src/protocols/silc/silc.c:1021
 msgid "Change Password..."
 msgstr "修改密碼..."
 
 #. }
-#: src/protocols/jabber/jabber.c:1236
-#, fuzzy
+#: ../src/protocols/jabber/jabber.c:1350
 msgid "Search for Users..."
-msgstr "搜尋(_S):"
+msgstr "搜尋使用者..."
 
 # NOTE 見 http://www.jabber.org/jeps/jep-0103.html
-#: src/protocols/jabber/jabber.c:1312
+#: ../src/protocols/jabber/jabber.c:1426
 msgid "Bad Request"
 msgstr "傳送網址時發生了不明的錯誤"
 
@@ -7030,51 +7454,51 @@
 #  NOTE(大概係指登入用的使用者自定字串)或工作階段登入,以致無法存取
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE 譯文更動 by Ambrose
-#: src/protocols/jabber/jabber.c:1314
+#: ../src/protocols/jabber/jabber.c:1428
 msgid "Conflict"
 msgstr "名稱或位址衝突"
 
-#: src/protocols/jabber/jabber.c:1316
+#: ../src/protocols/jabber/jabber.c:1430
 msgid "Feature Not Implemented"
 msgstr "該功能尚未實作"
 
 #  NOTE Jabber 錯誤 <forbidden/>,意思正常(表示權限不夠)
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: src/protocols/jabber/jabber.c:1318
+#: ../src/protocols/jabber/jabber.c:1432
 msgid "Forbidden"
 msgstr "權限不夠"
 
 #  NOTE Jabber 錯誤 <gone/>,表示使用者或伺服器曾經上線,後來離了線
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: src/protocols/jabber/jabber.c:1320
+#: ../src/protocols/jabber/jabber.c:1434
 msgid "Gone"
 msgstr "已離線"
 
-#: src/protocols/jabber/jabber.c:1322
-#: src/protocols/jabber/jabber.c:1396
+#: ../src/protocols/jabber/jabber.c:1436
+#: ../src/protocols/jabber/jabber.c:1511
 msgid "Internal Server Error"
 msgstr "伺服器內部錯誤"
 
-#: src/protocols/jabber/jabber.c:1324
+#: ../src/protocols/jabber/jabber.c:1438
 msgid "Item Not Found"
 msgstr "項目未找到"
 
-#: src/protocols/jabber/jabber.c:1326
+#: ../src/protocols/jabber/jabber.c:1440
 msgid "Malformed Jabber ID"
 msgstr "畸型的 Jabber ID"
 
 #  NOTE Jabber 錯誤 <not-acceptable/>,表示所送出的要求未能達到伺服器或收件人所訂下的
 #  NOTE 條件(例如訊息中含有禁字),以致無法存取
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: src/protocols/jabber/jabber.c:1328
+#: ../src/protocols/jabber/jabber.c:1442
 msgid "Not Acceptable"
 msgstr "無法接受"
 
-#: src/protocols/jabber/jabber.c:1330
+#: ../src/protocols/jabber/jabber.c:1444
 msgid "Not Allowed"
 msgstr "不被允許"
 
-#: src/protocols/jabber/jabber.c:1334
+#: ../src/protocols/jabber/jabber.c:1448
 msgid "Payment Required"
 msgstr "必須付款"
 
@@ -7082,78 +7506,78 @@
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE「暫時無法聯絡」應該比「不存在」通順
 #  NOTE 譯文更動 by Ambrose
-#: src/protocols/jabber/jabber.c:1336
+#: ../src/protocols/jabber/jabber.c:1450
 msgid "Recipient Unavailable"
 msgstr "暫時無法聯絡接收者"
 
-#: src/protocols/jabber/jabber.c:1340
+#: ../src/protocols/jabber/jabber.c:1454
 msgid "Registration Required"
 msgstr "必須註冊"
 
-#: src/protocols/jabber/jabber.c:1342
+#: ../src/protocols/jabber/jabber.c:1456
 msgid "Remote Server Not Found"
 msgstr "遠端伺服器未找到"
 
-#: src/protocols/jabber/jabber.c:1344
+#: ../src/protocols/jabber/jabber.c:1458
 msgid "Remote Server Timeout"
 msgstr "遠端伺服器逾時"
 
-#: src/protocols/jabber/jabber.c:1346
+#: ../src/protocols/jabber/jabber.c:1460
 msgid "Server Overloaded"
 msgstr "伺服器超載"
 
 #  NOTE Jabber 錯誤 <service-unavailable/>,表示伺服器收到一個意義不明的指令
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE 譯文更動 by Ambrose
-#: src/protocols/jabber/jabber.c:1348
+#: ../src/protocols/jabber/jabber.c:1462
 msgid "Service Unavailable"
 msgstr "不提供該項服務"
 
 #  NOTE Jabber 錯誤 <subscription-required/>,表示使用「服務」前
 #  NOTE 必須事先取得「Subscription」(認證)
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
-#: src/protocols/jabber/jabber.c:1350
+#: ../src/protocols/jabber/jabber.c:1464
 msgid "Subscription Required"
 msgstr "必須認證"
 
-#: src/protocols/jabber/jabber.c:1352
+#: ../src/protocols/jabber/jabber.c:1466
 msgid "Unexpected Request"
 msgstr "未預期的要求"
 
-#: src/protocols/jabber/jabber.c:1359
+#: ../src/protocols/jabber/jabber.c:1473
 msgid "Authorization Aborted"
 msgstr "認證取消"
 
-#: src/protocols/jabber/jabber.c:1361
+#: ../src/protocols/jabber/jabber.c:1475
 msgid "Incorrect encoding in authorization"
 msgstr "認證含錯誤的編碼"
 
-#: src/protocols/jabber/jabber.c:1364
+#: ../src/protocols/jabber/jabber.c:1478
 msgid "Invalid authzid"
 msgstr "無效的 authzid"
 
 # XXX 要覆查譯文
-#: src/protocols/jabber/jabber.c:1367
+#: ../src/protocols/jabber/jabber.c:1481
 msgid "Invalid Authorization Mechanism"
 msgstr "無效的認證機制"
 
-#: src/protocols/jabber/jabber.c:1370
+#: ../src/protocols/jabber/jabber.c:1484
 msgid "Authorization mechanism too weak"
 msgstr "認證機制太薄弱了"
 
-#: src/protocols/jabber/jabber.c:1375
+#: ../src/protocols/jabber/jabber.c:1489
 msgid "Temporary Authentication Failure"
 msgstr "認證暫時失敗"
 
-#: src/protocols/jabber/jabber.c:1377
+#: ../src/protocols/jabber/jabber.c:1492
 msgid "Authentication Failure"
 msgstr "認證失敗"
 
-#: src/protocols/jabber/jabber.c:1381
+#: ../src/protocols/jabber/jabber.c:1496
 msgid "Bad Format"
 msgstr "無效的格式"
 
-#: src/protocols/jabber/jabber.c:1383
+#: ../src/protocols/jabber/jabber.c:1498
 msgid "Bad Namespace Prefix"
 msgstr "無效的 Namespace Prefix"
 
@@ -7163,144 +7587,154 @@
 # NOTE 見 http://www.jabber.org/user/userguide.html
 # NOTE Jabber 協定中 Stanza Error 的一種,即 <conflict/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/jabber.c:1386
+#: ../src/protocols/jabber/jabber.c:1501
 msgid "Resource Conflict"
 msgstr "已經以指定的 Resource 在其他地方登入"
 
-#: src/protocols/jabber/jabber.c:1388
-#: src/protocols/silc/ops.c:1728
+#: ../src/protocols/jabber/jabber.c:1503
+#: ../src/protocols/silc/ops.c:1728
 msgid "Connection Timeout"
 msgstr "連線已逾時"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <host-gone/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/jabber.c:1390
+#: ../src/protocols/jabber/jabber.c:1505
 msgid "Host Gone"
 msgstr "伺服器已不再支援所給定的伺服器名稱"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <host-unknown/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/jabber.c:1392
+#: ../src/protocols/jabber/jabber.c:1507
 msgid "Host Unknown"
 msgstr "不明的伺服器名稱"
 
-#: src/protocols/jabber/jabber.c:1394
+#: ../src/protocols/jabber/jabber.c:1509
 msgid "Improper Addressing"
 msgstr "錯誤的定址"
 
-#: src/protocols/jabber/jabber.c:1398
+#: ../src/protocols/jabber/jabber.c:1513
 msgid "Invalid ID"
 msgstr "帳號無效"
 
 # FIXME 必須覆查譯文
-#: src/protocols/jabber/jabber.c:1400
+#: ../src/protocols/jabber/jabber.c:1515
 msgid "Invalid Namespace"
 msgstr "命名空間無效"
 
-#: src/protocols/jabber/jabber.c:1402
+#: ../src/protocols/jabber/jabber.c:1517
 msgid "Invalid XML"
 msgstr "無效的 XML"
 
 # XXX 這是暫譯,譯文有待改進
 # NOTE Jabber 協定中的「nonmatching-hosts」
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/jabber.c:1404
+#: ../src/protocols/jabber/jabber.c:1519
 msgid "Non-matching Hosts"
 msgstr "主機名稱不相乎"
 
 # XXX 這是暫譯,譯文有待改進。不過好像真的有人這樣寫,大概沒有太大的問題
 # NOTE Jabber 協定 xmpp-core 中 Stream Error 的一種,即 <policy-violation/>
 # NOTE 見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-19.html
-#: src/protocols/jabber/jabber.c:1408
+#: ../src/protocols/jabber/jabber.c:1523
 msgid "Policy Violation"
 msgstr "違反了服務政策"
 
 # NOTE Jabber 協定 Stream Error 的一種,即 <remote-connection-failed/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/jabber.c:1410
+#: ../src/protocols/jabber/jabber.c:1525
 msgid "Remote Connection Failed"
 msgstr "無法連線至認證所需的遠端資源"
 
 # NOTE Jabber 協定 Stream Error 的一種,即 <resource-constraint/>
 # NOTE 在這裏的 Resource 一詞與登入時使用者所用的 Resource 一詞意義並不相同
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/jabber.c:1412
+#: ../src/protocols/jabber/jabber.c:1527
 msgid "Resource Constraint"
 msgstr "伺服器資源短缺"
 
 # NOTE Jabber 協定 xmpp-core 中 Stream Error 的一種,即 <restricted-xml/>
 # NOTE 見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-18.html
-#: src/protocols/jabber/jabber.c:1414
+#: ../src/protocols/jabber/jabber.c:1529
 msgid "Restricted XML"
 msgstr "XML 中存在有 Jabber 協定不容許的 XML 元素"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <see-other-host/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/jabber.c:1416
+#: ../src/protocols/jabber/jabber.c:1531
 msgid "See Other Host"
 msgstr "伺服器在認證期間要求了重新導向至另一伺服器"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <system-shutdown/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/jabber/jabber.c:1418
+#: ../src/protocols/jabber/jabber.c:1533
 msgid "System Shutdown"
 msgstr "伺服器目前在關機中"
 
 # NOTE 見 http://www.jabber.org/jeps/jep-0103.html
-#: src/protocols/jabber/jabber.c:1420
+#: ../src/protocols/jabber/jabber.c:1535
 msgid "Undefined Condition"
 msgstr "傳送網址時發生了不明的錯誤"
 
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-August/001431.html
-#: src/protocols/jabber/jabber.c:1422
+#: ../src/protocols/jabber/jabber.c:1537
 msgid "Unsupported Encoding"
 msgstr "伺服器不支援給定的字元編碼"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <unsupported-stanza-type/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-#: src/protocols/jabber/jabber.c:1424
+#: ../src/protocols/jabber/jabber.c:1539
 msgid "Unsupported Stanza Type"
 msgstr "伺服器不支援給定的段落類別 (Stanza Type)"
 
 # NOTE Jabber 協定中 Stream Error 的一種,即 <unsupported-version/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-#: src/protocols/jabber/jabber.c:1426
+#: ../src/protocols/jabber/jabber.c:1541
 msgid "Unsupported Version"
 msgstr "不支援給定的 XMPP 版本"
 
-#: src/protocols/jabber/jabber.c:1428
+#: ../src/protocols/jabber/jabber.c:1543
 msgid "XML Not Well Formed"
 msgstr "XML 文件格式有問題"
 
-#: src/protocols/jabber/jabber.c:1430
+#: ../src/protocols/jabber/jabber.c:1545
 msgid "Stream Error"
 msgstr "串流錯誤"
 
-#: src/protocols/jabber/jabber.c:1497
+#: ../src/protocols/jabber/jabber.c:1612
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "無法禁止使用者 %s"
 
-#: src/protocols/jabber/jabber.c:1519
+#: ../src/protocols/jabber/jabber.c:1632
 #, fuzzy, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "未知的指令:%s"
 
-#: src/protocols/jabber/jabber.c:1524
+#: ../src/protocols/jabber/jabber.c:1637
 #, fuzzy, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "無法邀請使用者 (%s)。"
 
-#: src/protocols/jabber/jabber.c:1576
+#: ../src/protocols/jabber/jabber.c:1656
+#, fuzzy, c-format
+msgid "Unknown role: \"%s\""
+msgstr "未知的指令:%s"
+
+#: ../src/protocols/jabber/jabber.c:1663
+#, fuzzy, c-format
+msgid "Unable to set role \"%s\" for user: %s"
+msgstr "無法送出訊息:%s"
+
+#: ../src/protocols/jabber/jabber.c:1716
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "無法踢出使用者 %s"
 
-#: src/protocols/jabber/jabber.c:1602
+#: ../src/protocols/jabber/jabber.c:1747
 msgid "config:  Configure a chat room."
 msgstr "config:設定一個聊天室"
 
-#: src/protocols/jabber/jabber.c:1606
+#: ../src/protocols/jabber/jabber.c:1751
 msgid "configure:  Configure a chat room."
 msgstr "configure:設定一個聊天室"
 
@@ -7309,39 +7743,43 @@
 # #, c-format
 # msgid "%d %s in room"
 # msgstr "聊天室有 %d 家伙"
-#: src/protocols/jabber/jabber.c:1615
+#: ../src/protocols/jabber/jabber.c:1760
 msgid "part [room]:  Leave the room."
 msgstr "part [聊天室]:離開聊天室。"
 
-#: src/protocols/jabber/jabber.c:1620
+#: ../src/protocols/jabber/jabber.c:1765
 msgid "register:  Register with a chat room."
 msgstr "register:加入一個聊天室"
 
-#: src/protocols/jabber/jabber.c:1626
+#: ../src/protocols/jabber/jabber.c:1771
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [新主題]:檢視或修改聊天主題"
 
-#: src/protocols/jabber/jabber.c:1632
+#: ../src/protocols/jabber/jabber.c:1777
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;user&gt; [聊天室]:禁止某使用者進入聊天室"
 
-#: src/protocols/jabber/jabber.c:1638
+#: ../src/protocols/jabber/jabber.c:1783
 msgid "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's affiliation with the room."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1644
+#: ../src/protocols/jabber/jabber.c:1789
+msgid "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's role in the room."
+msgstr ""
+
+#: ../src/protocols/jabber/jabber.c:1795
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt使用者&gt; [訊息]:邀請使用者進入聊天室"
 
-#: src/protocols/jabber/jabber.c:1650
+#: ../src/protocols/jabber/jabber.c:1801
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt聊天室&gt; [伺服器]:加入位於這個伺服器的一個聊天室"
 
-#: src/protocols/jabber/jabber.c:1656
+#: ../src/protocols/jabber/jabber.c:1807
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;使用者&gt; [聊天室]:將使用者從聊天室中踢出。"
 
-#: src/protocols/jabber/jabber.c:1661
+#: ../src/protocols/jabber/jabber.c:1812
 msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr "msg &lt;使用者&gt; &lt;訊息&gt;:傳送私人訊息給另一個使用者"
 
@@ -7355,457 +7793,453 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1743
-#: src/protocols/jabber/jabber.c:1745
+#: ../src/protocols/jabber/jabber.c:1895
+#: ../src/protocols/jabber/jabber.c:1897
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber 協定模組"
 
 # XXX 暫譯
-#: src/protocols/jabber/jabber.c:1771
+#: ../src/protocols/jabber/jabber.c:1923
 msgid "Use TLS if available"
 msgstr "TLS 可用則用"
 
-#: src/protocols/jabber/jabber.c:1776
+#: ../src/protocols/jabber/jabber.c:1928
 msgid "Require TLS"
 msgstr "需要TLS"
 
-#: src/protocols/jabber/jabber.c:1779
-#, fuzzy
+#: ../src/protocols/jabber/jabber.c:1931
 msgid "Force old (port 5223) SSL"
-msgstr "強迫使用舊式 SSL"
+msgstr "強迫使用舊式 SSL (port 5223)"
 
 #  NOTE 譯文更動 by Ambrose
-#: src/protocols/jabber/jabber.c:1784
+#: ../src/protocols/jabber/jabber.c:1936
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "允許使用明文,在未經加密的串流上進行認證"
 
-#: src/protocols/jabber/jabber.c:1789
-#, fuzzy
+#: ../src/protocols/jabber/jabber.c:1941
+#: ../src/protocols/simple/simple.c:1781
 msgid "Connect port"
-msgstr "連線"
+msgstr "連線埠"
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1793
-#: src/protocols/silc/silc.c:1832
+#: ../src/protocols/jabber/jabber.c:1945
+#: ../src/protocols/silc/silc.c:1856
 msgid "Connect server"
 msgstr "連結伺服器"
 
-#: src/protocols/jabber/message.c:114
+#: ../src/protocols/jabber/message.c:117
 #, c-format
 msgid "Message from %s"
 msgstr "由 %s 發出的訊息"
 
-#: src/protocols/jabber/message.c:178
+#: ../src/protocols/jabber/message.c:181
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s 把聊天主題設定為:%s"
 
-#: src/protocols/jabber/message.c:180
+#: ../src/protocols/jabber/message.c:183
 #, c-format
 msgid "The topic is: %s"
 msgstr "主題:%s"
 
-#: src/protocols/jabber/message.c:230
+#: ../src/protocols/jabber/message.c:233
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "無法傳送訊息到 %s:%s"
 
-#: src/protocols/jabber/message.c:233
+#: ../src/protocols/jabber/message.c:236
 msgid "Jabber Message Error"
 msgstr "Jabber 訊息錯誤"
 
-#: src/protocols/jabber/message.c:297
+#: ../src/protocols/jabber/message.c:316
 #, c-format
 msgid " (Code %s)"
 msgstr " (代碼 %s)"
 
-#: src/protocols/jabber/parser.c:131
+#: ../src/protocols/jabber/parser.c:279
+#: ../src/protocols/jabber/parser.c:288
 msgid "XML Parse error"
 msgstr "XML 分析錯誤"
 
-#: src/protocols/jabber/presence.c:305
+#: ../src/protocols/jabber/presence.c:305
 msgid "Unknown Error in presence"
 msgstr "在確定好友的連線狀態時,發生了未知的錯誤"
 
-#: src/protocols/jabber/presence.c:310
-#: src/protocols/msn/userlist.c:104
+#: ../src/protocols/jabber/presence.c:310
+#: ../src/protocols/msn/userlist.c:98
 #, 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/msn/userlist.c:111
-#: src/protocols/oscar/oscar.c:4590
-#: src/protocols/oscar/oscar.c:7280
-#: src/protocols/yahoo/yahoo.c:907
-msgid "Authorize"
-msgstr "給予認證"
-
-#: src/protocols/jabber/presence.c:320
-#: src/protocols/msn/userlist.c:112
-#: src/protocols/oscar/oscar.c:4592
-#: src/protocols/oscar/oscar.c:7281
-#: src/protocols/yahoo/yahoo.c:909
-msgid "Deny"
-msgstr "拒絕"
-
-#: src/protocols/jabber/presence.c:376
-#: src/protocols/jabber/presence.c:377
+#: ../src/protocols/jabber/presence.c:319
+#: ../src/protocols/oscar/oscar.c:2382
+#: ../src/protocols/oscar/oscar.c:5061
+msgid "_Authorize"
+msgstr "給予認證(_A)"
+
+#: ../src/protocols/jabber/presence.c:320
+#: ../src/protocols/oscar/oscar.c:2384
+#: ../src/protocols/oscar/oscar.c:5062
+msgid "_Deny"
+msgstr "拒絕(_D)"
+
+#: ../src/protocols/jabber/presence.c:377
+#: ../src/protocols/jabber/presence.c:378
 msgid "Create New Room"
 msgstr "建立新聊天室"
 
-#: src/protocols/jabber/presence.c:378
+#: ../src/protocols/jabber/presence.c:379
 msgid "You are creating a new room.  Would you like to configure it, or accept the default settings?"
 msgstr "您正要建立一個新的聊天室,您要設定它,還是使用預設值?"
 
-#: src/protocols/jabber/presence.c:380
-msgid "Configure Room"
-msgstr "設定聊天室"
-
-#: src/protocols/jabber/presence.c:382
-msgid "Accept Defaults"
-msgstr "使用預設值"
-
-#: src/protocols/jabber/presence.c:419
+#: ../src/protocols/jabber/presence.c:382
+msgid "_Configure Room"
+msgstr "設定聊天室(_C)"
+
+#: ../src/protocols/jabber/presence.c:384
+msgid "_Accept Defaults"
+msgstr "使用預設值(_A)"
+
+#: ../src/protocols/jabber/presence.c:422
 #, c-format
 msgid "Error in chat %s"
 msgstr "聊天室 %s 發生錯誤"
 
-#: src/protocols/jabber/presence.c:422
+#: ../src/protocols/jabber/presence.c:425
 #, c-format
 msgid "Error joining chat %s"
 msgstr "加入聊天室 %s 時發生錯誤"
 
-#: src/protocols/jabber/si.c:591
+#: ../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:592
-#: src/protocols/jabber/si.c:593
+#: ../src/protocols/jabber/si.c:729
+#: ../src/protocols/jabber/si.c:730
 msgid "File Send Failed"
 msgstr "傳送檔案失敗"
 
 # XXX 暫譯
-#: src/protocols/msn/dialog.c:92
+#: ../src/protocols/msn/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "為 %s (%s) 的好友清單進行同步化途中出現問題"
 
 # XXX 暫譯
-#: src/protocols/msn/dialog.c:98
+#: ../src/protocols/msn/dialog.c:116
 #, c-format
 msgid "%s on the local list is inside the group \"%s\" but not on the server list. Do you want this buddy to be added?"
 msgstr "%s 在本地端的好友清單的「%s」群組裏,卻不在伺服器上;您要新增這個好友至伺服器的好友清單嗎?"
 
 # XXX 暫譯
-#: src/protocols/msn/dialog.c:106
+#: ../src/protocols/msn/dialog.c:124
 #, c-format
 msgid "%s is on the local list but not on the server list. Do you want this buddy to be added?"
 msgstr "%s 在本地端的好友清單,郤不在伺服器上;您要新增這個好友至伺服器的好友清單嗎?"
 
-#: src/protocols/msn/error.c:35
+#: ../src/protocols/msn/error.c:35
 msgid "Unable to parse message"
 msgstr "無法解析訊息"
 
 # NOTE MSN 錯誤訊息要參閱 http://www.hypothetic.org/docs/msn2/reference/error_list.php
-#: src/protocols/msn/error.c:38
+#: ../src/protocols/msn/error.c:38
 msgid "Syntax Error (probably a Gaim bug)"
 msgstr "語法錯誤(可能是 Gaim 的 Bug)"
 
-#: src/protocols/msn/error.c:42
+#: ../src/protocols/msn/error.c:42
 msgid "Invalid e-mail address"
 msgstr "無效的電子郵件位址"
 
-#: src/protocols/msn/error.c:45
+#: ../src/protocols/msn/error.c:45
 msgid "User does not exist"
 msgstr "使用者不存在"
 
-#: src/protocols/msn/error.c:49
+#: ../src/protocols/msn/error.c:49
 msgid "Fully Qualified Domain Name missing"
 msgstr "沒給予完整領域名稱 (FQDN)"
 
-#: src/protocols/msn/error.c:52
+#: ../src/protocols/msn/error.c:52
 msgid "Already Logged In"
 msgstr "已經登入"
 
-#: src/protocols/msn/error.c:55
+#: ../src/protocols/msn/error.c:55
 msgid "Invalid Username"
 msgstr "使用者名稱無效"
 
-#: src/protocols/msn/error.c:58
+#: ../src/protocols/msn/error.c:58
 msgid "Invalid Friendly Name"
 msgstr "暱稱無效"
 
-#: src/protocols/msn/error.c:61
+#: ../src/protocols/msn/error.c:61
 msgid "List Full"
 msgstr "好友清單已滿"
 
-#: src/protocols/msn/error.c:64
+#: ../src/protocols/msn/error.c:64
 msgid "Already there"
 msgstr "已經在清單裡"
 
-#: src/protocols/msn/error.c:67
+#: ../src/protocols/msn/error.c:67
 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 "使用者是離線的"
 
-#: src/protocols/msn/error.c:73
+#: ../src/protocols/msn/error.c:73
 msgid "Already in the mode"
 msgstr "已經在這個模式中"
 
-#: src/protocols/msn/error.c:76
+#: ../src/protocols/msn/error.c:76
 msgid "Already in opposite list"
 msgstr "已經在相對的清單中"
 
-#: src/protocols/msn/error.c:79
+#: ../src/protocols/msn/error.c:79
 msgid "Too many groups"
 msgstr "太多群組"
 
-#: src/protocols/msn/error.c:82
+#: ../src/protocols/msn/error.c:82
 msgid "Invalid group"
 msgstr "無效的群組"
 
-#: src/protocols/msn/error.c:85
+#: ../src/protocols/msn/error.c:85
 msgid "User not in group"
 msgstr "使用者不在群組內"
 
-#: src/protocols/msn/error.c:88
+#: ../src/protocols/msn/error.c:88
 msgid "Group name too long"
 msgstr "群組名稱過長"
 
-#: src/protocols/msn/error.c:91
+#: ../src/protocols/msn/error.c:91
 msgid "Cannot remove group zero"
 msgstr "無法移除「零」號群組"
 
-#: src/protocols/msn/error.c:95
-#, fuzzy
+#: ../src/protocols/msn/error.c:95
 msgid "Tried to add a user to a group that doesn't exist"
-msgstr "無法將好友加入一個不存在的群組"
-
-#: src/protocols/msn/error.c:99
+msgstr "嚐試將一個使用者加入不存在的群組"
+
+#: ../src/protocols/msn/error.c:99
 msgid "Switchboard failed"
 msgstr "Switchboard 失敗"
 
-#: src/protocols/msn/error.c:102
+#: ../src/protocols/msn/error.c:102
 msgid "Notify Transfer failed"
 msgstr "傳送通知失敗"
 
-#: src/protocols/msn/error.c:106
+#: ../src/protocols/msn/error.c:106
 msgid "Required fields missing"
 msgstr "找不到所需要的欄位"
 
-#: src/protocols/msn/error.c:109
+#: ../src/protocols/msn/error.c:109
 msgid "Too many hits to a FND"
 msgstr "FND 的結果有太多匹配"
 
-#: src/protocols/msn/error.c:112
-#: src/protocols/oscar/oscar.c:205
+#: ../src/protocols/msn/error.c:112
+#: ../src/protocols/oscar/oscar.c:148
 msgid "Not logged in"
 msgstr "尚未登入"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
 #  NOTE 譯文更動 by Ambrose
-#: src/protocols/msn/error.c:116
+#: ../src/protocols/msn/error.c:116
 msgid "Service Temporarily Unavailable"
 msgstr "暫時無法使用服務"
 
-#: src/protocols/msn/error.c:119
+#: ../src/protocols/msn/error.c:119
 msgid "Database server error"
 msgstr "資料庫錯誤"
 
 #  XXX 暫譯
-#: src/protocols/msn/error.c:122
+#: ../src/protocols/msn/error.c:122
 msgid "Command disabled"
 msgstr "指令被停用"
 
-#: src/protocols/msn/error.c:125
+#: ../src/protocols/msn/error.c:125
 msgid "File operation error"
 msgstr "檔案操作錯誤"
 
-#: src/protocols/msn/error.c:128
+#: ../src/protocols/msn/error.c:128
 msgid "Memory allocation error"
 msgstr "記憶體分配錯誤"
 
-#: src/protocols/msn/error.c:131
+#: ../src/protocols/msn/error.c:131
 msgid "Wrong CHL value sent to server"
 msgstr "錯誤的 CHL 值傳送到了伺服器"
 
-#: src/protocols/msn/error.c:135
+#: ../src/protocols/msn/error.c:135
 msgid "Server busy"
 msgstr "伺服器忙碌"
 
-#: src/protocols/msn/error.c:138
-#: src/protocols/msn/error.c:151
-#: src/protocols/msn/error.c:206
+#: ../src/protocols/msn/error.c:138
+#: ../src/protocols/msn/error.c:151
+#: ../src/protocols/msn/error.c:206
 msgid "Server unavailable"
 msgstr "伺服器目前不提供服務"
 
-#: src/protocols/msn/error.c:141
+#: ../src/protocols/msn/error.c:141
 msgid "Peer Notification server down"
 msgstr "點對點通知伺服器暫停服務"
 
-#: src/protocols/msn/error.c:144
+#: ../src/protocols/msn/error.c:144
 msgid "Database connect error"
 msgstr "資料庫連結錯誤"
 
-#: src/protocols/msn/error.c:148
+#: ../src/protocols/msn/error.c:148
 msgid "Server is going down (abandon ship)"
 msgstr "伺服器將暫停服務"
 
-#: src/protocols/msn/error.c:155
+#: ../src/protocols/msn/error.c:155
 msgid "Error creating connection"
 msgstr "連線開啟錯誤"
 
-#: src/protocols/msn/error.c:159
+#: ../src/protocols/msn/error.c:159
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR 參數是未知或是不允許的"
 
-#: src/protocols/msn/error.c:162
+#: ../src/protocols/msn/error.c:162
 msgid "Unable to write"
 msgstr "無法寫入"
 
-#: src/protocols/msn/error.c:165
+#: ../src/protocols/msn/error.c:165
 msgid "Session overload"
 msgstr "工作階段超載"
 
-#: src/protocols/msn/error.c:168
+#: ../src/protocols/msn/error.c:168
 msgid "User is too active"
 msgstr "使用者太過活躍"
 
-#: src/protocols/msn/error.c:171
+#: ../src/protocols/msn/error.c:171
 msgid "Too many sessions"
 msgstr "太多工作階段"
 
-#: src/protocols/msn/error.c:174
+#: ../src/protocols/msn/error.c:174
 msgid "Passport not verified"
 msgstr "護照帳號尚未經過驗證"
 
-#: src/protocols/msn/error.c:177
+#: ../src/protocols/msn/error.c:177
 msgid "Bad friend file"
 msgstr "好友檔案無效"
 
 # NOTE 參閱上列網站 (www.hypothetic.org) 第715號錯誤
-#: src/protocols/msn/error.c:180
+#: ../src/protocols/msn/error.c:180
 msgid "Not expected"
 msgstr "沒有預期的無效參數"
 
-#: src/protocols/msn/error.c:185
+#: ../src/protocols/msn/error.c:185
 msgid "Friendly name changes too rapidly"
 msgstr "暱稱的變更過於急速"
 
-#: src/protocols/msn/error.c:194
+#: ../src/protocols/msn/error.c:194
 msgid "Server too busy"
 msgstr "伺服器太忙碌"
 
-#: src/protocols/msn/error.c:198
-#: src/protocols/oscar/oscar.c:2751
-#: src/protocols/silc/ops.c:1717
-#: src/protocols/toc/toc.c:722
+#: ../src/protocols/msn/error.c:198
+#: ../src/protocols/oscar/oscar.c:1340
+#: ../src/protocols/silc/ops.c:1717
+#: ../src/protocols/toc/toc.c:722
 msgid "Authentication failed"
 msgstr "認證失敗"
 
-#: src/protocols/msn/error.c:201
+#: ../src/protocols/msn/error.c:201
 msgid "Not allowed when offline"
 msgstr "在離線時不允許這個指令"
 
-#: src/protocols/msn/error.c:209
+#: ../src/protocols/msn/error.c:209
 msgid "Not accepting new users"
 msgstr "不接受新的使用者"
 
-#: src/protocols/msn/error.c:213
+#: ../src/protocols/msn/error.c:213
 msgid "Kids Passport without parental consent"
 msgstr "未經家長同意下使用兒童護照"
 
-#: src/protocols/msn/error.c:217
+#: ../src/protocols/msn/error.c:217
 msgid "Passport account not yet verified"
 msgstr "護照帳號尚未經過驗證"
 
 #  FIXME「ticket」暫無譯文,也許可譯「通行證」或「許可證」?
 #  NOTE MSN 錯誤代號 928
 #  NOTE 詳見 http://www.hypothetic.org/docs/msn/notification/authentication.php
-#: src/protocols/msn/error.c:220
+#: ../src/protocols/msn/error.c:220
 msgid "Bad ticket"
 msgstr "無效的 ticket"
 
-#: src/protocols/msn/error.c:224
+#: ../src/protocols/msn/error.c:224
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "未知的錯誤代碼 %d"
 
-#: src/protocols/msn/error.c:236
+#: ../src/protocols/msn/error.c:236
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "MSN 錯誤:%s\n"
 
-#: src/protocols/msn/msn.c:113
+#: ../src/protocols/msn/msn.c:113
 msgid "You have just sent a Nudge!"
-msgstr ""
-
-#: src/protocols/msn/msn.c:138
+msgstr "您剛送出了一個呼叫!"
+
+#: ../src/protocols/msn/msn.c:138
 msgid "Your new MSN friendly name is too long."
 msgstr "您的新 MSN 暱稱太長。"
 
-#: src/protocols/msn/msn.c:246
+#: ../src/protocols/msn/msn.c:246
 msgid "Set your friendly name."
 msgstr "設定您的暱稱。"
 
 # NOTE MSN的暱稱不像Yahoo;使用者可以輸入任何的新暱稱,
 # NOTE 即使和使用者的帳號毫無關係,似乎也是有效的
 # XXX 這看來是一個鈙述句,事實上是對使用者發出的請求/問題
-#: src/protocols/msn/msn.c:247
+#: ../src/protocols/msn/msn.c:247
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "別人在 MSN 查閱您的個人資料時顯示這個暱稱。"
 
-#: src/protocols/msn/msn.c:263
+#: ../src/protocols/msn/msn.c:263
 msgid "Set your home phone number."
 msgstr "設定您的住家電話號碼。"
 
-#: src/protocols/msn/msn.c:278
+#: ../src/protocols/msn/msn.c:278
 msgid "Set your work phone number."
 msgstr "設定您的辦公室電話號碼。"
 
-#: src/protocols/msn/msn.c:293
+#: ../src/protocols/msn/msn.c:293
 msgid "Set your mobile phone number."
 msgstr "設定您的行動電話號碼。"
 
-#: src/protocols/msn/msn.c:306
+#: ../src/protocols/msn/msn.c:306
 msgid "Allow MSN Mobile pages?"
 msgstr "允許 MSN 傳呼?"
 
-#: src/protocols/msn/msn.c:307
+#: ../src/protocols/msn/msn.c:307
 msgid "Do you want to allow or disallow people on your buddy list to send you MSN Mobile pages to your cell phone or other mobile device?"
 msgstr "您是否允許在您好友清單中的好友傳送 Mobile Page 到您的行動電話,或是其他的行動裝置上呢?"
 
-#: src/protocols/msn/msn.c:311
+#: ../src/protocols/msn/msn.c:311
 msgid "Allow"
 msgstr "允許"
 
-#: src/protocols/msn/msn.c:312
+#: ../src/protocols/msn/msn.c:312
 msgid "Disallow"
 msgstr "不允許"
 
-#: src/protocols/msn/msn.c:328
+#: ../src/protocols/msn/msn.c:328
 msgid "This Hotmail account may not be active."
 msgstr "這個Hotmail帳號可能尚未被啟動。"
 
-#: src/protocols/msn/msn.c:354
+#: ../src/protocols/msn/msn.c:354
 msgid "Send a mobile message."
 msgstr "送出行動訊息。"
 
-#: src/protocols/msn/msn.c:356
+#: ../src/protocols/msn/msn.c:356
 msgid "Page"
 msgstr "傳呼"
 
-#: src/protocols/msn/msn.c:552
-#: src/protocols/msn/msn.c:559
-#: src/protocols/msn/msn.c:562
-#: src/protocols/yahoo/yahoo.c:2809
-#: src/protocols/yahoo/yahoo.c:2815
+#: ../src/protocols/msn/msn.c:546
+#: ../src/protocols/msn/msn.c:553
+#: ../src/protocols/msn/msn.c:562
+#: ../src/protocols/sametime/sametime.c:3239
+#: ../src/protocols/yahoo/yahoo.c:2888
+#: ../src/protocols/yahoo/yahoo.c:2894
 #, c-format
 msgid ""
 "\n"
@@ -7814,183 +8248,347 @@
 "\n"
 "<b>%s:</b>%s"
 
-#: src/protocols/msn/msn.c:559
+#: ../src/protocols/msn/msn.c:553
 msgid "Has you"
 msgstr "你在他(她)的好友清單裏"
 
-#: src/protocols/msn/msn.c:589
-#: src/protocols/msn/state.c:33
-#: src/protocols/yahoo/yahoo.c:2640
-#: src/protocols/yahoo/yahoo.c:3217
+#: ../src/protocols/msn/msn.c:583
+#: ../src/protocols/msn/state.c:33
+#: ../src/protocols/yahoo/yahoo.c:2717
+#: ../src/protocols/yahoo/yahoo.c:3318
 msgid "Be Right Back"
 msgstr "馬上回來"
 
-#: src/protocols/msn/msn.c:597
-#: src/protocols/yahoo/yahoo.c:2650
-#: src/protocols/yahoo/yahoo.c:3232
-#, fuzzy
+#: ../src/protocols/msn/msn.c:587
+#: ../src/protocols/msn/state.c:31
+#: ../src/protocols/novell/novell.c:2849
+#: ../src/protocols/novell/novell.c:2983
+#: ../src/protocols/silc/buddy.c:1473
+#: ../src/protocols/silc/silc.c:53
+#: ../src/protocols/yahoo/yahoo.c:2719
+#: ../src/protocols/yahoo/yahoo.c:3321
+msgid "Busy"
+msgstr "忙碌"
+
+#: ../src/protocols/msn/msn.c:591
+#: ../src/protocols/yahoo/yahoo.c:2727
+#: ../src/protocols/yahoo/yahoo.c:3333
 msgid "On the Phone"
 msgstr "電話中"
 
-#: src/protocols/msn/msn.c:601
-#: src/protocols/yahoo/yahoo.c:2654
-#: src/protocols/yahoo/yahoo.c:3238
-#, fuzzy
+#: ../src/protocols/msn/msn.c:595
+#: ../src/protocols/yahoo/yahoo.c:2731
+#: ../src/protocols/yahoo/yahoo.c:3339
 msgid "Out to Lunch"
 msgstr "外出用餐"
 
-#: src/protocols/msn/msn.c:605
-#: src/protocols/zephyr/zephyr.c:2256
-#: src/status.c:156
-msgid "Hidden"
-msgstr "隱藏"
-
-#: src/protocols/msn/msn.c:621
+#: ../src/protocols/msn/msn.c:619
 msgid "Set Friendly Name..."
 msgstr "設定暱稱..."
 
-#: src/protocols/msn/msn.c:626
+#: ../src/protocols/msn/msn.c:624
 msgid "Set Home Phone Number..."
 msgstr "設定住家電話號碼..."
 
-#: src/protocols/msn/msn.c:630
+#: ../src/protocols/msn/msn.c:628
 msgid "Set Work Phone Number..."
 msgstr "設定工作電話號碼..."
 
-#: src/protocols/msn/msn.c:634
+#: ../src/protocols/msn/msn.c:632
 msgid "Set Mobile Phone Number..."
 msgstr "設定行動電話號碼..."
 
-#: src/protocols/msn/msn.c:640
+#: ../src/protocols/msn/msn.c:638
 msgid "Enable/Disable Mobile Devices..."
 msgstr "開啟 / 關閉行動裝置..."
 
-#: src/protocols/msn/msn.c:645
+#: ../src/protocols/msn/msn.c:643
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "允許 / 不允許 Mobile Page..."
 
-#: src/protocols/msn/msn.c:655
+#: ../src/protocols/msn/msn.c:653
 msgid "Open Hotmail Inbox"
 msgstr "開啟Hotmail收件匣"
 
-#: src/protocols/msn/msn.c:679
+#: ../src/protocols/msn/msn.c:677
 msgid "Send to Mobile"
 msgstr "傳送至行動電話"
 
-#: src/protocols/msn/msn.c:688
-#: src/protocols/novell/novell.c:3444
+#: ../src/protocols/msn/msn.c:687
+#: ../src/protocols/novell/novell.c:3439
 msgid "Initiate _Chat"
 msgstr "開啟聊天室(_C)"
 
 # XXX 暫譯
-#: src/protocols/msn/msn.c:725
+#: ../src/protocols/msn/msn.c:725
 msgid "SSL support is needed for MSN. Please install a supported SSL library. See http://gaim.sf.net/faq-ssl.php for more information."
 msgstr "MSN 需要 SSL 程式庫的支援,請安裝一個受支援的 SSL 程式庫。詳情請閱 http://gaim.sf.net/faq-ssl.php。"
 
-#: src/protocols/msn/msn.c:753
+#: ../src/protocols/msn/msn.c:752
 msgid "Failed to connect to server."
 msgstr "無法連線到伺服器。"
 
-#: src/protocols/msn/msn.c:1361
-#: src/protocols/yahoo/yahoo_profile.c:654
-#: src/protocols/zephyr/zephyr.c:721
-#: src/protocols/zephyr/zephyr.c:1136
+#: ../src/protocols/msn/msn.c:1363
+#: ../src/protocols/yahoo/yahoo_profile.c:685
+#: ../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:1368
-#: src/protocols/msn/msn.c:1714
-#: src/protocols/yahoo/yahoo_profile.c:1171
-#: src/util.c:800
+#: ../src/protocols/msn/msn.c:1370
+#: ../src/protocols/yahoo/yahoo_profile.c:1208
+#: ../src/util.c:1061
 #, c-format
 msgid "<b>%s:</b> "
 msgstr "<b>%s:</b>"
 
-#: src/protocols/msn/msn.c:1445
+#: ../src/protocols/msn/msn.c:1460
 msgid "MSN Profile"
 msgstr "MSN 個人資料"
 
-#: src/protocols/msn/msn.c:1450
-#: src/protocols/msn/msn.c:1701
-#: src/protocols/yahoo/yahoo_profile.c:764
+#: ../src/protocols/msn/msn.c:1465
+#: ../src/protocols/msn/msn.c:1791
+#: ../src/protocols/yahoo/yahoo_profile.c:795
 msgid "Error retrieving profile"
 msgstr "取得個人資訊時發生錯誤"
 
-#: src/protocols/msn/msn.c:1520
-#: src/protocols/oscar/oscar.c:6034
-#: src/protocols/yahoo/yahoo_profile.c:1019
+#: ../src/protocols/msn/msn.c:1533
+#: ../src/protocols/oscar/oscar.c:3694
+#: ../src/protocols/yahoo/yahoo_profile.c:1056
 msgid "Age"
 msgstr "年齡"
 
-#: src/protocols/msn/msn.c:1536
-#: src/protocols/yahoo/yahoo_profile.c:1024
-msgid "Marital Status"
-msgstr "婚姻狀況"
-
-#: src/protocols/msn/msn.c:1543
-#: src/protocols/novell/novell.c:1480
-#: src/protocols/yahoo/yahoo_profile.c:1014
+#: ../src/protocols/msn/msn.c:1535
+#: ../src/protocols/yahoo/yahoo_profile.c:1071
+msgid "Occupation"
+msgstr "職業"
+
+#: ../src/protocols/msn/msn.c:1536
+#: ../src/protocols/novell/novell.c:1478
+#: ../src/protocols/yahoo/yahoo_profile.c:1051
 msgid "Location"
 msgstr "所在位置"
 
-#: src/protocols/msn/msn.c:1551
-#: src/protocols/yahoo/yahoo_profile.c:1034
-msgid "Occupation"
-msgstr "職業"
-
-#: src/protocols/msn/msn.c:1568
-#: src/protocols/msn/msn.c:1574
-#: src/protocols/msn/msn.c:1581
-#: src/protocols/msn/msn.c:1589
-#: src/protocols/msn/msn.c:1596
+#: ../src/protocols/msn/msn.c:1541
+#: ../src/protocols/msn/msn.c:1720
+#: ../src/protocols/msn/msn.c:1726
+#: ../src/protocols/msn/msn.c:1733
+msgid "Hobbies and Interests"
+msgstr "嗜好/興趣"
+
+#: ../src/protocols/msn/msn.c:1547
+#: ../src/protocols/msn/msn.c:1654
+#: ../src/protocols/msn/msn.c:1660
+#: ../src/protocols/msn/msn.c:1667
+#: ../src/protocols/msn/msn.c:1675
+#: ../src/protocols/msn/msn.c:1682
 msgid "A Little About Me"
 msgstr "自我簡介"
 
-#: src/protocols/msn/msn.c:1605
-#: src/protocols/msn/msn.c:1611
-#: src/protocols/msn/msn.c:1618
-#: src/protocols/msn/msn.c:1625
-msgid "Favorite Things"
-msgstr "喜愛事物"
-
-#: src/protocols/msn/msn.c:1634
-#: src/protocols/msn/msn.c:1640
-#: src/protocols/msn/msn.c:1647
-msgid "Hobbies and Interests"
-msgstr "嗜好/興趣"
+#: ../src/protocols/msn/msn.c:1553
+#, fuzzy, c-format
+msgid "%s<b>General</b><br>%s"
+msgstr "<b>外部使用者</b><br>"
+
+#. Social
+#: ../src/protocols/msn/msn.c:1562
+#: ../src/protocols/yahoo/yahoo_profile.c:1061
+msgid "Marital Status"
+msgstr "婚姻狀況"
+
+# NOTE 可能是指「反向選取」
+#: ../src/protocols/msn/msn.c:1563
+msgid "Interests"
+msgstr "興趣"
+
+#: ../src/protocols/msn/msn.c:1564
+msgid "Pets"
+msgstr "寵物"
+
+#: ../src/protocols/msn/msn.c:1565
+msgid "Hometown"
+msgstr "故鄉"
+
+#: ../src/protocols/msn/msn.c:1566
+msgid "Places Lived"
+msgstr "居住過的地方"
+
+#: ../src/protocols/msn/msn.c:1567
+msgid "Fashion"
+msgstr "時尚"
+
+#: ../src/protocols/msn/msn.c:1568
+msgid "Humor"
+msgstr "幽默"
+
+#: ../src/protocols/msn/msn.c:1569
+msgid "Music"
+msgstr "音樂"
 
 # NOTE 日文po檔及MSN本身均譯「座右銘」
-#: src/protocols/msn/msn.c:1656
-#: src/protocols/msn/msn.c:1662
-#: src/protocols/yahoo/yahoo_profile.c:1076
+#: ../src/protocols/msn/msn.c:1570
+#: ../src/protocols/msn/msn.c:1742
+#: ../src/protocols/msn/msn.c:1748
+#: ../src/protocols/yahoo/yahoo_profile.c:1113
 msgid "Favorite Quote"
 msgstr "座右銘"
 
-#: src/protocols/msn/msn.c:1670
+#: ../src/protocols/msn/msn.c:1574
+#, fuzzy, c-format
+msgid "%s<b>Social</b><br>%s"
+msgstr "<b>別名:</b>%s<br>"
+
+#: ../src/protocols/msn/msn.c:1583
+msgid "Significant Other"
+msgstr ""
+
+#: ../src/protocols/msn/msn.c:1584
+msgid "Home Phone"
+msgstr "住家電話"
+
+#: ../src/protocols/msn/msn.c:1585
+msgid "Home Phone 2"
+msgstr "住家電話2"
+
+#: ../src/protocols/msn/msn.c:1586
+#: ../src/protocols/oscar/oscar.c:3706
+msgid "Home Address"
+msgstr "住家地址"
+
+#: ../src/protocols/msn/msn.c:1587
+msgid "Personal Mobile"
+msgstr "個人行動電話"
+
+#: ../src/protocols/msn/msn.c:1588
+msgid "Home Fax"
+msgstr "住家傳真"
+
+#: ../src/protocols/msn/msn.c:1589
+msgid "Personal E-Mail"
+msgstr "個人電子郵件"
+
+#: ../src/protocols/msn/msn.c:1590
+msgid "Personal IM"
+msgstr "個人即時訊息帳號"
+
+#: ../src/protocols/msn/msn.c:1592
+msgid "Anniversary"
+msgstr ""
+
+#: ../src/protocols/msn/msn.c:1593
+#: ../src/protocols/msn/msn.c:1617
+msgid "Notes"
+msgstr "備註"
+
+#: ../src/protocols/msn/msn.c:1597
+#, fuzzy, c-format
+msgid "<br><b>Personal</b><br>%s"
+msgstr "<br><b>頻道主題:</b><br>%s"
+
+#: ../src/protocols/msn/msn.c:1604
+#: ../src/protocols/silc/ops.c:1044
+msgid "Job Title"
+msgstr "職銜"
+
+#: ../src/protocols/msn/msn.c:1605
+#: ../src/protocols/oscar/oscar.c:3723
+msgid "Company"
+msgstr "公司名稱"
+
+#: ../src/protocols/msn/msn.c:1606
+#: ../src/protocols/novell/novell.c:1480
+msgid "Department"
+msgstr "所屬部門"
+
+#: ../src/protocols/msn/msn.c:1607
+msgid "Profession"
+msgstr "專業"
+
+#: ../src/protocols/msn/msn.c:1608
+msgid "Work Phone"
+msgstr "商務電話"
+
+#: ../src/protocols/msn/msn.c:1609
+msgid "Work Phone 2"
+msgstr "商務電話2"
+
+#: ../src/protocols/msn/msn.c:1610
+#: ../src/protocols/oscar/oscar.c:3714
+msgid "Work Address"
+msgstr "工作地址"
+
+#: ../src/protocols/msn/msn.c:1611
+msgid "Work Mobile"
+msgstr "商務行動電話"
+
+#: ../src/protocols/msn/msn.c:1612
+msgid "Work Pager"
+msgstr "商務呼叫器"
+
+#: ../src/protocols/msn/msn.c:1613
+msgid "Work Fax"
+msgstr "商務傳真"
+
+#: ../src/protocols/msn/msn.c:1614
+msgid "Work E-Mail"
+msgstr "商務電子郵件"
+
+#: ../src/protocols/msn/msn.c:1615
+msgid "Work IM"
+msgstr "商務即時訊息帳號"
+
+#: ../src/protocols/msn/msn.c:1616
+msgid "Start Date"
+msgstr "開始日期"
+
+#: ../src/protocols/msn/msn.c:1621
+#, fuzzy, c-format
+msgid "<br><b>Business</b><br>%s"
+msgstr "<br><b>頻道主題:</b><br>%s"
+
+#: ../src/protocols/msn/msn.c:1632
+#, c-format
+msgid "<hr><b>Contact Info</b>%s%s"
+msgstr "<hr><b>聯絡資訊</b>%s%s"
+
+#: ../src/protocols/msn/msn.c:1691
+#: ../src/protocols/msn/msn.c:1697
+#: ../src/protocols/msn/msn.c:1704
+#: ../src/protocols/msn/msn.c:1711
+msgid "Favorite Things"
+msgstr "喜愛事物"
+
+#: ../src/protocols/msn/msn.c:1756
 msgid "Last Updated"
 msgstr "更新日期"
 
-#: src/protocols/msn/msn.c:1681
-#: src/protocols/silc/ops.c:1060
+#: ../src/protocols/msn/msn.c:1768
+#: ../src/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "網頁"
 
-#: src/protocols/msn/msn.c:1703
+#: ../src/protocols/msn/msn.c:1793
 msgid "The user has not created a public profile."
 msgstr "這個使用者未有建立公開的個人資料。"
 
-#: src/protocols/msn/msn.c:1704
+#: ../src/protocols/msn/msn.c:1794
 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 public profile."
 msgstr "MSN 回報說找不到這個使用者的個人資料。這表示這個使用者可能不存在;亦有可能使用者存在,但沒有建立公開的個人資料。"
 
-#: src/protocols/msn/msn.c:1708
+#: ../src/protocols/msn/msn.c:1798
 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:1714
-#: src/protocols/yahoo/yahoo_profile.c:1171
+#. put a link to the actual profile URL
+#: ../src/protocols/msn/msn.c:1803
+#, c-format
+msgid "<hr><b>%s:</b> "
+msgstr "<hr><b>%s:</b>"
+
+#: ../src/protocols/msn/msn.c:1803
+#: ../src/protocols/yahoo/yahoo_profile.c:1208
 msgid "Profile URL"
 msgstr "個人資料網址"
 
@@ -8004,94 +8602,93 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1917
-#: src/protocols/msn/msn.c:1919
+#: ../src/protocols/msn/msn.c:2025
+#: ../src/protocols/msn/msn.c:2027
 msgid "MSN Protocol Plugin"
 msgstr "MSN 協定模組"
 
-#: src/protocols/msn/msn.c:1938
-msgid "Login server"
-msgstr "登入伺服器"
-
-#: src/protocols/msn/msn.c:1947
+#: ../src/protocols/msn/msn.c:2055
 msgid "Use HTTP Method"
 msgstr "使用 HTTP 方式"
 
-#: src/protocols/msn/msn.c:1955
-#, fuzzy
+#: ../src/protocols/msn/msn.c:2060
+msgid "Show custom smileys"
+msgstr "顯示使用者圖示"
+
+#: ../src/protocols/msn/msn.c:2068
 msgid "nudge: nudge a user to get their attention"
-msgstr "buzz: 給好友一個「嗶」引他(她)注意"
-
-#: src/protocols/msn/nexus.c:103
-#: src/protocols/msn/servconn.c:127
-#: src/protocols/yahoo/yahoochat.c:1326
+msgstr "nudge:呼叫使用者,引起他們的注意"
+
+#: ../src/protocols/msn/nexus.c:141
+#: ../src/protocols/msn/servconn.c:135
+#: ../src/protocols/yahoo/yahoochat.c:1346
+#: ../src/protocols/yahoo/yahoochat.c:1373
 msgid "Unable to connect"
 msgstr "無法連線"
 
-#: src/protocols/msn/notification.c:178
+#: ../src/protocols/msn/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s 不是一個有效的群組。"
 
-#: src/protocols/msn/notification.c:184
-#: src/protocols/msn/notification.c:532
-#: src/protocols/msn/session.c:334
+#: ../src/protocols/msn/notification.c:184
+#: ../src/protocols/msn/notification.c:532
+#: ../src/protocols/msn/session.c:329
 msgid "Unknown error."
 msgstr "未知錯誤。"
 
 # NOTE: 第二個 %s 為使用者名稱,第三個 %s 為通訊協定名稱
 # NOTE: 第一個 %s 似乎係錯誤訊息摘要(整個字串為視窗標題)
-#: src/protocols/msn/notification.c:187
+#: ../src/protocols/msn/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%2$s (%3$s):%1$s"
 
 #  TODO 請覆查,譯文有待改進
-#: src/protocols/msn/notification.c:498
+#: ../src/protocols/msn/notification.c:498
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "%s (%s) 新增使用者失敗"
 
 #  TODO 請覆查,譯文有待改進
-#: src/protocols/msn/notification.c:502
+#: ../src/protocols/msn/notification.c:502
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "%s (%s) 拒絕使用者失敗"
 
 #  TODO 請覆查,譯文有待改進
-#: src/protocols/msn/notification.c:506
+#: ../src/protocols/msn/notification.c:506
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "%s (%s) 允許使用者失敗"
 
-#: src/protocols/msn/notification.c:514
+#: ../src/protocols/msn/notification.c:514
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "因為好友清單已滿,以致無法新增 %s"
 
-#: src/protocols/msn/notification.c:523
+#: ../src/protocols/msn/notification.c:523
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s 不是一個有效的 Passport 帳號"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
 #  NOTE 譯文更動 by Ambrose
-#: src/protocols/msn/notification.c:528
-#, fuzzy
+#: ../src/protocols/msn/notification.c:528
 msgid "Service Temporarily Unavailable."
-msgstr "暫時無法使用服務"
-
-#: src/protocols/msn/notification.c:821
+msgstr "暫時無法提供服務"
+
+#: ../src/protocols/msn/notification.c:820
 msgid "Unable to rename group"
 msgstr "無法更改群組名稱"
 
-#: src/protocols/msn/notification.c:876
+#: ../src/protocols/msn/notification.c:875
 msgid "Unable to delete group"
 msgstr "無法移除群組"
 
 # NOTE "in %d minutes" 意為「在 %d 分鐘之內」的意思
 # NOTE 譯文更動 by Ambrose
-#: src/protocols/msn/notification.c:1309
+#: ../src/protocols/msn/notification.c:1308
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will automatically be signed out at that time.  Please finish any conversations in progress.\n"
@@ -8110,208 +8707,216 @@
 "\n"
 "當維護工作結束,您將可以再度登入。"
 
-#: src/protocols/msn/servconn.c:129
+#: ../src/protocols/msn/servconn.c:137
 msgid "Writing error"
 msgstr "寫入錯誤"
 
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
-#: src/protocols/msn/servconn.c:131
+#: ../src/protocols/msn/servconn.c:139
 msgid "Reading error"
 msgstr "讀取錯誤"
 
-#: src/protocols/msn/servconn.c:133
-#: src/protocols/msn/session.c:326
-#: src/protocols/oscar/oscar.c:4913
-msgid "Unknown error"
-msgstr "未知錯誤"
-
 #  NOTE 首個 %s 為「Notification」或「Switchboard」其一,次為伺服器名稱,末者為錯誤訊息
-#: src/protocols/msn/servconn.c:138
-#, fuzzy, c-format
+#: ../src/protocols/msn/servconn.c:146
+#, c-format
 msgid ""
 "Connection error from %s server:\n"
 "%s"
 msgstr ""
-"%s 伺服器 (%s) 傳來了一個連線錯誤:\n"
+"%s 伺服器傳來一個連線錯誤:\n"
 "%s"
 
-#: src/protocols/msn/session.c:304
+#: ../src/protocols/msn/session.c:299
 msgid "Our protocol is not supported by the server."
 msgstr "這個伺服器不支援我們使用的通訊協定。"
 
-#: src/protocols/msn/session.c:308
+#: ../src/protocols/msn/session.c:303
 msgid "Error parsing HTTP."
 msgstr "解析 HTTP 途中發生錯誤。"
 
 #. 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:5667
-#: src/protocols/yahoo/yahoo.c:193
+#: ../src/protocols/msn/session.c:307
+#: ../src/protocols/napster/napster.c:456
+#: ../src/protocols/oscar/oscar.c:3431
+#: ../src/protocols/yahoo/yahoo.c:191
 msgid "You have signed on from another location."
 msgstr "您由其他的地方登入。"
 
 #  XXX
-#: src/protocols/msn/session.c:315
+#: ../src/protocols/msn/session.c:310
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "暫時無法使用 MSN 使服器,請過一會後重試。"
 
-#: src/protocols/msn/session.c:320
+#: ../src/protocols/msn/session.c:315
 msgid "The MSN servers are going down temporarily."
 msgstr "MSN 伺服器將暫時關閉。"
 
-#: src/protocols/msn/session.c:324
+#: ../src/protocols/msn/session.c:319
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "無法認證:%s"
 
-#: src/protocols/msn/session.c:329
+#: ../src/protocols/msn/session.c:324
 msgid "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr "暫時無法取得您的好友清單,請過一會後重試。"
 
-#: src/protocols/msn/session.c:350
-#: src/protocols/msn/session.c:352
+#: ../src/protocols/msn/session.c:345
+#: ../src/protocols/msn/session.c:347
 msgid "Handshaking"
 msgstr "交談中"
 
-#: src/protocols/msn/session.c:351
+#: ../src/protocols/msn/session.c:346
 msgid "Transferring"
 msgstr "傳輸中"
 
-#: src/protocols/msn/session.c:353
+#: ../src/protocols/msn/session.c:348
 msgid "Starting authentication"
 msgstr "認證開始中"
 
-#: src/protocols/msn/session.c:354
+#: ../src/protocols/msn/session.c:349
 msgid "Getting cookie"
 msgstr "取得 Cookie 中"
 
-#: src/protocols/msn/session.c:356
+#: ../src/protocols/msn/session.c:351
 msgid "Sending cookie"
 msgstr "傳送 Cookie 中"
 
-#: src/protocols/msn/session.c:357
+#: ../src/protocols/msn/session.c:352
 msgid "Retrieving buddy list"
 msgstr "讀取好友清單中"
 
-#: src/protocols/msn/state.c:34
+#: ../src/protocols/msn/state.c:34
 msgid "Away From Computer"
 msgstr "不在電腦前"
 
-#: src/protocols/msn/state.c:35
+#: ../src/protocols/msn/state.c:35
 msgid "On The Phone"
 msgstr "電話中"
 
-#: src/protocols/msn/state.c:36
+#: ../src/protocols/msn/state.c:36
 msgid "Out To Lunch"
 msgstr "外出用餐"
 
-#: src/protocols/msn/switchboard.c:405
+#: ../src/protocols/msn/switchboard.c:401
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "送出訊息逾時,可能沒有送出訊息:"
 
-#: src/protocols/msn/switchboard.c:413
+#: ../src/protocols/msn/switchboard.c:409
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr "隱身時無法送出訊息:"
 
-#: src/protocols/msn/switchboard.c:417
+#: ../src/protocols/msn/switchboard.c:413
 msgid "Message could not be sent because the user is offline:"
 msgstr "因為使用者目前離線,所以無法送出訊息:"
 
-#: src/protocols/msn/switchboard.c:421
+#: ../src/protocols/msn/switchboard.c:417
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "因為連線發生錯誤,所以訊息無法送出:"
 
-#: src/protocols/msn/switchboard.c:425
+#: ../src/protocols/msn/switchboard.c:421
+msgid "Message could not be sent because we are sending too quickly:"
+msgstr "因為我們傳送訊息的速度太快,所以訊息無法送出:"
+
+#: ../src/protocols/msn/switchboard.c:425
 msgid "Message could not be sent because an error with the switchboard occurred:"
 msgstr "因為 Switchboard 發生錯誤,所以訊息無法送出"
 
-#: src/protocols/msn/switchboard.c:433
+#: ../src/protocols/msn/switchboard.c:433
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "因為發生不明的錯誤,訊息可能沒有送出:"
 
-#: src/protocols/msn/switchboard.c:954
-#, fuzzy, c-format
+#: ../src/protocols/msn/switchboard.c:953
+#, c-format
 msgid "%s just sent you a Nudge!"
-msgstr "%s 想要傳送個檔案給您"
-
-#: src/protocols/msn/userlist.c:96
+msgstr "%s 在呼叫您!"
+
+#: ../src/protocols/msn/userlist.c:90
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr "使用者 %s(%s)想要將 %s 加入他(她)的好友清單。"
 
-#: src/protocols/msn/userlist.c:286
-#, fuzzy, c-format
+#: ../src/protocols/msn/userlist.c:105
+#: ../src/protocols/yahoo/yahoo.c:920
+msgid "Authorize"
+msgstr "給予認證"
+
+#: ../src/protocols/msn/userlist.c:106
+#: ../src/protocols/yahoo/yahoo.c:922
+msgid "Deny"
+msgstr "拒絕"
+
+#: ../src/protocols/msn/userlist.c:280
+#, c-format
 msgid "%s has added you to his or her buddy list."
-msgstr "使用者 %s 想要將 %s 加入他(她)的好友清單。"
-
-#: src/protocols/msn/userlist.c:350
-#, fuzzy, c-format
+msgstr "%s 將您加入他(她)的好友清單。"
+
+#: ../src/protocols/msn/userlist.c:349
+#, c-format
 msgid "%s has removed you from his or her buddy list."
-msgstr "%s 將您從他(她)的聯絡清單中移除。"
-
-#: src/protocols/msn/userlist.c:670
+msgstr "%s 將您從他(她)的好友清單中移除。"
+
+#: ../src/protocols/msn/userlist.c:671
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "無法新增「%s」。"
 
-#: src/protocols/msn/userlist.c:672
+#: ../src/protocols/msn/userlist.c:673
 msgid "The screen name specified is invalid."
 msgstr "您所輸入的暱稱無效。"
 
-#: src/protocols/napster/napster.c:266
+#: ../src/protocols/napster/napster.c:266
 msgid "Unable to read header from server"
 msgstr "無法由伺服器讀取標頭資訊"
 
-#: src/protocols/napster/napster.c:280
+#: ../src/protocols/napster/napster.c:280
 #, c-format
 msgid "Unable to read message from server: %s.  Command is %hd, length is %hd."
 msgstr "無法由伺服器讀取資訊:%s。指令為 %hd,長度為 %hd。"
 
-#: src/protocols/napster/napster.c:296
-#, fuzzy
+#: ../src/protocols/napster/napster.c:296
 msgid "Unknown server error."
-msgstr "未知錯誤。"
-
-#: src/protocols/napster/napster.c:345
+msgstr "未知伺服器錯誤。"
+
+#: ../src/protocols/napster/napster.c:345
 #, c-format
 msgid "users: %s, files: %s, size: %sGB"
 msgstr "使用者:%s,檔案:%s,大小:%sGB"
 
 #. MSG_SERVER_HOTLIST_ERROR
-#: src/protocols/napster/napster.c:356
+#: ../src/protocols/napster/napster.c:356
 #, c-format
 msgid "Unable to add \"%s\" to your Napster hotlist"
 msgstr "無法將「%s」加入您的 Napster 熱門清單中"
 
 #. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:420
+#: ../src/protocols/napster/napster.c:420
 #, c-format
 msgid "%s requested your information"
 msgstr "%s 查詢您的使用者資訊"
 
 #. MSG_CLIENT_PING
-#: src/protocols/napster/napster.c:460
+#: ../src/protocols/napster/napster.c:460
 #, c-format
 msgid "%s requested a PING"
 msgstr "%s 要求一個 PING"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: src/protocols/napster/napster.c:507
-#: src/protocols/napster/napster.c:538
-#: src/protocols/toc/toc.c:172
-#: src/protocols/yahoo/yahoo.c:2224
-#: src/protocols/yahoo/yahoo.c:2251
-#: src/protocols/yahoo/yahoo.c:2314
-#: src/protocols/yahoo/yahoo_filexfer.c:69
-#: src/protocols/yahoo/yahoo_filexfer.c:111
-#: src/protocols/yahoo/ycht.c:481
+#: ../src/protocols/napster/napster.c:507
+#: ../src/protocols/napster/napster.c:543
+#: ../src/protocols/toc/toc.c:172
+#: ../src/protocols/yahoo/yahoo.c:2247
+#: ../src/protocols/yahoo/yahoo.c:2274
+#: ../src/protocols/yahoo/yahoo.c:2357
+#: ../src/protocols/yahoo/yahoo.c:2372
+#: ../src/protocols/yahoo/yahoo_filexfer.c:74
+#: ../src/protocols/yahoo/yahoo_filexfer.c:137
+#: ../src/protocols/yahoo/ycht.c:540
 msgid "Unable to connect."
 msgstr "無法連結。"
 
-#: src/protocols/napster/napster.c:596
-#: src/protocols/toc/toc.c:1367
+#: ../src/protocols/napster/napster.c:599
+#: ../src/protocols/toc/toc.c:1367
 msgid "_Group:"
 msgstr "群組(_G):"
 
@@ -8325,250 +8930,240 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/napster/napster.c:694
-#: src/protocols/napster/napster.c:696
+#: ../src/protocols/napster/napster.c:699
+#: ../src/protocols/napster/napster.c:701
 msgid "NAPSTER Protocol Plugin"
 msgstr "NAPSTER 協定模組"
 
-#: src/protocols/novell/nmuser.c:1868
+#: ../src/protocols/novell/nmuser.c:1868
 msgid "Required parameters not passed in"
 msgstr "沒有提供所需的參數"
 
-#: src/protocols/novell/nmuser.c:1871
+#: ../src/protocols/novell/nmuser.c:1871
 msgid "Unable to write to network"
 msgstr "無法寫入網路"
 
-#: src/protocols/novell/nmuser.c:1874
+#: ../src/protocols/novell/nmuser.c:1874
 msgid "Unable to read from network"
 msgstr "無法由網路讀取"
 
-#: src/protocols/novell/nmuser.c:1877
+#: ../src/protocols/novell/nmuser.c:1877
 msgid "Error communicating with server"
 msgstr "和伺服器溝通時發生錯誤"
 
-#: src/protocols/novell/nmuser.c:1881
+#: ../src/protocols/novell/nmuser.c:1881
 msgid "Conference not found"
 msgstr "找不到該會議"
 
-#: src/protocols/novell/nmuser.c:1884
+#: ../src/protocols/novell/nmuser.c:1884
 msgid "Conference does not exist"
 msgstr "該會議並不存在"
 
-#: src/protocols/novell/nmuser.c:1888
+#: ../src/protocols/novell/nmuser.c:1888
 msgid "A folder with that name already exists"
 msgstr "那個目錄已經存在"
 
 #  XXX 這個太奇怪了 (^^;)
-#: src/protocols/novell/nmuser.c:1891
+#: ../src/protocols/novell/nmuser.c:1891
 msgid "Not supported"
 msgstr "不支援"
 
-#: src/protocols/novell/nmuser.c:1895
+#: ../src/protocols/novell/nmuser.c:1895
 msgid "Password has expired"
 msgstr "密碼已過期"
 
-#: src/protocols/novell/nmuser.c:1898
+#: ../src/protocols/novell/nmuser.c:1898
 msgid "Invalid password"
 msgstr "密碼無效"
 
-#: src/protocols/novell/nmuser.c:1901
+#: ../src/protocols/novell/nmuser.c:1901
 msgid "User not found"
 msgstr "找不到該使用者"
 
-#: src/protocols/novell/nmuser.c:1904
+#: ../src/protocols/novell/nmuser.c:1904
 msgid "Account has been disabled"
 msgstr "帳號已被停用"
 
-#: src/protocols/novell/nmuser.c:1907
+#: ../src/protocols/novell/nmuser.c:1907
 msgid "The server could not access the directory"
 msgstr "伺服器無法存取目錄"
 
 #  XXX 要覆查譯文
-#: src/protocols/novell/nmuser.c:1910
+#: ../src/protocols/novell/nmuser.c:1910
 msgid "Your system administrator has disabled this operation"
 msgstr "您的系統管理員不容許這個動作"
 
-#: src/protocols/novell/nmuser.c:1913
+#: ../src/protocols/novell/nmuser.c:1913
 msgid "The server is unavailable; try again later"
 msgstr "暫時無法使用伺服器;請稍後重試"
 
-#: src/protocols/novell/nmuser.c:1916
+#: ../src/protocols/novell/nmuser.c:1916
 msgid "Cannot add a contact to the same folder twice"
 msgstr "無法在同一資料夾內新增同一好友兩次"
 
-#: src/protocols/novell/nmuser.c:1919
+#: ../src/protocols/novell/nmuser.c:1919
 msgid "Cannot add yourself"
 msgstr "無法新增您自己至好友清單"
 
 #  TODO 不知「Master archive」有無正式譯文,也不知應如何譯
-#: src/protocols/novell/nmuser.c:1922
+#: ../src/protocols/novell/nmuser.c:1922
 msgid "Master archive is misconfigured"
 msgstr "Master archive 設定錯誤"
 
-#: src/protocols/novell/nmuser.c:1926
+#: ../src/protocols/novell/nmuser.c:1926
 msgid "Invalid username or password"
 msgstr "使用者名稱或密碼無效"
 
-#: src/protocols/novell/nmuser.c:1929
+#: ../src/protocols/novell/nmuser.c:1929
 msgid "Could not recognize the host of the username you entered"
 msgstr "無法辦識您所輸入的主機或使用者名稱"
 
-#: src/protocols/novell/nmuser.c:1932
+#: ../src/protocols/novell/nmuser.c:1932
 msgid "Your account has been disabled because too many invalid passwords were entered"
 msgstr "您的帳號已被停用,因為輸入了太多無效的密碼"
 
-#: src/protocols/novell/nmuser.c:1935
+#: ../src/protocols/novell/nmuser.c:1935
 msgid "You cannot add the same person twice to a conversation"
 msgstr "您不能在同一交談內新增同一個人兩次"
 
-#: src/protocols/novell/nmuser.c:1939
+#: ../src/protocols/novell/nmuser.c:1939
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "您的好友人數已達上限"
 
-#: src/protocols/novell/nmuser.c:1942
+#: ../src/protocols/novell/nmuser.c:1942
 msgid "You have entered an invalid username"
 msgstr "您輸入了無效的使用者名稱"
 
-#: src/protocols/novell/nmuser.c:1945
+#: ../src/protocols/novell/nmuser.c:1945
 msgid "An error occurred while updating the directory"
 msgstr "更新目錄途中發生錯誤"
 
-#: src/protocols/novell/nmuser.c:1948
+#: ../src/protocols/novell/nmuser.c:1948
 msgid "Incompatible protocol version"
 msgstr "協定版本不相容"
 
-#: src/protocols/novell/nmuser.c:1951
+#: ../src/protocols/novell/nmuser.c:1951
 msgid "The user has blocked you"
 msgstr "該使用者拒絕了您"
 
-#: src/protocols/novell/nmuser.c:1954
+#: ../src/protocols/novell/nmuser.c:1954
 msgid "This evaluation version does not allow more than ten users to log in at one time"
 msgstr "試用版最多只容許十個使用者同時登入"
 
-#: src/protocols/novell/nmuser.c:1957
+#: ../src/protocols/novell/nmuser.c:1957
 msgid "The user is either offline or you are blocked"
 msgstr "該使用者可能是離線,或者您已被他(她)拒絕"
 
-#: src/protocols/novell/nmuser.c:1960
+#: ../src/protocols/novell/nmuser.c:1960
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "未知錯誤:0x%X"
 
-#: src/protocols/novell/novell.c:124
+#: ../src/protocols/novell/novell.c:124
 #, c-format
 msgid "Login failed (%s)."
 msgstr "登入失敗 (%s)。"
 
 #  XXX 暫譯
-#: src/protocols/novell/novell.c:247
+#: ../src/protocols/novell/novell.c:247
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr "無法送出訊息。無法取得使用者的細節 (%s)。"
 
-#: src/protocols/novell/novell.c:396
+#: ../src/protocols/novell/novell.c:396
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "無法把 %s 加至您的好友清單 (%s)。"
 
 #. TODO: Improve this! message to who or for what conference?
-#: src/protocols/novell/novell.c:422
+#: ../src/protocols/novell/novell.c:422
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "無法送出訊息 (%s)。"
 
-#: src/protocols/novell/novell.c:493
-#: src/protocols/novell/novell.c:987
+#: ../src/protocols/novell/novell.c:493
+#: ../src/protocols/novell/novell.c:985
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "無法邀請使用者 (%s)。"
 
-#: src/protocols/novell/novell.c:532
+#: ../src/protocols/novell/novell.c:532
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr "無法送出訊息至 %s。無法建立會議 (%s)。"
 
-#: src/protocols/novell/novell.c:537
+#: ../src/protocols/novell/novell.c:537
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "無法送出訊息。無法建立會議 (%s)。"
 
-#: src/protocols/novell/novell.c:584
+#: ../src/protocols/novell/novell.c:584
 #, c-format
 msgid "Unable to move user %s to folder %s in the server side list. Error while creating folder (%s)."
 msgstr "無法在伺服器上的清單把使用者 %s 移至目錄 %s。建立目錄時發生錯誤 (%s)。"
 
-#: src/protocols/novell/novell.c:632
+#: ../src/protocols/novell/novell.c:632
 #, c-format
 msgid "Unable to add %s to your buddy list. Error creating folder in server side list (%s)."
 msgstr "無法新增 %s 至好友清單。在伺服器上的清單建立目錄時發生錯誤 (%s)。"
 
-#: src/protocols/novell/novell.c:705
+#: ../src/protocols/novell/novell.c:705
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "無法取得使用者 %s 的細節 (%s)。"
 
 #  FIXME 譯文有待改進
-#: src/protocols/novell/novell.c:751
-#: src/protocols/novell/novell.c:897
+#: ../src/protocols/novell/novell.c:751
+#: ../src/protocols/novell/novell.c:897
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "無法把使用者加至您的隱私清單 (%s)。"
 
-#: src/protocols/novell/novell.c:798
+#: ../src/protocols/novell/novell.c:798
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "無法把 %s 加至您的拒絕清單 (%s)。"
 
-#: src/protocols/novell/novell.c:851
+#: ../src/protocols/novell/novell.c:851
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "無法把 %s 加至您的允許清單 (%s)。"
 
-#: src/protocols/novell/novell.c:919
+#: ../src/protocols/novell/novell.c:919
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "無法把 %s 移除自您的隱私清單 (%s)。"
 
-#: src/protocols/novell/novell.c:942
-#: src/protocols/novell/novell.c:1654
+#: ../src/protocols/novell/novell.c:942
+#: ../src/protocols/novell/novell.c:1652
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "無法在伺服器端修改隱私設定 (%s)。"
 
-#: src/protocols/novell/novell.c:1014
+#: ../src/protocols/novell/novell.c:1012
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "無法建立會議 (%s)。"
 
-#: src/protocols/novell/novell.c:1123
-#: src/protocols/novell/novell.c:1693
+#: ../src/protocols/novell/novell.c:1121
+#: ../src/protocols/novell/novell.c:1691
 msgid "Error communicating with server. Closing connection."
 msgstr "和伺服器間的通訊發生錯誤。關閉連線。"
 
-#: src/protocols/novell/novell.c:1478
+#: ../src/protocols/novell/novell.c:1476
 msgid "Telephone Number"
 msgstr "電話號碼"
 
-#: src/protocols/novell/novell.c:1482
-msgid "Department"
-msgstr "所屬部門"
-
-#: src/protocols/novell/novell.c:1484
+#: ../src/protocols/novell/novell.c:1482
 msgid "Personal Title"
 msgstr "個人職銜"
 
 #  NOTE 似乎無中文譯文
-#: src/protocols/novell/novell.c:1488
+#: ../src/protocols/novell/novell.c:1486
 msgid "Mailstop"
 msgstr "Mail Stop"
 
-#: src/protocols/novell/novell.c:1490
-#: src/protocols/oscar/oscar.c:6007
-#: src/protocols/oscar/oscar.c:6014
-msgid "Email Address"
-msgstr "電子郵件"
-
-#: src/protocols/novell/novell.c:1506
+#: ../src/protocols/novell/novell.c:1504
 msgid "User ID"
 msgstr "使用者ID"
 
@@ -8579,43 +9174,43 @@
 #. tag, value);
 #. }
 #.
-#: src/protocols/novell/novell.c:1520
+#: ../src/protocols/novell/novell.c:1518
 msgid "Full name"
 msgstr "全名"
 
 #  NOTE「GroupWise」是軟件名稱,正式中文名大概不會是「群組」...
-#: src/protocols/novell/novell.c:1644
+#: ../src/protocols/novell/novell.c:1642
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise 會議 %d"
 
-#: src/protocols/novell/novell.c:1669
+#: ../src/protocols/novell/novell.c:1667
 msgid "Unable to make SSL connection to server."
 msgstr "無法使用 SSL 協定連線到伺服器。"
 
-#: src/protocols/novell/novell.c:1726
+#: ../src/protocols/novell/novell.c:1724
 msgid "Authenticating..."
 msgstr "認證中..."
 
-#: src/protocols/novell/novell.c:1738
+#: ../src/protocols/novell/novell.c:1736
 msgid "Unable to connect to server."
 msgstr "無法連線到伺服器。"
 
-#: src/protocols/novell/novell.c:1741
+#: ../src/protocols/novell/novell.c:1739
 msgid "Waiting for response..."
 msgstr "等待回覆中..."
 
-#: src/protocols/novell/novell.c:1876
+#: ../src/protocols/novell/novell.c:1874
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "邀請了 %s 加入這個交談。"
 
-#: src/protocols/novell/novell.c:1904
+#: ../src/protocols/novell/novell.c:1902
 msgid "Invitation to Conversation"
 msgstr "邀請加入交談"
 
 #  NOTE「Sent」係指發出邀請時的時間
-#: src/protocols/novell/novell.c:1905
+#: ../src/protocols/novell/novell.c:1903
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -8626,16 +9221,16 @@
 "\n"
 "時間:%s"
 
-#: src/protocols/novell/novell.c:1907
+#: ../src/protocols/novell/novell.c:1905
 msgid "Would you like to join the conversation?"
 msgstr "您要加入個這交談嗎?"
 
 # XXX 暫譯
-#: src/protocols/novell/novell.c:2014
+#: ../src/protocols/novell/novell.c:2012
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "您已經被登出,因為您已在其他電腦上登入。"
 
-#: src/protocols/novell/novell.c:2070
+#: ../src/protocols/novell/novell.c:2068
 #, c-format
 msgid "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s 目前似乎離線,所以不會收到您剛才送出的訊息。"
@@ -8644,24 +9239,18 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:2168
+#: ../src/protocols/novell/novell.c:2166
 msgid "Unable to connect to server. Please enter the address of the server you wish to connect to."
 msgstr "無法連線至伺服器。請輸入您希望連線至的伺服器的位址。"
 
-#: src/protocols/novell/novell.c:2190
+#: ../src/protocols/novell/novell.c:2188
 msgid "Error. SSL support is not installed."
 msgstr "錯誤:沒有安裝 SSL 支援。"
 
-#: src/protocols/novell/novell.c:2499
+#: ../src/protocols/novell/novell.c:2497
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "這個會議已經關閉。無法繼續送出任何訊息。"
 
-#  NOTE 這是「看來是離線」。其他協定的「離線」狀態也不一定真的是離線,我想只譯「離線」也不太離譜
-#: src/protocols/novell/novell.c:2996
-#: src/protocols/yahoo/yahoo.c:2861
-msgid "Appear Offline"
-msgstr "離線"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -8672,166 +9261,209 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:3543
-#: src/protocols/novell/novell.c:3545
+#: ../src/protocols/novell/novell.c:3541
+#: ../src/protocols/novell/novell.c:3543
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger 協定模組"
 
-#: src/protocols/novell/novell.c:3564
+#: ../src/protocols/novell/novell.c:3562
 msgid "Server address"
 msgstr "伺服器位址"
 
-#: src/protocols/novell/novell.c:3568
+#: ../src/protocols/novell/novell.c:3566
 msgid "Server port"
 msgstr "伺服器通訊埠"
 
+#: ../src/protocols/oscar/flap_connection.c:221
+msgid "Server closed the connection."
+msgstr "伺服器關閉連線。"
+
+#: ../src/protocols/oscar/flap_connection.c:223
+msgid "Lost connection with server for an unknown reason."
+msgstr "因為不明原因導致與伺服器連線中斷。"
+
+#: ../src/protocols/oscar/flap_connection.c:225
+msgid "Received invalid data on connection with server."
+msgstr "連線至伺服器時收到無效的資料。"
+
+#: ../src/protocols/oscar/flap_connection.c:227
+msgid "Could not establish a connection with the server."
+msgstr "無法與伺服器建立連線。"
+
+#: ../src/protocols/oscar/odc.c:40
+msgid "The remote user has closed the connection."
+msgstr "遠端使用者關閉了連線。"
+
+#: ../src/protocols/oscar/odc.c:42
+msgid "The remote user has declined your request."
+msgstr "遠端使用者拒絕了您的要求。"
+
+#: ../src/protocols/oscar/odc.c:44
+msgid "Lost connection with the remote user for an unknown reason."
+msgstr "因為不明的原因導致與遠端使用者的連線中斷。"
+
+#: ../src/protocols/oscar/odc.c:46
+msgid "Received invalid data on connection with remote user."
+msgstr "在與遠端使用者的連線上收到無交的資料。"
+
+#: ../src/protocols/oscar/odc.c:48
+msgid "Could not establish a connection with the remote user."
+msgstr "無法與遠端使用者建立連線。"
+
+#: ../src/protocols/oscar/odc.c:557
+msgid "Direct IM established"
+msgstr "即時訊息已經建立"
+
 # NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
-#: src/protocols/oscar/oscar.c:201
+#: ../src/protocols/oscar/oscar.c:144
 msgid "Invalid error"
 msgstr "無效錯誤"
 
-#: src/protocols/oscar/oscar.c:202
+#: ../src/protocols/oscar/oscar.c:145
 msgid "Invalid SNAC"
 msgstr "無效的 SNAC"
 
-#: src/protocols/oscar/oscar.c:203
+#: ../src/protocols/oscar/oscar.c:146
 msgid "Rate to host"
 msgstr "到伺服器速率"
 
-#: src/protocols/oscar/oscar.c:204
+#: ../src/protocols/oscar/oscar.c:147
 msgid "Rate to client"
 msgstr "到用戶端速率"
 
 #  XXX 可能是誤譯
-#: src/protocols/oscar/oscar.c:206
+#: ../src/protocols/oscar/oscar.c:149
 msgid "Service unavailable"
 msgstr "伺服器不存在"
 
-#: src/protocols/oscar/oscar.c:207
+#: ../src/protocols/oscar/oscar.c:150
 msgid "Service not defined"
 msgstr "沒有指定服務"
 
-#: src/protocols/oscar/oscar.c:208
+#: ../src/protocols/oscar/oscar.c:151
 msgid "Obsolete SNAC"
 msgstr "過時的 SNAC"
 
-#: src/protocols/oscar/oscar.c:209
+#: ../src/protocols/oscar/oscar.c:152
 msgid "Not supported by host"
 msgstr "伺服器不支援"
 
-#: src/protocols/oscar/oscar.c:210
+#: ../src/protocols/oscar/oscar.c:153
 msgid "Not supported by client"
 msgstr "用戶端不支援"
 
-#: src/protocols/oscar/oscar.c:211
+#: ../src/protocols/oscar/oscar.c:154
 msgid "Refused by client"
 msgstr "被用戶端拒絕"
 
-#: src/protocols/oscar/oscar.c:212
+#: ../src/protocols/oscar/oscar.c:155
 msgid "Reply too big"
 msgstr "回覆太大了"
 
-#: src/protocols/oscar/oscar.c:213
+#: ../src/protocols/oscar/oscar.c:156
 msgid "Responses lost"
 msgstr "遺失回應"
 
-#: src/protocols/oscar/oscar.c:214
+#: ../src/protocols/oscar/oscar.c:157
 msgid "Request denied"
 msgstr "要求被拒"
 
 # NOTE「Busted」與「SNAC payload」的說名由Luke Schierer在#gaim提供
 # NOTE 整句的意思其實係「您一次過傳送太多資訊了」
-#: src/protocols/oscar/oscar.c:215
+#: ../src/protocols/oscar/oscar.c:158
 msgid "Busted SNAC payload"
 msgstr "SNAC負載過大"
 
-#: src/protocols/oscar/oscar.c:216
+#: ../src/protocols/oscar/oscar.c:159
 msgid "Insufficient rights"
 msgstr "權限不夠"
 
 # NOTE Debian 譯「local」為「本地端」(Windows 舊譯「本地」,新譯「本機」)
-#: src/protocols/oscar/oscar.c:217
+#: ../src/protocols/oscar/oscar.c:160
 msgid "In local permit/deny"
 msgstr "本地端的允許/拒絕清單"
 
-#: src/protocols/oscar/oscar.c:218
+#: ../src/protocols/oscar/oscar.c:161
 msgid "Too evil (sender)"
 msgstr "太邪惡了(寄件人)"
 
-#: src/protocols/oscar/oscar.c:219
+#: ../src/protocols/oscar/oscar.c:162
 msgid "Too evil (receiver)"
 msgstr "太邪惡了(收件人)"
 
-#: src/protocols/oscar/oscar.c:220
+#: ../src/protocols/oscar/oscar.c:163
 msgid "User temporarily unavailable"
 msgstr "使用者暫時不在"
 
-#: src/protocols/oscar/oscar.c:221
+#: ../src/protocols/oscar/oscar.c:164
 msgid "No match"
 msgstr "沒有相符合的"
 
-#: src/protocols/oscar/oscar.c:222
+#: ../src/protocols/oscar/oscar.c:165
 msgid "List overflow"
 msgstr "清單溢出"
 
-#: src/protocols/oscar/oscar.c:223
+#: ../src/protocols/oscar/oscar.c:166
 msgid "Request ambiguous"
 msgstr "要求不明確"
 
-#: src/protocols/oscar/oscar.c:224
+#: ../src/protocols/oscar/oscar.c:167
 msgid "Queue full"
 msgstr "佇列滿了"
 
-#: src/protocols/oscar/oscar.c:225
+#: ../src/protocols/oscar/oscar.c:168
 msgid "Not while on AOL"
 msgstr "在 AOL 時不允許"
 
-#: src/protocols/oscar/oscar.c:417
-#: src/protocols/oscar/oscar.c:502
+#: ../src/protocols/oscar/oscar.c:346
+msgid "(There was an error receiving this message.  The buddy you are speaking with is probably using a different encoding than expected.  If you know what encoding he is using, you can specify it in the advanced account options for your AIM/ICQ account.)"
+msgstr ""
+
+#: ../src/protocols/oscar/oscar.c:449
 msgid "(There was an error receiving this message.  The buddy you are speaking to most likely has a buggy client.)"
 msgstr "(接收這個訊息時發生了錯誤。正在跟您交談的好友很可能是在使用有問題的用戶端程式。)"
 
-#: src/protocols/oscar/oscar.c:616
+#: ../src/protocols/oscar/oscar.c:628
 msgid "Voice"
 msgstr "聲音"
 
 # NOTE 將「直接消息」改譯為「即時訊息」
-#: src/protocols/oscar/oscar.c:619
+#: ../src/protocols/oscar/oscar.c:631
 msgid "AIM Direct IM"
 msgstr "AIM 式即時訊息"
 
-#: src/protocols/oscar/oscar.c:622
-#: src/protocols/silc/silc.c:683
-#: src/protocols/silc/util.c:510
+#: ../src/protocols/oscar/oscar.c:634
+#: ../src/protocols/silc/silc.c:699
+#: ../src/protocols/silc/util.c:524
 msgid "Chat"
 msgstr "聊天"
 
-#: src/protocols/oscar/oscar.c:625
-#: src/protocols/oscar/oscar.c:7968
+#: ../src/protocols/oscar/oscar.c:637
+#: ../src/protocols/oscar/oscar.c:5837
 msgid "Get File"
 msgstr "接收檔案"
 
-#: src/protocols/oscar/oscar.c:632
+#: ../src/protocols/oscar/oscar.c:644
 msgid "Games"
 msgstr "遊戲"
 
-#: src/protocols/oscar/oscar.c:635
+#: ../src/protocols/oscar/oscar.c:647
 msgid "Add-Ins"
 msgstr "模組"
 
-#: src/protocols/oscar/oscar.c:638
+#: ../src/protocols/oscar/oscar.c:650
 msgid "Send Buddy List"
 msgstr "送出好友清單"
 
-#: src/protocols/oscar/oscar.c:641
+#: ../src/protocols/oscar/oscar.c:653
 msgid "ICQ Direct Connect"
 msgstr "ICQ 式直接連線"
 
-#: src/protocols/oscar/oscar.c:644
+#: ../src/protocols/oscar/oscar.c:656
 msgid "AP User"
 msgstr "應用程式使用者"
 
-#: src/protocols/oscar/oscar.c:647
+#: ../src/protocols/oscar/oscar.c:659
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
@@ -8842,334 +9474,235 @@
 # NOTE (18:17:29) KingAnt: Right...
 # NOTE (18:17:36) wing: what does that mean though?
 # NOTE (18:17:48) KingAnt: I have no idea--probably nothing
-#: src/protocols/oscar/oscar.c:650
+#: ../src/protocols/oscar/oscar.c:662
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: src/protocols/oscar/oscar.c:653
+#: ../src/protocols/oscar/oscar.c:665
 msgid "ICQ Server Relay"
 msgstr "ICQ 伺服器轉送"
 
-#: src/protocols/oscar/oscar.c:656
+#: ../src/protocols/oscar/oscar.c:668
 msgid "Old ICQ UTF8"
 msgstr "舊式 ICQ UTF8"
 
-#: src/protocols/oscar/oscar.c:659
+#: ../src/protocols/oscar/oscar.c:671
 msgid "Trillian Encryption"
 msgstr "Trillian 加密"
 
-#: src/protocols/oscar/oscar.c:662
+#: ../src/protocols/oscar/oscar.c:674
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
 # NOTE 這似乎是一種掌上電腦的牌子
-#: src/protocols/oscar/oscar.c:665
+#: ../src/protocols/oscar/oscar.c:677
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: src/protocols/oscar/oscar.c:668
+#: ../src/protocols/oscar/oscar.c:680
 msgid "Security Enabled"
 msgstr "有保安功能"
 
 # XXX 暫譯
-#: src/protocols/oscar/oscar.c:671
+#: ../src/protocols/oscar/oscar.c:683
 msgid "Video Chat"
 msgstr "視像聊天"
 
 # XXX 暫譯
-#: src/protocols/oscar/oscar.c:675
+#: ../src/protocols/oscar/oscar.c:687
 msgid "iChat AV"
 msgstr "iChat 視像聊天"
 
-#: src/protocols/oscar/oscar.c:678
+#: ../src/protocols/oscar/oscar.c:690
 msgid "Live Video"
 msgstr "動態視訊"
 
 #  NOTE AIM_CAPS_CAMERA,即是什麼呢(^^;)
-#: src/protocols/oscar/oscar.c:681
+#: ../src/protocols/oscar/oscar.c:693
 msgid "Camera"
 msgstr "照相機"
 
-#: src/protocols/oscar/oscar.c:699
-#: src/protocols/oscar/oscar.c:7851
+#: ../src/protocols/oscar/oscar.c:711
+#: ../src/protocols/oscar/oscar.c:5622
 msgid "Free For Chat"
 msgstr "我有空聊天"
 
-#: src/protocols/oscar/oscar.c:703
-#: src/protocols/oscar/oscar.c:7866
+#: ../src/protocols/oscar/oscar.c:715
+#: ../src/protocols/oscar/oscar.c:5650
 msgid "Not Available"
 msgstr "長時間離開"
 
-#: src/protocols/oscar/oscar.c:705
-#: src/protocols/oscar/oscar.c:7856
+#: ../src/protocols/oscar/oscar.c:717
+#: ../src/protocols/oscar/oscar.c:5640
 msgid "Occupied"
 msgstr "忙碌"
 
 # NOTE 參閱 http://www.geocities.com/Athens/Delphi/6470/icq99.html
-#: src/protocols/oscar/oscar.c:709
+#: ../src/protocols/oscar/oscar.c:721
 msgid "Web Aware"
 msgstr "允許其他使用者在網路上查看您目前的狀態"
 
-#: src/protocols/oscar/oscar.c:713
+#: ../src/protocols/oscar/oscar.c:725
 msgid "Online"
 msgstr "上線"
 
-#: src/protocols/oscar/oscar.c:786
-#: src/protocols/oscar/oscar.c:5038
+#: ../src/protocols/oscar/oscar.c:811
+#: ../src/protocols/oscar/oscar.c:2829
 msgid "Warning Level"
 msgstr "警告等級"
 
-#: src/protocols/oscar/oscar.c:795
+#: ../src/protocols/oscar/oscar.c:820
 msgid "Buddy Comment"
 msgstr "好友說明"
 
-#: src/protocols/oscar/oscar.c:946
-#, c-format
-msgid "Direct IM with %s closed"
-msgstr "和 %s 的即時訊息關閉"
-
-#: src/protocols/oscar/oscar.c:948
-#, c-format
-msgid "Direct IM with %s failed"
-msgstr "和 %s 的即時訊息失敗"
-
-#: src/protocols/oscar/oscar.c:956
-msgid "Direct Connect failed"
-msgstr "直接連線失敗"
-
-#: src/protocols/oscar/oscar.c:1033
-#: src/protocols/oscar/oscar.c:1164
-#, c-format
-msgid "Direct IM with %s established"
-msgstr "和 %s 的即時訊息已經被建立"
-
-#: src/protocols/oscar/oscar.c:1114
-#, c-format
-msgid "Attempting to connect to %s at %s:%hu for Direct IM."
-msgstr "正在嘗試連線至 %2$s:%3$hu,以便和 %1$s 建立即時訊息。"
-
-#: src/protocols/oscar/oscar.c:1535
-#, c-format
-msgid "Asking %s to connect to us at %s:%hu for Direct IM."
-msgstr "正在要求 %s 連線至此處 (%s:%hu),以便建立即時訊息。"
-
-#: src/protocols/oscar/oscar.c:1540
-msgid "Unable to open Direct IM"
-msgstr "無法開啟直接的即時訊息"
-
-#: src/protocols/oscar/oscar.c:1575
-#, c-format
-msgid "You have selected to open a Direct IM connection with %s."
-msgstr "您選擇了與 %s 開啟一個直接即時訊息。"
-
-#: src/protocols/oscar/oscar.c:1579
-msgid "Because this reveals your IP address, it may be considered a privacy risk.  Do you wish to continue?"
-msgstr "這樣將會曝露出您的 IP 位址,因此可能會有隱私上的風險。您想要繼續嗎?"
-
-#: src/protocols/oscar/oscar.c:1583
-#: src/protocols/oscar/oscar.c:4349
-#: src/protocols/sametime/sametime.c:3547
-msgid "Connect"
-msgstr "連線"
-
-#: src/protocols/oscar/oscar.c:1649
-#, fuzzy, c-format
-msgid "You have lost your connection to chat room %s."
-msgstr "您已經由聊天室 %s 停止連線。"
-
-#: src/protocols/oscar/oscar.c:1672
-msgid "Chat is currently unavailable"
-msgstr "目前無法使用聊天室"
-
-#: src/protocols/oscar/oscar.c:1742
+#: ../src/protocols/oscar/oscar.c:975
+msgid "Could not connect to authentication server"
+msgstr "無法連線至認證伺服器"
+
+#: ../src/protocols/oscar/oscar.c:977
+msgid "Could not connect to BOS server"
+msgstr "無法連線到 BOS 伺服器"
+
+#: ../src/protocols/oscar/oscar.c:1007
 msgid "Screen name sent"
 msgstr "送出帳號"
 
-#: src/protocols/oscar/oscar.c:1758
+#: ../src/protocols/oscar/oscar.c:1012
+msgid "Connection established, cookie sent"
+msgstr "連線已建立,並已送出 Cookie"
+
+#. TODO: Don't call this with ssi
+#: ../src/protocols/oscar/oscar.c:1043
+msgid "Finalizing connection"
+msgstr "完成連線"
+
+#: ../src/protocols/oscar/oscar.c:1227
 #, c-format
 msgid "Unable to login: Could not sign on as %s because the screen name is invalid.  Screen names must either start with a letter and contain only letters, numbers and spaces, or contain only numbers."
 msgstr "無法登入:無法以 %s 身份登入,因為這個帳號是無效的。帳號必須以英文字母起始,並只含英文字母、數字及空白;或者只由數字組成。"
 
-#: src/protocols/oscar/oscar.c:1787
-msgid "Unable to login to AIM"
-msgstr "無法登入到 AIM"
-
-#: src/protocols/oscar/oscar.c:1891
-#: src/protocols/oscar/oscar.c:2842
-msgid "Could Not Connect"
-msgstr "無法連線"
-
-#: src/protocols/oscar/oscar.c:1899
-msgid "Connection established, cookie sent"
-msgstr "連線已建立,並已送出 Cookie"
-
-#. clientip & verifiedip failed, request a redirect
-#. * that is, we want the sender to connect to us
-#. Let the user not to lose hope quite yet
-#: src/protocols/oscar/oscar.c:2051
-#, fuzzy
-msgid "Attempting connection redirect..."
-msgstr "正在嘗試連線至 %2$s:%3$hu,以便和 %1$s 建立即時訊息。"
-
-#. proxyip timed out
-#. * 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/2 proxied transfer might work when a stage 3 will not.
-#: src/protocols/oscar/oscar.c:2096
-#, c-format
-msgid ""
-"Transfer of file %s timed out.\n"
-" Try enabling proxy servers for file transfers in Tools->Preferences->AIM/ICQ."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:2194
-#: src/protocols/yahoo/yahoo_filexfer.c:174
-#: src/protocols/yahoo/yahoo_filexfer.c:183
-#: src/protocols/yahoo/yahoo_filexfer.c:192
-msgid "Unable to establish file descriptor."
-msgstr "無法建立檔案介紹。"
-
-#: src/protocols/oscar/oscar.c:2199
-msgid "Unable to create new connection."
-msgstr "無法開啟新連結。"
-
-#: src/protocols/oscar/oscar.c:2433
-#: src/protocols/oscar/oscar.c:2442
-#: src/protocols/oscar/oscar.c:2456
-#: src/protocols/oscar/oscar.c:2466
-#, fuzzy
-msgid "Unable to log into file transfer proxy."
-msgstr "無法登入到 Rendezvous"
-
-#: src/protocols/oscar/oscar.c:2520
-#, fuzzy
-msgid "Unable to establish listener socket or no AOL proxy connection present."
-msgstr "無法建立監聽器 Socket。"
-
-#: src/protocols/oscar/oscar.c:2728
-#: src/protocols/toc/toc.c:543
+#: ../src/protocols/oscar/oscar.c:1317
+#: ../src/protocols/toc/toc.c:543
 msgid "Incorrect nickname or password."
 msgstr "錯誤的暱稱或密碼"
 
-#: src/protocols/oscar/oscar.c:2733
+#: ../src/protocols/oscar/oscar.c:1322
 msgid "Your account is currently suspended."
 msgstr "您的帳號目前停用中。"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
 #  NOTE 譯文更動 by Ambrose
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:2737
+#: ../src/protocols/oscar/oscar.c:1326
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "暫時無法使用 AOL 即時訊息服務。"
 
-#: src/protocols/oscar/oscar.c:2742
+#: ../src/protocols/oscar/oscar.c:1331
 msgid "You have been connecting and disconnecting too frequently. Wait ten minutes and try again. If you continue to try, you will need to wait even longer."
 msgstr "您的連線/斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連線,那麼您的等待時間將會更加的延長。"
 
-#: src/protocols/oscar/oscar.c:2747
+#: ../src/protocols/oscar/oscar.c:1336
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "您所使用的用戶端程式太過老舊。請到 %s 更新"
 
-#: src/protocols/oscar/oscar.c:2778
-msgid "Internal Error"
-msgstr "內部錯誤"
-
-#: src/protocols/oscar/oscar.c:2849
+#: ../src/protocols/oscar/oscar.c:1372
+msgid "Could Not Connect"
+msgstr "無法連線"
+
+#: ../src/protocols/oscar/oscar.c:1377
 msgid "Received authorization"
 msgstr "收到認證"
 
-#: src/protocols/oscar/oscar.c:2873
+#: ../src/protocols/oscar/oscar.c:1400
 msgid "The SecurID key entered is invalid."
 msgstr "您所輸入的 SecurID 碼無效。"
 
-#: src/protocols/oscar/oscar.c:2887
+#: ../src/protocols/oscar/oscar.c:1414
 msgid "Enter SecurID"
 msgstr "請輸入 SecurID"
 
-#: src/protocols/oscar/oscar.c:2888
+#: ../src/protocols/oscar/oscar.c:1415
 msgid "Enter the 6 digit number from the digital display."
 msgstr "請輸入數碼顯示器所顯示的六位數字。"
 
-#: src/protocols/oscar/oscar.c:2928
-#: src/protocols/oscar/oscar.c:2958
-#: src/protocols/oscar/oscar.c:3047
+#: ../src/protocols/oscar/oscar.c:1455
+#: ../src/protocols/oscar/oscar.c:1489
 #, c-format
 msgid "You may be disconnected shortly.  You may want to use TOC until this is fixed.  Check %s for updates."
 msgstr "您可能會短時間中斷連線。您可能會想在這個問題被修正後使用 TOC。請到 %s 看看有沒有更新。"
 
-#: src/protocols/oscar/oscar.c:2931
-#: src/protocols/oscar/oscar.c:2961
+#: ../src/protocols/oscar/oscar.c:1458
+#: ../src/protocols/oscar/oscar.c:1492
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr "Gaim 無法取得有效的 AIM 登入碼。"
 
-#: src/protocols/oscar/oscar.c:3050
+#: ../src/protocols/oscar/oscar.c:1578
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr "您可能會短時間中斷連線。請到 %s 看看有沒有更新。"
+
+#: ../src/protocols/oscar/oscar.c:1581
 msgid "Gaim was unable to get a valid login hash."
 msgstr "Gaim 無法取得有效的登入碼。"
 
-#: src/protocols/oscar/oscar.c:3071
+#: ../src/protocols/oscar/oscar.c:1607
 msgid "Password sent"
 msgstr "密碼送出"
 
-#: src/protocols/oscar/oscar.c:4340
-#, c-format
-msgid "%s has just asked to directly connect to %s"
-msgstr "%s 剛剛要求直接連線到 %s"
-
-#: src/protocols/oscar/oscar.c:4343
-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 considered a privacy risk."
-msgstr "這個要求將會在兩部電腦間建立起直接連線,而這是在傳送即時訊息影像時所必須的。這樣將會曝露您的 IP 位址,因此可能會有隱私方面的風險。"
-
-#: src/protocols/oscar/oscar.c:4382
+#: ../src/protocols/oscar/oscar.c:2165
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "請通過我的認證要求,好讓我可以將您加入我的好友清單中。"
 
-#: src/protocols/oscar/oscar.c:4390
+#: ../src/protocols/oscar/oscar.c:2174
 msgid "Authorization Request Message:"
 msgstr "認證要求訊息:"
 
-#: src/protocols/oscar/oscar.c:4391
+#: ../src/protocols/oscar/oscar.c:2175
 msgid "Please authorize me!"
 msgstr "請通過我的認證!"
 
-#: src/protocols/oscar/oscar.c:4421
+#: ../src/protocols/oscar/oscar.c:2207
 #, c-format
 msgid "The user %s requires authorization before being added to a buddy list.  Do you want to send an authorization request?"
 msgstr "使用者 %s 要求在加入好友清單前先取得他的認證。您要送出您的認證要求嗎?"
 
-#: src/protocols/oscar/oscar.c:4426
-#: src/protocols/oscar/oscar.c:4428
+#: ../src/protocols/oscar/oscar.c:2212
 msgid "Request Authorization"
 msgstr "要求認證"
 
-#: src/protocols/oscar/oscar.c:4466
-#: src/protocols/oscar/oscar.c:4472
-#: src/protocols/oscar/oscar.c:4576
-#: src/protocols/oscar/oscar.c:4600
-#: src/protocols/oscar/oscar.c:7266
-#: src/protocols/oscar/oscar.c:7318
+#: ../src/protocols/oscar/oscar.c:2214
+msgid "_Request Authorization"
+msgstr "要求認證(_R)"
+
+#: ../src/protocols/oscar/oscar.c:2255
+#: ../src/protocols/oscar/oscar.c:2262
+#: ../src/protocols/oscar/oscar.c:2368
+#: ../src/protocols/oscar/oscar.c:2392
+#: ../src/protocols/oscar/oscar.c:5047
+#: ../src/protocols/oscar/oscar.c:5099
 msgid "No reason given."
 msgstr "沒有給予原因。"
 
-#: src/protocols/oscar/oscar.c:4471
+#: ../src/protocols/oscar/oscar.c:2261
 msgid "Authorization Denied Message:"
 msgstr "拒絕認證訊息:"
 
-#: src/protocols/oscar/oscar.c:4578
-#, fuzzy, c-format
+#: ../src/protocols/oscar/oscar.c:2370
+#, c-format
 msgid ""
 "The user %u wants to add %s to their buddy list for the following reason:\n"
 "%s"
 msgstr ""
-"使用者 %u 因為下列原因,想要將您加入他(她)的好友清單中:\n"
+"使用者 %u 因為下列原因,想要將 %s 加入他(她)的好友清單中:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4588
-#: src/protocols/oscar/oscar.c:7278
+#: ../src/protocols/oscar/oscar.c:2380
+#: ../src/protocols/oscar/oscar.c:5059
 msgid "Authorization Request"
 msgstr "認證要求"
 
-#: src/protocols/oscar/oscar.c:4600
+#: ../src/protocols/oscar/oscar.c:2392
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the following reason:\n"
@@ -9178,17 +9711,17 @@
 "使用者 %u 因為下列原因,拒絕了您將其加入好友清單的要求:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4601
+#: ../src/protocols/oscar/oscar.c:2393
 msgid "ICQ authorization denied."
 msgstr "ICQ 認證拒絕。"
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:4608
+#: ../src/protocols/oscar/oscar.c:2400
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr "使用者 %u 同意了您將其加入好友清單的要求。"
 
-#: src/protocols/oscar/oscar.c:4616
+#: ../src/protocols/oscar/oscar.c:2408
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -9201,7 +9734,7 @@
 "來自:%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4624
+#: ../src/protocols/oscar/oscar.c:2416
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -9214,7 +9747,7 @@
 "來自:%s [%s]\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4632
+#: ../src/protocols/oscar/oscar.c:2424
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -9227,34 +9760,34 @@
 "訊息為:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:4653
+#: ../src/protocols/oscar/oscar.c:2445
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ 使用者 %u 送來一個好友資訊:%s (%s)"
 
-#: src/protocols/oscar/oscar.c:4659
+#: ../src/protocols/oscar/oscar.c:2451
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "您想將他(她)加入到您的好友名單中嗎?"
 
-#: src/protocols/oscar/oscar.c:4663
-msgid "Decline"
-msgstr "婉拒"
-
-#: src/protocols/oscar/oscar.c:4747
+#: ../src/protocols/oscar/oscar.c:2455
+msgid "_Decline"
+msgstr "婉拒(_D)"
+
+#: ../src/protocols/oscar/oscar.c:2539
 #, 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."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息,因為它是無效的。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為它們是無效的。"
 
-#: src/protocols/oscar/oscar.c:4756
+#: ../src/protocols/oscar/oscar.c:2548
 #, 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."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息,因為它太大了。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為它們太大了。"
 
-#: src/protocols/oscar/oscar.c:4765
+#: ../src/protocols/oscar/oscar.c:2557
 #, 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."
@@ -9262,227 +9795,218 @@
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為它們傳送的速度太快。"
 
 # XXX 跟芬蘭文的譯者有同感,直譯「邪惡」好像行不通,下同
-#: src/protocols/oscar/oscar.c:4774
+#: ../src/protocols/oscar/oscar.c:2566
 #, 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."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息,因為他(她)太邪惡了。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為他(她)太邪惡了。"
 
-#: src/protocols/oscar/oscar.c:4783
+#: ../src/protocols/oscar/oscar.c:2575
 #, 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."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息,因為您太邪惡了。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,因為您太邪惡了。"
 
-#: src/protocols/oscar/oscar.c:4792
+#: ../src/protocols/oscar/oscar.c:2584
 #, 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."
 msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息,原因不明。"
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,原因不明。"
 
-#: src/protocols/oscar/oscar.c:4851
+#: ../src/protocols/oscar/oscar.c:2640
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr "<B>帳號:</B> %s<BR><B>狀態:</B> %s<HR>%s"
 
-#: src/protocols/oscar/oscar.c:4912
+#: ../src/protocols/oscar/oscar.c:2701
 #, 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:4949
+#: ../src/protocols/oscar/oscar.c:2737
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "無法送出訊息:%s"
 
-#: src/protocols/oscar/oscar.c:4949
-#: src/protocols/oscar/oscar.c:4954
-#: src/protocols/oscar/oscar.c:5012
-#: src/protocols/oscar/oscar.c:5016
+#: ../src/protocols/oscar/oscar.c:2737
+#: ../src/protocols/oscar/oscar.c:2742
+#: ../src/protocols/oscar/oscar.c:2804
+#: ../src/protocols/oscar/oscar.c:2808
 msgid "Unknown reason."
 msgstr "原因不明。"
 
-#: src/protocols/oscar/oscar.c:4952
-#: src/protocols/sametime/sametime.c:2303
+#: ../src/protocols/oscar/oscar.c:2740
+#: ../src/protocols/sametime/sametime.c:2367
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "無法送出訊息至 %s:"
 
-#: src/protocols/oscar/oscar.c:5012
+#: ../src/protocols/oscar/oscar.c:2804
 #, c-format
 msgid "User information not available: %s"
 msgstr "無法取得個人資訊:%s"
 
 # NOTE 譯文更動 by Ambrose
-#: src/protocols/oscar/oscar.c:5015
+#: ../src/protocols/oscar/oscar.c:2807
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "無法取得使用者 %s 的個人資訊:"
 
-#: src/protocols/oscar/oscar.c:5042
+#: ../src/protocols/oscar/oscar.c:2833
 msgid "Online Since"
 msgstr "上線自"
 
 # XXX 改譯「註冊日期」會否比較通順?
-#: src/protocols/oscar/oscar.c:5047
-#: src/protocols/yahoo/yahoo_profile.c:1122
+#: ../src/protocols/oscar/oscar.c:2838
+#: ../src/protocols/yahoo/yahoo_profile.c:1159
 msgid "Member Since"
 msgstr "成為成員的時間"
 
-#: src/protocols/oscar/oscar.c:5052
+#: ../src/protocols/oscar/oscar.c:2843
 msgid "Capabilities"
 msgstr "相容性"
 
-#: src/protocols/oscar/oscar.c:5180
+#: ../src/protocols/oscar/oscar.c:2861
+msgid "Available Message"
+msgstr "尚有訊息"
+
+#: ../src/protocols/oscar/oscar.c:2958
 msgid "Your AIM connection may be lost."
 msgstr "您的 AIM 可能斷線了。"
 
 #  The conversion failed!
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:5366
+#: ../src/protocols/oscar/oscar.c:3139
 msgid "[Unable to display a message from this user because it contained invalid characters.]"
 msgstr "「無法顯示來自這個使用者的訊息,因為它包含了無效字元。」"
 
-#: src/protocols/oscar/oscar.c:5592
+#: ../src/protocols/oscar/oscar.c:3360
 msgid "Rate limiting error."
 msgstr "速率限制錯誤。"
 
-#: src/protocols/oscar/oscar.c:5593
+#: ../src/protocols/oscar/oscar.c:3361
 msgid "The last action you attempted could not be performed because you are over the rate limit. Please wait 10 seconds and try again."
 msgstr "您最近做的一個動作無法完成,因為您已經達到發送訊息速率的上限。請等待十秒後再試一次。"
 
-#: src/protocols/oscar/oscar.c:5669
+#: ../src/protocols/oscar/oscar.c:3433
 msgid "You have been signed off for an unknown reason."
 msgstr "您因為不明原因而登出。"
 
-#: src/protocols/oscar/oscar.c:5682
-#: src/protocols/toc/toc.c:971
+#: ../src/protocols/oscar/oscar.c:3446
+#: ../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:5707
-msgid "Finalizing connection"
-msgstr "完成連線"
-
-#: src/protocols/oscar/oscar.c:6019
-#: src/protocols/silc/util.c:542
+#: ../src/protocols/oscar/oscar.c:3670
+#: ../src/protocols/silc/util.c:556
 msgid "Mobile Phone"
 msgstr "行動電話"
 
-#: src/protocols/oscar/oscar.c:6037
+#: ../src/protocols/oscar/oscar.c:3697
 msgid "Personal Web Page"
 msgstr "個人網頁"
 
-#: src/protocols/oscar/oscar.c:6041
+#: ../src/protocols/oscar/oscar.c:3701
 msgid "Additional Information"
 msgstr "其他資訊"
 
-#: src/protocols/oscar/oscar.c:6046
-msgid "Home Address"
-msgstr "住家地址"
-
-#: src/protocols/oscar/oscar.c:6050
-#: src/protocols/oscar/oscar.c:6058
+#: ../src/protocols/oscar/oscar.c:3710
+#: ../src/protocols/oscar/oscar.c:3718
 msgid "Zip Code"
 msgstr "郵遞區號"
 
-#: src/protocols/oscar/oscar.c:6054
-msgid "Work Address"
-msgstr "工作地址"
-
-#: src/protocols/oscar/oscar.c:6062
+#: ../src/protocols/oscar/oscar.c:3722
 msgid "Work Information"
 msgstr "工作資訊"
 
-#: src/protocols/oscar/oscar.c:6063
-msgid "Company"
-msgstr "公司名稱"
-
-#: src/protocols/oscar/oscar.c:6064
+#: ../src/protocols/oscar/oscar.c:3724
 msgid "Division"
 msgstr "部門"
 
-#: src/protocols/oscar/oscar.c:6065
+#: ../src/protocols/oscar/oscar.c:3725
 msgid "Position"
 msgstr "職位"
 
-#: src/protocols/oscar/oscar.c:6067
+#: ../src/protocols/oscar/oscar.c:3727
 msgid "Web Page"
 msgstr "網頁"
 
 # XXX 這是什麼 (情形下出現的)? (好像是以前譯「訊息」的那個??)
-#: src/protocols/oscar/oscar.c:6124
+#: ../src/protocols/oscar/oscar.c:3785
 msgid "Pop-Up Message"
 msgstr "彈出訊息"
 
 # Patch by Kevin Leung
-#: src/protocols/oscar/oscar.c:6164
-#, fuzzy, c-format
+#: ../src/protocols/oscar/oscar.c:3825
+#, 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:6195
+#: ../src/protocols/oscar/oscar.c:3830
+msgid "Screen name"
+msgstr "帳號"
+
+#: ../src/protocols/oscar/oscar.c:3856
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "找不到和電子郵件地址 %s 相關的結果"
 
-#: src/protocols/oscar/oscar.c:6216
+#: ../src/protocols/oscar/oscar.c:3877
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "您應該會收到一封要求對 %s 進行認證的電子郵件。"
 
-#: src/protocols/oscar/oscar.c:6218
+#: ../src/protocols/oscar/oscar.c:3879
 msgid "Account Confirmation Requested"
 msgstr "帳號確認"
 
-#: src/protocols/oscar/oscar.c:6249
+#: ../src/protocols/oscar/oscar.c:3910
 msgid "Error Changing Account Info"
 msgstr "更改帳號資訊錯誤"
 
-#: src/protocols/oscar/oscar.c:6252
+#: ../src/protocols/oscar/oscar.c:3913
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because the requested screen name differs from the original."
 msgstr "錯誤 0x%04x:無法格式化帳號,因為要求的帳號與原本的不同。"
 
-#: src/protocols/oscar/oscar.c:6255
-#, fuzzy, c-format
+#: ../src/protocols/oscar/oscar.c:3916
+#, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
-msgstr "錯誤 0x%04x:無法格式化帳號,因為要求的帳號太長。"
-
-#: src/protocols/oscar/oscar.c:6258
+msgstr "錯誤 0x%04x:無法格式化帳號,因為它是無效的。"
+
+#: ../src/protocols/oscar/oscar.c:3919
 #, 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:6261
+#: ../src/protocols/oscar/oscar.c:3922
 #, 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:6264
+msgstr "錯誤 0x%04x:無法改變電子郵件地址,因為這個帳號尚有要求等待處理。"
+
+#: ../src/protocols/oscar/oscar.c:3925
 #, 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:6267
+#: ../src/protocols/oscar/oscar.c:3928
 #, 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:6270
+#: ../src/protocols/oscar/oscar.c:3931
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "錯誤 0x%04x:未知錯誤。"
 
-#: src/protocols/oscar/oscar.c:6280
+#: ../src/protocols/oscar/oscar.c:3941
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -9491,126 +10015,125 @@
 "您的帳號目前被格式化如下:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:6281
-#: src/protocols/oscar/oscar.c:6288
+#: ../src/protocols/oscar/oscar.c:3942
+#: ../src/protocols/oscar/oscar.c:3949
 msgid "Account Info"
 msgstr "帳號資訊"
 
-#: src/protocols/oscar/oscar.c:6286
+#: ../src/protocols/oscar/oscar.c:3947
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "%s 的電子郵件地址為 %s"
 
-#: src/protocols/oscar/oscar.c:6353
+#: ../src/protocols/oscar/oscar.c:4122
 msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "無法傳送即時訊息影像;要傳送即時訊息影像,必須與對方直接連線。"
 
-#: src/protocols/oscar/oscar.c:6572
+#: ../src/protocols/oscar/oscar.c:4367
 msgid "Unable to set AIM profile."
 msgstr "無法設定 AIM 個人資料。"
 
-#: src/protocols/oscar/oscar.c:6573
+#: ../src/protocols/oscar/oscar.c:4368
 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 fully connected."
 msgstr "您在未登入完成前要求修改您的個人資訊,所以這些資訊並未被修改。請在完成登入後再重新進行設定。"
 
-#: src/protocols/oscar/oscar.c:6587
+#: ../src/protocols/oscar/oscar.c:4382
 #, c-format
 msgid "The maximum profile length of %d byte has been exceeded.  Gaim has truncated it for you."
 msgid_plural "The maximum profile length of %d bytes has been exceeded.  Gaim has truncated it for you."
 msgstr[0] "個人資訊的長度超出了 %d 個位元組的上限。Gaim 已替您截短內容。"
 msgstr[1] "個人資訊的長度超出了 %d 個位元組的上限。Gaim 已替您截短內容。"
 
-#: src/protocols/oscar/oscar.c:6592
+#: ../src/protocols/oscar/oscar.c:4387
 msgid "Profile too long."
 msgstr "個人資訊過長。"
 
-#: src/protocols/oscar/oscar.c:6628
+#: ../src/protocols/oscar/oscar.c:4430
 #, c-format
 msgid "The maximum away message length of %d byte has been exceeded.  Gaim has truncated it for you."
 msgid_plural "The maximum away message length of %d bytes has been exceeded.  Gaim has truncated it for you."
 msgstr[0] "離開訊息的長度超出了 %d 個位元組的上限。Gaim 已替您截短內容。"
 msgstr[1] "離開訊息的長度超出了 %d 個位元組的上限。Gaim 已替您截短內容。"
 
-#: src/protocols/oscar/oscar.c:6633
+#: ../src/protocols/oscar/oscar.c:4435
 msgid "Away message too long."
 msgstr "離開訊息過長。"
 
-#: src/protocols/oscar/oscar.c:6724
+#: ../src/protocols/oscar/oscar.c:4504
 #, c-format
 msgid "Could not add the buddy %s because the screen name is invalid.  Screen names must either start with a letter and contain only letters, numbers and spaces, or contain only numbers."
 msgstr "因為這個帳號不是一個有效的帳號,所以無法將好友「%s」加入清單中。帳號必須以英文字母為開頭,同時由「英文字母」、「數字」和「空白」所組成,或者單純以「數字」組成。"
 
-#: src/protocols/oscar/oscar.c:6726
-#: src/protocols/oscar/oscar.c:7124
-#: src/protocols/oscar/oscar.c:7138
-#: src/protocols/simple/simple.c:203
+#: ../src/protocols/oscar/oscar.c:4506
+#: ../src/protocols/oscar/oscar.c:4905
+#: ../src/protocols/oscar/oscar.c:4919
 msgid "Unable To Add"
 msgstr "無法加入"
 
-#: src/protocols/oscar/oscar.c:6831
+#: ../src/protocols/oscar/oscar.c:4610
 msgid "Unable To Retrieve Buddy List"
 msgstr "無法讀取好友清單"
 
-#: src/protocols/oscar/oscar.c:6832
+#: ../src/protocols/oscar/oscar.c:4611
 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 a few hours."
 msgstr "Gaim 暫時沒有辦法由 AIM 伺服器上取得您的好友清單。不過這個好友清單並沒有遺失,可能可以在幾個小時後取得。"
 
-#: src/protocols/oscar/oscar.c:7022
-#: src/protocols/oscar/oscar.c:7023
-#: src/protocols/oscar/oscar.c:7028
-#: src/protocols/oscar/oscar.c:7182
-#: src/protocols/oscar/oscar.c:7183
-#: src/protocols/oscar/oscar.c:7188
+#: ../src/protocols/oscar/oscar.c:4803
+#: ../src/protocols/oscar/oscar.c:4804
+#: ../src/protocols/oscar/oscar.c:4809
+#: ../src/protocols/oscar/oscar.c:4963
+#: ../src/protocols/oscar/oscar.c:4964
+#: ../src/protocols/oscar/oscar.c:4969
 msgid "Orphans"
 msgstr "孤兒們"
 
-#: src/protocols/oscar/oscar.c:7122
+#: ../src/protocols/oscar/oscar.c:4903
 #, c-format
 msgid "Could not add the buddy %s because you have too many buddies in your buddy list.  Please remove one and try again."
 msgstr "因為您的好友法單中有太多的好友,所以沒有辦法加入好友 %s。請在移除部份好友後重試。"
 
-#: src/protocols/oscar/oscar.c:7122
-#: src/protocols/oscar/oscar.c:7136
+#: ../src/protocols/oscar/oscar.c:4903
+#: ../src/protocols/oscar/oscar.c:4917
 msgid "(no name)"
 msgstr "(沒有名字)"
 
-#: src/protocols/oscar/oscar.c:7136
+#: ../src/protocols/oscar/oscar.c:4917
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason.  The most common reason for this is that you have the maximum number of allowed buddies in your buddy list."
 msgstr "因為不明原因而無法將好友 %s 加入。一般的原因是因為您的好友清單中的好友數目超過所系統允許的上限。"
 
-#: src/protocols/oscar/oscar.c:7219
+#: ../src/protocols/oscar/oscar.c:5000
 #, c-format
 msgid "The user %s has given you permission to add you to their buddy list.  Do you want to add them?"
 msgstr "使用者 %s 已經允許您加入到他(她)的好友清單中。您是不是也要將他(她)加入呢?"
 
 # NOTE 這是我們允許別人發出的認證要求後顯示給我們自己看的
-#: src/protocols/oscar/oscar.c:7225
+#: ../src/protocols/oscar/oscar.c:5006
 msgid "Authorization Given"
 msgstr "給予認證"
 
-#: src/protocols/oscar/oscar.c:7269
-#, fuzzy, c-format
+#: ../src/protocols/oscar/oscar.c:5050
+#, c-format
 msgid ""
 "The user %s wants to add %s to their buddy list for the following reason:\n"
 "%s"
 msgstr ""
-"使用者 %s 因為下列原因,想要將您加入他(她)的好友清單中:\n"
+"使用者 %s 因為下列原因,想要將 %s 加入他(她)的好友清單中:\n"
 "%s"
 
 #. Granted
-#: src/protocols/oscar/oscar.c:7314
+#: ../src/protocols/oscar/oscar.c:5095
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "使用者 %s 允許了您將他(她)加入好友清單的要求。"
 
 # NOTE 這是我們發出的認證要求被對方允許時顯示的
-#: src/protocols/oscar/oscar.c:7315
+#: ../src/protocols/oscar/oscar.c:5096
 msgid "Authorization Granted"
 msgstr "認證獲允"
 
 #. Denied
-#: src/protocols/oscar/oscar.c:7318
+#: ../src/protocols/oscar/oscar.c:5099
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the following reason:\n"
@@ -9619,185 +10142,181 @@
 "使用者 %s 因為下列原因,拒絕了您將他(她)加入好友清單的要求:\n"
 "%s"
 
-#: src/protocols/oscar/oscar.c:7319
+#: ../src/protocols/oscar/oscar.c:5100
 msgid "Authorization Denied"
 msgstr "認證被拒"
 
 # NOTE: 這裡的字義係由 #gaim 的 MrHappy 及 deryni 提供的
 # NOTE: KingAnt 提供的字義有些不同,暫時不予理會
-#: src/protocols/oscar/oscar.c:7356
-#: src/protocols/toc/toc.c:1372
+#: ../src/protocols/oscar/oscar.c:5136
+#: ../src/protocols/toc/toc.c:1372
 msgid "_Exchange:"
 msgstr "頻道號碼(_E):"
 
-#: src/protocols/oscar/oscar.c:7392
+#: ../src/protocols/oscar/oscar.c:5176
 msgid "Invalid chat name specified."
 msgstr "給予了無效的聊天室名稱。"
 
-#: src/protocols/oscar/oscar.c:7462
+#: ../src/protocols/oscar/oscar.c:5246
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "無法傳送即時訊息影像;AIM 聊天並不支援即時訊息影像的傳送。"
 
-#. Available status messages are plain text
-#: src/protocols/oscar/oscar.c:7598
-#, fuzzy
-msgid "Available Message"
-msgstr "送出訊息"
-
-#: src/protocols/oscar/oscar.c:7612
-#: src/protocols/oscar/oscar.c:7617
-msgid "Away Message"
-msgstr "離開訊息"
-
-#  NOTE Jabber 術語,見上
-#: src/protocols/oscar/oscar.c:7617
-#, fuzzy
-msgid "(pending)"
-msgstr "無(但正等待對方認證您)"
-
-#: src/protocols/oscar/oscar.c:7924
+#: ../src/protocols/oscar/oscar.c:5408
+msgid "<i>(retrieving)</i>"
+msgstr " <i>(搜尋中)</i>"
+
+#: ../src/protocols/oscar/oscar.c:5713
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "%s 的好友說明"
 
-#: src/protocols/oscar/oscar.c:7925
+#: ../src/protocols/oscar/oscar.c:5714
 msgid "Buddy Comment:"
 msgstr "好友說明:"
 
-#: src/protocols/oscar/oscar.c:7944
+#: ../src/protocols/oscar/oscar.c:5760
+#, c-format
+msgid "You have selected to open a Direct IM connection with %s."
+msgstr "您選擇了與 %s 開啟一個直接即時訊息。"
+
+#: ../src/protocols/oscar/oscar.c:5764
+#, fuzzy
+msgid "Because this reveals your IP address, it may be considered a security risk.  Do you wish to continue?"
+msgstr "這樣將會曝露出您的 IP 位址,因此可能會有隱私上的風險。您想要繼續嗎?"
+
+#: ../src/protocols/oscar/oscar.c:5768
+#: ../src/protocols/oscar/peer.c:941
+msgid "_Connect"
+msgstr "連線(_C)"
+
+#: ../src/protocols/oscar/oscar.c:5802
+msgid "Get AIM Info"
+msgstr "取得 AIM 資訊"
+
+#: ../src/protocols/oscar/oscar.c:5808
 msgid "Edit Buddy Comment"
 msgstr "編輯好友說明"
 
-#: src/protocols/oscar/oscar.c:7950
+#: ../src/protocols/oscar/oscar.c:5816
 msgid "Get Status Msg"
 msgstr "取得狀態訊息"
 
 # NOTE 將「直接消息」改譯為「即時訊息」
-#: src/protocols/oscar/oscar.c:7962
+#: ../src/protocols/oscar/oscar.c:5829
 msgid "Direct IM"
 msgstr "即時訊息"
 
-#: src/protocols/oscar/oscar.c:7979
+#: ../src/protocols/oscar/oscar.c:5851
 msgid "Re-request Authorization"
 msgstr "重新要求認證"
 
-#: src/protocols/oscar/oscar.c:8039
+#: ../src/protocols/oscar/oscar.c:5908
 msgid "Require authorization"
 msgstr "要求認證"
 
-#: src/protocols/oscar/oscar.c:8042
-msgid "Hide IP address"
-msgstr "隱藏 IP 位址"
-
-# NOTE 參閱 http://www.geocities.com/Athens/Delphi/6470/icq99.html
-#: src/protocols/oscar/oscar.c:8045
-#, fuzzy
-msgid "Web aware"
-msgstr "允許其他使用者在網路上查看您目前的狀態"
-
-#: src/protocols/oscar/oscar.c:8050
+#: ../src/protocols/oscar/oscar.c:5911
+msgid "Web aware (enabling this will cause you to receive SPAM!)"
+msgstr ""
+
+#: ../src/protocols/oscar/oscar.c:5916
 msgid "ICQ Privacy Options"
 msgstr "ICQ 隱私選頊"
 
-#: src/protocols/oscar/oscar.c:8067
+#: ../src/protocols/oscar/oscar.c:5933
 msgid "The new formatting is invalid."
 msgstr "新的格式是無效的。"
 
-#: src/protocols/oscar/oscar.c:8068
+#: ../src/protocols/oscar/oscar.c:5934
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "帳號格式化只能改變大寫以及空白。"
 
-#: src/protocols/oscar/oscar.c:8075
+#: ../src/protocols/oscar/oscar.c:5941
 msgid "New screen name formatting:"
 msgstr "新的帳號格式:"
 
-#: src/protocols/oscar/oscar.c:8127
+#: ../src/protocols/oscar/oscar.c:5997
 msgid "Change Address To:"
 msgstr "變更地址為:"
 
-#: src/protocols/oscar/oscar.c:8172
+#: ../src/protocols/oscar/oscar.c:6042
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>您並沒有在等待驗證</i>"
 
-#: src/protocols/oscar/oscar.c:8175
+#: ../src/protocols/oscar/oscar.c:6045
 msgid "You are awaiting authorization from the following buddies"
 msgstr "您目前正在等待下列好友的認證"
 
-#: src/protocols/oscar/oscar.c:8176
+#: ../src/protocols/oscar/oscar.c:6046
 msgid "You can re-request authorization from these buddies by right-clicking on them and selecting \"Re-request Authorization.\""
 msgstr "您可以重新要求這些好友的認證,只要在好友清單中以滑鼠右鍵點擊他們,然後選擇「要求重新認證」。"
 
-#: src/protocols/oscar/oscar.c:8193
+#: ../src/protocols/oscar/oscar.c:6063
 msgid "Find Buddy by E-Mail"
 msgstr "以電子郵件地址來找尋好友"
 
-#: src/protocols/oscar/oscar.c:8194
+#: ../src/protocols/oscar/oscar.c:6064
 msgid "Search for a buddy by e-mail address"
 msgstr "使用電子郵件地址搜尋好友"
 
-#: src/protocols/oscar/oscar.c:8195
+#: ../src/protocols/oscar/oscar.c:6065
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "請輸入對方的電子郵件地址。"
 
-#: src/protocols/oscar/oscar.c:8288
+#: ../src/protocols/oscar/oscar.c:6234
 msgid "Set User Info (URL)..."
 msgstr "設定使用者資訊 (URL)..."
 
-#: src/protocols/oscar/oscar.c:8299
+#: ../src/protocols/oscar/oscar.c:6245
 msgid "Change Password (URL)"
 msgstr "修改密碼 (透過網頁)"
 
-#: src/protocols/oscar/oscar.c:8303
+#: ../src/protocols/oscar/oscar.c:6249
 msgid "Configure IM Forwarding (URL)"
 msgstr "設定即時訊息的轉送 (透過網頁)"
 
 #  NOTE 譯文更動 by Ambrose
 #. ICQ actions
-#: src/protocols/oscar/oscar.c:8313
-msgid "Show Privacy Options..."
-msgstr "顯示隱私選項..."
+#: ../src/protocols/oscar/oscar.c:6259
+msgid "Set Privacy Options..."
+msgstr "設定隱私選項..."
 
 #. AIM actions
-#: src/protocols/oscar/oscar.c:8320
+#: ../src/protocols/oscar/oscar.c:6266
 msgid "Format Screen Name..."
 msgstr "格式化帳號..."
 
-#: src/protocols/oscar/oscar.c:8324
+#: ../src/protocols/oscar/oscar.c:6270
 msgid "Confirm Account"
 msgstr "確認帳號"
 
-#: src/protocols/oscar/oscar.c:8328
-msgid "Display Currently Registered Address"
-msgstr "顯示目前所註冊的地址"
-
-#: src/protocols/oscar/oscar.c:8332
-msgid "Change Currently Registered Address..."
-msgstr "修改目前所註冊的地址..."
-
-#: src/protocols/oscar/oscar.c:8339
+#: ../src/protocols/oscar/oscar.c:6274
+msgid "Display Currently Registered E-Mail Address"
+msgstr "顯示目前所註冊的電子郵件位址"
+
+#: ../src/protocols/oscar/oscar.c:6278
+msgid "Change Currently Registered E-Mail Address..."
+msgstr "修改目前所註冊的電子郵件位址..."
+
+#: ../src/protocols/oscar/oscar.c:6285
 msgid "Show Buddies Awaiting Authorization"
 msgstr "顯示等待認證的好友"
 
-#: src/protocols/oscar/oscar.c:8345
-msgid "Search for Buddy by E-Mail..."
+#: ../src/protocols/oscar/oscar.c:6291
+msgid "Search for Buddy by E-Mail Address..."
 msgstr "使用電子郵件地址搜尋好友..."
 
-#: src/protocols/oscar/oscar.c:8350
+#: ../src/protocols/oscar/oscar.c:6296
 msgid "Search for Buddy by Information"
 msgstr "依照資訊尋找好友"
 
-#: src/protocols/oscar/oscar.c:8416
+#: ../src/protocols/oscar/oscar.c:6362
 msgid "Use recent buddies group"
 msgstr "使用「Recent Buddies」群組"
 
-#: src/protocols/oscar/oscar.c:8419
+#: ../src/protocols/oscar/oscar.c:6365
 msgid "Show how long you have been idle"
 msgstr "顯示你閒置多久時間"
 
-#: src/protocols/oscar/oscar.c:8428
-msgid "Use AIM/ICQ proxy server (Slower/More Secure/Usually Works)"
-msgstr ""
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9808,535 +10327,541 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:8545
-#: src/protocols/oscar/oscar.c:8547
+#: ../src/protocols/oscar/oscar.c:6490
+#: ../src/protocols/oscar/oscar.c:6492
 msgid "AIM/ICQ Protocol Plugin"
 msgstr "AIM/ICQ 協定模組"
 
-#: src/protocols/oscar/oscar.c:8566
-msgid "Auth host"
-msgstr "認證伺服器"
-
-#: src/protocols/oscar/oscar.c:8569
-msgid "Auth port"
-msgstr "認證通訊埠"
-
-#: src/protocols/oscar/oscar.c:8572
-#: src/protocols/zephyr/zephyr.c:2894
+#: ../src/protocols/oscar/oscar.c:6517
+#: ../src/protocols/zephyr/zephyr.c:2927
 msgid "Encoding"
 msgstr "編碼"
 
-#: src/protocols/sametime/sametime.c:363
+#: ../src/protocols/oscar/oscar.c:6521
+msgid ""
+"Always use AIM/ICQ proxy server\n"
+"(slower, but does not reveal your IP address)"
+msgstr ""
+
+#: ../src/protocols/oscar/peer.c:613
+#, c-format
+msgid "Asking %s to connect to us at %s:%hu for Direct IM."
+msgstr "正在要求 %s 連線至此處 (%s:%hu),以便建立即時訊息。"
+
+#: ../src/protocols/oscar/peer.c:662
+#: ../src/protocols/oscar/peer.c:693
+#, c-format
+msgid "Attempting to connect to %s:%hu."
+msgstr "正在嘗試連線至 %s;%hu。"
+
+#: ../src/protocols/oscar/peer.c:753
+msgid "Attempting to connect via proxy server."
+msgstr "正在嘗試透過 Proxy 伺服器連線。"
+
+#: ../src/protocols/oscar/peer.c:931
+#, c-format
+msgid "%s has just asked to directly connect to %s"
+msgstr "%s 剛剛要求直接連線到 %s"
+
+#: ../src/protocols/oscar/peer.c:935
+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 considered a privacy risk."
+msgstr "這個要求將會在兩部電腦間建立起直接連線,而這是在傳送即時訊息影像時所必須的。這樣將會曝露您的 IP 位址,因此可能會有隱私方面的風險。"
+
+#: ../src/protocols/sametime/sametime.c:415
 msgid "Connection closed (writing)"
 msgstr "連線關閉(寫入)"
 
-#: src/protocols/sametime/sametime.c:1208
+#: ../src/protocols/sametime/sametime.c:1261
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>群組名稱:</b>%s<br>"
 
-#: src/protocols/sametime/sametime.c:1209
+#: ../src/protocols/sametime/sametime.c:1262
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr "<b>Notes 群組 ID:</b>%s<br>"
 
-#: src/protocols/sametime/sametime.c:1211
+#: ../src/protocols/sametime/sametime.c:1264
 #, c-format
 msgid "Info for Group %s"
 msgstr "關於群組 %s 的資訊"
 
-#: src/protocols/sametime/sametime.c:1213
-#, fuzzy
+#: ../src/protocols/sametime/sametime.c:1266
 msgid "Notes Address Book Information"
-msgstr "工作資訊"
-
-# NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
-#: src/protocols/sametime/sametime.c:1245
-#, fuzzy
+msgstr "Notes 通訊錄資訊"
+
+#: ../src/protocols/sametime/sametime.c:1298
 msgid "Invite Group to Conference..."
-msgstr "開啟會議室"
+msgstr "邀請整個群組進入會議室..."
 
 #  NOTE 注意!evolution 本身的譯法是「目錄服務」而非「通訊錄」
-#: src/protocols/sametime/sametime.c:1254
-#, fuzzy
+#: ../src/protocols/sametime/sametime.c:1308
 msgid "Get Notes Address Book Info"
-msgstr "增加到通訊錄"
-
-#: src/protocols/sametime/sametime.c:1406
-#, fuzzy
+msgstr "取得 Notes 通訊錄資訊"
+
+#: ../src/protocols/sametime/sametime.c:1461
 msgid "Sending Handshake"
-msgstr "傳送 Cookie 中"
-
-#  XXX 暫譯
-#: src/protocols/sametime/sametime.c:1411
-#, fuzzy
+msgstr "傳送 Handshake"
+
+#: ../src/protocols/sametime/sametime.c:1466
 msgid "Waiting for Handshake Acknowledgement"
-msgstr "等待開始傳輸檔案中..."
-
-#: src/protocols/sametime/sametime.c:1416
+msgstr "等待 Handshake 回應"
+
+#: ../src/protocols/sametime/sametime.c:1471
 msgid "Handshake Acknowledged, Sending Login"
 msgstr "Handshake收到回應,送出登入要求"
 
-#: src/protocols/sametime/sametime.c:1421
+#: ../src/protocols/sametime/sametime.c:1476
 msgid "Waiting for Login Acknowledgement"
 msgstr "等待登入要求的回應"
 
-#: src/protocols/sametime/sametime.c:1426
-#, fuzzy
+#: ../src/protocols/sametime/sametime.c:1481
 msgid "Login Redirected"
-msgstr "登入伺服器"
-
-#: src/protocols/sametime/sametime.c:1432
-#, fuzzy
+msgstr "重新導向登入"
+
+#: ../src/protocols/sametime/sametime.c:1487
 msgid "Forcing Login"
-msgstr "登入中"
-
-#: src/protocols/sametime/sametime.c:1436
+msgstr "強行登入"
+
+#: ../src/protocols/sametime/sametime.c:1491
 msgid "Login Acknowledged"
 msgstr "登入要求收到回應"
 
-#: src/protocols/sametime/sametime.c:1441
-#, fuzzy
-msgid "Connected to Sametime Community Server"
-msgstr "連線至 SILC 伺服器中"
-
-#. * @todo Admin alerts should probably be in a conversation window
-#. rather than a gaim_notify_message. Or in some sort of updating
-#. dialog, or something.
-#: src/protocols/sametime/sametime.c:1535
-msgid "Admin Alert"
-msgstr ""
-
-#: src/protocols/sametime/sametime.c:1592
-#, fuzzy
+#  XXX 暫譯
+#: ../src/protocols/sametime/sametime.c:1496
+msgid "Starting Services"
+msgstr "啟動服務"
+
+#: ../src/protocols/sametime/sametime.c:1501
+msgid "Connected"
+msgstr "已連結"
+
+#: ../src/protocols/sametime/sametime.c:1599
+#, c-format
+msgid "A Sametime administrator has issued the following announcement on server %s"
+msgstr ""
+
+#: ../src/protocols/sametime/sametime.c:1604
+msgid "Sametime Administrator Announcement"
+msgstr ""
+
+#: ../src/protocols/sametime/sametime.c:1656
 msgid "Connection reset"
-msgstr "連線關閉"
-
-#: src/protocols/sametime/sametime.c:1599
-#, fuzzy, c-format
+msgstr "連線重置"
+
+#: ../src/protocols/sametime/sametime.c:1663
+#, c-format
 msgid "Error reading from socket: %s"
-msgstr "讀取 Socket 時發生錯誤。"
+msgstr "讀取 Socket 時發生錯誤;%s"
 
 #. this is a regular connect, error out
-#: src/protocols/sametime/sametime.c:1628
-#: src/protocols/sametime/sametime.c:3613
-#, fuzzy
+#: ../src/protocols/sametime/sametime.c:1692
+#: ../src/protocols/sametime/sametime.c:3688
 msgid "Unable to connect to host"
-msgstr "無法連線到伺服器"
-
-#: src/protocols/sametime/sametime.c:1665
+msgstr "無法連線到主機"
+
+#: ../src/protocols/sametime/sametime.c:1730
 #, c-format
 msgid "Announcement from %s"
 msgstr "自 %s 發怖"
 
-#: src/protocols/sametime/sametime.c:1836
-#, fuzzy
+#: ../src/protocols/sametime/sametime.c:1904
 msgid "Conference Closed"
-msgstr "連線關閉"
-
-#: src/protocols/sametime/sametime.c:2297
-#, fuzzy
+msgstr "會議室關閉"
+
+#: ../src/protocols/sametime/sametime.c:2361
 msgid "Unable to send message: "
-msgstr "無法送出訊息:%s"
-
-#: src/protocols/sametime/sametime.c:2893
+msgstr "無法送出訊息:"
+
+#: ../src/protocols/sametime/sametime.c:2918
 #, fuzzy
 msgid "Place Closed"
 msgstr "已取消"
 
-#: src/protocols/sametime/sametime.c:3180
+#: ../src/protocols/sametime/sametime.c:3209
 msgid "Microphone"
 msgstr "麥克風"
 
-#: src/protocols/sametime/sametime.c:3181
+#: ../src/protocols/sametime/sametime.c:3210
 msgid "Speakers"
 msgstr "喇叭"
 
 # XXX 暫譯
-#: src/protocols/sametime/sametime.c:3182
-#, fuzzy
+#: ../src/protocols/sametime/sametime.c:3211
 msgid "Video Camera"
-msgstr "視像聊天"
-
-#: src/protocols/sametime/sametime.c:3186
-#, fuzzy
+msgstr "視訊"
+
+#: ../src/protocols/sametime/sametime.c:3215
 msgid "File Transfer"
 msgstr "檔案傳輸"
 
-#: src/protocols/sametime/sametime.c:3207
-#, fuzzy, c-format
+#: ../src/protocols/sametime/sametime.c:3249
+#, c-format
 msgid ""
 "\n"
-"<b>Status</b>: %s"
-msgstr "<b>狀態:</b>%s"
-
-#: src/protocols/sametime/sametime.c:3212
-#, fuzzy, c-format
-msgid ""
-"\n"
-"<b>Message</b>: %s"
+"<b>Supports:</b> %s"
 msgstr ""
 "\n"
-"<b>%s:</b>%s"
-
-#: src/protocols/sametime/sametime.c:3218
-#, fuzzy, c-format
-msgid ""
-"\n"
-"<b>Supports</b>: %s"
-msgstr "<b>狀態:</b>%s"
-
-#: src/protocols/sametime/sametime.c:3223
-#, fuzzy
+"<b>支援:</b>%s"
+
+#: ../src/protocols/sametime/sametime.c:3254
 msgid ""
 "\n"
 "<b>External User</b>"
 msgstr ""
 "\n"
-"<b>警告:<b>"
-
-#  XXX 這個有點怪,譯錯?
-#: src/protocols/sametime/sametime.c:3241
-msgid "Active"
-msgstr "啟動"
-
-#: src/protocols/sametime/sametime.c:3330
-#, fuzzy
+"<b>外部使用者<b>"
+
+#: ../src/protocols/sametime/sametime.c:3360
 msgid "Create conference with user"
-msgstr "選擇查詢的會議伺服器"
-
-#: src/protocols/sametime/sametime.c:3331
+msgstr "與使用者建立會議室"
+
+#: ../src/protocols/sametime/sametime.c:3361
 #, c-format
 msgid "Please enter a topic for the new conference, and an invitation message to be sent to %s"
 msgstr "請為新的會議室輸入一個主題,同時發出一個邀請訊息給%s"
 
-# NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
-#: src/protocols/sametime/sametime.c:3335
-#, fuzzy
+#: ../src/protocols/sametime/sametime.c:3365
 msgid "New Conference"
-msgstr "開啟會議室"
-
-#: src/protocols/sametime/sametime.c:3337
-#, fuzzy
+msgstr "新會議室"
+
+#: ../src/protocols/sametime/sametime.c:3367
 msgid "Create"
-msgstr "聊天"
+msgstr "建立"
+
+#: ../src/protocols/sametime/sametime.c:3431
+msgid "Available Conferences"
+msgstr "現有會議室"
+
+#: ../src/protocols/sametime/sametime.c:3437
+msgid "Create New Conference..."
+msgstr "開啟新會議室..."
 
 # NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
-#: src/protocols/sametime/sametime.c:3399
-#, fuzzy
-msgid "Available Conferences"
-msgstr "開啟會議室"
-
-# NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
-#: src/protocols/sametime/sametime.c:3405
-#, fuzzy
-msgid "Create New Conference..."
-msgstr "開啟會議室"
-
-# NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
-#: src/protocols/sametime/sametime.c:3412
-#, fuzzy
+#: ../src/protocols/sametime/sametime.c:3444
 msgid "Invite user to a conference"
-msgstr "開啟會議室"
-
-#: src/protocols/sametime/sametime.c:3413
+msgstr "邀請使用者進入會議室"
+
+#: ../src/protocols/sametime/sametime.c:3445
 #, c-format
 msgid "Select a conference from the list below to send an invite to user %s. Select \"Create New Conference\" if you'd like to create a new conference to invite this user to."
 msgstr "從下方的清單中選取一個會議室,同時發出邀請給使用者%s。如果您想開啟一個新的會議室,並且邀請這個使用者加入,您可以選擇「開啟新會議室」選項。"
 
 # NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
-#: src/protocols/sametime/sametime.c:3418
-#, fuzzy
+#: ../src/protocols/sametime/sametime.c:3450
 msgid "Invite to Conference"
-msgstr "開啟會議室"
-
-#: src/protocols/sametime/sametime.c:3420
+msgstr "邀請進入會議室"
+
+#: ../src/protocols/sametime/sametime.c:3452
 msgid "Invite"
 msgstr "邀請"
 
-# NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
-#: src/protocols/sametime/sametime.c:3472
-#, fuzzy
+#: ../src/protocols/sametime/sametime.c:3540
 msgid "Invite to Conference..."
-msgstr "開啟會議室"
-
-#: src/protocols/sametime/sametime.c:3518
-#, fuzzy
+msgstr "邀請進入會議室"
+
+#: ../src/protocols/sametime/sametime.c:3545
+msgid "Send TEST Announcement"
+msgstr ""
+
+#: ../src/protocols/sametime/sametime.c:3592
 msgid "No Sametime Community Server specified"
-msgstr "連線至 SILC 伺服器中"
-
-#: src/protocols/sametime/sametime.c:3539
+msgstr "未指定 Sametime 社群伺服器"
+
+#: ../src/protocols/sametime/sametime.c:3614
 #, c-format
 msgid "No host or IP address has been configured for the Meanwhile account %s. Please enter one below to continue logging in."
 msgstr ""
 
-# NOTE Jabber 協定 Stream Error 的一種,即 <remote-connection-failed/>
-# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
-#: src/protocols/sametime/sametime.c:3544
-#, fuzzy
+#: ../src/protocols/sametime/sametime.c:3619
 msgid "Meanwhile Connection Setup"
-msgstr "無法連線至認證所需的遠端資源"
-
-#: src/protocols/sametime/sametime.c:3545
-#, fuzzy
+msgstr "正在進行連線設定"
+
+#: ../src/protocols/sametime/sametime.c:3620
 msgid "No Sametime Community Server Specified"
-msgstr "連線至 SILC 伺服器中"
-
-#: src/protocols/sametime/sametime.c:4061
+msgstr "未指定 Sametime 社群伺服器"
+
+#: ../src/protocols/sametime/sametime.c:4082
 msgid "<b>External User</b><br>"
 msgstr "<b>外部使用者</b><br>"
 
-#: src/protocols/sametime/sametime.c:4064
+#: ../src/protocols/sametime/sametime.c:4085
 #, c-format
 msgid "<b>User ID:</b> %s<br>"
 msgstr "<b>使用者帳號:</b>%s<br>"
 
-#: src/protocols/sametime/sametime.c:4070
+#: ../src/protocols/sametime/sametime.c:4091
 #, c-format
 msgid "<b>Full Name:</b> %s<br>"
 msgstr "<b>全名:</b>%s<br>"
 
-#: src/protocols/sametime/sametime.c:4076
+#: ../src/protocols/sametime/sametime.c:4097
 msgid "<b>Last Known Client:</b> "
 msgstr "<b>上次已知用戶端:</b>"
 
-#: src/protocols/sametime/sametime.c:4084
+#: ../src/protocols/sametime/sametime.c:4105
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "未知(0x%04x)<br>"
 
-#: src/protocols/sametime/sametime.c:4091
+#: ../src/protocols/sametime/sametime.c:4112
 #, c-format
 msgid "<b>Supports:</b> %s<br>"
 msgstr "<b>支援:</b>%s<br>"
 
-#: src/protocols/sametime/sametime.c:4097
+#: ../src/protocols/sametime/sametime.c:4118
 #, c-format
 msgid "<b>Status:</b> %s"
 msgstr "<b>狀態:</b>%s"
 
-#: src/protocols/sametime/sametime.c:4342
-#: src/protocols/sametime/sametime.c:5369
-msgid "Possible Matches"
-msgstr "可能相符的項目"
-
-#: src/protocols/sametime/sametime.c:4383
+#: ../src/protocols/sametime/sametime.c:4261
+#: ../src/protocols/sametime/sametime.c:5424
+msgid "User Name"
+msgstr "使用者名稱"
+
+#: ../src/protocols/sametime/sametime.c:4264
+#: ../src/protocols/sametime/sametime.c:5427
+msgid "Sametime ID"
+msgstr "Sametime ID"
+
+#: ../src/protocols/sametime/sametime.c:4288
 msgid "An ambiguous user ID was entered"
 msgstr "輸入了一個不明的使用者 ID"
 
-#: src/protocols/sametime/sametime.c:4384
+#: ../src/protocols/sametime/sametime.c:4289
 #, fuzzy, c-format
 msgid "The identifier '%s' may possibly refer to any of the following users. Please select the correct user from the list below to add them to your buddy list."
 msgstr "超過一個使用者使用同一名稱。請從清單選擇正確的使用者,以便新增至好友清單內。"
 
-#: src/protocols/sametime/sametime.c:4389
-msgid "Select User to Add"
-msgstr "選取並新增使用者"
-
-#: src/protocols/sametime/sametime.c:4391
-msgid "Add User"
-msgstr "新增使用者"
+#: ../src/protocols/sametime/sametime.c:4294
+msgid "Select User"
+msgstr "選擇使用者"
 
 #  TODO 請覆查,譯文有待改進
-#: src/protocols/sametime/sametime.c:4452
+#: ../src/protocols/sametime/sametime.c:4364
 msgid "Unable to add user: user not found"
 msgstr "無法新增使用者:找不到使用者"
 
-#: src/protocols/sametime/sametime.c:4454
+#: ../src/protocols/sametime/sametime.c:4366
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community. This entry has been removed from your buddy list."
 msgstr "「%s」與您在 Sametime 社群中的任何使用者帳號不符。它將從您的好友清單中被移除。"
 
-#: src/protocols/sametime/sametime.c:4459
+#: ../src/protocols/sametime/sametime.c:4371
 msgid "Unable to add user"
 msgstr "無法新增使用者"
 
-#: src/protocols/sametime/sametime.c:5029
-#, fuzzy, c-format
+#: ../src/protocols/sametime/sametime.c:4943
+#, c-format
 msgid ""
 "Error reading file %s: \n"
 "%s\n"
 msgstr ""
-"讀取 %s 途中發生了錯誤:\n"
-"%s。\n"
-
-#: src/protocols/sametime/sametime.c:5155
-#, fuzzy
+"讀取檔案 %s 發生錯誤;\n"
+"%s\n"
+
+#: ../src/protocols/sametime/sametime.c:5074
 msgid "Remotely Stored Buddy List"
-msgstr "送出好友清單"
-
-#: src/protocols/sametime/sametime.c:5160
-#, fuzzy
+msgstr "好友清單存放於遠端"
+
+#: ../src/protocols/sametime/sametime.c:5079
 msgid "Buddy List Storage Mode"
-msgstr "好友清單排序"
-
-#: src/protocols/sametime/sametime.c:5163
-#, fuzzy
+msgstr "好友清單儲存模式"
+
+#: ../src/protocols/sametime/sametime.c:5082
 msgid "Local Buddy List Only"
-msgstr "可停駐的好友清單(_D)"
-
-#: src/protocols/sametime/sametime.c:5165
-#, fuzzy
+msgstr "好友清單只存放於本機"
+
+#: ../src/protocols/sametime/sametime.c:5084
 msgid "Merge List from Server"
-msgstr "將伺服器上的好友名單刪除"
-
-#: src/protocols/sametime/sametime.c:5167
-#, fuzzy
+msgstr "合併伺服器上的好友清單至本機"
+
+#: ../src/protocols/sametime/sametime.c:5086
 msgid "Merge and Save List to Server"
-msgstr "錯誤的 CHL 值傳送到了伺服器"
-
-#: src/protocols/sametime/sametime.c:5169
+msgstr "合併並存放好友清單至伺服器"
+
+#: ../src/protocols/sametime/sametime.c:5088
 msgid "Synchronize List with Server"
 msgstr "與伺服器同步清單"
 
-#: src/protocols/sametime/sametime.c:5218
+#: ../src/protocols/sametime/sametime.c:5137
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "匯入 Sametime 清單給帳號「%s」"
 
-#: src/protocols/sametime/sametime.c:5257
+#: ../src/protocols/sametime/sametime.c:5176
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "匯出 Sametime 清單給帳號「%s」"
 
-#: src/protocols/sametime/sametime.c:5308
+#: ../src/protocols/sametime/sametime.c:5229
 msgid "Unable to add group: group exists"
 msgstr "無法新增群組:群組已存在"
 
-#: src/protocols/sametime/sametime.c:5309
+#: ../src/protocols/sametime/sametime.c:5230
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "群組名稱「%s」已經存在於您的好友清單中。"
 
-#: src/protocols/sametime/sametime.c:5312
-#: src/protocols/sametime/sametime.c:5437
+#: ../src/protocols/sametime/sametime.c:5233
+#: ../src/protocols/sametime/sametime.c:5362
 msgid "Unable to add group"
 msgstr "無法新增群組"
 
-#: src/protocols/sametime/sametime.c:5385
+#: ../src/protocols/sametime/sametime.c:5292
+msgid "Possible Matches"
+msgstr "可能相符的項目"
+
+#: ../src/protocols/sametime/sametime.c:5308
 msgid "Notes Address Book group results"
-msgstr ""
-
-#: src/protocols/sametime/sametime.c:5386
+msgstr "Notes 通訊錄結果"
+
+#: ../src/protocols/sametime/sametime.c:5309
 #, c-format
 msgid "The identifier '%s' may possibly refer to any of the following Notes Address Book groups. Please select the correct group from the list below to add it to your buddy list."
-msgstr ""
-
-#  NOTE 注意!evolution 本身的譯法是「目錄服務」而非「通訊錄」
-#: src/protocols/sametime/sametime.c:5391
-#, fuzzy
+msgstr "「%s」可能參考到下列的 Notes 通訊錄群組。請自下方選取正確的群組,以加入您的好友清單。"
+
+#: ../src/protocols/sametime/sametime.c:5314
 msgid "Select Notes Address Book"
-msgstr "增加到通訊錄"
-
-#: src/protocols/sametime/sametime.c:5431
+msgstr "選擇 Notes 通訊錄"
+
+#: ../src/protocols/sametime/sametime.c:5356
 msgid "Unable to add group: group not found"
 msgstr "無法新增群組:找不到群組"
 
-#: src/protocols/sametime/sametime.c:5433
+#: ../src/protocols/sametime/sametime.c:5358
 #, c-format
 msgid "The identifier '%s' did not match any Notes Address Book groups in your Sametime community."
-msgstr ""
-
-#  NOTE 注意!evolution 本身的譯法是「目錄服務」而非「通訊錄」
-#: src/protocols/sametime/sametime.c:5473
-#, fuzzy
+msgstr "在您的 Sametime 社群中,並沒有任何與「%s」相符的 Notes 通訊錄群組。"
+
+#: ../src/protocols/sametime/sametime.c:5399
 msgid "Notes Address Book Group"
-msgstr "增加到通訊錄"
-
-#: src/protocols/sametime/sametime.c:5474
+msgstr "Notes 通訊錄群組"
+
+#: ../src/protocols/sametime/sametime.c:5400
 msgid "Enter the name of a Notes Address Book group in the field below to add the group and its members to your buddy list."
-msgstr ""
-
-#: src/protocols/sametime/sametime.c:5489
+msgstr "輸入 Notes 通訊錄群組名稱於欄位中,以新增這個群組及它所屬的成員到您的好友清單中。"
+
+#: ../src/protocols/sametime/sametime.c:5448
+#, c-format
+msgid "Search results for '%s'"
+msgstr "對 '%s' 的搜尋結果"
+
+#: ../src/protocols/sametime/sametime.c:5449
+#, fuzzy, c-format
+msgid "The identifier '%s' may possibly refer to any of the following users. You may add these users to your buddy list or send them messages with the action buttons below."
+msgstr "超過一個使用者使用同一名稱。請從清單選擇正確的使用者,以便新增至好友清單內。"
+
+#: ../src/protocols/sametime/sametime.c:5481
+msgid "No matches"
+msgstr "沒有相符合的"
+
+#: ../src/protocols/sametime/sametime.c:5482
+#, fuzzy, c-format
+msgid "The identifier '%s' did not match any users in your Sametime community."
+msgstr "「%s」與您在 Sametime 社群中的任何使用者帳號不符。它將從您的好友清單中被移除。"
+
+#: ../src/protocols/sametime/sametime.c:5486
+msgid "No Matches"
+msgstr "沒有相符合的"
+
+#: ../src/protocols/sametime/sametime.c:5523
+msgid "Search for a user"
+msgstr "搜尋一個使用者"
+
+#: ../src/protocols/sametime/sametime.c:5524
+msgid "Enter a name or partial ID in the field below to search for matching users in your Sametime community."
+msgstr "輸入姓名或部份 ID 於下方的欄位,來查詢您 Sametime 社群中符合的使用者。"
+
+#: ../src/protocols/sametime/sametime.c:5527
+msgid "User Search"
+msgstr "使用者搜尋"
+
+#: ../src/protocols/sametime/sametime.c:5539
 msgid "Import Sametime List..."
 msgstr "匯入 Sametime 清單..."
 
-#: src/protocols/sametime/sametime.c:5493
+#: ../src/protocols/sametime/sametime.c:5543
 msgid "Export Sametime List..."
 msgstr "匯出 Sametime 清單..."
 
-#  NOTE 注意!evolution 本身的譯法是「目錄服務」而非「通訊錄」
-#: src/protocols/sametime/sametime.c:5497
-#, fuzzy
+#: ../src/protocols/sametime/sametime.c:5547
 msgid "Add Notes Address Book Group..."
-msgstr "增加到通訊錄"
-
-# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-August/001431.html
-#. notesbuddy hack encoding
-#: src/protocols/sametime/sametime.c:5591
-#, fuzzy
-msgid "NotesBuddy encoding"
-msgstr "伺服器不支援給定的字元編碼"
-
-#: src/protocols/sametime/sametime.c:5600
+msgstr "新增 Notes 通訊錄群組"
+
+#: ../src/protocols/sametime/sametime.c:5551
+msgid "User Search..."
+msgstr "使用者搜尋..."
+
+#: ../src/protocols/sametime/sametime.c:5648
 msgid "Force login (ignore server redirects)"
-msgstr ""
+msgstr "強行登入(忽略伺服器重新導向)"
 
 #. pretend to be Sametime Connect
-#: src/protocols/sametime/sametime.c:5610
+#: ../src/protocols/sametime/sametime.c:5658
 msgid "Hide client identity"
-msgstr ""
-
-#: src/protocols/silc/buddy.c:52
-#: src/protocols/silc/buddy.c:420
-#: src/protocols/silc/buddy.c:545
-#: src/protocols/silc/buddy.c:712
-#: src/protocols/silc/ft.c:338
+msgstr "隱藏客戶端識別"
+
+#: ../src/protocols/silc/buddy.c:52
+#: ../src/protocols/silc/buddy.c:420
+#: ../src/protocols/silc/buddy.c:545
+#: ../src/protocols/silc/buddy.c:711
+#: ../src/protocols/silc/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "使用者 %s 不在網路上"
 
-#: src/protocols/silc/buddy.c:53
-#: src/protocols/silc/buddy.c:115
-#: src/protocols/silc/buddy.c:120
-#: src/protocols/silc/buddy.c:124
-#: src/protocols/silc/buddy.c:129
-#: src/protocols/silc/buddy.c:134
-#: src/protocols/silc/buddy.c:139
-#: src/protocols/silc/buddy.c:257
+#: ../src/protocols/silc/buddy.c:53
+#: ../src/protocols/silc/buddy.c:115
+#: ../src/protocols/silc/buddy.c:120
+#: ../src/protocols/silc/buddy.c:124
+#: ../src/protocols/silc/buddy.c:129
+#: ../src/protocols/silc/buddy.c:134
+#: ../src/protocols/silc/buddy.c:139
+#: ../src/protocols/silc/buddy.c:257
 msgid "Key Agreement"
 msgstr "交換密鑰"
 
-#: src/protocols/silc/buddy.c:54
+#: ../src/protocols/silc/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr "無法交換密鑰"
 
-#: src/protocols/silc/buddy.c:116
+#: ../src/protocols/silc/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr "交換密鑰中出現錯誤"
 
-#: src/protocols/silc/buddy.c:120
+#: ../src/protocols/silc/buddy.c:120
 msgid "Key Agreement failed"
 msgstr "交換密鑰失敗"
 
-#: src/protocols/silc/buddy.c:125
+#: ../src/protocols/silc/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr "交換密鑰逾時"
 
-#: src/protocols/silc/buddy.c:130
+#: ../src/protocols/silc/buddy.c:130
 msgid "Key agreement was aborted"
 msgstr "交換密鑰被中止"
 
-#: src/protocols/silc/buddy.c:135
+#: ../src/protocols/silc/buddy.c:135
 msgid "Key agreement is already started"
 msgstr "交換密鑰己開始"
 
-#: src/protocols/silc/buddy.c:140
+#: ../src/protocols/silc/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
 msgstr "不可與自己交換密鑰"
 
-#: src/protocols/silc/buddy.c:258
-#: src/protocols/silc/buddy.c:388
-#: src/protocols/silc/buddy.c:513
+#: ../src/protocols/silc/buddy.c:258
+#: ../src/protocols/silc/buddy.c:388
+#: ../src/protocols/silc/buddy.c:513
 msgid "The remote user is not present in the network any more"
 msgstr "遠端使用者已不在網路上"
 
-#: src/protocols/silc/buddy.c:294
+#: ../src/protocols/silc/buddy.c:294
 #, c-format
 msgid "Key agreement request received from %s. Would you like to perform the key agreement?"
 msgstr "由 %s 收到一個交換密鑰要求,您想交換密鑰嗎?"
 
-#: src/protocols/silc/buddy.c:298
+#: ../src/protocols/silc/buddy.c:298
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -10347,686 +10872,688 @@
 "遠端主機 :%s\n"
 "遠端通訊埠:%d"
 
-#: src/protocols/silc/buddy.c:311
+#: ../src/protocols/silc/buddy.c:311
 msgid "Key Agreement Request"
 msgstr "交換密鑰要求"
 
-#: src/protocols/silc/buddy.c:387
-#: src/protocols/silc/buddy.c:422
-#: src/protocols/silc/buddy.c:464
+#: ../src/protocols/silc/buddy.c:387
+#: ../src/protocols/silc/buddy.c:422
+#: ../src/protocols/silc/buddy.c:464
 msgid "IM With Password"
 msgstr "有密碼之即時訊息"
 
-#: src/protocols/silc/buddy.c:423
+#: ../src/protocols/silc/buddy.c:423
 msgid "Cannot set IM key"
 msgstr "無法設定即時訊息密鑰"
 
-#: src/protocols/silc/buddy.c:465
+#: ../src/protocols/silc/buddy.c:465
 msgid "Set IM Password"
 msgstr "設定即時訊息密碼"
 
-#: src/protocols/silc/buddy.c:512
-#: src/protocols/silc/buddy.c:547
-#: src/protocols/silc/ops.c:1492
-#: src/protocols/silc/ops.c:1503
+#: ../src/protocols/silc/buddy.c:512
+#: ../src/protocols/silc/buddy.c:547
+#: ../src/protocols/silc/ops.c:1492
+#: ../src/protocols/silc/ops.c:1503
 msgid "Get Public Key"
 msgstr "取得公鑰"
 
-#: src/protocols/silc/buddy.c:548
-#: src/protocols/silc/ops.c:1493
-#: src/protocols/silc/ops.c:1504
+#: ../src/protocols/silc/buddy.c:548
+#: ../src/protocols/silc/ops.c:1493
+#: ../src/protocols/silc/ops.c:1504
 msgid "Cannot fetch the public key"
 msgstr "無法取得公鑰"
 
-#: src/protocols/silc/buddy.c:635
-#: src/protocols/silc/buddy.c:1610
+#: ../src/protocols/silc/buddy.c:634
+#: ../src/protocols/silc/buddy.c:1647
 msgid "Show Public Key"
 msgstr "顯示公鑰"
 
-#: src/protocols/silc/buddy.c:636
-#: src/protocols/silc/buddy.c:995
-#: src/protocols/silc/chat.c:236
+#: ../src/protocols/silc/buddy.c:635
+#: ../src/protocols/silc/buddy.c:1030
+#: ../src/protocols/silc/chat.c:237
 msgid "Could not load public key"
 msgstr "無法載入公鑰"
 
-#: src/protocols/silc/buddy.c:713
-#: src/protocols/silc/ops.c:1087
-#: src/protocols/silc/ops.c:1159
-#: src/protocols/silc/ops.c:1294
-#: src/protocols/silc/ops.c:1295
-#: src/protocols/silc/ops.c:1313
+#: ../src/protocols/silc/buddy.c:712
+#: ../src/protocols/silc/ops.c:1087
+#: ../src/protocols/silc/ops.c:1159
+#: ../src/protocols/silc/ops.c:1294
+#: ../src/protocols/silc/ops.c:1295
+#: ../src/protocols/silc/ops.c:1313
 msgid "User Information"
 msgstr "使用者資訊"
 
-#: src/protocols/silc/buddy.c:714
-#: src/protocols/silc/ops.c:1160
-#: src/protocols/silc/ops.c:1314
+#: ../src/protocols/silc/buddy.c:713
+#: ../src/protocols/silc/ops.c:1160
+#: ../src/protocols/silc/ops.c:1314
 msgid "Cannot get user information"
 msgstr "無法讀取使用者資訊"
 
-#: src/protocols/silc/buddy.c:735
+#: ../src/protocols/silc/buddy.c:734
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "好友 %s 不被信任"
 
-#: src/protocols/silc/buddy.c:738
+#: ../src/protocols/silc/buddy.c:737
 msgid "You cannot receive buddy notifications until you import his/her public key.  You can use the Get Public Key command to get the public key."
 msgstr "直至您匯入好友的公鑰,您將無法收到該好友的好友通知。要取得公鑰,用「取得公鑰」指令即可。"
 
 #. Open file selector to select the public key.
-#: src/protocols/silc/buddy.c:1029
+#: ../src/protocols/silc/buddy.c:1064
 msgid "Open..."
 msgstr "開啟..."
 
-#: src/protocols/silc/buddy.c:1038
+#: ../src/protocols/silc/buddy.c:1073
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "好友 %s 不在網路上"
 
-#: src/protocols/silc/buddy.c:1041
+#: ../src/protocols/silc/buddy.c:1076
 msgid "To add the buddy you must import his/her public key. Press Import to import a public key."
 msgstr "要新增好友,必須匯入他(她)的公鑰。要匯入公鑰,請按「匯入」。"
 
-#: src/protocols/silc/buddy.c:1044
-msgid "Import..."
-msgstr "匯入..."
-
-#: src/protocols/silc/buddy.c:1140
+#: ../src/protocols/silc/buddy.c:1079
+msgid "_Import..."
+msgstr "匯入(_I)..."
+
+#: ../src/protocols/silc/buddy.c:1175
 msgid "Select correct user"
 msgstr "選擇正確的使用者"
 
-#: src/protocols/silc/buddy.c:1142
+#: ../src/protocols/silc/buddy.c:1177
 msgid "More than one user was found with the same public key. Select the correct user from the list to add to the buddy list."
 msgstr "超過一個使用者使用同一公鑰。請從清單選擇正確的使用者,以便新增至好友清單內。"
 
-#: src/protocols/silc/buddy.c:1144
+#: ../src/protocols/silc/buddy.c:1179
 msgid "More than one user was found with the same name. Select the correct user from the list to add to the buddy list."
 msgstr "超過一個使用者使用同一名稱。請從清單選擇正確的使用者,以便新增至好友清單內。"
 
-#: src/protocols/silc/buddy.c:1429
+#: ../src/protocols/silc/buddy.c:1467
 msgid "Detached"
 msgstr "暫停連線"
 
 #  NOTE (01:24:07) wing: what is a status of "indisposed"?
 #  NOTE (01:25:44) LSchiere: if you take the dictionary definition, its more or less the same as "sick"
 #  NOTE (01:25:51) LSchiere: or "not feeling well"
-#: src/protocols/silc/buddy.c:1433
-#: src/protocols/silc/silc.c:57
+#: ../src/protocols/silc/buddy.c:1471
+#: ../src/protocols/silc/silc.c:55
 msgid "Indisposed"
 msgstr "不適"
 
 #  XXX
-#: src/protocols/silc/buddy.c:1437
-#: src/protocols/silc/silc.c:59
+#: ../src/protocols/silc/buddy.c:1475
+#: ../src/protocols/silc/silc.c:57
 msgid "Wake Me Up"
 msgstr "叫醒我!"
 
 #  XXX
-#: src/protocols/silc/buddy.c:1439
-#: src/protocols/silc/silc.c:51
+#: ../src/protocols/silc/buddy.c:1477
+#: ../src/protocols/silc/silc.c:49
 msgid "Hyper Active"
 msgstr "極度活躍"
 
-#: src/protocols/silc/buddy.c:1441
+#: ../src/protocols/silc/buddy.c:1479
 msgid "Robot"
 msgstr "機械人"
 
-#: src/protocols/silc/buddy.c:1448
-#: src/protocols/silc/silc.c:658
-#: src/protocols/silc/util.c:473
+#: ../src/protocols/silc/buddy.c:1486
+#: ../src/protocols/silc/silc.c:674
+#: ../src/protocols/silc/util.c:487
 msgid "Happy"
 msgstr "開心"
 
-#: src/protocols/silc/buddy.c:1450
-#: src/protocols/silc/silc.c:660
-#: src/protocols/silc/util.c:475
+#: ../src/protocols/silc/buddy.c:1488
+#: ../src/protocols/silc/silc.c:676
+#: ../src/protocols/silc/util.c:489
 msgid "Sad"
 msgstr "憂愁"
 
-#: src/protocols/silc/buddy.c:1452
-#: src/protocols/silc/silc.c:662
-#: src/protocols/silc/util.c:477
+#: ../src/protocols/silc/buddy.c:1490
+#: ../src/protocols/silc/silc.c:678
+#: ../src/protocols/silc/util.c:491
 msgid "Angry"
 msgstr "憤怒"
 
-#: src/protocols/silc/buddy.c:1454
-#: src/protocols/silc/silc.c:664
-#: src/protocols/silc/util.c:479
+#: ../src/protocols/silc/buddy.c:1492
+#: ../src/protocols/silc/silc.c:680
+#: ../src/protocols/silc/util.c:493
 msgid "Jealous"
 msgstr "嫉妒"
 
-#: src/protocols/silc/buddy.c:1456
-#: src/protocols/silc/silc.c:666
-#: src/protocols/silc/util.c:481
+#: ../src/protocols/silc/buddy.c:1494
+#: ../src/protocols/silc/silc.c:682
+#: ../src/protocols/silc/util.c:495
 msgid "Ashamed"
 msgstr "慚愧"
 
-#: src/protocols/silc/buddy.c:1458
-#: src/protocols/silc/silc.c:668
-#: src/protocols/silc/util.c:483
+#: ../src/protocols/silc/buddy.c:1496
+#: ../src/protocols/silc/silc.c:684
+#: ../src/protocols/silc/util.c:497
 msgid "Invincible"
 msgstr "無敵"
 
-#: src/protocols/silc/buddy.c:1460
-#: src/protocols/silc/silc.c:670
-#: src/protocols/silc/util.c:485
+#: ../src/protocols/silc/buddy.c:1498
+#: ../src/protocols/silc/util.c:499
 msgid "In Love"
 msgstr "戀愛中"
 
-#: src/protocols/silc/buddy.c:1462
-#: src/protocols/silc/silc.c:672
-#: src/protocols/silc/util.c:487
+#: ../src/protocols/silc/buddy.c:1500
+#: ../src/protocols/silc/silc.c:688
+#: ../src/protocols/silc/util.c:501
 msgid "Sleepy"
 msgstr "想睡"
 
-#: src/protocols/silc/buddy.c:1464
-#: src/protocols/silc/silc.c:674
-#: src/protocols/silc/util.c:489
+#: ../src/protocols/silc/buddy.c:1502
+#: ../src/protocols/silc/silc.c:690
+#: ../src/protocols/silc/util.c:503
 msgid "Bored"
 msgstr "發悶"
 
-#: src/protocols/silc/buddy.c:1466
-#: src/protocols/silc/silc.c:676
-#: src/protocols/silc/util.c:491
+#: ../src/protocols/silc/buddy.c:1504
+#: ../src/protocols/silc/silc.c:692
+#: ../src/protocols/silc/util.c:505
 msgid "Excited"
 msgstr "興奮"
 
-#: src/protocols/silc/buddy.c:1468
-#: src/protocols/silc/silc.c:678
-#: src/protocols/silc/util.c:493
+#: ../src/protocols/silc/buddy.c:1506
+#: ../src/protocols/silc/silc.c:694
+#: ../src/protocols/silc/util.c:507
 msgid "Anxious"
 msgstr "憂慮"
 
-#: src/protocols/silc/buddy.c:1500
-#: src/protocols/silc/ops.c:1196
+#: ../src/protocols/silc/buddy.c:1534
+#: ../src/protocols/silc/ops.c:1196
 msgid "User Modes"
 msgstr "使用者模式"
 
-#: src/protocols/silc/buddy.c:1509
-#: src/protocols/silc/ops.c:1205
+#: ../src/protocols/silc/buddy.c:1550
+#: ../src/protocols/silc/ops.c:1205
 msgid "Mood"
 msgstr "心情"
 
-#: src/protocols/silc/buddy.c:1513
-#: src/protocols/silc/ops.c:1211
-msgid "Status Text"
-msgstr "狀態訊息"
-
-#: src/protocols/silc/buddy.c:1518
-#: src/protocols/silc/ops.c:1217
+#: ../src/protocols/silc/buddy.c:1555
+#: ../src/protocols/silc/ops.c:1217
 msgid "Preferred Contact"
 msgstr "聯絡方法"
 
-#: src/protocols/silc/buddy.c:1523
-#: src/protocols/silc/ops.c:1222
+#: ../src/protocols/silc/buddy.c:1560
+#: ../src/protocols/silc/ops.c:1222
 msgid "Preferred Language"
 msgstr "選用語文"
 
-#: src/protocols/silc/buddy.c:1528
-#: src/protocols/silc/ops.c:1227
+#: ../src/protocols/silc/buddy.c:1565
+#: ../src/protocols/silc/ops.c:1227
 msgid "Device"
 msgstr "所用裝置"
 
-#: src/protocols/silc/buddy.c:1533
-#: src/protocols/silc/ops.c:1232
-#: src/protocols/silc/silc.c:726
-#: src/protocols/silc/silc.c:728
+#: ../src/protocols/silc/buddy.c:1570
+#: ../src/protocols/silc/ops.c:1232
+#: ../src/protocols/silc/silc.c:742
+#: ../src/protocols/silc/silc.c:744
 msgid "Timezone"
 msgstr "時區"
 
-#: src/protocols/silc/buddy.c:1538
-#: src/protocols/silc/ops.c:1237
+#: ../src/protocols/silc/buddy.c:1575
+#: ../src/protocols/silc/ops.c:1237
 msgid "Geolocation"
 msgstr "所在位置"
 
-#: src/protocols/silc/buddy.c:1594
+#: ../src/protocols/silc/buddy.c:1629
 msgid "Reset IM Key"
 msgstr "清除即時訊息密鑰"
 
-#: src/protocols/silc/buddy.c:1599
+#: ../src/protocols/silc/buddy.c:1635
 msgid "IM with Key Exchange"
 msgstr "要交換密鑰之即時訊息"
 
-#: src/protocols/silc/buddy.c:1603
+#: ../src/protocols/silc/buddy.c:1640
 msgid "IM with Password"
 msgstr "有密碼之即時訊息"
 
-#: src/protocols/silc/buddy.c:1615
+#: ../src/protocols/silc/buddy.c:1653
 msgid "Get Public Key..."
 msgstr "取得公鑰..."
 
-#: src/protocols/silc/buddy.c:1622
-#: src/protocols/silc/ops.c:1623
+#: ../src/protocols/silc/buddy.c:1660
+#: ../src/protocols/silc/ops.c:1623
 msgid "Kill User"
 msgstr "從網路上移除使用者"
 
-#: src/protocols/silc/buddy.c:1631
-#: src/protocols/silc/chat.c:971
+#: ../src/protocols/silc/buddy.c:1670
+#: ../src/protocols/silc/chat.c:972
 msgid "Draw On Whiteboard"
 msgstr "在白板上繪圖"
 
-#: src/protocols/silc/chat.c:39
+#: ../src/protocols/silc/chat.c:39
 msgid "_Passphrase:"
 msgstr "密碼(_P):"
 
-#: src/protocols/silc/chat.c:80
+#: ../src/protocols/silc/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "頻道 %s 不在網路上"
 
-#: src/protocols/silc/chat.c:81
-#: src/protocols/silc/chat.c:173
+#: ../src/protocols/silc/chat.c:81
+#: ../src/protocols/silc/chat.c:174
 msgid "Channel Information"
 msgstr "頻道資訊"
 
-#: src/protocols/silc/chat.c:82
+#: ../src/protocols/silc/chat.c:82
 msgid "Cannot get channel information"
 msgstr "無法取得頻道資訊"
 
-#: src/protocols/silc/chat.c:119
+#: ../src/protocols/silc/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>頻道名稱:</b>%s"
 
-#: src/protocols/silc/chat.c:122
+#: ../src/protocols/silc/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>使用者人數:</b>%d"
 
-#: src/protocols/silc/chat.c:129
+#: ../src/protocols/silc/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>頻道創立者:</b>%s"
 
-#: src/protocols/silc/chat.c:138
+#: ../src/protocols/silc/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>頻道加密方式 (Cipher):</b>%s"
 
-#: src/protocols/silc/chat.c:141
+#. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
+#: ../src/protocols/silc/chat.c:142
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>頻道身份驗證代碼 (HMAC):</b>%s"
 
-#: src/protocols/silc/chat.c:146
+#: ../src/protocols/silc/chat.c:147
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>頻道主題:</b><br>%s"
 
-#: src/protocols/silc/chat.c:151
+#: ../src/protocols/silc/chat.c:152
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>頻道模式:</b>"
 
-#: src/protocols/silc/chat.c:164
+#: ../src/protocols/silc/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>創立者之公鑰指紋:</b><br>%s"
 
-#: src/protocols/silc/chat.c:165
+#: ../src/protocols/silc/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>創立者之公鑰指紋可讀版本 (Babbleprint):</b><br>%s"
 
-#: src/protocols/silc/chat.c:235
+#: ../src/protocols/silc/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "新增頻道公鑰"
 
 #. Add new public key
-#: src/protocols/silc/chat.c:290
+#: ../src/protocols/silc/chat.c:291
 msgid "Open Public Key..."
 msgstr "開啟公鑰..."
 
-#: src/protocols/silc/chat.c:399
+#: ../src/protocols/silc/chat.c:400
 msgid "Channel Passphrase"
 msgstr "頻道密碼"
 
-#: src/protocols/silc/chat.c:406
+#: ../src/protocols/silc/chat.c:407
 msgid "Channel Public Keys List"
 msgstr "頻道公鑰清單"
 
-#: src/protocols/silc/chat.c:411
+#: ../src/protocols/silc/chat.c:412
 msgid "Channel authentication is used to secure the channel from unauthorized access. The authentication may be based on passphrase and digital signatures. If passphrase is set, it is required to be able to join. If channel public keys are set then only users whose public keys are listed are able to join."
 msgstr "頻道認證是用來防止頻道未經授權而被存取,認證的方法可以是透過密碼或者透過數位簽章。如果設定了密碼,加入頻道就必須事先輸入密碼;如果設定了頻道公鑰,加入頻道就必須擁有所列公鑰內之其一。"
 
 #  XXX 暫譯
-#: src/protocols/silc/chat.c:420
-#: src/protocols/silc/chat.c:421
-#: src/protocols/silc/chat.c:458
-#: src/protocols/silc/chat.c:459
-#: src/protocols/silc/chat.c:905
+#: ../src/protocols/silc/chat.c:421
+#: ../src/protocols/silc/chat.c:422
+#: ../src/protocols/silc/chat.c:459
+#: ../src/protocols/silc/chat.c:460
+#: ../src/protocols/silc/chat.c:906
 msgid "Channel Authentication"
 msgstr "頻道認證"
 
-#: src/protocols/silc/chat.c:422
-#: src/protocols/silc/chat.c:460
+#: ../src/protocols/silc/chat.c:423
+#: ../src/protocols/silc/chat.c:461
 msgid "Add / Remove"
 msgstr "新增/移除"
 
 # XXX may be wrong
-#: src/protocols/silc/chat.c:577
+#: ../src/protocols/silc/chat.c:578
 msgid "Group Name"
 msgstr "聊天室名稱"
 
-#: src/protocols/silc/chat.c:581
-#: src/protocols/silc/ops.c:1908
-#: src/protocols/silc/silc.c:934
+#: ../src/protocols/silc/chat.c:582
+#: ../src/protocols/silc/ops.c:1908
+#: ../src/protocols/silc/silc.c:950
 msgid "Passphrase"
 msgstr "密碼"
 
-#: src/protocols/silc/chat.c:592
+#: ../src/protocols/silc/chat.c:593
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "請您給頻道 %s 內的小圈子輸入名稱及密碼。"
 
-#: src/protocols/silc/chat.c:594
+#: ../src/protocols/silc/chat.c:595
 msgid "Add Channel Private Group"
 msgstr "新增頻道小圈子"
 
 # XXX may be wrong
-#: src/protocols/silc/chat.c:721
+#: ../src/protocols/silc/chat.c:722
 msgid "User Limit"
 msgstr "使用者數目上限"
 
-#: src/protocols/silc/chat.c:722
+#: ../src/protocols/silc/chat.c:723
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr "設定使用者數目上限;要清除使用者數目上限,輸入零即可。"
 
-#: src/protocols/silc/chat.c:877
+#: ../src/protocols/silc/chat.c:878
 msgid "Get Info"
 msgstr "取得資訊"
 
-#: src/protocols/silc/chat.c:885
+#: ../src/protocols/silc/chat.c:886
 msgid "Invite List"
 msgstr "邀請清單"
 
 #  XXX 暫譯
-#: src/protocols/silc/chat.c:890
+#: ../src/protocols/silc/chat.c:891
 msgid "Ban List"
 msgstr "禁止清單"
 
-#: src/protocols/silc/chat.c:898
+#: ../src/protocols/silc/chat.c:899
 msgid "Add Private Group"
 msgstr "新增小圈子"
 
-#: src/protocols/silc/chat.c:911
+#: ../src/protocols/silc/chat.c:912
 msgid "Reset Permanent"
 msgstr "清除永久性頻道模式"
 
-#: src/protocols/silc/chat.c:916
+#: ../src/protocols/silc/chat.c:917
 msgid "Set Permanent"
 msgstr "設定永久性頻道模式"
 
 #  XXX may be wrong
-#: src/protocols/silc/chat.c:924
+#: ../src/protocols/silc/chat.c:925
 msgid "Set User Limit"
 msgstr "設定使用者數目上限"
 
-#: src/protocols/silc/chat.c:930
+#: ../src/protocols/silc/chat.c:931
 msgid "Reset Topic Restriction"
 msgstr "清除主題限制"
 
-#: src/protocols/silc/chat.c:935
+#: ../src/protocols/silc/chat.c:936
 msgid "Set Topic Restriction"
 msgstr "設定主題限制"
 
-#: src/protocols/silc/chat.c:942
+#: ../src/protocols/silc/chat.c:943
 msgid "Reset Private Channel"
 msgstr "清除私用頻道模式"
 
-#: src/protocols/silc/chat.c:947
+#: ../src/protocols/silc/chat.c:948
 msgid "Set Private Channel"
 msgstr "設定私用頻道模式"
 
-#: src/protocols/silc/chat.c:954
+#: ../src/protocols/silc/chat.c:955
 msgid "Reset Secret Channel"
 msgstr "清除秘密頻道模式"
 
-#: src/protocols/silc/chat.c:959
+#: ../src/protocols/silc/chat.c:960
 msgid "Set Secret Channel"
 msgstr "設定秘密頻道模式"
 
 #  XXX 暫譯
-#: src/protocols/silc/chat.c:1032
+#: ../src/protocols/silc/chat.c:1034
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "您是 <I>%s</I> 的頻道創立者"
 
-#: src/protocols/silc/chat.c:1036
+#: ../src/protocols/silc/chat.c:1038
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "<I>%s</I> 的頻道創立者為 <I>%s</I>"
 
-#: src/protocols/silc/chat.c:1095
+#: ../src/protocols/silc/chat.c:1097
 #, c-format
 msgid "You have to join the %s channel before you are able to join the private group"
 msgstr "加入小圈子前,您必須首先加入頻道 %s"
 
-#: src/protocols/silc/chat.c:1097
+#: ../src/protocols/silc/chat.c:1099
 msgid "Join Private Group"
 msgstr "加入小圈子"
 
-#: src/protocols/silc/chat.c:1098
+#: ../src/protocols/silc/chat.c:1100
 msgid "Cannot join private group"
 msgstr "無法加入小圈子"
 
-#: src/protocols/silc/chat.c:1292
-#: src/protocols/silc/silc.c:1142
+#: ../src/protocols/silc/chat.c:1294
+#: ../src/protocols/silc/silc.c:1158
+msgid "Call Command"
+msgstr "呼叫指令"
+
+#: ../src/protocols/silc/chat.c:1294
+#: ../src/protocols/silc/silc.c:1158
 msgid "Cannot call command"
 msgstr "無法執行指令"
 
-#: src/protocols/silc/chat.c:1293
-#: src/protocols/silc/silc.c:1143
+#: ../src/protocols/silc/chat.c:1295
+#: ../src/protocols/silc/silc.c:1159
 msgid "Unknown command"
 msgstr "未知的指令"
 
 #  NOTE 這些都是視窗標題
-#: src/protocols/silc/ft.c:89
-#: src/protocols/silc/ft.c:92
-#: src/protocols/silc/ft.c:96
-#: src/protocols/silc/ft.c:100
-#: src/protocols/silc/ft.c:104
-#: src/protocols/silc/ft.c:205
-#: src/protocols/silc/ft.c:210
-#: src/protocols/silc/ft.c:215
-#: src/protocols/silc/ft.c:221
-#: src/protocols/silc/ft.c:340
+#: ../src/protocols/silc/ft.c:89
+#: ../src/protocols/silc/ft.c:92
+#: ../src/protocols/silc/ft.c:96
+#: ../src/protocols/silc/ft.c:100
+#: ../src/protocols/silc/ft.c:104
+#: ../src/protocols/silc/ft.c:205
+#: ../src/protocols/silc/ft.c:210
+#: ../src/protocols/silc/ft.c:215
+#: ../src/protocols/silc/ft.c:221
+#: ../src/protocols/silc/ft.c:340
 msgid "Secure File Transfer"
 msgstr "安全的檔案傳輸"
 
-#: src/protocols/silc/ft.c:90
-#: src/protocols/silc/ft.c:93
-#: src/protocols/silc/ft.c:97
-#: src/protocols/silc/ft.c:101
-#: src/protocols/silc/ft.c:105
+#: ../src/protocols/silc/ft.c:90
+#: ../src/protocols/silc/ft.c:93
+#: ../src/protocols/silc/ft.c:97
+#: ../src/protocols/silc/ft.c:101
+#: ../src/protocols/silc/ft.c:105
 msgid "Error during file transfer"
 msgstr "檔案傳輸時發生錯誤"
 
-#: src/protocols/silc/ft.c:94
+#: ../src/protocols/silc/ft.c:94
 msgid "Permission denied"
 msgstr "拒絕不符權限的操作"
 
-#: src/protocols/silc/ft.c:98
+#: ../src/protocols/silc/ft.c:98
 msgid "Key agreement failed"
 msgstr "交換密鑰失敗"
 
-#: src/protocols/silc/ft.c:102
+#: ../src/protocols/silc/ft.c:102
 msgid "File transfer session does not exist"
 msgstr "檔案傳輸工作階段不存在"
 
-#: src/protocols/silc/ft.c:206
+#: ../src/protocols/silc/ft.c:206
 msgid "No file transfer session active"
 msgstr "沒有進行中的檔案傳輸工作階段"
 
-#: src/protocols/silc/ft.c:211
+#: ../src/protocols/silc/ft.c:211
 msgid "File transfer already started"
 msgstr "檔案傳輸已開始"
 
-#: src/protocols/silc/ft.c:216
+#: ../src/protocols/silc/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr "無法交換密鑰以供傳輸"
 
-#: src/protocols/silc/ft.c:222
+#: ../src/protocols/silc/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "無法開始檔案傳輸"
 
-#: src/protocols/silc/ft.c:341
+#: ../src/protocols/silc/ft.c:341
 msgid "Cannot send file"
 msgstr "無法傳送檔案"
 
-#: src/protocols/silc/ops.c:555
-#: src/protocols/silc/ops.c:564
-#: src/protocols/silc/ops.c:573
+#: ../src/protocols/silc/ops.c:555
+#: ../src/protocols/silc/ops.c:564
+#: ../src/protocols/silc/ops.c:573
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s 把 <I>%s</I> 的聊天主題修改為:%s"
 
-#: src/protocols/silc/ops.c:639
+#: ../src/protocols/silc/ops.c:639
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> 設定頻道 <I>%s</I> 的模式為:%s"
 
-#: src/protocols/silc/ops.c:643
+#: ../src/protocols/silc/ops.c:643
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> 清除了頻道 <I>%s</I> 所有的模式"
 
-#: src/protocols/silc/ops.c:676
+#: ../src/protocols/silc/ops.c:676
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> 設定 <I>%s</I> 的使用者模式為:%s"
 
-#: src/protocols/silc/ops.c:684
+#: ../src/protocols/silc/ops.c:684
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> 清除了 <I>%s's</I> 所有的模式"
 
-#: src/protocols/silc/ops.c:713
+#: ../src/protocols/silc/ops.c:713
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "您被 <I>%2$s</I> 由 <I>%1$s</I> 踢出 (%3$s)"
 
-#: src/protocols/silc/ops.c:743
-#: src/protocols/silc/ops.c:748
-#: src/protocols/silc/ops.c:753
+#: ../src/protocols/silc/ops.c:743
+#: ../src/protocols/silc/ops.c:748
+#: ../src/protocols/silc/ops.c:753
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "您被 %s 從網路上移除 (%s)"
 
-#: src/protocols/silc/ops.c:774
-#: src/protocols/silc/ops.c:779
-#: src/protocols/silc/ops.c:784
+#: ../src/protocols/silc/ops.c:774
+#: ../src/protocols/silc/ops.c:779
+#: ../src/protocols/silc/ops.c:784
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "被 %s 從網路上移除 (%s)"
 
 #  XXX 要核實
-#: src/protocols/silc/ops.c:830
+#: ../src/protocols/silc/ops.c:830
 msgid "Server signoff"
 msgstr "從伺服器登出"
 
-#: src/protocols/silc/ops.c:1017
+#: ../src/protocols/silc/ops.c:1017
 msgid "Personal Information"
 msgstr "個人資訊"
 
-#: src/protocols/silc/ops.c:1040
+#: ../src/protocols/silc/ops.c:1040
 msgid "Birth Day"
 msgstr "生日"
 
-#: src/protocols/silc/ops.c:1044
-msgid "Job Title"
-msgstr "職銜"
-
-#: src/protocols/silc/ops.c:1048
+#: ../src/protocols/silc/ops.c:1048
 msgid "Job Role"
 msgstr "職責"
 
-#: src/protocols/silc/ops.c:1052
-#: src/protocols/silc/silc.c:927
+#: ../src/protocols/silc/ops.c:1052
+#: ../src/protocols/silc/silc.c:943
 msgid "Organization"
 msgstr "所屬機構"
 
-#: src/protocols/silc/ops.c:1056
+#: ../src/protocols/silc/ops.c:1056
 msgid "Unit"
 msgstr "部門"
 
-#: src/protocols/silc/ops.c:1075
-msgid "EMail"
-msgstr "電子郵件"
-
-#: src/protocols/silc/ops.c:1080
+#: ../src/protocols/silc/ops.c:1080
 msgid "Note"
 msgstr "備註"
 
-#: src/protocols/silc/ops.c:1128
+#: ../src/protocols/silc/ops.c:1128
 msgid "Join Chat"
 msgstr "加入聊天室"
 
-#: src/protocols/silc/ops.c:1284
-#: src/protocols/silc/ops.c:1354
+#: ../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 "狀態訊息"
+
+#: ../src/protocols/silc/ops.c:1284
+#: ../src/protocols/silc/ops.c:1354
 msgid "Public Key Fingerprint"
 msgstr "公鑰指紋"
 
-#: src/protocols/silc/ops.c:1285
-#: src/protocols/silc/ops.c:1355
+#: ../src/protocols/silc/ops.c:1285
+#: ../src/protocols/silc/ops.c:1355
 msgid "Public Key Babbleprint"
 msgstr "公鑰指紋可讀版本 (Babbleprint)"
 
-#: src/protocols/silc/ops.c:1298
-msgid "More..."
-msgstr "顯示細節..."
-
-#: src/protocols/silc/ops.c:1369
-#: src/protocols/silc/silc.c:993
+#: ../src/protocols/silc/ops.c:1298
+msgid "_More..."
+msgstr "更多(_M)..."
+
+#: ../src/protocols/silc/ops.c:1369
+#: ../src/protocols/silc/silc.c:1009
 msgid "Detach From Server"
 msgstr "與伺服器暫停連線"
 
-#: src/protocols/silc/ops.c:1369
+#: ../src/protocols/silc/ops.c:1369
 msgid "Cannot detach"
 msgstr "無法暫停連線"
 
-#: src/protocols/silc/ops.c:1380
+#: ../src/protocols/silc/ops.c:1380
 msgid "Cannot set topic"
 msgstr "無法設定主題"
 
-#: src/protocols/silc/ops.c:1412
+#: ../src/protocols/silc/ops.c:1412
 msgid "Failed to change nickname"
 msgstr "無法更改暱稱"
 
-#: src/protocols/silc/ops.c:1460
+#: ../src/protocols/silc/ops.c:1460
 msgid "Roomlist"
 msgstr "聊天室清單"
 
-#: src/protocols/silc/ops.c:1460
+#: ../src/protocols/silc/ops.c:1460
 msgid "Cannot get room list"
 msgstr "無法取得聊天室清單"
 
-#: src/protocols/silc/ops.c:1505
+#: ../src/protocols/silc/ops.c:1505
 msgid "No public key was received"
 msgstr "沒有收到公鑰"
 
-#: src/protocols/silc/ops.c:1518
-#: src/protocols/silc/ops.c:1531
+#: ../src/protocols/silc/ops.c:1518
+#: ../src/protocols/silc/ops.c:1531
 msgid "Server Information"
 msgstr "伺服器資訊"
 
-#: src/protocols/silc/ops.c:1519
+#: ../src/protocols/silc/ops.c:1519
 msgid "Cannot get server information"
 msgstr "無法取得伺服器資訊"
 
-#: src/protocols/silc/ops.c:1548
-#: src/protocols/silc/ops.c:1557
+#: ../src/protocols/silc/ops.c:1548
+#: ../src/protocols/silc/ops.c:1557
 msgid "Server Statistics"
 msgstr "伺服器統計資料"
 
-#: src/protocols/silc/ops.c:1549
+#: ../src/protocols/silc/ops.c:1549
 msgid "Cannot get server statistics"
 msgstr "無法取得伺服器的統計資料"
 
-#: src/protocols/silc/ops.c:1558
+#: ../src/protocols/silc/ops.c:1558
 msgid "No server statistics available"
 msgstr "伺服器沒有統計資料"
 
-#: src/protocols/silc/ops.c:1580
+#: ../src/protocols/silc/ops.c:1580
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -11061,114 +11588,114 @@
 "伺服器管理者總數:%d 人\n"
 "路由器管理者總數:%d 人\n"
 
-#: src/protocols/silc/ops.c:1603
+#: ../src/protocols/silc/ops.c:1603
 msgid "Network Statistics"
 msgstr "網路統計資料"
 
-#: src/protocols/silc/ops.c:1611
-#: src/protocols/silc/ops.c:1616
+#: ../src/protocols/silc/ops.c:1611
+#: ../src/protocols/silc/ops.c:1616
 msgid "Ping"
 msgstr "Ping"
 
-#: src/protocols/silc/ops.c:1611
+#: ../src/protocols/silc/ops.c:1611
 msgid "Ping failed"
 msgstr "Ping 失敗"
 
-#: src/protocols/silc/ops.c:1616
+#: ../src/protocols/silc/ops.c:1616
 msgid "Ping reply received from server"
 msgstr "由伺服器收到 Ping 回應"
 
-#: src/protocols/silc/ops.c:1624
+#: ../src/protocols/silc/ops.c:1624
 msgid "Could not kill user"
 msgstr "無法傱網路上移除使用者"
 
-#: src/protocols/silc/ops.c:1708
+#: ../src/protocols/silc/ops.c:1708
 msgid "Error during connecting to SILC Server"
 msgstr "連線至 SILC 伺服器時發生錯誤"
 
-#: src/protocols/silc/ops.c:1713
+#: ../src/protocols/silc/ops.c:1713
 msgid "Key Exchange failed"
 msgstr "密鑰交換失敗"
 
-#: src/protocols/silc/ops.c:1722
+#: ../src/protocols/silc/ops.c:1722
 msgid "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr "恢復連線失敗,請按「重新連線」建立新的連線。"
 
-#: src/protocols/silc/ops.c:1757
+#: ../src/protocols/silc/ops.c:1757
 msgid "Disconnected by server"
 msgstr "伺服器中斷了連線"
 
-#: src/protocols/silc/ops.c:1819
-#: src/protocols/silc/ops.c:1866
-#: src/protocols/silc/silc.c:195
+#: ../src/protocols/silc/ops.c:1819
+#: ../src/protocols/silc/ops.c:1866
+#: ../src/protocols/silc/silc.c:195
 msgid "Resuming session"
 msgstr "恢復工作階段中"
 
-#: src/protocols/silc/ops.c:1821
+#: ../src/protocols/silc/ops.c:1821
 msgid "Authenticating connection"
 msgstr "為連線進行驗證中"
 
-#: src/protocols/silc/ops.c:1868
+#: ../src/protocols/silc/ops.c:1868
 msgid "Verifying server public key"
 msgstr "核實伺服器的公鑰中"
 
-#: src/protocols/silc/ops.c:1909
+#: ../src/protocols/silc/ops.c:1909
 msgid "Passphrase required"
 msgstr "必須輸入密碼"
 
-#: src/protocols/silc/ops.c:1938
+#: ../src/protocols/silc/ops.c:1938
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "失敗:版本不符,請更新您的用戶端程式"
 
-#: src/protocols/silc/ops.c:1941
+#: ../src/protocols/silc/ops.c:1941
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "失敗:遠端不信任/不支援您的公鑰"
 
-#: src/protocols/silc/ops.c:1944
+#: ../src/protocols/silc/ops.c:1944
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "失敗:遠端不支援建議中的密鑰交換群組 (KE group)"
 
-#: src/protocols/silc/ops.c:1947
+#: ../src/protocols/silc/ops.c:1947
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "失敗:遠端不支援建議中的加密方式 (cipher)"
 
 #  NOTE 譯文源自 http://www.nii.org.tw/cnt/info/Report/19980906.htm
-#: src/protocols/silc/ops.c:1950
+#: ../src/protocols/silc/ops.c:1950
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "失敗:遠端不支援建議中的公開鑰匙證書標準 (PKCS)"
 
-#: src/protocols/silc/ops.c:1953
+#: ../src/protocols/silc/ops.c:1953
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "失敗:遠端不支援建議中的雜湊函數 (hash function)"
 
 #  NOTE 譯文源自 http://www.cert.org.tw/document/column/show.php?key=28
-#: src/protocols/silc/ops.c:1956
+#: ../src/protocols/silc/ops.c:1956
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "失敗:遠端不支援建議中的身份驗證代碼 (HMAC)"
 
-#: src/protocols/silc/ops.c:1958
+#: ../src/protocols/silc/ops.c:1958
 msgid "Failure: Incorrect signature"
 msgstr "失敗:錯誤的簽章"
 
-#: src/protocols/silc/ops.c:1960
+#: ../src/protocols/silc/ops.c:1960
 msgid "Failure: Invalid cookie"
 msgstr "失敗:無效的 Cookie"
 
-#: src/protocols/silc/ops.c:1971
+#: ../src/protocols/silc/ops.c:1971
 msgid "Failure: Authentication failed"
 msgstr "失敗:認證失敗"
 
-#: src/protocols/silc/pk.c:103
+#: ../src/protocols/silc/pk.c:103
 #, c-format
 msgid "Received %s's public key. Your local copy does not match this key. Would you still like to accept this public key?"
 msgstr "收到 %s 的公鑰,但收到的公鑰跟您現有的不同。仍然接受這個公鑰嗎?"
 
-#: src/protocols/silc/pk.c:108
+#: ../src/protocols/silc/pk.c:108
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr "收到 %s 的公鑰,接受這個公鑰嗎?"
 
-#: src/protocols/silc/pk.c:112
+#: ../src/protocols/silc/pk.c:112
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -11181,49 +11708,66 @@
 "%s\n"
 "%s\n"
 
-#: src/protocols/silc/pk.c:115
-#: src/protocols/silc/pk.c:140
+#: ../src/protocols/silc/pk.c:115
+#: ../src/protocols/silc/pk.c:140
 msgid "Verify Public Key"
 msgstr "核實公鑰"
 
-#: src/protocols/silc/pk.c:119
-msgid "View..."
-msgstr "檢視..."
-
-#: src/protocols/silc/pk.c:141
+#: ../src/protocols/silc/pk.c:119
+msgid "_View..."
+msgstr "檢視(_V)..."
+
+#: ../src/protocols/silc/pk.c:141
 msgid "Unsupported public key type"
 msgstr "不支援的公鑰類型"
 
-#: src/protocols/silc/silc.c:155
+#: ../src/protocols/silc/silc.c:162
 msgid "Connection failed"
 msgstr "連線失敗"
 
-#: src/protocols/silc/silc.c:187
+#: ../src/protocols/silc/silc.c:187
 msgid "Cannot initialize SILC Client connection"
 msgstr "無法初始化 SILC 的用戶端連線"
 
-#: src/protocols/silc/silc.c:198
+#: ../src/protocols/silc/silc.c:198
 msgid "Performing key exchange"
 msgstr "交換密鑰中"
 
-#: src/protocols/silc/silc.c:273
+#: ../src/protocols/silc/silc.c:284
 msgid "Out of memory"
 msgstr "記憶體不夠"
 
+#: ../src/protocols/silc/silc.c:330
+msgid "Cannot initialize SILC protocol"
+msgstr "無法初始化 SILC 協定"
+
+#: ../src/protocols/silc/silc.c:337
+msgid "Cannot find/access ~/.silc directory"
+msgstr "無法找到或存取 ~/.silc 目錄"
+
 #. Progress
-#: src/protocols/silc/silc.c:326
+#: ../src/protocols/silc/silc.c:342
 msgid "Connecting to SILC Server"
 msgstr "連線至 SILC 伺服器中"
 
-#: src/protocols/silc/silc.c:654
+#: ../src/protocols/silc/silc.c:351
+#, c-format
+msgid "Could not load SILC key pair: %s"
+msgstr "無法讀取 SILC 密鑰對:%s"
+
+#: ../src/protocols/silc/silc.c:371
+msgid "Unable to create connection"
+msgstr "無法建立連結"
+
+#: ../src/protocols/silc/silc.c:670
 msgid "Your Current Mood"
 msgstr "您目前的心情"
 
-#: src/protocols/silc/silc.c:656
-msgid "Normal"
-msgstr "正常"
-
-#: src/protocols/silc/silc.c:681
+#: ../src/protocols/silc/silc.c:686
+msgid "In love"
+msgstr "戀愛中"
+
+#: ../src/protocols/silc/silc.c:697
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -11231,269 +11775,264 @@
 "\n"
 "聯絡方法"
 
-#: src/protocols/silc/silc.c:689
-#: src/protocols/silc/util.c:518
+#: ../src/protocols/silc/silc.c:705
+#: ../src/protocols/silc/util.c:532
 msgid "SMS"
 msgstr "SMS"
 
-#: src/protocols/silc/silc.c:691
-#: src/protocols/silc/util.c:520
+#: ../src/protocols/silc/silc.c:707
+#: ../src/protocols/silc/util.c:534
 msgid "MMS"
 msgstr "MMS"
 
-#: src/protocols/silc/silc.c:693
-#: src/protocols/silc/util.c:522
-msgid "Video Conferencing"
-msgstr "視像會議"
-
-#: src/protocols/silc/silc.c:698
+#: ../src/protocols/silc/silc.c:709
+msgid "Video conferencing"
+msgstr "視訊會議中"
+
+#: ../src/protocols/silc/silc.c:714
 msgid "Your Current Status"
 msgstr "目前狀態"
 
 #  XXX 暫譯
-#: src/protocols/silc/silc.c:705
+#: ../src/protocols/silc/silc.c:721
 msgid "Online Services"
 msgstr "所用之線上服務"
 
-#: src/protocols/silc/silc.c:708
+#: ../src/protocols/silc/silc.c:724
 msgid "Let others see what services you are using"
 msgstr "讓他人可以得知您使用那些線上服務"
 
 #  NOTE XXX 原始碼顯示這個其實不是電腦類型,而是操作系統版本 :-/
-#: src/protocols/silc/silc.c:714
+#: ../src/protocols/silc/silc.c:730
 msgid "Let others see what computer you are using"
 msgstr "容許別人查看您用的是什麼電腦"
 
-#: src/protocols/silc/silc.c:721
+#: ../src/protocols/silc/silc.c:737
 msgid "Your VCard File"
 msgstr "您的 VCard 檔案"
 
 #  XXX 好像很怪
-#: src/protocols/silc/silc.c:733
-#: src/protocols/silc/silc.c:734
+#: ../src/protocols/silc/silc.c:749
+#: ../src/protocols/silc/silc.c:750
 msgid "User Online Status Attributes"
 msgstr "使用者上線狀態屬性"
 
-#: src/protocols/silc/silc.c:735
+#: ../src/protocols/silc/silc.c:751
 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 about yourself."
 msgstr "您可以給其他使用者看見您的上線狀態及個人資訊。有關您的資訊,只須輸入您希望別人看得見的各項。"
 
-#: src/protocols/silc/silc.c:775
-#: src/protocols/silc/silc.c:781
-#: src/protocols/silc/silc.c:1421
+#: ../src/protocols/silc/silc.c:791
+#: ../src/protocols/silc/silc.c:797
+#: ../src/protocols/silc/silc.c:1436
 msgid "Message of the Day"
 msgstr "是日訊息"
 
-#: src/protocols/silc/silc.c:775
+#: ../src/protocols/silc/silc.c:791
 msgid "No Message of the Day available"
 msgstr "沒有是日訊息"
 
-#: src/protocols/silc/silc.c:776
-#: src/protocols/silc/silc.c:1416
+#: ../src/protocols/silc/silc.c:792
+#: ../src/protocols/silc/silc.c:1431
 msgid "There is no Message of the Day associated with this connection"
 msgstr "這個連結沒有相關的是日訊息"
 
-#: src/protocols/silc/silc.c:827
-#: src/protocols/silc/silc.c:871
-#: src/protocols/silc/silc.c:942
-#: src/protocols/silc/silc.c:943
+#: ../src/protocols/silc/silc.c:843
+#: ../src/protocols/silc/silc.c:887
+#: ../src/protocols/silc/silc.c:958
+#: ../src/protocols/silc/silc.c:959
 msgid "Create New SILC Key Pair"
 msgstr "產生新的 SILC 密錀對"
 
-#: src/protocols/silc/silc.c:827
+#: ../src/protocols/silc/silc.c:843
 msgid "Passphrases do not match"
 msgstr "密碼不符"
 
-#: src/protocols/silc/silc.c:871
+#: ../src/protocols/silc/silc.c:887
 msgid "Key Pair Generation failed"
 msgstr "密鑰對產生失敗"
 
-#: src/protocols/silc/silc.c:910
+#: ../src/protocols/silc/silc.c:926
 msgid "Key length"
 msgstr "密鑰長度"
 
-#: src/protocols/silc/silc.c:912
+#: ../src/protocols/silc/silc.c:928
 msgid "Public key file"
 msgstr "公鑰檔案"
 
-#: src/protocols/silc/silc.c:914
+#: ../src/protocols/silc/silc.c:930
 msgid "Private key file"
 msgstr "私鑰檔案"
 
-#: src/protocols/silc/silc.c:923
-msgid "Real Name"
-msgstr "姓名"
-
-#: src/protocols/silc/silc.c:937
-msgid "Re-type Passphrase"
-msgstr "再次輸入密碼"
-
-#: src/protocols/silc/silc.c:944
+#: ../src/protocols/silc/silc.c:953
+msgid "Passphrase (retype)"
+msgstr "密碼(再次輸入)"
+
+#: ../src/protocols/silc/silc.c:960
 msgid "Generate Key Pair"
 msgstr "產生密鑰對"
 
-#: src/protocols/silc/silc.c:988
+#: ../src/protocols/silc/silc.c:1004
 msgid "Online Status"
 msgstr "上線狀態"
 
-#: src/protocols/silc/silc.c:997
+#: ../src/protocols/silc/silc.c:1013
 msgid "View Message of the Day"
 msgstr "顯示是日訊息 (MOTD)"
 
-#: src/protocols/silc/silc.c:1001
+#: ../src/protocols/silc/silc.c:1017
 msgid "Create SILC Key Pair..."
 msgstr "產生 SILC 密鑰對..."
 
-#: src/protocols/silc/silc.c:1100
+#: ../src/protocols/silc/silc.c:1116
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "使用者 <I>%s</I> 不在網路上"
 
-#: src/protocols/silc/silc.c:1292
+#: ../src/protocols/silc/silc.c:1307
 msgid "Topic too long"
 msgstr "聊天主題過長"
 
-#: src/protocols/silc/silc.c:1373
+#: ../src/protocols/silc/silc.c:1388
 msgid "You must specify a nick"
 msgstr "必須指定暱稱"
 
-#: src/protocols/silc/silc.c:1475
+#: ../src/protocols/silc/silc.c:1490
 #, c-format
 msgid "channel %s not found"
 msgstr "找不到會議 %s"
 
-#: src/protocols/silc/silc.c:1480
+#: ../src/protocols/silc/silc.c:1495
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "%s 的頻道模式為:%s"
 
-#: src/protocols/silc/silc.c:1482
+#: ../src/protocols/silc/silc.c:1497
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "%s 沒有設定頻道模式"
 
-#: src/protocols/silc/silc.c:1495
+#: ../src/protocols/silc/silc.c:1510
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "無法為 %s 設定頻道模式"
 
-#: src/protocols/silc/silc.c:1525
+#: ../src/protocols/silc/silc.c:1540
 #, c-format
 msgid "Unknown command: %s, (may be a Gaim bug)"
 msgstr "未知的指令:%s(可能是 Gaim 的錯誤)"
 
-#: src/protocols/silc/silc.c:1588
+#: ../src/protocols/silc/silc.c:1603
 msgid "part [channel]:  Leave the chat"
 msgstr "part [頻道]:離開聊天室"
 
-#: src/protocols/silc/silc.c:1592
+#: ../src/protocols/silc/silc.c:1607
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [頻道]:離開聊天室"
 
-#: src/protocols/silc/silc.c:1596
+#: ../src/protocols/silc/silc.c:1611
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;新主題&gt;]:檢視或修改聊天主題"
 
-#: src/protocols/silc/silc.c:1601
+#: ../src/protocols/silc/silc.c:1616
 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:1605
+#: ../src/protocols/silc/silc.c:1620
 msgid "list:  List channels on this network"
 msgstr "list:列出目前在網絡上的聊天室清單"
 
-#: src/protocols/silc/silc.c:1609
+#: ../src/protocols/silc/silc.c:1624
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;暱稱&gt;:查看這個暱稱的相關資訊"
 
-#: src/protocols/silc/silc.c:1613
-#: src/protocols/zephyr/zephyr.c:2598
+#: ../src/protocols/silc/silc.c:1628
+#: ../src/protocols/zephyr/zephyr.c:2629
 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:1617
+#: ../src/protocols/silc/silc.c:1632
 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:1621
+#: ../src/protocols/silc/silc.c:1636
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:顯示伺服器的是日訊息 (MOTD)"
 
-#: src/protocols/silc/silc.c:1625
+#: ../src/protocols/silc/silc.c:1640
 msgid "detach:  Detach this session"
 msgstr "detach:暫停連線這個工作階段"
 
-#: src/protocols/silc/silc.c:1629
+#: ../src/protocols/silc/silc.c:1644
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [訊息]:自伺服器離線,並可選擇送出指定的訊息"
 
-#: src/protocols/silc/silc.c:1633
+#: ../src/protocols/silc/silc.c:1648
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;指令&gt;:執行 SILC 指定的用戶端指令"
 
-#: src/protocols/silc/silc.c:1639
+#: ../src/protocols/silc/silc.c:1654
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;暱稱&gt; [-pubkey|&lt;理由&gt;]:從網路上移除暱稱"
 
-#: src/protocols/silc/silc.c:1643
+#: ../src/protocols/silc/silc.c:1658
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;新暱稱&gt;:改變您的暱稱"
 
-#: src/protocols/silc/silc.c:1647
+#: ../src/protocols/silc/silc.c:1662
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;暱稱&gt;:查看暱稱的相關資訊"
 
-#: src/protocols/silc/silc.c:1651
+#: ../src/protocols/silc/silc.c:1666
 msgid "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display channel modes"
 msgstr "cmode &lt;頻道&gt; [+|-&lt;模式&gt;]; [參數]:設定或顯示頻道模式"
 
-#: src/protocols/silc/silc.c:1655
+#: ../src/protocols/silc/silc.c:1670
 msgid "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes on channel"
 msgstr "cumode &lt;頻道&gt; +|-&lt;模式&gt; &lt;暱稱&gt;:在指定頻道修改指定的暱稱的模式"
 
-#: src/protocols/silc/silc.c:1659
+#: ../src/protocols/silc/silc.c:1674
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;使用者模式&gt;:設定您在網路上的模式"
 
-#: src/protocols/silc/silc.c:1663
+#: ../src/protocols/silc/silc.c:1678
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;暱稱&gt; [-pubkey]:取得伺服器管理者的權限"
 
-#: src/protocols/silc/silc.c:1667
+#: ../src/protocols/silc/silc.c:1682
 msgid "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from channel invite list"
 msgstr "invite &lt;頻道&gt; [-|+]&lt;暱稱&gt;:邀請指定的暱稱、新增指定的暱稱到頻道的被邀者列表、或把指定的暱稱從頻道的被邀者列表中移除"
 
-#: src/protocols/silc/silc.c:1671
+#: ../src/protocols/silc/silc.c:1686
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr "kick &lt;頻道&gt; &lt;暱稱&gt; [備註]:把指定的暱稱從頻道中踢出"
 
 #  XXX 暫譯
-#: src/protocols/silc/silc.c:1675
+#: ../src/protocols/silc/silc.c:1690
 msgid "info [server]:  View server administrative details"
 msgstr "info [伺服器]:觀看伺服器的管理細節"
 
 #  XXX 暫譯
-#: src/protocols/silc/silc.c:1679
+#: ../src/protocols/silc/silc.c:1694
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;頻道&gt; +|-&lt;暱稱&gt;]:於指定的頻道禁止指定的用戶端"
 
-#: src/protocols/silc/silc.c:1683
+#: ../src/protocols/silc/silc.c:1698
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr "getkey &lt;暱稱|伺服器&gt;:取得用戶端或伺服器的公鑰"
 
-#: src/protocols/silc/silc.c:1687
+#: ../src/protocols/silc/silc.c:1702
 msgid "stats:  View server and network statistics"
 msgstr "stats:觀看伺服器及網路的統計資料"
 
-#: src/protocols/silc/silc.c:1691
+#: ../src/protocols/silc/silc.c:1706
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:向連結的伺服器送出 PING"
 
-#: src/protocols/silc/silc.c:1696
+#: ../src/protocols/silc/silc.c:1711
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;頻道&gt;:列出頻道中的使用者"
 
-#: src/protocols/silc/silc.c:1700
+#: ../src/protocols/silc/silc.c:1715
 msgid "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List specific users in channel(s)"
 msgstr "names [-count|-ops|-halfops|-voices|-normal] &lt;頻道...&gt;:列出指定的一或多個頻道的使用者或某一類使用者"
 
@@ -11506,117 +12045,116 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1800
+#: ../src/protocols/silc/silc.c:1824
 msgid "SILC Protocol Plugin"
 msgstr "SILC 協定模組"
 
 #. *  description
-#: src/protocols/silc/silc.c:1802
+#: ../src/protocols/silc/silc.c:1826
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "安全性網際網路即時會議 (SILC) 協定"
 
-#: src/protocols/silc/silc.c:1839
+#: ../src/protocols/silc/silc.c:1863
 msgid "Public Key file"
 msgstr "公鑰檔案"
 
-#: src/protocols/silc/silc.c:1843
+#: ../src/protocols/silc/silc.c:1867
 msgid "Private Key file"
 msgstr "私鑰檔案"
 
-#: src/protocols/silc/silc.c:1853
+#: ../src/protocols/silc/silc.c:1877
 msgid "Cipher"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1863
+#: ../src/protocols/silc/silc.c:1887
 msgid "HMAC"
-msgstr ""
+msgstr "HMAC"
 
 #  XXX
-#: src/protocols/silc/silc.c:1866
+#: ../src/protocols/silc/silc.c:1890
 msgid "Public key authentication"
 msgstr "使用公鑰認證"
 
 #  TODO 譯文有待改進,這是意譯
-#: src/protocols/silc/silc.c:1869
+#: ../src/protocols/silc/silc.c:1893
 msgid "Reject watching by other users"
 msgstr "拒絕伺服器端的好友狀態捕捉"
 
-#: src/protocols/silc/silc.c:1872
+#: ../src/protocols/silc/silc.c:1896
 msgid "Block invites"
 msgstr "拒絕邀請"
 
 #  XXX 好像聽來很怪
-#: src/protocols/silc/silc.c:1875
+#: ../src/protocols/silc/silc.c:1899
 msgid "Block IMs without Key Exchange"
 msgstr "拒絕沒有交換密鑰的即時訊息"
 
-#: src/protocols/silc/silc.c:1878
+#: ../src/protocols/silc/silc.c:1902
 msgid "Reject online status attribute requests"
 msgstr "拒絕上線狀態屬性要求"
 
-#: src/protocols/silc/silc.c:1881
+#: ../src/protocols/silc/silc.c:1905
 msgid "Block messages to whiteboard"
-msgstr ""
+msgstr "禁止傳送訊息至白板"
 
 # XXX 暫譯
-#: src/protocols/silc/silc.c:1884
+#: ../src/protocols/silc/silc.c:1908
 msgid "Automatically open whiteboard"
 msgstr "自動打開白板"
 
-#: src/protocols/silc/silc.c:1887
-#, fuzzy
+#: ../src/protocols/silc/silc.c:1911
 msgid "Digitally sign and verify all messages"
 msgstr "數位簽署所有即時訊息"
 
-#: src/protocols/silc/util.c:206
-#: src/protocols/silc/util.c:231
+#: ../src/protocols/silc/util.c:207
+#: ../src/protocols/silc/util.c:233
 msgid "Creating SILC key pair..."
 msgstr "建立 SILC key pair 中..."
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: src/protocols/silc/util.c:314
+#: ../src/protocols/silc/util.c:328
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "姓名:   \t%s\n"
 
-#: src/protocols/silc/util.c:316
+#: ../src/protocols/silc/util.c:330
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "使用者名稱:\t%s\n"
 
-#: src/protocols/silc/util.c:318
-#, c-format
-msgid "EMail: \t\t%s\n"
-msgstr "電子郵件: \t%s\n"
-
-#: src/protocols/silc/util.c:320
+#: ../src/protocols/silc/util.c:332
+#, c-format
+msgid "E-Mail: \t\t%s\n"
+msgstr "電子郵件:\t\t%s\n"
+
+#: ../src/protocols/silc/util.c:334
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "主機名稱: \t%s\n"
 
-#: src/protocols/silc/util.c:322
+#: ../src/protocols/silc/util.c:336
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "所屬機構: \t%s\n"
 
-#: src/protocols/silc/util.c:324
+#: ../src/protocols/silc/util.c:338
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "國家:   \t%s\n"
 
-#: src/protocols/silc/util.c:325
+#: ../src/protocols/silc/util.c:339
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "演算法:  \t%s\n"
 
-#: src/protocols/silc/util.c:326
-#, c-format
-msgid "Key length: \t%d bits\n"
+#: ../src/protocols/silc/util.c:340
+#, c-format
+msgid "Key Length: \t%d bits\n"
 msgstr "密鑰長度: \t%d 個位元\n"
 
-#: src/protocols/silc/util.c:328
+#: ../src/protocols/silc/util.c:342
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -11627,7 +12165,7 @@
 "%s\n"
 "\n"
 
-#: src/protocols/silc/util.c:329
+#: ../src/protocols/silc/util.c:343
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -11636,53 +12174,71 @@
 "公鑰指紋可讀版本 (Babbleprint):\n"
 "%s"
 
-#: src/protocols/silc/util.c:333
-#: src/protocols/silc/util.c:334
+#: ../src/protocols/silc/util.c:347
+#: ../src/protocols/silc/util.c:348
 msgid "Public Key Information"
 msgstr "公鑰資訊"
 
-#: src/protocols/silc/util.c:516
+#: ../src/protocols/silc/util.c:530
 msgid "Paging"
 msgstr "傳呼"
 
-#: src/protocols/silc/util.c:540
+#: ../src/protocols/silc/util.c:536
+msgid "Video Conferencing"
+msgstr "視像會議"
+
+#: ../src/protocols/silc/util.c:554
 msgid "Computer"
 msgstr "電腦"
 
-#: src/protocols/silc/util.c:544
+#: ../src/protocols/silc/util.c:558
 msgid "PDA"
 msgstr "電子手帳"
 
-#: src/protocols/silc/util.c:546
+#: ../src/protocols/silc/util.c:560
 msgid "Terminal"
 msgstr "終端機"
 
-#: src/protocols/silc/wb.c:284
+#: ../src/protocols/silc/wb.c:284
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
-msgstr ""
-
-#: src/protocols/silc/wb.c:288
+msgstr "%s 傳送訊息到白板。您要開啟白板嗎?"
+
+#: ../src/protocols/silc/wb.c:288
 #, c-format
 msgid "%s sent message to whiteboard on %s channel. Would you like to open the whiteboard?"
-msgstr ""
-
-#: src/protocols/silc/wb.c:302
-#, fuzzy
+msgstr "%s 傳送訊息到 %s 頻道的白板。您要開啟白板嗎?"
+
+#: ../src/protocols/silc/wb.c:302
 msgid "Whiteboard"
-msgstr "在白板上繪圖"
-
-#: src/protocols/simple/simple.c:202
-#, c-format
-msgid "Could not add the buddy %s because every simple user has to start with 'sip:'."
-msgstr ""
-
-#: src/protocols/simple/simple.c:1227
-#, fuzzy
+msgstr "白板"
+
+#. TODO: do we really want to disconnect on a failure to write?
+#: ../src/protocols/simple/simple.c:411
+msgid "Could not write"
+msgstr "無法寫入"
+
+#: ../src/protocols/simple/simple.c:426
+#: ../src/protocols/simple/simple.c:1431
+msgid "Could not connect"
+msgstr "無法連結"
+
+#: ../src/protocols/simple/simple.c:997
+msgid "Wrong Password"
+msgstr "錯誤的密碼"
+
+#: ../src/protocols/simple/simple.c:1462
+#: ../src/protocols/simple/simple.c:1501
+#: ../src/protocols/simple/simple.c:1513
+#: ../src/protocols/simple/simple.c:1571
 msgid "Could not create listen socket"
-msgstr "無法建立 Socket"
-
-#: src/protocols/simple/simple.c:1281
+msgstr "無法建立 Socket 監聽"
+
+#: ../src/protocols/simple/simple.c:1483
+msgid "Couldn't resolve host"
+msgstr "無法解析主機"
+
+#: ../src/protocols/simple/simple.c:1593
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP 使用者名稱不可含有空白字元或「@」符號"
 
@@ -11694,241 +12250,243 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/simple/simple.c:1428
+#: ../src/protocols/simple/simple.c:1755
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE 通訊協定模組"
 
 #. *  summary
-#: src/protocols/simple/simple.c:1429
+#: ../src/protocols/simple/simple.c:1756
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE 通訊協定模組"
 
-#: src/protocols/simple/simple.c:1451
-#, fuzzy
+#: ../src/protocols/simple/simple.c:1778
 msgid "Publish status (note: everyone may watch you)"
 msgstr "刊登狀態(請注意:任何人都能看到您)"
 
-#: src/protocols/simple/simple.c:1454
+#: ../src/protocols/simple/simple.c:1784
 msgid "Use UDP"
 msgstr "使用 UDP"
 
-#: src/protocols/simple/simple.c:1456
-#, fuzzy
+#: ../src/protocols/simple/simple.c:1786
 msgid "Use proxy"
 msgstr "使用 Proxy"
 
-#: src/protocols/simple/simple.c:1458
+#: ../src/protocols/simple/simple.c:1788
 msgid "Proxy"
 msgstr "代理伺服器"
 
-#: src/protocols/toc/toc.c:139
+#: ../src/protocols/simple/simple.c:1790
+msgid "Auth User"
+msgstr "認證使用者"
+
+#: ../src/protocols/simple/simple.c:1792
+msgid "Auth Domain"
+msgstr ""
+
+#: ../src/protocols/toc/toc.c:139
 #, c-format
 msgid "Looking up %s"
 msgstr "找尋 %s 中"
 
-#: src/protocols/toc/toc.c:148
+#: ../src/protocols/toc/toc.c:148
 #, c-format
 msgid "Connect to %s failed"
 msgstr "連結到 %s 失敗"
 
-#: src/protocols/toc/toc.c:200
+#: ../src/protocols/toc/toc.c:200
 #, c-format
 msgid "Signon: %s"
 msgstr "登入:%s"
 
-#: src/protocols/toc/toc.c:482
+#: ../src/protocols/toc/toc.c:482
 #, c-format
 msgid "Unable to write file %s."
 msgstr "無法寫入檔案 %s。"
 
-#: src/protocols/toc/toc.c:485
+#: ../src/protocols/toc/toc.c:485
 #, c-format
 msgid "Unable to read file %s."
 msgstr "無法讀取檔案 %s。"
 
-#: src/protocols/toc/toc.c:488
+#: ../src/protocols/toc/toc.c:488
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "訊息太長,最後的 %s 位元組被截去。"
 
-#: src/protocols/toc/toc.c:491
+#: ../src/protocols/toc/toc.c:491
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s 目前並未登入。"
 
 #  NOTE 譯文更動 by Ambrose
-#: src/protocols/toc/toc.c:494
+#: ../src/protocols/toc/toc.c:494
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "不允許對 %s 發出警告。"
 
-#: src/protocols/toc/toc.c:497
+#: ../src/protocols/toc/toc.c:497
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "訊息被丟棄,因為您達到了伺服器所限制的發送速度。"
 
-#: src/protocols/toc/toc.c:500
+#: ../src/protocols/toc/toc.c:500
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "在 %s 不可以聊天。"
 
-#: src/protocols/toc/toc.c:503
+#: ../src/protocols/toc/toc.c:503
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "您送訊息給 %s 的速度太快了。"
 
-#: src/protocols/toc/toc.c:506
+#: ../src/protocols/toc/toc.c:506
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr "您遺失了一個由 %s 送來的訊息,因為它太大了。"
 
-#: src/protocols/toc/toc.c:509
+#: ../src/protocols/toc/toc.c:509
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr "您遺失了一個由 %s 送來的訊息,因為它傳送的速度太快。"
 
-#: src/protocols/toc/toc.c:512
+#: ../src/protocols/toc/toc.c:512
 msgid "Failure."
 msgstr "失敗。"
 
-#: src/protocols/toc/toc.c:515
+#: ../src/protocols/toc/toc.c:515
 msgid "Too many matches."
 msgstr "匹配太多。"
 
-#: src/protocols/toc/toc.c:518
+#: ../src/protocols/toc/toc.c:518
 msgid "Need more qualifiers."
 msgstr "需輸入更多檢索條件。"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
 #  NOTE 譯文更動 by Ambrose
-#: src/protocols/toc/toc.c:521
+#: ../src/protocols/toc/toc.c:521
 msgid "Dir service temporarily unavailable."
 msgstr "暫時無法使用目錄服務。"
 
-#: src/protocols/toc/toc.c:524
+#: ../src/protocols/toc/toc.c:524
 msgid "E-mail lookup restricted."
-msgstr "禁止 eMail 檢查。"
-
-#: src/protocols/toc/toc.c:527
+msgstr "禁止 E-Mail 檢查。"
+
+#: ../src/protocols/toc/toc.c:527
 msgid "Keyword ignored."
 msgstr "關鍵字已被忽略。"
 
-#: src/protocols/toc/toc.c:530
+#: ../src/protocols/toc/toc.c:530
 msgid "No keywords."
 msgstr "沒有關鍵字。"
 
-#: src/protocols/toc/toc.c:533
+#: ../src/protocols/toc/toc.c:533
 msgid "User has no directory information."
 msgstr "這個使用者沒有他的相關資訊。"
 
-#: src/protocols/toc/toc.c:537
+#: ../src/protocols/toc/toc.c:537
 msgid "Country not supported."
 msgstr "這個國家不被支援。"
 
-#: src/protocols/toc/toc.c:540
+#: ../src/protocols/toc/toc.c:540
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "未知的失敗原因:%s。"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
 #  NOTE 譯文更動 by Ambrose
-#: src/protocols/toc/toc.c:546
+#: ../src/protocols/toc/toc.c:546
 msgid "The service is temporarily unavailable."
 msgstr "暫時無法使用該項服務。"
 
-#: src/protocols/toc/toc.c:549
+#: ../src/protocols/toc/toc.c:549
 msgid "Your warning level is currently too high to log in."
 msgstr "您目前登入系統的警告等級太高,以致無法登入。"
 
-#: src/protocols/toc/toc.c:552
+#: ../src/protocols/toc/toc.c:552
 msgid "You have been connecting and disconnecting too frequently.  Wait ten minutes and try again.  If you continue to try, you will need to wait even longer."
 msgstr "您的連線/斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連線,那麼您的等待時間將會更加的延長。"
 
-#: src/protocols/toc/toc.c:554
+#: ../src/protocols/toc/toc.c:554
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "發生了一個未知的登入錯誤:%s。"
 
-#: src/protocols/toc/toc.c:557
+#: ../src/protocols/toc/toc.c:557
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "一個未知的錯誤 %d 發生。資訊:%s"
 
-#: src/protocols/toc/toc.c:584
+#: ../src/protocols/toc/toc.c:584
 msgid "Invalid Groupname"
 msgstr "無效的群組名稱"
 
-#: src/protocols/toc/toc.c:668
+#: ../src/protocols/toc/toc.c:668
 msgid "Connection Closed"
 msgstr "連線關閉"
 
-#: src/protocols/toc/toc.c:708
+#: ../src/protocols/toc/toc.c:708
 msgid "Waiting for reply..."
 msgstr "等待回覆中..."
 
-#: src/protocols/toc/toc.c:786
+#: ../src/protocols/toc/toc.c:786
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC 結束了暫停狀態。您現在可以繼續的傳送您的訊息。"
 
-#: src/protocols/toc/toc.c:989
+#: ../src/protocols/toc/toc.c:989
 msgid "Password Change Successful"
 msgstr "密碼修改成功"
 
-#: src/protocols/toc/toc.c:993
+#: ../src/protocols/toc/toc.c:993
 msgid "TOC has sent a PAUSE command."
 msgstr "TOC 送出了一個暫停 (PAUSE) 指令。"
 
-#: src/protocols/toc/toc.c:994
+#: ../src/protocols/toc/toc.c:994
 msgid "When this happens, TOC ignores any messages sent to it, and may kick you off if you send a message. Gaim will prevent anything from going through. This is only temporary, please be patient."
 msgstr "當這個發生時,TOC 會忽略所有送來的訊息,同時可能在您送出訊息時,將您踢出系統。Gaim 將避免發生這樣的事。這只是一個暫時性的狀態,請您見諒。"
 
-#: src/protocols/toc/toc.c:1549
+#: ../src/protocols/toc/toc.c:1549
 msgid "Get Dir Info"
 msgstr "取得使用者個人資訊"
 
-#: src/protocols/toc/toc.c:1684
-msgid "Set User Info"
-msgstr "設定使用者資訊"
-
-#: src/protocols/toc/toc.c:1689
+#: ../src/protocols/toc/toc.c:1689
 msgid "Set Dir Info"
 msgstr "設定使用者個人資訊"
 
-#: src/protocols/toc/toc.c:1694
+#: ../src/protocols/toc/toc.c:1694
 msgid "Change Password"
 msgstr "修改密碼"
 
-#: src/protocols/toc/toc.c:1811
+#: ../src/protocols/toc/toc.c:1811
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "無法開啟 %s 以供寫入!"
 
-#: src/protocols/toc/toc.c:1847
+#: ../src/protocols/toc/toc.c:1847
 msgid "File transfer failed; other side probably canceled."
 msgstr "檔案傳輸失敗;可能是對方取消傳輸。"
 
-#: src/protocols/toc/toc.c:1892
-#: src/protocols/toc/toc.c:1932
-#: src/protocols/toc/toc.c:2056
-#: src/protocols/toc/toc.c:2144
+#: ../src/protocols/toc/toc.c:1892
+#: ../src/protocols/toc/toc.c:1932
+#: ../src/protocols/toc/toc.c:2056
+#: ../src/protocols/toc/toc.c:2144
 msgid "Could not connect for transfer."
 msgstr "無法開啟連線以供傳輸。"
 
-#: src/protocols/toc/toc.c:2089
+#: ../src/protocols/toc/toc.c:2089
 msgid "Could not write file header.  The file will not be transferred."
 msgstr "無法寫入檔頭資訊。這個檔案將不會被傳送。"
 
-#: src/protocols/toc/toc.c:2189
+#: ../src/protocols/toc/toc.c:2189
 msgid "Gaim - Save As..."
 msgstr "Gaim - 儲存為..."
 
-#: src/protocols/toc/toc.c:2223
+#: ../src/protocols/toc/toc.c:2223
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] "%s 要求 %s 接收 %d 個檔案:%s (%.2f %s)%s%s"
 msgstr[1] "%s 要求 %s 接收 %d 個檔案:%s (%.2f %s)%s%s"
 
-#: src/protocols/toc/toc.c:2230
+#: ../src/protocols/toc/toc.c:2230
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s 要求您傳送檔案給他(她)。"
@@ -11943,31 +12501,23 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2317
-#: src/protocols/toc/toc.c:2319
+#: ../src/protocols/toc/toc.c:2319
+#: ../src/protocols/toc/toc.c:2321
 msgid "TOC Protocol Plugin"
 msgstr "TOC 協定模組"
 
-#: src/protocols/toc/toc.c:2338
-msgid "TOC host"
-msgstr "TOC 伺服器"
-
-#: src/protocols/toc/toc.c:2342
-msgid "TOC port"
-msgstr "TOC 通訊埠"
-
 # NOTE 譯文更動 by Ambrose
-#: src/protocols/yahoo/yahoo.c:712
+#: ../src/protocols/yahoo/yahoo.c:711
 msgid "Your Yahoo! message did not get sent."
 msgstr "無法送出您的 Yahoo! 訊息。"
 
-#: src/protocols/yahoo/yahoo.c:758
-#: src/protocols/yahoo/yahoo.c:3487
+#: ../src/protocols/yahoo/yahoo.c:770
+#: ../src/protocols/yahoo/yahoo.c:3590
 msgid "Buzz!!"
 msgstr "嗶!"
 
 # XXX 暫譯
-#: src/protocols/yahoo/yahoo.c:803
+#: ../src/protocols/yahoo/yahoo.c:816
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "%s 的 Yahoo! 系統訊息:"
@@ -11976,123 +12526,126 @@
 #. TODO: this is almost exactly the same as what MSN does,
 #. * this should probably be moved to the core.
 #.
-#: src/protocols/yahoo/yahoo.c:899
+#: ../src/protocols/yahoo/yahoo.c:912
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list%s%s."
 msgstr "使用者 %s 想要將 %s 加入他(她)的好友清單%s%s。"
 
 #  XXX
-#: src/protocols/yahoo/yahoo.c:905
+#: ../src/protocols/yahoo/yahoo.c:918
 msgid "Message (optional) :"
 msgstr "訊息(可以不填):"
 
-#: src/protocols/yahoo/yahoo.c:947
+#: ../src/protocols/yahoo/yahoo.c:960
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr "使用者 %s 剛剛拒絕了您先前將他(她)新增至您的好友清單的要求。"
 
-#: src/protocols/yahoo/yahoo.c:950
+#: ../src/protocols/yahoo/yahoo.c:963
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list for the following reason: %s."
 msgstr "使用者 %s 因為下列原因,剛剛拒絕了您先前將他(她)新增至您的好友清單的要求:%s"
 
-#: src/protocols/yahoo/yahoo.c:953
+#: ../src/protocols/yahoo/yahoo.c:966
 msgid "Add buddy rejected"
 msgstr "新增好友被拒"
 
-#: src/protocols/yahoo/yahoo.c:1696
+#: ../src/protocols/yahoo/yahoo.c:1709
 #, c-format
 msgid "The Yahoo server has requested the use of an unrecognized authentication method.  This version of Gaim will likely not be able to successfully sign on to Yahoo.  Check %s for updates."
 msgstr "Yahoo 伺服器要求了使用一種不明的認證方式,因此這個版本的 Gaim 很可能不會成功登入 Yahoo。請到 %s 檢查有沒有更新的版本。"
 
-#: src/protocols/yahoo/yahoo.c:1699
+#: ../src/protocols/yahoo/yahoo.c:1712
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! 認證失敗"
 
-#: src/protocols/yahoo/yahoo.c:1772
+#: ../src/protocols/yahoo/yahoo.c:1778
 #, c-format
 msgid "You have tried to ignore %s, but the user is on your buddy list.  Clicking \"Yes\" will remove and ignore the buddy."
 msgstr "您嘗試忽略在您的好友名單內的 %s。如果您打算把他(她)從您的好友清單中移除,並隨即忽略他(她),請按一下「是」。"
 
-#: src/protocols/yahoo/yahoo.c:1775
+#: ../src/protocols/yahoo/yahoo.c:1781
 msgid "Ignore buddy?"
 msgstr "忽略使用者?"
 
-#: src/protocols/yahoo/yahoo.c:1809
+#: ../src/protocols/yahoo/yahoo.c:1815
 msgid "Invalid username."
 msgstr "使用者名稱無效。"
 
-#: src/protocols/yahoo/yahoo.c:1820
+#: ../src/protocols/yahoo/yahoo.c:1826
 msgid "Normal authentication failed!"
 msgstr "無法以正常程序認證!"
 
-#: src/protocols/yahoo/yahoo.c:1821
+#: ../src/protocols/yahoo/yahoo.c:1827
 msgid "The normal authentication method has failed. This means either your password is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now attempt to log in using Web Messenger authentication, which will result in reduced functionality and features."
 msgstr "無法以正常方法進行認證,這表示您輸入了錯誤的密碼,或者 Yahoo! 更改了認證方法。Gaim 隨即嘗試透過 Web Messenger 方法認證,這種認證方法只支援部分功能。"
 
-#: src/protocols/yahoo/yahoo.c:1829
+#: ../src/protocols/yahoo/yahoo.c:1835
 msgid "Incorrect password."
 msgstr "錯誤的密碼。"
 
-#: src/protocols/yahoo/yahoo.c:1832
+#: ../src/protocols/yahoo/yahoo.c:1838
 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:1841
 #, 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:1895
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "無法將好友「%1$s」新增至帳號「%3$s」在伺服器上的清單內的群組「%2$s」。"
 
-#: src/protocols/yahoo/yahoo.c:1892
+#: ../src/protocols/yahoo/yahoo.c:1898
 msgid "Could not add buddy to server list"
 msgstr "無法將好友新增至伺服器上的清單內"
 
-#: src/protocols/yahoo/yahoo.c:2136
-#: src/protocols/yahoo/yahoo.c:2282
-#: src/protocols/yahoo/ycht.c:413
+#: ../src/protocols/yahoo/yahoo.c:2017
+#, c-format
+msgid "[ Audible %s/%s/%s.swf ] %s"
+msgstr ""
+
+#: ../src/protocols/yahoo/yahoo.c:2159
+#: ../src/protocols/yahoo/yahoo.c:2306
+#: ../src/protocols/yahoo/yahoo.c:2321
+#: ../src/protocols/yahoo/ycht.c:472
 msgid "Unable to read"
 msgstr "無法讀取"
 
-#: src/protocols/yahoo/yahoo.c:2304
-#: src/protocols/yahoo/yahoo.c:2432
-#: src/protocols/yahoo/yahoo.c:2531
-#: src/protocols/yahoo/yahoo.c:2541
-#: src/protocols/yahoo/yahoochat.c:1395
-#: src/protocols/yahoo/yahoochat.c:1465
-#: src/protocols/yahoo/ycht.c:517
+#: ../src/protocols/yahoo/yahoo.c:2345
+#: ../src/protocols/yahoo/yahoo.c:2502
+#: ../src/protocols/yahoo/yahoo.c:2605
+#: ../src/protocols/yahoo/yahoo.c:2615
+#: ../src/protocols/yahoo/yahoochat.c:1448
+#: ../src/protocols/yahoo/yahoochat.c:1518
+#: ../src/protocols/yahoo/ycht.c:576
 msgid "Connection problem"
 msgstr "連線錯誤"
 
-#: src/protocols/yahoo/yahoo.c:2644
-#: src/protocols/yahoo/yahoo.c:3223
-#, fuzzy
+#: ../src/protocols/yahoo/yahoo.c:2721
+#: ../src/protocols/yahoo/yahoo.c:3324
 msgid "Not at Home"
 msgstr "不在家"
 
-#: src/protocols/yahoo/yahoo.c:2646
-#: src/protocols/yahoo/yahoo.c:3226
-#, fuzzy
+#: ../src/protocols/yahoo/yahoo.c:2723
+#: ../src/protocols/yahoo/yahoo.c:3327
 msgid "Not at Desk"
 msgstr "不在座位"
 
-#: src/protocols/yahoo/yahoo.c:2648
-#: src/protocols/yahoo/yahoo.c:3229
-#, fuzzy
+#: ../src/protocols/yahoo/yahoo.c:2725
+#: ../src/protocols/yahoo/yahoo.c:3330
 msgid "Not in Office"
 msgstr "不在辦公室"
 
-#: src/protocols/yahoo/yahoo.c:2652
-#: src/protocols/yahoo/yahoo.c:3235
+#: ../src/protocols/yahoo/yahoo.c:2729
+#: ../src/protocols/yahoo/yahoo.c:3336
 msgid "On Vacation"
 msgstr "渡假去了"
 
-#: src/protocols/yahoo/yahoo.c:2656
-#: src/protocols/yahoo/yahoo.c:3241
+#: ../src/protocols/yahoo/yahoo.c:2733
+#: ../src/protocols/yahoo/yahoo.c:3342
 msgid "Stepped Out"
 msgstr "走出去了"
 
@@ -12100,87 +12653,93 @@
 # NOTE 這也表示你不會看見這個好友登入等等。」(yeah, it mean the buddy
 # NOTE isn't on the server's buddy list/ which also means you won't
 # NOTE be able to see when they log on, etc)
-#: src/protocols/yahoo/yahoo.c:2749
-#: src/protocols/yahoo/yahoo.c:2778
+#: ../src/protocols/yahoo/yahoo.c:2826
+#: ../src/protocols/yahoo/yahoo.c:2856
 msgid "Not on server list"
 msgstr "不在伺服器上的清單中"
 
 #  NOTE 這是「看來是離線」。其他協定的「離線」狀態也不一定真的是離線,我想只譯「離線」也不太離譜
-#: src/protocols/yahoo/yahoo.c:2795
-#: src/protocols/yahoo/yahoo.c:2855
-#, fuzzy
+#: ../src/protocols/yahoo/yahoo.c:2873
+#: ../src/protocols/yahoo/yahoo.c:2932
 msgid "Appear Online"
 msgstr "離線"
 
 #  NOTE 這是「看來是離線」。其他協定的「離線」狀態也不一定真的是離線,我想只譯「離線」也不太離譜
-#: src/protocols/yahoo/yahoo.c:2798
-#: src/protocols/yahoo/yahoo.c:2877
+#: ../src/protocols/yahoo/yahoo.c:2876
+#: ../src/protocols/yahoo/yahoo.c:2953
 #, fuzzy
 msgid "Appear Permanently Offline"
 msgstr "離線"
 
-#: src/protocols/yahoo/yahoo.c:2816
+#: ../src/protocols/yahoo/yahoo.c:2895
 #, fuzzy
 msgid "Presence"
 msgstr "偏好設定"
 
 #  NOTE 這是「看來是離線」。其他協定的「離線」狀態也不一定真的是離線,我想只譯「離線」也不太離譜
-#: src/protocols/yahoo/yahoo.c:2871
+#: ../src/protocols/yahoo/yahoo.c:2938
+msgid "Appear Offline"
+msgstr "離線"
+
+#  NOTE 這是「看來是離線」。其他協定的「離線」狀態也不一定真的是離線,我想只譯「離線」也不太離譜
+#: ../src/protocols/yahoo/yahoo.c:2947
 #, fuzzy
 msgid "Don't Appear Permanently Offline"
 msgstr "離線"
 
 # NOTE #gaim 的 Vann 及 LSchiere 解:如果選取了的好友目前處於一個聊天,便加入該個聊天
 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
-#: src/protocols/yahoo/yahoo.c:2918
+#: ../src/protocols/yahoo/yahoo.c:2995
 msgid "Join in Chat"
 msgstr "加入好友目前所在的聊天室"
 
 # NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
-#: src/protocols/yahoo/yahoo.c:2923
+#: ../src/protocols/yahoo/yahoo.c:3001
 msgid "Initiate Conference"
 msgstr "開啟會議室"
 
-#: src/protocols/yahoo/yahoo.c:2948
+#: ../src/protocols/yahoo/yahoo.c:3029
 #, fuzzy
 msgid "Presence Settings"
 msgstr "使用環境變數設定"
 
-#: src/protocols/yahoo/yahoo.c:2954
+#: ../src/protocols/yahoo/yahoo.c:3035
 msgid "Start Doodling"
-msgstr ""
-
-#: src/protocols/yahoo/yahoo.c:2985
+msgstr "開始 Doodle"
+
+#: ../src/protocols/yahoo/yahoo.c:3067
 msgid "Active which ID?"
 msgstr "啟動哪一個 ID?"
 
 # NOTE #gaim 的 Vann 及 LSchiere 解:如果選取了的好友目前處於一個聊天,便加入該個聊天
 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
-#: src/protocols/yahoo/yahoo.c:2994
+#: ../src/protocols/yahoo/yahoo.c:3076
 msgid "Join who in chat?"
 msgstr "加入哪個好友目前所在的聊天室?"
 
-#: src/protocols/yahoo/yahoo.c:3004
+#: ../src/protocols/yahoo/yahoo.c:3086
 msgid "Activate ID..."
 msgstr "啟動 ID..."
 
-#: src/protocols/yahoo/yahoo.c:3008
-#, fuzzy
+#: ../src/protocols/yahoo/yahoo.c:3090
 msgid "Join User in Chat..."
 msgstr "加入好友目前所在的聊天室..."
 
-#: src/protocols/yahoo/yahoo.c:3529
+#: ../src/protocols/yahoo/yahoo.c:3649
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt聊天室&gt;:加入位於 Yahoo! 網路的一個聊天室"
 
-#: src/protocols/yahoo/yahoo.c:3533
-#, fuzzy
+#: ../src/protocols/yahoo/yahoo.c:3654
+msgid "list: List rooms on the Yahoo network"
+msgstr "list:列出Yahoo網路上的聊天室清單"
+
+#: ../src/protocols/yahoo/yahoo.c:3658
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: 給好友一個「嗶」引他(她)注意"
 
-#: src/protocols/yahoo/yahoo.c:3538
+#: ../src/protocols/yahoo/yahoo.c:3662
 msgid "doodle: Request user to start a Doodle session"
-msgstr ""
+msgstr "doodle: 要求使用者開始 Doodle Session"
 
 #. *< type
 #. *< ui_requirement
@@ -12192,224 +12751,262 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3630
-#: src/protocols/yahoo/yahoo.c:3632
+#: ../src/protocols/yahoo/yahoo.c:3755
+#: ../src/protocols/yahoo/yahoo.c:3757
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo 協定模組"
 
-#: src/protocols/yahoo/yahoo.c:3649
+#: ../src/protocols/yahoo/yahoo.c:3774
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: src/protocols/yahoo/yahoo.c:3652
-msgid "Pager host"
-msgstr "傳呼系統伺服器"
-
-#: src/protocols/yahoo/yahoo.c:3655
-msgid "Japan Pager host"
-msgstr "傳呼系統伺服器(日本地區)"
-
-#: src/protocols/yahoo/yahoo.c:3658
+#: ../src/protocols/yahoo/yahoo.c:3777
+msgid "Pager server"
+msgstr "傳呼伺服器"
+
+#: ../src/protocols/yahoo/yahoo.c:3780
+msgid "Japan Pager server"
+msgstr "傳呼伺服器(日本地區)"
+
+#: ../src/protocols/yahoo/yahoo.c:3783
 msgid "Pager port"
 msgstr "傳呼系統通訊埠"
 
-#: src/protocols/yahoo/yahoo.c:3661
-msgid "File transfer host"
-msgstr "檔案傳輸主機"
-
-#: src/protocols/yahoo/yahoo.c:3664
-msgid "Japan file transfer host"
-msgstr "檔案傳輸主機(日本地區)"
-
-#: src/protocols/yahoo/yahoo.c:3667
+#: ../src/protocols/yahoo/yahoo.c:3786
+msgid "File transfer server"
+msgstr "檔案傳輸伺服器"
+
+#: ../src/protocols/yahoo/yahoo.c:3789
+msgid "Japan file transfer server"
+msgstr "檔案傳輸伺服器(日本地區)"
+
+#: ../src/protocols/yahoo/yahoo.c:3792
 msgid "File transfer port"
 msgstr "檔案傳輸通訊埠"
 
 #  XXX 無劃一譯法,有譯「地區」、「區域」甚至「場所」(?!)
-#: src/protocols/yahoo/yahoo.c:3670
+#: ../src/protocols/yahoo/yahoo.c:3795
 msgid "Chat room locale"
 msgstr "聊天室區域 (Locale)"
 
-#: src/protocols/yahoo/yahoo.c:3673
+#: ../src/protocols/yahoo/yahoo.c:3798
+msgid "Ignore conference and chatroom invitations"
+msgstr "忽略會議室與聊天室邀請"
+
+#: ../src/protocols/yahoo/yahoo.c:3802
 msgid "Chat room list URL"
 msgstr "聊天室清單所在網址"
 
-#: src/protocols/yahoo/yahoo.c:3676
-msgid "YCHT host"
-msgstr "YCHT 主機"
-
-#: src/protocols/yahoo/yahoo.c:3679
-msgid "YCHT port"
-msgstr "YCHT 通訊埠"
-
-#: src/protocols/yahoo/yahoo_profile.c:676
+#: ../src/protocols/yahoo/yahoo.c:3805
+msgid "Yahoo Chat server"
+msgstr "Yahoo 聊天伺服器"
+
+#: ../src/protocols/yahoo/yahoo.c:3808
+msgid "Yahoo Chat port"
+msgstr "Yahoo 聊天室通訊埠"
+
+#. 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 要求。"
+
+#: ../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 "無法建立檔案介紹。"
+
+#. TODO: what to do here - do we really have to disconnect?
+#: ../src/protocols/yahoo/yahoo_packet.c:265
+msgid "Write Error"
+msgstr "寫入錯誤"
+
+#: ../src/protocols/yahoo/yahoo_profile.c:707
 #, c-format
 msgid "<b>IP Address:</b> %s<br>"
 msgstr "<b>IP 位址:</b>%s<br>"
 
-#: src/protocols/yahoo/yahoo_profile.c:752
+#: ../src/protocols/yahoo/yahoo_profile.c:783
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japan 個人資料"
 
-#: src/protocols/yahoo/yahoo_profile.c:753
+#: ../src/protocols/yahoo/yahoo_profile.c:784
 msgid "Yahoo! Profile"
 msgstr "Yahoo! 個人資料"
 
-#: src/protocols/yahoo/yahoo_profile.c:797
+#: ../src/protocols/yahoo/yahoo_profile.c:828
 msgid "Sorry, profiles marked as containing adult content are not supported at this time."
 msgstr "對不起,暫時並不支援內容被列為兒童不宜的個人資訊。"
 
 # NOTE 注意:鏈結在譯文之下顯示,故譯成「以下」
-#: src/protocols/yahoo/yahoo_profile.c:799
+#: ../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 "您如果想看這則個人資訊,請用您的瀏覽器開啟以下連結"
 
-#: src/protocols/yahoo/yahoo_profile.c:975
+#: ../src/protocols/yahoo/yahoo_profile.c:1012
 msgid "Yahoo! ID"
 msgstr "Yahoo! 帳號"
 
-#: src/protocols/yahoo/yahoo_profile.c:1047
-#: src/protocols/yahoo/yahoo_profile.c:1051
-#: src/protocols/yahoo/yahoo_profile.c:1055
+#: ../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:1065
-#: src/protocols/yahoo/yahoo_profile.c:1069
+#: ../src/protocols/yahoo/yahoo_profile.c:1102
+#: ../src/protocols/yahoo/yahoo_profile.c:1106
 msgid "Latest News"
 msgstr "最新消息"
 
-#: src/protocols/yahoo/yahoo_profile.c:1090
+#: ../src/protocols/yahoo/yahoo_profile.c:1127
 msgid "Home Page"
 msgstr "網頁"
 
-#: src/protocols/yahoo/yahoo_profile.c:1105
+#: ../src/protocols/yahoo/yahoo_profile.c:1142
 msgid "Cool Link 1"
 msgstr "酷連結(一)"
 
-#: src/protocols/yahoo/yahoo_profile.c:1110
+#: ../src/protocols/yahoo/yahoo_profile.c:1147
 msgid "Cool Link 2"
 msgstr "酷連結(二)"
 
-#: src/protocols/yahoo/yahoo_profile.c:1114
+#: ../src/protocols/yahoo/yahoo_profile.c:1151
 msgid "Cool Link 3"
 msgstr "酷連結(三)"
 
-#: src/protocols/yahoo/yahoo_profile.c:1127
+#: ../src/protocols/yahoo/yahoo_profile.c:1164
 msgid "Last Update"
 msgstr "更新日期"
 
 # NOTE 譯文更動 by Ambrose
-#: src/protocols/yahoo/yahoo_profile.c:1133
+#: ../src/protocols/yahoo/yahoo_profile.c:1170
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "無法取得使用者 %s 的個人資訊"
 
-#: src/protocols/yahoo/yahoo_profile.c:1139
+#: ../src/protocols/yahoo/yahoo_profile.c:1176
 #, fuzzy
 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:1155
+#: ../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."
 msgstr "無法取得使用者的個人資料。這很有可能只是伺服器出現暫時性的問題,請稍後重試。"
 
-#: src/protocols/yahoo/yahoo_profile.c:1158
+#: ../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 profile. If you know that the user exists, please try again later."
 msgstr "無法取得使用者的個人資料。這很有可能表示這個使用者並不存在;然而,Yahoo! 會不時找不到使用者的個人資料。若果您知道使用者確實存在,請稍後重試。"
 
-#: src/protocols/yahoo/yahoo_profile.c:1166
+#: ../src/protocols/yahoo/yahoo_profile.c:1203
 msgid "The user's profile is empty."
 msgstr "這個使用者的資訊是空白的。"
 
-#: src/protocols/yahoo/yahoochat.c:202
+#: ../src/protocols/yahoo/yahoochat.c:203
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr "%s 婉拒了你詢問他(她)到會議室「%s」的邀請,理由是「%s」。"
 
-#: src/protocols/yahoo/yahoochat.c:204
+#: ../src/protocols/yahoo/yahoochat.c:205
 msgid "Invitation Rejected"
 msgstr "邀請被婉拒了"
 
-#: src/protocols/yahoo/yahoochat.c:358
+#: ../src/protocols/yahoo/yahoochat.c:361
 msgid "Failed to join chat"
 msgstr "無法加入聊天室"
 
-#: src/protocols/yahoo/yahoochat.c:358
-msgid "Maybe the room is full?"
-msgstr "或許參與聊天室使用者已經到達上限?"
-
-#: src/protocols/yahoo/yahoochat.c:435
+#. -6
+#: ../src/protocols/yahoo/yahoochat.c:364
+msgid "Unknown room"
+msgstr "未知聊天室"
+
+#. -15
+#: ../src/protocols/yahoo/yahoochat.c:367
+msgid "Maybe the room is full"
+msgstr "也許聊天室使用者已經到達上限"
+
+#. -35
+#: ../src/protocols/yahoo/yahoochat.c:370
+msgid "Not available"
+msgstr "聊天室不存在"
+
+#: ../src/protocols/yahoo/yahoochat.c:374
+msgid "Unknown error. You may need to logout and wait five minutes before being able to rejoin a chatroom"
+msgstr "未知的錯誤。您或許需要登出並等待五分鐘,以重新進入聊天室"
+
+#: ../src/protocols/yahoo/yahoochat.c:452
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "您現在進入「%s」進行聊天。"
 
-#: src/protocols/yahoo/yahoochat.c:608
+#: ../src/protocols/yahoo/yahoochat.c:627
 msgid "Failed to join buddy in chat"
 msgstr "無法加入好友目前所在的聊天室"
 
-#: src/protocols/yahoo/yahoochat.c:609
+#: ../src/protocols/yahoo/yahoochat.c:628
 msgid "Maybe they're not in a chat?"
 msgstr "可能他(她)並不在聊天室內?"
 
-#: src/protocols/yahoo/yahoochat.c:1326
+#: ../src/protocols/yahoo/yahoochat.c:1346
+#: ../src/protocols/yahoo/yahoochat.c:1373
 msgid "Fetching the room list failed."
 msgstr "讀取聊天室清單發生錯誤。"
 
 # NOTE 解「可語音聊天的使用者數目」(marv)
-#: src/protocols/yahoo/yahoochat.c:1381
+#: ../src/protocols/yahoo/yahoochat.c:1434
 msgid "Voices"
 msgstr "可語音聊天"
 
 # NOTE 解「可視像聊天的使用者數目」(marv)
-#: src/protocols/yahoo/yahoochat.c:1384
+#: ../src/protocols/yahoo/yahoochat.c:1437
 msgid "Webcams"
 msgstr "可視像聊天"
 
-#: src/protocols/yahoo/yahoochat.c:1395
-#: src/protocols/yahoo/yahoochat.c:1465
+#: ../src/protocols/yahoo/yahoochat.c:1448
+#: ../src/protocols/yahoo/yahoochat.c:1518
 msgid "Unable to fetch room list."
 msgstr "無法取得聊天室清單。"
 
 # NOTE wing: does "User Rooms" mean rooms created by users? i guess yes?
 # NOTE marv: wing: yeah, Yahoo has Yahoo rooms and user rooms
 # NOTE marv: marv: in the room list stuff? yeah it's a user created room as opposed to an official room
-#: src/protocols/yahoo/yahoochat.c:1458
+#: ../src/protocols/yahoo/yahoochat.c:1511
 msgid "User Rooms"
 msgstr "使用者建立之聊天室"
 
-#: src/protocols/yahoo/ycht.c:400
+#: ../src/protocols/yahoo/ycht.c:456
 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)"
 msgstr "(為這個訊息轉換編碼時發生了錯誤。請檢查帳號清單中的「編碼」選項)"
 
-#: src/protocols/zephyr/zephyr.c:686
-#, fuzzy, c-format
+#: ../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
+msgstr "無法傳送至聊天室 %s,%s,%s"
+
+#: ../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>從 %2$s 起已在 %1$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 "任何人"
 
@@ -12420,80 +13017,80 @@
 # NOTE 參閱 http://consult.stanford.edu/pub/communications/zephyr-guide
 # NOTE (15:05:28) aatharuv: wing: A class is basically a high level chat. Any message sent to a class will also have "instance", and "recipient" parameters, which control who gets it. If someone "subscribes" to only a particular instance of the class, they'll only get messages sent to the specific class and instance, whereas someone who subs to all the instances of the class, instance "*", will get any message to the class.
 # NOTE (15:11:31) aatharuv: The "recipient" field also controls who gets a message. if the recipient is "", then anyone subbed to said class and instance will get the message, otherwise it will only be received by the person with that "username". This allows IM's in zephyr to be a special case of chats
-#: src/protocols/zephyr/zephyr.c:2274
+#: ../src/protocols/zephyr/zephyr.c:2298
 msgid "_Class:"
 msgstr "類別/聊天室(_C):"
 
 # XXX 暫譯
 # NOTE 參閱 http://www.mit.edu/afs/sipb/project/doc/izephyr/html/node19.html 及其鏈結
 # NOTE 參閱 http://consult.stanford.edu/pub/communications/zephyr-guide
-#: src/protocols/zephyr/zephyr.c:2280
+#: ../src/protocols/zephyr/zephyr.c:2304
 msgid "_Instance:"
 msgstr "實體/頻道(_I):"
 
-#: src/protocols/zephyr/zephyr.c:2286
+#: ../src/protocols/zephyr/zephyr.c:2310
 msgid "_Recipient:"
 msgstr "接受者(_R):"
 
 #  FIXME 暫譯
-#: src/protocols/zephyr/zephyr.c:2297
+#: ../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:2603
+#: ../src/protocols/zephyr/zephyr.c:2634
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;暱稱&gt;:尋找使用者"
 
-#: src/protocols/zephyr/zephyr.c:2608
+#: ../src/protocols/zephyr/zephyr.c:2639
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;暱稱&gt;:尋找使用者"
 
-#: src/protocols/zephyr/zephyr.c:2613
+#: ../src/protocols/zephyr/zephyr.c:2644
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "instance &lt;實體&gt;:設定這個「類別」(聊天室)的「實體」(頻道)"
 
-#: src/protocols/zephyr/zephyr.c:2618
+#: ../src/protocols/zephyr/zephyr.c:2649
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;實體&gt;:設定這個「類別」(聊天室)的「實體」(頻道)"
 
-#: src/protocols/zephyr/zephyr.c:2623
+#: ../src/protocols/zephyr/zephyr.c:2654
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "topic &lt;實體&gt;:設定這個「類別」(聊天室)的「實體」(頻道)"
 
-#: src/protocols/zephyr/zephyr.c:2629
+#: ../src/protocols/zephyr/zephyr.c:2660
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr "sub &lt;類別&gt; &lt;實體&gt; &lt;接受者&gt;:加入聊天室"
 
 #  NOTE (14:46:12) aatharuv: wing: So all zephyrs get sent to a triplet <class,instance,recipient>   . "message" is the default class that zephyrs go to, and "personal" is the default instance.
-#: src/protocols/zephyr/zephyr.c:2634
+#: ../src/protocols/zephyr/zephyr.c:2665
 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:2640
+#: ../src/protocols/zephyr/zephyr.c:2671
 msgid "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,<i>instance</i>,*&gt;"
 msgstr "zi &lt;類別&gt; &lt;實體&gt:送出訊息至&lt;<i>類別</i>,<i>實體</i>,*&gt;"
 
-#: src/protocols/zephyr/zephyr.c:2646
+#: ../src/protocols/zephyr/zephyr.c:2677
 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;"
 msgstr "zcir &lt;類別&gt; &lt;實體&gt; &lt;接受者&gt;:送出訊息至 &lt;<i>類別</i>,<i>實體</i>,<i>接受者</i>&gt;"
 
-#: src/protocols/zephyr/zephyr.c:2652
+#: ../src/protocols/zephyr/zephyr.c:2683
 msgid "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,<i>instance</i>,<i>recipient</i>&gt;"
 msgstr "zir &lt;實體&gt; &lt;接受者&gt;:送出訊息至 &lt;MESSAGE,<i>實體</i>,<i>接受者</i>&gt;"
 
-#: src/protocols/zephyr/zephyr.c:2657
+#: ../src/protocols/zephyr/zephyr.c:2688
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr "zc &lt;類別&gt;:送出訊息至 &lt;<i>類別</i>,PERSONAL,*&gt;"
 
 #  NOTE (14:46:42) aatharuv: wing: resubscribe is basically "rejoin chat"
 #  NOTE (14:47:50) aatharuv: wing: err, "rejoin all chats"
-#: src/protocols/zephyr/zephyr.c:2763
+#: ../src/protocols/zephyr/zephyr.c:2794
 msgid "Resubscribe"
 msgstr "重新加入所有聊天室"
 
 #  FIXME 要覆查譯文
-#: src/protocols/zephyr/zephyr.c:2766
+#: ../src/protocols/zephyr/zephyr.c:2797
 msgid "Retrieve subscriptions from server"
 msgstr "由伺服器取得目前所在聊天室的清單"
 
@@ -12507,22 +13104,30 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:2849
-#: src/protocols/zephyr/zephyr.c:2851
+#: ../src/protocols/zephyr/zephyr.c:2882
+#: ../src/protocols/zephyr/zephyr.c:2884
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr 協定模組"
 
+#: ../src/protocols/zephyr/zephyr.c:2903
+msgid "Use tzc"
+msgstr "使用 TZC"
+
+#: ../src/protocols/zephyr/zephyr.c:2906
+msgid "tzc command"
+msgstr "TZC 指令"
+
 # NOTE: 這是Zephyr使用者會自然明白的術語,不用費心解釋
 # NOTE: aatharuv: Most zephyr clients use ".anyone" to store the Zephyr
 # NOTE: buddylist. The export to .anyone option controls whether you want
 # NOTE: gaim to write to .anyone upon logout. Some people use multiple
 # NOTE: clients and prefer to have separate buddylists for separate clients.
 # NOTE: Similarly, .zephyr.subs controls the chats that a person subs.
-#: src/protocols/zephyr/zephyr.c:2876
+#: ../src/protocols/zephyr/zephyr.c:2909
 msgid "Export to .anyone"
 msgstr "匯出至 .anyone 檔"
 
-#: src/protocols/zephyr/zephyr.c:2879
+#: ../src/protocols/zephyr/zephyr.c:2912
 msgid "Export to .zephyr.subs"
 msgstr "匯出至 .zephyr.subs 檔"
 
@@ -12532,15 +13137,15 @@
 # NOTE: gaim to write to .anyone upon logout. Some people use multiple
 # NOTE: clients and prefer to have separate buddylists for separate clients.
 # NOTE: Similarly, .zephyr.subs controls the chats that a person subs.
-#: src/protocols/zephyr/zephyr.c:2882
+#: ../src/protocols/zephyr/zephyr.c:2915
 msgid "Import from .anyone"
 msgstr "自 .anyone 檔案中匯入"
 
-#: src/protocols/zephyr/zephyr.c:2885
+#: ../src/protocols/zephyr/zephyr.c:2918
 msgid "Import from .zephyr.subs"
 msgstr "自 .zephyr.subs 檔中匯入"
 
-#: src/protocols/zephyr/zephyr.c:2888
+#: ../src/protocols/zephyr/zephyr.c:2921
 #, fuzzy
 msgid "Realm"
 msgstr "姓名"
@@ -12548,54 +13153,48 @@
 # FIXME 暫譯;譯得很差,有待改進
 # NOTE: Zephyr 的「Exposure」指隱身至現身之間的各種狀態
 # NOTE: aatharuv: exposure in zephyr controls your visibility.
-#: src/protocols/zephyr/zephyr.c:2891
+#: ../src/protocols/zephyr/zephyr.c:2924
 msgid "Exposure"
 msgstr "現身程度"
 
-#: src/proxy.c:1118
-#: src/proxy.c:1148
-#: src/proxy.c:1170
-#: src/proxy.c:1182
+#: ../src/proxy.c:1215
+#: ../src/proxy.c:1271
+#: ../src/proxy.c:1319
+#: ../src/proxy.c:1346
 #, c-format
 msgid "Proxy connection error %d"
 msgstr "代理伺服器連線錯誤 %d"
 
 #. Forbidden
-#: src/proxy.c:1178
+#: ../src/proxy.c:1335
 #, c-format
 msgid "Access denied: proxy server forbids port %d tunnelling."
 msgstr "拒絕存取:Proxy 伺服器禁止通訊埠 %d 的資料傳送。"
 
-#: src/proxy.c:2019
-msgid "Invalid proxy settings"
-msgstr "無效的代理伺服器設定"
-
-#: src/proxy.c:2019
-msgid "Either the host name or port number specified for your given proxy type is invalid."
-msgstr "對於您目前所設定的代理伺服器型態來說,您所給定的伺服器名稱及通訊埠是無效的"
-
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:1350
-msgid "Accept"
-msgstr "接受"
-
-#: src/savedstatuses.c:502
-#, fuzzy
-msgid "saved statuses"
-msgstr "伺服器統計資料"
-
-#: src/savedstatuses.c:709
+#: ../src/request.h:1354
+msgid "_Accept"
+msgstr "接受(_A)"
+
+#. *
+#. * The default message to use when the user becomes auto-away.
+#.
+#: ../src/savedstatuses.c:45
 msgid "I'm not here right now"
 msgstr "我現在不在位子上"
 
-#: src/server.c:224
+#: ../src/savedstatuses.c:524
+msgid "saved statuses"
+msgstr "儲存狀態"
+
+#: ../src/server.c:225
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s 改變暱稱為 %s。\n"
 
-#: src/server.c:691
+#: ../src/server.c:689
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -12604,107 +13203,373 @@
 "%s 邀請 %s 到聊天室「%s」:\n"
 "%s"
 
-#: src/server.c:696
+#: ../src/server.c:694
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s 邀請了 %s 到聊天室「%s」:\n"
 
-#: src/server.c:700
+#: ../src/server.c:698
 msgid "Accept chat invitation?"
 msgstr "接受邀請嗎?"
 
-#: src/status.c:152
+#: ../src/status.c:153
 msgid "Unset"
 msgstr "取消設定"
 
-#: src/status.c:155
+#: ../src/status.c:156
 msgid "Unavailable"
 msgstr "離線"
 
-#: src/status.c:620
-#, c-format
-msgid "%s came back"
-msgstr "%s 回來了"
-
-#: src/status.c:625
-#, c-format
-msgid "%s went away"
-msgstr "%s 已經離開"
-
-#: src/status.c:1271
+#: ../src/status.c:160
+msgid "Mobile"
+msgstr "使用行動裝置"
+
+#: ../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:1311
 #, c-format
 msgid "%s became idle"
 msgstr "%s 變更狀態為閒置"
 
-#: src/status.c:1284
+#: ../src/status.c:1328
 #, c-format
 msgid "%s became unidle"
 msgstr "%s 由閒置返回"
 
-#: src/status.c:1357
+#: ../src/status.c:1394
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s 變更狀態為閒置"
 
-#: src/status.c:1359
+#: ../src/status.c:1396
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s 由閒置返回"
 
-#: src/util.c:2120
+#: ../src/util.c:679
+#, c-format
+msgid "%x %X"
+msgstr "%x %X"
+
+#: ../src/util.c:2454
 #, c-format
 msgid "Error Reading %s"
 msgstr "讀取 %s 途中發生了錯誤"
 
-#: src/util.c:2121
+#: ../src/util.c:2455
 #, c-format
 msgid "An error was encountered reading your %s.  They have not been loaded, and the old file has been renamed to %s~."
 msgstr "在解析您的 %s 時發生錯誤。它們並沒有被讀入,同時舊檔案已移至 %s~。"
 
-#: src/util.c:2616
+#: ../src/util.c:2908
 msgid "Calculating..."
 msgstr "計算中..."
 
-#: src/util.c:2619
+#: ../src/util.c:2911
 msgid "Unknown."
 msgstr "未知。"
 
-#: src/util.c:2649
-msgid "second"
-msgid_plural "seconds"
-msgstr[0] "秒"
-msgstr[1] "秒"
-
-#: src/util.c:2663
-msgid "day"
-msgid_plural "days"
-msgstr[0] "日"
-msgstr[1] "日"
-
-#: src/util.c:2671
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "小時"
-msgstr[1] "小時"
-
-#: src/util.c:2679
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "分"
-msgstr[1] "分"
-
-#: src/util.c:3117
+#: ../src/util.c:2937
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d 秒"
+msgstr[1] "%d 秒"
+
+#: ../src/util.c:2949
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d 日"
+msgstr[1] "%d 日"
+
+#: ../src/util.c:2957
+#, c-format
+msgid "%s, %d hour"
+msgid_plural "%s, %d hours"
+msgstr[0] "%s, %d 小時"
+msgstr[1] "%s, %d 小時"
+
+#: ../src/util.c:2963
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d 小時"
+msgstr[1] "%d 小時"
+
+#: ../src/util.c:2971
+#, c-format
+msgid "%s, %d minute"
+msgid_plural "%s, %d minutes"
+msgstr[0] "%s, %d 分"
+msgstr[1] "%s, %d 分"
+
+#: ../src/util.c:2977
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d 分"
+msgstr[1] "%d 分"
+
+#: ../src/util.c:3446
 msgid "g003: Error opening connection.\n"
 msgstr "g003: 連線開啟錯誤。\n"
 
+#~ msgid "Unable to play sound because the chosen file (%s) does not exist."
+#~ msgstr "無法播放音效,因為所選取的檔案 (%s) 不存在。"
+#~ msgid ""
+#~ "Unable to play sound because the 'Command' sound method has been chosen, "
+#~ "but no command has been set."
+#~ msgstr ""
+#~ "無法播放音效,因為選取了「指令」為播放模式,可是並沒有設定任何指令。"
+#~ msgid ""
+#~ "Unable to play sound because the configured sound command could not be "
+#~ "launched: %s"
+#~ msgstr "無法播放音效,因為無法執行所設定的音效指令:%s"
+#~ msgid "Unable to initiate a new search"
+#~ msgstr "無法啟始一個新的搜尋"
+#~ msgid "You have a pending search. Please wait for it to finish."
+#~ msgstr "您有一個處理中的搜尋。請等候它完成。"
+#~ msgid "Direct IM with %s closed"
+#~ msgstr "和 %s 的即時訊息關閉"
+#~ msgid "Direct IM with %s failed"
+#~ msgstr "和 %s 的即時訊息失敗"
+#~ msgid "Unable to open Direct IM"
+#~ msgstr "無法開啟直接的即時訊息"
+#~ msgid "You have lost your connection to chat room %s."
+#~ msgstr "您已經由聊天室 %s 停止連線。"
+#~ msgid "Chat is currently unavailable"
+#~ msgstr "目前無法使用聊天室"
+#~ msgid "Unable to login to AIM"
+#~ msgstr "無法登入到 AIM"
+#~ msgid "Unable to create new connection."
+#~ msgstr "無法開啟新連結。"
+
+#, fuzzy
+#~ msgid "Unable to log into file transfer proxy."
+#~ msgstr "無法登入到 Rendezvous"
+
+#, fuzzy
+#~ msgid ""
+#~ "Unable to establish listener socket or no AOL proxy connection present."
+#~ msgstr "無法建立監聽器 Socket。"
+#~ msgid "Internal Error"
+#~ msgstr "內部錯誤"
+#~ msgid "Auth host"
+#~ msgstr "認證伺服器"
+#~ msgid "Auth port"
+#~ msgstr "認證通訊埠"
+#~ msgid "TOC host"
+#~ msgstr "TOC 伺服器"
+#~ msgid "TOC port"
+#~ msgstr "TOC 通訊埠"
+#~ msgid "Pager host"
+#~ msgstr "傳呼系統伺服器"
+#~ msgid "YCHT host"
+#~ msgstr "YCHT 主機"
+#~ msgid "YCHT port"
+#~ msgstr "YCHT 通訊埠"
+#~ msgid "%s logged out."
+#~ msgstr "%s 登出。"
+#~ msgid "Start _Voice Chat"
+#~ msgstr "開啟語音聊天"
+#~ msgid "Screen Name:"
+#~ msgstr "帳號:"
+
+#, fuzzy
+#~ msgid "Background color name"
+#~ msgstr "背景顏色"
+
+#, fuzzy
+#~ msgid "Background color as a string"
+#~ msgstr "背景顏色"
+
+#, fuzzy
+#~ msgid "Background color as a GdkColor"
+#~ msgstr "背景顏色"
+
+#, fuzzy
+#~ msgid "Background set"
+#~ msgstr "背景顏色"
+#~ msgid "Whether this tag affects the background color"
+#~ msgstr "不管這個標籤是否影響背景顏色"
+#~ msgid "ComboBox model"
+#~ msgstr "ComboBox樣式"
+#~ msgid "The model for the combo box"
+#~ msgstr "Combo Box的樣式"
+#~ msgid "Wrap width"
+#~ msgstr "換行寬度"
+#~ msgid "Wrap width for layouting the items in a grid"
+#~ msgstr "控制項在 Grid 中顯示的換行寬度"
+#~ msgid "Row span column"
+#~ msgstr "橫向跨欄"
+#~ msgid "Column span column"
+#~ msgstr "縱向跨欄"
+
+#  XXX 這個有點怪,譯錯?
+#, fuzzy
+#~ msgid "Active item"
+#~ msgstr "啟動"
+
+#, fuzzy
+#~ msgid "The item which is currently active"
+#~ msgstr "目前無法使用聊天室"
+
+#  NOTE 這是「看來是離線」。其他協定的「離線」狀態也不一定真的是離線,我想只譯「離線」也不太離譜
+#, fuzzy
+#~ msgid "Appears as list"
+#~ msgstr "離線"
+#~ msgid "me is using Gaim v%s."
+#~ msgstr "我在用 Gaim v%s。"
+#~ msgid "Call ended."
+#~ msgstr "結束呼叫。"
+#~ msgid "Calling %s"
+#~ msgstr "呼叫 %s"
+#~ msgid "End Call"
+#~ msgstr "結束呼叫"
+#~ msgid "Receiving call from %s"
+#~ msgstr "收到來息 %s 的呼叫"
+#~ msgid "Reject Call"
+#~ msgstr "拒絕呼叫"
+#~ msgid "Accept call"
+#~ msgstr "接受呼叫"
+#~ msgid "Connected to %s"
+#~ msgstr "已連結到 %s"
+#~ msgid "_Mute"
+#~ msgstr "靜音(_M)"
+#~ msgid "Error launching <b>%s</b>: %s"
+#~ msgstr "執行「%s」時發生了錯誤:%s"
+#~ msgid "Email"
+#~ msgstr "電子郵件"
+#~ msgid "e-Mail"
+#~ 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 "再次輸入密碼"
+
+#, fuzzy
+#~ 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 "New Status..."
+#~ msgstr "新狀態..."
+#~ msgid "Saved Status..."
+#~ msgstr "儲存狀態..."
+#~ msgid "Join A Chat..."
+#~ msgstr "加入聊天室..."
+
+#, fuzzy
+#~ msgid "GtkTreeView Expander Indentation"
+#~ msgstr "GtkTreeView展開器大小"
+#~ msgid "(+%d more)"
+#~ msgstr "(以及另外 %d 個)"
+#~ msgid " left the room (%s)."
+#~ msgstr " 離開聊天室 (%s)。"
+#~ msgid "Offline "
+#~ msgstr "離線 "
+
+#, fuzzy
+#~ msgid "Conversation in %s on %s"
+#~ msgstr "與 %s 的交談"
+#~ msgid "Default"
+#~ msgstr "預設"
+#~ msgid "<span weight=\"bold\">From:</span> %s\n"
+#~ msgstr "<span weight=\"bold\">來自:</span> %s\n"
+#~ msgid "<span weight=\"bold\">Subject:</span> %s\n"
+#~ msgstr "<span weight=\"bold\">主題:</span> %s\n"
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
+#~ "\n"
+#~ "%s%s%s%s"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">您收到了郵件!</span>\n"
+#~ "\n"
+#~ "%s%s%s%s"
+#~ msgid "Pounce Action"
+#~ msgstr "捕捉動作"
+#~ msgid "Custom..."
+#~ msgstr "使用者自定..."
+#~ msgid "_Warn"
+#~ msgstr "警告(_W)"
+#~ msgid "Jabber ID"
+#~ msgstr "Jabber 帳號"
+#~ msgid "Hidden"
+#~ msgstr "隱藏"
+#~ msgid "Away Message"
+#~ msgstr "離開訊息"
+
+#  NOTE Jabber 術語,見上
+#, fuzzy
+#~ msgid "(pending)"
+#~ msgstr "無(但正等待對方認證您)"
+#~ msgid "Hide IP address"
+#~ msgstr "隱藏 IP 位址"
+
+# NOTE 參閱 http://www.geocities.com/Athens/Delphi/6470/icq99.html
+#, fuzzy
+#~ msgid "Web aware"
+#~ msgstr "允許其他使用者在網路上查看您目前的狀態"
+
+#, fuzzy
+#~ msgid "Connected to Sametime Community Server"
+#~ msgstr "連線至 SILC 伺服器中"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "<b>Status</b>: %s"
+#~ msgstr "<b>狀態:</b>%s"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "<b>Message</b>: %s"
+#~ msgstr ""
+#~ "\n"
+#~ "<b>%s:</b>%s"
+
+#  XXX 這個有點怪,譯錯?
+#~ msgid "Active"
+#~ msgstr "啟動"
+#~ msgid "Add User"
+#~ msgstr "新增使用者"
+# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-August/001431.html
+#, fuzzy
+#~ msgid "NotesBuddy encoding"
+#~ msgstr "伺服器不支援給定的字元編碼"
 #~ msgid "Write a gtkrc file with these settings to %s"
 #~ msgstr "將這些設定寫入到 %s 的 gtkrc 檔"
 #~ msgid "Screenname:"
 #~ msgstr "帳號:"
 #~ msgid "Host name"
 #~ msgstr "主機名稱"
-#~ msgid "Nick name"
-#~ msgstr "暱稱"
 
 #, fuzzy
 #~ msgid "Active Message"
@@ -12748,9 +13613,6 @@
 #~ msgid "_Alias Buddy..."
 #~ msgstr "為這個好友加上別名(_A)..."
 
-# XXX「Remove Buddy」和「Remove Contact」在中文版Gaim無法析別;可能有改進的空間
-#~ msgid "_Remove Buddy"
-#~ msgstr "移除這個好友(_R)"
 # XXX 中文譯文無法分別出「Alias Buddy」和「Alias Contact」
 #~ msgid "Alias Contact..."
 #~ msgstr "為這組好友加上別名..."
@@ -12769,10 +13631,6 @@
 #~ msgstr "儲存設定並啟動(_E)"
 
 #, fuzzy
-#~ msgid "Persists"
-#~ msgstr "許可"
-
-#, fuzzy
 #~ msgid "Change password"
 #~ msgstr "修改密碼"
 #~ msgid "Error processing event or response (%s)."
@@ -12840,10 +13698,6 @@
 #~ msgstr "在離開時,將所有的新訊息置入佇列中(_Q)"
 
 #, fuzzy
-#~ msgid "Custom status"
-#~ msgstr "依照狀態"
-
-#, fuzzy
 #~ msgid "Could't open file"
 #~ msgstr "無法傳送檔案"
 #~ msgid "Unable to set AIM away message."
--- a/src/gtkdialogs.c	Wed Aug 09 06:23:18 2006 +0000
+++ b/src/gtkdialogs.c	Wed Aug 09 14:47:37 2006 +0000
@@ -132,6 +132,7 @@
 	{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", "nacho.resa@gmail.com"},
+	{N_("Gujarati"),            "gu", "Ankit Patel", "ankit_patel@users.sf.net"},
 	{N_("Hebrew"),              "he", "Shalom Craimer", "scraimer@gmail.com"},
 	{N_("Hindi"),               "hi", "Ravishankar Shrivastava", "raviratlami@yahoo.com"},
 	{N_("Hungarian"),           "hu", "Zoltan Sutto", "sutto.zoltan@rutinsoft.hu"},
@@ -144,6 +145,7 @@
 	{N_("Kurdish"),             "ku", "Rizoyê Xerzî", "rizoxerzi@hotmail.com"},
 	{N_("Lithuanian"),          "lt", "Laurynas Biveinis", "laurynas.biveinis@gmail.com"},
 	{N_("Macedonian"),          "mk", "Tomislav Markovski", "herrera@users.sf.net"},
+	{N_("Nepali"),              "ne", "Shyam Krishna Bal", "shyamkrishna_bal@yahoo.com"},
 	{N_("Dutch, Flemish"),      "nl", "Vincent van Adrighem", "V.vanAdrighem@dirck.mine.nu"},
 	{N_("Norwegian"),           "no", "Petter Johan Olsen", "petter.olsen@cc.uit.no"},
 	{N_("Polish"),              "pl", "Emil Nowak", "emil5@go2.pl"},