diff po/hi.po @ 10302:581de78cf809

[gaim-migrate @ 11487] Rename main.c to gtkmain.c Change POTFILES.in to reflect the new file names Update the po's so they use the new file names Update the po's to use the correct line numbers (or whatever make dist does) committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Thu, 02 Dec 2004 23:48:48 +0000
parents 1d2cf6e8ca8f
children 364a2ef907ae
line wrap: on
line diff
--- a/po/hi.po	Thu Dec 02 23:26:57 2004 +0000
+++ b/po/hi.po	Thu Dec 02 23:48:48 2004 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gaim.hi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-25 23:58-0400\n"
+"POT-Creation-Date: 2004-12-02 18:38-0500\n"
 "PO-Revision-Date: 2004-04-10 16:24+0530\n"
 "Last-Translator: Ravishankar Shrivastava <raviratlami@yahoo.com>\n"
 "Language-Team: Hindi <indlinux-hindi-gnome@lists.sourceforge.net>\n"
@@ -15,23 +15,24 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: plugins/autorecon.c:233
+#: plugins/autorecon.c:276
 msgid "Error Message Suppression"
 msgstr ""
 
-#: plugins/autorecon.c:237
+#: plugins/autorecon.c:280
 #, fuzzy
 msgid "Hide Disconnect Errors"
 msgstr "कनेक्शन में त्रुटि"
 
-#: plugins/autorecon.c:241
+#: plugins/autorecon.c:284
 #, fuzzy
 msgid "Hide Login Errors"
 msgstr "बड्डी सूची त्रुटि"
 
-#: plugins/autorecon.c:245
-msgid "Restore Away State On Reconnect"
-msgstr ""
+#: plugins/autorecon.c:288
+#, fuzzy
+msgid "Hide Reconnecting Dialog"
+msgstr "कनेक्शन में त्रुटि"
 
 #  *< api_version
 #  *< type
@@ -40,14 +41,13 @@
 #  *< dependencies
 #  *< priority
 #  *< id
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/autorecon.c:267
+#: plugins/autorecon.c:312
 msgid "Auto-Reconnect"
 msgstr "स्वचालित पुनःजुड़ें"
 
@@ -58,7 +58,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/autorecon.c:270 plugins/autorecon.c:272
+#: plugins/autorecon.c:315 plugins/autorecon.c:317
 msgid "When you are kicked offline, this reconnects you."
 msgstr "जब आप अनचाहे आफलाइन हो जाते हैं, तो यह आपको पुनः जोड़ता है."
 
@@ -79,29 +79,29 @@
 msgid "Check email every X seconds.\n"
 msgstr "हर X सेकण्ड मे डाक देखें.\n"
 
-#: plugins/contact_priority.c:83
+#: plugins/contact_priority.c:84
 msgid "Point values to use when..."
 msgstr "अंक मान जब उपयोग में हों..."
 
-#: plugins/contact_priority.c:92
+#: plugins/contact_priority.c:93
 msgid "Buddy is offline:"
 msgstr "बड्डी ऑफलाइन है:"
 
-#: plugins/contact_priority.c:106
+#: plugins/contact_priority.c:107
 msgid "Buddy is away:"
 msgstr "बड्डी दूर हैः"
 
-#: plugins/contact_priority.c:120
+#: plugins/contact_priority.c:121
 msgid "Buddy is idle:"
 msgstr "बड्डी निष्क्रिय हैः"
 
-#: plugins/contact_priority.c:134
+#: plugins/contact_priority.c:135
 msgid "Use last matching buddy"
 msgstr "पिछली मैचिंग बड्डी उपयोग करें"
 
 #  Explanation
 #. Explanation
-#: plugins/contact_priority.c:140
+#: plugins/contact_priority.c:141
 msgid ""
 "The buddy with the lowest score is the buddy who will have priority in the "
 "contact.\n"
@@ -113,7 +113,7 @@
 "डिफाल्ट मान (ऑफलाइन = 4,दूर = 2, और निष्क्रिय = 1)\n"
 "यह अन्तर्निर्मित अनुक्रम उपयोग करेंगे सक्रिय->निष्क्रिय->दूर->दूर+निष्क्रिय->ऑफलाइन."
 
-#: plugins/contact_priority.c:143
+#: plugins/contact_priority.c:144
 msgid "Point values to use for Account..."
 msgstr "खाता हेतु उपयोग में मान अंक..."
 
@@ -124,14 +124,13 @@
 #  *< dependencies
 #  *< priority
 #  *< id
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/contact_priority.c:192
+#: plugins/contact_priority.c:195
 msgid "Contact Priority"
 msgstr "सम्पर्क प्राथमिकता"
 
@@ -141,14 +140,14 @@
 #. *< name
 #. *< version
 #. *< summary
-#: plugins/contact_priority.c:195
+#: plugins/contact_priority.c:198
 msgid ""
 "Allows for controlling the values associated with different buddy states."
 msgstr "भिन्न बड्डी अवस्था से सम्बद्ध मान को नियंत्रण करने देता है."
 
 #  *< description
 #. *< description
-#: plugins/contact_priority.c:197
+#: plugins/contact_priority.c:200
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
@@ -172,70 +171,69 @@
 msgid "Gaim - Away"
 msgstr "गेम - दूर"
 
-#: plugins/docklet/docklet.c:133 src/gtkaccount.c:738 src/gtkaccount.c:2160
+#: plugins/docklet/docklet.c:140
 msgid "Auto-login"
 msgstr "स्वचालित - लॉगइन"
 
-#: plugins/docklet/docklet.c:136
+#: plugins/docklet/docklet.c:143
 msgid "New Message..."
 msgstr "नया संदेश..."
 
-#: plugins/docklet/docklet.c:137
+#: plugins/docklet/docklet.c:144
 msgid "Join A Chat..."
 msgstr "गपशप से जुडें..."
 
-#: plugins/docklet/docklet.c:172
+#: plugins/docklet/docklet.c:181
 msgid "New..."
 msgstr "नया..."
 
-#: plugins/docklet/docklet.c:180 src/gtkprefs.c:1809 src/protocols/gg/gg.c:51
-#: src/protocols/irc/msgs.c:189 src/protocols/jabber/jabber.c:960
-#: src/protocols/jabber/jutil.c:32 src/protocols/jabber/presence.c:63
-#: src/protocols/jabber/presence.c:126 src/protocols/novell/novell.c:2798
-#: src/protocols/novell/novell.c:2915 src/protocols/novell/novell.c:2967
-#: src/protocols/oscar/oscar.c:648 src/protocols/oscar/oscar.c:5570
-#: src/protocols/oscar/oscar.c:6558 src/protocols/oscar/oscar.c:6758
-#: src/protocols/silc/buddy.c:1379 src/protocols/silc/silc.c:46
-#: src/protocols/silc/silc.c:76
+#: plugins/docklet/docklet.c:189 src/gtkprefs.c:1760 src/protocols/gg/gg.c:52
+#: src/protocols/irc/irc.c:169 src/protocols/irc/msgs.c:189
+#: src/protocols/jabber/buddy.c:1074 src/protocols/jabber/jabber.c:987
+#: src/protocols/msn/msn.c:542 src/protocols/novell/novell.c:2811
+#: src/protocols/novell/novell.c:2928 src/protocols/novell/novell.c:2980
+#: src/protocols/oscar/oscar.c:677 src/protocols/oscar/oscar.c:5592
+#: src/protocols/oscar/oscar.c:6662 src/protocols/oscar/oscar.c:6883
+#: src/protocols/silc/buddy.c:1384 src/protocols/silc/silc.c:52
+#: src/protocols/yahoo/yahoo.c:3167 src/protocols/zephyr/zephyr.c:2225
 msgid "Away"
 msgstr "दूर"
 
-#. else...
-#: plugins/docklet/docklet.c:186 src/away.c:583
-#: src/protocols/oscar/oscar.c:5488 src/protocols/oscar/oscar.c:6766
+#: plugins/docklet/docklet.c:197
 msgid "Back"
 msgstr "पीछे"
 
-#: plugins/docklet/docklet.c:194
+#: plugins/docklet/docklet.c:206
 msgid "Mute Sounds"
 msgstr "आवाज बंद करें"
 
-#: plugins/docklet/docklet.c:199 src/gtkft.c:628
+#: plugins/docklet/docklet.c:213 src/gtkft.c:628
 msgid "File Transfers"
 msgstr "फ़ाइल हस्तांतरण"
 
 #  And now for the buttons
-#: plugins/docklet/docklet.c:200 src/gtkaccount.c:2341
+#: plugins/docklet/docklet.c:214 src/gtkaccount.c:2345
 msgid "Accounts"
 msgstr "खाता"
 
-#: plugins/docklet/docklet.c:201 src/gtkprefs.c:2506
+#: plugins/docklet/docklet.c:215 src/gtkprefs.c:2263
 msgid "Preferences"
 msgstr "वरीयताएँ"
 
-#: plugins/docklet/docklet.c:210
-msgid "Signoff"
-msgstr "साइनऑफ"
-
-#: plugins/docklet/docklet.c:214
+#: plugins/docklet/docklet.c:224
+#, fuzzy
+msgid "Log Out"
+msgstr "विन-गेम विकल्प"
+
+#: plugins/docklet/docklet.c:228
 msgid "Quit"
 msgstr "बाहर"
 
-#: plugins/docklet/docklet.c:505
+#: plugins/docklet/docklet.c:553
 msgid "Tray Icon Configuration"
 msgstr "ट्रे आइकन कॉन्फ़िगरेशन"
 
-#: plugins/docklet/docklet.c:509
+#: plugins/docklet/docklet.c:557
 msgid "_Hide new messages until tray icon is clicked"
 msgstr "जब तक ट्रे आइकन क्लिक नहीं किया जाता, नए संदेश छुपाएँ (_H)"
 
@@ -246,14 +244,13 @@
 #  *< dependencies
 #  *< priority
 #  *< id
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/docklet/docklet.c:533
+#: plugins/docklet/docklet.c:583
 msgid "System Tray Icon"
 msgstr "तंत्र तश्तरी आइकन"
 
@@ -263,13 +260,13 @@
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/docklet/docklet.c:536
+#: plugins/docklet/docklet.c:586
 msgid "Displays an icon for Gaim in the system tray."
 msgstr "गेम के लिए तंत्र तश्तरी में आइकन दर्शाएँ"
 
 #  *  description
 #. *  description
-#: plugins/docklet/docklet.c:538
+#: plugins/docklet/docklet.c:588
 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, "
@@ -282,48 +279,47 @@
 "नहीं किया जाता, आईसीक्यू की तरह."
 
 #  Conversations
-#: plugins/extplacement.c:76
+#: plugins/extplacement.c:77
 #, fuzzy
 msgid "By conversation count"
 msgstr "वार्तालाप"
 
 #  Conversations
-#: plugins/extplacement.c:97
+#: plugins/extplacement.c:98
 #, fuzzy
 msgid "Conversation Placement"
 msgstr "वार्तालाप"
 
 #  IM Convo trans options
-#: plugins/extplacement.c:102
+#: plugins/extplacement.c:103
 #, fuzzy
 msgid "Number of conversations per window"
 msgstr "आईएम वार्तालाप विंडो"
 
-#: plugins/extplacement.c:108
+#: plugins/extplacement.c:109
 msgid "Separate IM and Chat windows when placing by number"
 msgstr ""
 
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/extplacement.c:127
+#: plugins/extplacement.c:130
 #, fuzzy
 msgid "ExtPlacement"
 msgstr "बदलने हेतु पाठ"
 
 #. *< name
 #. *< version
-#: plugins/extplacement.c:129
+#: plugins/extplacement.c:132
 msgid "Extra conversation placement options."
 msgstr ""
 
 #. *< summary
 #. *  description
-#: plugins/extplacement.c:131
+#: plugins/extplacement.c:134
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
@@ -336,14 +332,13 @@
 #  *< dependencies
 #  *< priority
 #  *< id
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/filectl.c:222
+#: plugins/filectl.c:249
 msgid "Gaim File Control"
 msgstr "गेम फ़ाइल नियंत्रण"
 
@@ -354,34 +349,34 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/filectl.c:225 plugins/filectl.c:227
+#: plugins/filectl.c:252 plugins/filectl.c:254
 msgid "Allows you to control Gaim by entering commands in a file."
 msgstr "गेम पर नियंत्रण हेतु फ़ाइल में कमांड भरने हेतु अनुमति देता है."
 
-#: plugins/gaim-remote/remote.c:90
+#: plugins/gaim-remote/remote.c:91
 msgid "Not connected to AIM"
 msgstr "एआईएम से कनेक्टेड नहीं है."
 
-#: plugins/gaim-remote/remote.c:99 plugins/gaim-remote/remote.c:138
+#: plugins/gaim-remote/remote.c:100 plugins/gaim-remote/remote.c:139
 msgid "No screenname given."
 msgstr "कोई स्क्रीन-नाम नहीं दिया है."
 
-#: plugins/gaim-remote/remote.c:175
+#: plugins/gaim-remote/remote.c:176
 msgid "No roomname given."
 msgstr "कोई कमरा-नाम नहीं दिया है."
 
-#: plugins/gaim-remote/remote.c:194
+#: plugins/gaim-remote/remote.c:195
 msgid "Invalid AIM URI"
 msgstr "अवैध एआईएम यूआरआई"
 
-#: plugins/gaim-remote/remote.c:668
+#: plugins/gaim-remote/remote.c:742
 #, c-format
 msgid ""
 "Failed to assign %s to a socket:\n"
 "%s"
 msgstr ""
 
-#: plugins/gaim-remote/remote.c:691
+#: plugins/gaim-remote/remote.c:765
 msgid "Unable to open socket"
 msgstr ""
 
@@ -392,14 +387,13 @@
 #  *< dependencies
 #  *< priority
 #  *< id
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaim-remote/remote.c:739
+#: plugins/gaim-remote/remote.c:815
 msgid "Remote Control"
 msgstr "रिमोट कंट्रोल"
 
@@ -409,13 +403,13 @@
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaim-remote/remote.c:742
+#: plugins/gaim-remote/remote.c:818
 msgid "Provides remote control for gaim applications."
 msgstr "गेम अनुप्रयोगों के लिए रिमोट कंट्रोल प्रदान करता है"
 
 #  *  description
 #. *  description
-#: plugins/gaim-remote/remote.c:744
+#: plugins/gaim-remote/remote.c:820
 msgid ""
 "Gives Gaim the ability to be remote-controlled through third-party "
 "applications or through the gaim-remote tool."
@@ -430,14 +424,13 @@
 #  *< dependencies
 #  *< priority
 #  *< id
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gaiminc.c:87
+#: plugins/gaiminc.c:91
 msgid "Gaim Demonstration Plugin"
 msgstr "गेम प्रदर्शक प्लगइन"
 
@@ -447,13 +440,13 @@
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gaiminc.c:90
+#: plugins/gaiminc.c:94
 msgid "An example plugin that does stuff - see the description."
 msgstr "एक प्लगइन उदाहरण जो काम करता है - इसका विवरण देखें"
 
 #  *  description
 #. *  description
-#: plugins/gaiminc.c:92
+#: 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"
@@ -467,21 +460,21 @@
 
 #  Configuration frame
 #. Configuration frame
-#: plugins/gestures/gestures.c:220
+#: plugins/gestures/gestures.c:221
 msgid "Mouse Gestures Configuration"
 msgstr "माउस संकेतक आकार कॉन्फ़िगरेशन"
 
-#: plugins/gestures/gestures.c:227
+#: plugins/gestures/gestures.c:228
 msgid "Middle mouse button"
 msgstr "माउस का मध्य बटन"
 
-#: plugins/gestures/gestures.c:232
+#: plugins/gestures/gestures.c:233
 msgid "Right mouse button"
 msgstr "माउस का दाँया बटन"
 
 #  "Visual gesture display" checkbox
 #. "Visual gesture display" checkbox
-#: plugins/gestures/gestures.c:244
+#: plugins/gestures/gestures.c:245
 msgid "_Visual gesture display"
 msgstr "दृष्टि संकेतक आकार प्रदर्शक (_V)"
 
@@ -492,14 +485,13 @@
 #  *< dependencies
 #  *< priority
 #  *< id
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gestures/gestures.c:271
+#: plugins/gestures/gestures.c:274
 msgid "Mouse Gestures"
 msgstr "माउस संकेतक आकार"
 
@@ -509,13 +501,13 @@
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/gestures/gestures.c:274
+#: plugins/gestures/gestures.c:277
 msgid "Provides support for mouse gestures"
 msgstr "माउस संकेतक आकार के लिए समर्थन प्रदान करता है"
 
 #  *  description
 #. *  description
-#: plugins/gestures/gestures.c:276
+#: 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"
@@ -530,115 +522,101 @@
 " पूर्व वार्तालाप पर जाने हेतु पहले ऊपर फिर बाँए घसीटें.\n"
 " अगले वार्तालाप पर जाने हेतु पहले ऊपर फिर दाँए घसीटें. "
 
-#: plugins/gevolution/add_buddy_dialog.c:134
-#: plugins/gevolution/assoc-buddy.c:72
-msgid "Local Addressbook"
-msgstr ""
-
-#: plugins/gevolution/add_buddy_dialog.c:144
-#: plugins/gevolution/add_buddy_dialog.c:155
-#: plugins/gevolution/assoc-buddy.c:82 plugins/gevolution/assoc-buddy.c:93
-#: src/gtkblist.c:3011 src/gtkprefs.c:959 src/gtkprefs.c:1011
-#: src/gtkprefs.c:1823 src/protocols/jabber/jabber.c:924
-msgid "None"
-msgstr ""
-
-#: plugins/gevolution/add_buddy_dialog.c:188
-#: plugins/gevolution/assoc-buddy.c:176 src/gtkprefs.c:2164
-#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:598
-#: src/protocols/msn/msn.c:1312 src/protocols/trepia/trepia.c:398
+#: plugins/gevolution/add_buddy_dialog.c:132
+#: plugins/gevolution/assoc-buddy.c:120 src/gtkprefs.c:2080
+#: src/gtkroomlist.c:553 src/protocols/jabber/jabber.c:606
+#: src/protocols/msn/msn.c:1501 src/protocols/trepia/trepia.c:399
 msgid "Name"
 msgstr ""
 
-#: plugins/gevolution/add_buddy_dialog.c:199
+#: plugins/gevolution/add_buddy_dialog.c:143
 msgid "Instant Messaging"
 msgstr ""
 
 #. Add the label.
-#: plugins/gevolution/add_buddy_dialog.c:480
+#: 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:493
-#: plugins/gevolution/assoc-buddy.c:381 src/protocols/oscar/oscar.c:7042
+#: plugins/gevolution/add_buddy_dialog.c:468
+#: plugins/gevolution/assoc-buddy.c:354 src/protocols/oscar/oscar.c:7189
 msgid "Search"
 msgstr ""
 
-#: plugins/gevolution/add_buddy_dialog.c:564
-#: plugins/gevolution/new_person_dialog.c:308 src/gtkblist.c:4051
-#: src/gtkblist.c:4389
+#: plugins/gevolution/add_buddy_dialog.c:549
+#: plugins/gevolution/new_person_dialog.c:304 src/gtkblist.c:4053
+#: src/gtkblist.c:4402
 msgid "Group:"
 msgstr ""
 
 #. "New Person" button
-#: plugins/gevolution/add_buddy_dialog.c:590
-#: plugins/gevolution/assoc-buddy.c:484
+#: 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:607
+#: plugins/gevolution/add_buddy_dialog.c:592
 msgid "Select Buddy"
 msgstr ""
 
 #. Add the label.
-#: plugins/gevolution/assoc-buddy.c:368
+#: 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:447
+#: plugins/gevolution/assoc-buddy.c:429
 msgid "Show user details"
 msgstr ""
 
-#: plugins/gevolution/assoc-buddy.c:448
+#: plugins/gevolution/assoc-buddy.c:430
 msgid "Hide user details"
 msgstr ""
 
 #. "Associate Buddy" button
-#: plugins/gevolution/assoc-buddy.c:501
+#: plugins/gevolution/assoc-buddy.c:483
 #, fuzzy
 msgid "_Associate Buddy"
 msgstr "डाकेबल बड्डी सूची (_D)"
 
-#: plugins/gevolution/gevo-util.c:65 plugins/gevolution/gevolution.c:89
-#: src/blist.c:774 src/blist.c:982 src/blist.c:1912 src/gtkblist.c:3870
+#: plugins/gevolution/gevo-util.c:64 plugins/gevolution/gevolution.c:90
+#: src/blist.c:775 src/blist.c:982 src/blist.c:1933 src/gtkblist.c:3873
 #: src/protocols/jabber/roster.c:66
 msgid "Buddies"
 msgstr "बड्डीस"
 
-#: plugins/gevolution/gevolution.c:220
+#: plugins/gevolution/gevolution.c:221
 msgid "Add to Address Book"
 msgstr ""
 
 #. Configuration frame
-#: plugins/gevolution/gevolution.c:351
+#: plugins/gevolution/gevolution.c:344
 #, fuzzy
 msgid "Evolution Integration Configuration"
 msgstr "ट्रे आइकन कॉन्फ़िगरेशन"
 
 #. Label
-#: plugins/gevolution/gevolution.c:354
+#: plugins/gevolution/gevolution.c:347
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr ""
 
 #  And now for the buttons
-#: plugins/gevolution/gevolution.c:384 plugins/idle.c:51 src/gtkconn.c:620
+#: plugins/gevolution/gevolution.c:377 plugins/idle.c:52 src/gtkconn.c:626
 #, fuzzy
 msgid "Account"
 msgstr "खाता"
 
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/gevolution/gevolution.c:465
+#: plugins/gevolution/gevolution.c:460
 msgid "Evolution Integration"
 msgstr ""
 
@@ -646,60 +624,60 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/gevolution/gevolution.c:468 plugins/gevolution/gevolution.c:470
+#: plugins/gevolution/gevolution.c:463 plugins/gevolution/gevolution.c:465
 msgid "Provides integration with Ximian Evolution."
 msgstr ""
 
+#: 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 person's information below."
-msgstr ""
-
-#: plugins/gevolution/new_person_dialog.c:272
 msgid "Please enter the buddy's screen name and account type below."
 msgstr ""
 
-#: plugins/gevolution/new_person_dialog.c:292
+#: plugins/gevolution/new_person_dialog.c:288
 #, fuzzy
 msgid "Account type:"
 msgstr "आपने टाइप किया (_t):"
 
-#: plugins/gevolution/new_person_dialog.c:296
+#: plugins/gevolution/new_person_dialog.c:292
 msgid "Screenname:"
 msgstr ""
 
 #. Optional Information section
-#: plugins/gevolution/new_person_dialog.c:316
+#: plugins/gevolution/new_person_dialog.c:312
 msgid "Optional information:"
 msgstr ""
 
 #. Label
-#: plugins/gevolution/new_person_dialog.c:339 src/gtkaccount.c:372
-#: src/gtkaccount.c:402 src/protocols/oscar/oscar.c:554
+#: plugins/gevolution/new_person_dialog.c:335 src/gtkaccount.c:372
+#: src/gtkaccount.c:402 src/protocols/oscar/oscar.c:583
 #, fuzzy
 msgid "Buddy Icon"
 msgstr "बड्डी टिकर"
 
-#: plugins/gevolution/new_person_dialog.c:351
+#: plugins/gevolution/new_person_dialog.c:347
 msgid "First name:"
 msgstr ""
 
-#: plugins/gevolution/new_person_dialog.c:363
+#: plugins/gevolution/new_person_dialog.c:359
 msgid "Last name:"
 msgstr ""
 
-#: plugins/gevolution/new_person_dialog.c:383
+#: plugins/gevolution/new_person_dialog.c:379
 msgid "E-mail:"
 msgstr ""
 
-#: plugins/history.c:89
+#: plugins/history.c:92
 msgid "History"
 msgstr "इतिहास"
 
-#: plugins/history.c:91
+#: plugins/history.c:94
 msgid "Shows recently logged conversations in new conversations."
 msgstr "हाल ही में लाग किए वार्तालापों को नए वार्तालापों में दिखाता है."
 
-#: plugins/history.c:92
+#: plugins/history.c:95
 #, fuzzy
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
@@ -715,14 +693,13 @@
 #  *< dependencies
 #  *< priority
 #  *< id
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/iconaway.c:101
+#: plugins/iconaway.c:106
 msgid "Iconify on Away"
 msgstr "दूर होने पर आइकन बनाए"
 
@@ -733,25 +710,25 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/iconaway.c:104 plugins/iconaway.c:106
+#: plugins/iconaway.c:109 plugins/iconaway.c:111
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "जब आप दूर होंगे तब आपके वार्तालापों और बड्डी सूची को आइकन बनाता है."
 
-#: plugins/idle.c:55
+#: plugins/idle.c:56
 #, fuzzy
 msgid "Minutes"
 msgstr "मिनट्स"
 
-#: plugins/idle.c:62 plugins/idle.c:95
+#: plugins/idle.c:63 plugins/idle.c:98
 msgid "I'dle Mak'er"
 msgstr "निष्क्रिय बनाने वाला"
 
-#: plugins/idle.c:63 plugins/idle.c:78
+#: plugins/idle.c:64 plugins/idle.c:79
 #, fuzzy
 msgid "Set Account Idle Time"
 msgstr "निष्क्रिय समय"
 
-#: plugins/idle.c:66
+#: plugins/idle.c:67
 msgid "_Set"
 msgstr "नियत करें (_S)"
 
@@ -759,12 +736,12 @@
 # #-#-#-#-#  gnome-session.HEAD.hi.po (gnome-session VERSION)  #-#-#-#-#
 # gnome-session/session-properties.c:179
 #  Cancel button.
-#: plugins/idle.c:67 src/away.c:910
+#: plugins/idle.c:68
 #, fuzzy
 msgid "_Cancel"
 msgstr "रद्द"
 
-#: plugins/idle.c:97 plugins/idle.c:98
+#: plugins/idle.c:100 plugins/idle.c:101
 msgid "Allows you to hand-configure how long you've been idle for"
 msgstr "आपको हैंड-कानफिगर की अनुमति देता है कि आप कितने देर निष्क्रिय रह सकते हैं"
 
@@ -775,14 +752,13 @@
 #  *< dependencies
 #  *< priority
 #  *< id
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ipc-test-client.c:84
+#: plugins/ipc-test-client.c:87
 msgid "IPC Test Client"
 msgstr "आईपीसी परीक्षण क्लाएन्ट"
 
@@ -792,13 +768,13 @@
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ipc-test-client.c:87
+#: plugins/ipc-test-client.c:90
 msgid "Test plugin IPC support, as a client."
 msgstr "प्लगइन आइपीसी समर्थन, एक क्लाइंट की तरह परीक्षण करें."
 
 #  *  description
 #. *  description
-#: plugins/ipc-test-client.c:89
+#: plugins/ipc-test-client.c:92
 msgid ""
 "Test plugin IPC support, as a client. This locates the server plugin and "
 "calls the commands registered."
@@ -813,14 +789,13 @@
 #  *< dependencies
 #  *< priority
 #  *< id
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ipc-test-server.c:71
+#: plugins/ipc-test-server.c:74
 msgid "IPC Test Server"
 msgstr "आईपीसी परीक्षण सर्वर"
 
@@ -830,114 +805,113 @@
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/ipc-test-server.c:74
+#: plugins/ipc-test-server.c:77
 msgid "Test plugin IPC support, as a server."
 msgstr "प्लगइन आईपीसी समर्थन को एक सर्वर की तरह परीक्षण करें"
 
 #  *  description
 #. *  description
-#: plugins/ipc-test-server.c:76
+#: plugins/ipc-test-server.c:79
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr ""
 "प्लगइन आइपीसी समर्थन सर्वर की तरह परीक्षण करें. यह आइपीसी कमांड्स रजिस्टर करता है."
 
-#: plugins/mailchk.c:157
+#: plugins/mailchk.c:160
 msgid "Mail Checker"
 msgstr "डाक देखने वाला"
 
-#: plugins/mailchk.c:159
+#: plugins/mailchk.c:162
 msgid "Checks for new local mail."
 msgstr "नए स्थानीय डाक देखें."
 
-#: plugins/mailchk.c:160
+#: plugins/mailchk.c:163
 msgid "Adds a small box to the buddy list that shows if you have new mail."
 msgstr ""
 
 #  ---------- "Notify For" ----------
 #. ---------- "Notify For" ----------
-#: plugins/notify.c:600
+#: plugins/notify.c:599
 msgid "Notify For"
 msgstr "हेतु सूचना दे"
 
-#: plugins/notify.c:604
+#: plugins/notify.c:603
 msgid "_IM windows"
 msgstr "आईएम विंडोस (_I)"
 
-#: plugins/notify.c:611
+#: plugins/notify.c:610
 msgid "C_hat windows"
 msgstr "गपशप विंडोस (_h)"
 
-#: plugins/notify.c:618
+#: plugins/notify.c:617
 msgid "_Focused windows"
 msgstr "संकेंद्रित विंडोस (_F)"
 
 #  ---------- "Notification Methods" ----------
 #. ---------- "Notification Methods" ----------
-#: plugins/notify.c:626
+#: plugins/notify.c:625
 msgid "Notification Methods"
 msgstr "सूचना की विधियाँ"
 
-#: plugins/notify.c:633
+#: plugins/notify.c:632
 msgid "Prepend _string into window title:"
 msgstr "विंडो शीर्षक में स्ट्रिंग प्रीपेन्ड करें (_s):"
 
 #  Count method button
 #. Count method button
-#: plugins/notify.c:652
+#: plugins/notify.c:651
 msgid "Insert c_ount of new messages into window title"
 msgstr "विंडो शीर्षक में भरें - नए संदेशों को गिनें (_o)"
 
 #  Urgent method button
 #. Urgent method button
-#: plugins/notify.c:660
+#: plugins/notify.c:659
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "विंडो मैनेजर नियत करें \"अत्यावश्यक\" संकेत (_U)"
 
 #  ---------- "Notification Removals" ----------
 #. ---------- "Notification Removals" ----------
-#: plugins/notify.c:668
+#: plugins/notify.c:667
 msgid "Notification Removal"
 msgstr "सूचक हटाना"
 
 #  Remove on focus button
 #. Remove on focus button
-#: plugins/notify.c:673
+#: plugins/notify.c:672
 msgid "Remove when conversation window _gains focus"
 msgstr "वार्तालाप विंडो पर केंद्र प्राप्त हो तो हटाएँ (_g)"
 
 #  Remove on click button
 #. Remove on click button
-#: plugins/notify.c:680
+#: plugins/notify.c:679
 msgid "Remove when conversation window _receives click"
 msgstr "वार्तालाप विंडो में क्लिक प्राप्त  हो तो हटाएँ (_r)"
 
 #  Remove on type button
 #. Remove on type button
-#: plugins/notify.c:688
+#: plugins/notify.c:687
 msgid "Remove when _typing in conversation window"
 msgstr "वार्तालाप विंडो में टाइप कर रहे  हों तो हटाएँ (_t)"
 
 #  Remove on message send button
 #. Remove on message send button
-#: plugins/notify.c:696
+#: plugins/notify.c:695
 msgid "Remove when a _message gets sent"
 msgstr "जब संदेश भेजा जा चुके तो हटाएँ (_m)"
 
 #  Remove on conversation switch button
 #. Remove on conversation switch button
-#: plugins/notify.c:705
+#: plugins/notify.c:704
 #, fuzzy
 msgid "Remove on switch to conversation ta_b"
 msgstr "वार्तालाप टैब स्विच से हटाएँ (_b)"
 
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/notify.c:793
+#: plugins/notify.c:794
 msgid "Message Notification"
 msgstr "संदेश सूचना"
 
@@ -948,18 +922,17 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/notify.c:796 plugins/notify.c:798
+#: plugins/notify.c:797 plugins/notify.c:799
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr "बिना पढ़े संदेशों के बारे में कई प्रकार से सूचना दे."
 
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/perl/perl.c:532
+#: plugins/perl/perl.c:535
 msgid "Perl Plugin Loader"
 msgstr "पर्ल प्लगइन लोडर"
 
@@ -968,19 +941,19 @@
 #. *< name
 #. *< version
 #. *< summary
-#: plugins/perl/perl.c:534 plugins/perl/perl.c:535
+#: plugins/perl/perl.c:537 plugins/perl/perl.c:538
 msgid "Provides support for loading perl plugins."
 msgstr "पर्ल प्लगइन लोड करने में सहायक है."
 
-#: plugins/raw.c:146
+#: plugins/raw.c:149
 msgid "Raw"
 msgstr "अपूर्ण"
 
-#: plugins/raw.c:148
+#: plugins/raw.c:151
 msgid "Lets you send raw input to text-based protocols."
 msgstr "अक्षर आधारित प्रोटोकाल पर अपूर्ण इनपुट भेजने देता है."
 
-#: plugins/raw.c:149
+#: plugins/raw.c:152
 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."
@@ -988,37 +961,36 @@
 "अक्षर आधारित प्रोटोकाल पर अपूर्ण इनपुट भेजने देता है. (जैबर, एमएसएन, आईआरसी, टीओसी). "
 "भेजने हेतु एन्ट्री बाक्स पर एन्टर बटन दबाएँ. डिबग विंडो देखें."
 
-#: plugins/relnot.c:62
+#: plugins/relnot.c:63
 #, c-format
 msgid "You are using Gaim version %s.  The current version is %s.<hr>"
 msgstr ""
 
-#: plugins/relnot.c:68
+#: plugins/relnot.c:69
 #, c-format
 msgid ""
 "<b>ChangeLog:</b>\n"
 "%s<br><br>"
 msgstr ""
 
-#: plugins/relnot.c:73
+#: 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 ""
 
-#: plugins/relnot.c:77 plugins/relnot.c:78
+#: plugins/relnot.c:78 plugins/relnot.c:79
 msgid "New Version Available"
 msgstr ""
 
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/relnot.c:134
+#: plugins/relnot.c:137
 #, fuzzy
 msgid "Release Notification"
 msgstr "संदेश सूचना"
@@ -1026,12 +998,12 @@
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/relnot.c:137
+#: plugins/relnot.c:140
 msgid "Checks periodically for new releases."
 msgstr ""
 
 #. *  description
-#: plugins/relnot.c:139
+#: plugins/relnot.c:142
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
@@ -1044,14 +1016,13 @@
 #  *< dependencies
 #  *< priority
 #  *< id
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/signals-test.c:582
+#: plugins/signals-test.c:585
 msgid "Signals Test"
 msgstr "सिग्नल्स परीक्षण"
 
@@ -1062,18 +1033,17 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/signals-test.c:585 plugins/signals-test.c:587
+#: plugins/signals-test.c:588 plugins/signals-test.c:590
 msgid "Test to see that all signals are working properly."
 msgstr "यह देखने के लिए परीक्षण करे कि सभी सिग्नल्स  भली प्रकार कार्य कर रहे हैं."
 
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/simple.c:31
+#: plugins/simple.c:34
 msgid "Simple Plugin"
 msgstr "सादा प्लगइन"
 
@@ -1084,39 +1054,39 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/simple.c:34 plugins/simple.c:36
+#: plugins/simple.c:37 plugins/simple.c:39
 msgid "Tests to see that most things are working."
 msgstr "परीक्षण कर देखता है कि अधिकतर चीजें कार्य कर रही हैं."
 
-#: plugins/spellchk.c:413
+#: plugins/spellchk.c:415
 msgid "Text Replacements"
 msgstr "पाठ बदलें"
 
-#: plugins/spellchk.c:437
+#: plugins/spellchk.c:439
 msgid "You type"
 msgstr "आपने टाइप किया"
 
-#: plugins/spellchk.c:449
+#: plugins/spellchk.c:451
 msgid "You send"
 msgstr "आपने भेजा"
 
-#: plugins/spellchk.c:475
+#: plugins/spellchk.c:477
 msgid "Add a new text replacement"
 msgstr "जोड़ें एक नया बदला पाठ"
 
-#: plugins/spellchk.c:482
+#: plugins/spellchk.c:484
 msgid "You _type:"
 msgstr "आपने टाइप किया (_t):"
 
-#: plugins/spellchk.c:496
+#: plugins/spellchk.c:498
 msgid "You _send:"
 msgstr "आपने भेजा (_s):"
 
-#: plugins/spellchk.c:536
+#: plugins/spellchk.c:540
 msgid "Text replacement"
 msgstr "बदलने हेतु पाठ"
 
-#: plugins/spellchk.c:538 plugins/spellchk.c:539
+#: plugins/spellchk.c:542 plugins/spellchk.c:543
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "उपयोगकर्ता  द्वारा पारिभाषित नियमों के तहत बाहर जाने वाले संदेशों में पाठ बदलता है"
 
@@ -1127,14 +1097,13 @@
 #  *< dependencies
 #  *< priority
 #  *< id
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-gnutls.c:223
+#: plugins/ssl/ssl-gnutls.c:226
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -1142,18 +1111,17 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ssl/ssl-gnutls.c:226 plugins/ssl/ssl-gnutls.c:228
+#: plugins/ssl/ssl-gnutls.c:229 plugins/ssl/ssl-gnutls.c:231
 msgid "Provides SSL support through GNUTLS."
 msgstr "GNUTLS के द्वारा SSL सपोर्ट प्रदान करता है."
 
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl-nss.c:314
+#: plugins/ssl/ssl-nss.c:318
 msgid "NSS"
 msgstr "NSS"
 
@@ -1161,18 +1129,17 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ssl/ssl-nss.c:317 plugins/ssl/ssl-nss.c:319
+#: plugins/ssl/ssl-nss.c:321 plugins/ssl/ssl-nss.c:323
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "मोज़िल्ला NSS के द्वारा SSL सपोर्ट प्रदान करता है."
 
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ssl/ssl.c:91
+#: plugins/ssl/ssl.c:94
 msgid "SSL"
 msgstr "SSL"
 
@@ -1183,54 +1150,53 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ssl/ssl.c:94 plugins/ssl/ssl.c:96
+#: plugins/ssl/ssl.c:97 plugins/ssl/ssl.c:99
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "SSL सपोर्ट लाइब्रेरीज़ के अराउंड व्रेपर प्रदान करता है."
 
-#: plugins/statenotify.c:37
+#: plugins/statenotify.c:42
 #, c-format
 msgid "%s has gone away."
 msgstr "%s दूर चला गया."
 
-#: plugins/statenotify.c:44
+#: plugins/statenotify.c:49
 #, c-format
 msgid "%s is no longer away."
 msgstr "अब %s  दूर नहीं है."
 
-#: plugins/statenotify.c:51
+#: plugins/statenotify.c:56
 #, c-format
 msgid "%s has become idle."
 msgstr "%s निष्क्रिय हो गया है."
 
-#: plugins/statenotify.c:58
+#: plugins/statenotify.c:63
 #, c-format
 msgid "%s is no longer idle."
 msgstr "अब %s निष्क्रिय नहीं है."
 
 #  ---------- "Notify For" ----------
-#: plugins/statenotify.c:69
+#: plugins/statenotify.c:74
 #, fuzzy
 msgid "Notify When"
 msgstr "हेतु सूचना दे"
 
-#: plugins/statenotify.c:72
+#: plugins/statenotify.c:77
 #, fuzzy
 msgid "Buddy Goes _Away"
 msgstr "बड्डी दूर हैः"
 
-#: plugins/statenotify.c:75
+#: plugins/statenotify.c:80
 #, fuzzy
 msgid "Buddy Goes _Idle"
 msgstr "बड्डी निष्क्रिय हैः"
 
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/statenotify.c:113
+#: plugins/statenotify.c:120
 msgid "Buddy State Notification"
 msgstr "बड्डी स्थिति सूचना"
 
@@ -1241,28 +1207,27 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/statenotify.c:116 plugins/statenotify.c:119
+#: plugins/statenotify.c:123 plugins/statenotify.c:126
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
 msgstr "वार्तालाप विंडो में सूचना देता है जब बड्डी दूर या निष्क्रिय से आता या जाता है."
 
-#: plugins/tcl/tcl.c:359
+#: plugins/tcl/tcl.c:363
 msgid "Tcl Plugin Loader"
 msgstr "टीसीएल प्लगइन लोडर"
 
-#: plugins/tcl/tcl.c:361 plugins/tcl/tcl.c:362
+#: plugins/tcl/tcl.c:365 plugins/tcl/tcl.c:366
 msgid "Provides support for loading Tcl plugins"
 msgstr "टीसीएल प्लगइन लोड करने में सहायक है."
 
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/ticker/ticker.c:74 plugins/ticker/ticker.c:328
+#: plugins/ticker/ticker.c:75 plugins/ticker/ticker.c:331
 msgid "Buddy Ticker"
 msgstr "बड्डी टिकर"
 
@@ -1273,27 +1238,26 @@
 #. *< version
 #. *  summary
 #. *  description
-#: plugins/ticker/ticker.c:331 plugins/ticker/ticker.c:333
+#: plugins/ticker/ticker.c:334 plugins/ticker/ticker.c:336
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "क्षैतिज स्क्रोल वाला बड्डी सूची वर्सन "
 
-#: plugins/timestamp.c:185
+#: plugins/timestamp.c:183
 msgid "iChat Timestamp"
 msgstr "आईचैट अंकित समय"
 
-#: plugins/timestamp.c:192
+#: plugins/timestamp.c:190
 msgid "Delay"
 msgstr "देरी"
 
-#: plugins/timestamp.c:199
+#: plugins/timestamp.c:197
 msgid "minutes."
 msgstr "मिनट्स"
 
-#: plugins/timestamp.c:205
+#: plugins/timestamp.c:203
 msgid "_Apply"
 msgstr "लागू करें (_A)"
 
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -1315,51 +1279,50 @@
 msgid "Adds iChat-style timestamps to conversations every N minutes."
 msgstr "प्रत्येक एन (N ) मिनट में आईचैट प्रकार के अंकित समय जोड़ें"
 
-#: plugins/win32/transparency/win2ktrans.c:133
-#: plugins/win32/transparency/win2ktrans.c:387
-#: plugins/win32/transparency/win2ktrans.c:418
+#: plugins/win32/transparency/win2ktrans.c:134
+#: plugins/win32/transparency/win2ktrans.c:404
+#: plugins/win32/transparency/win2ktrans.c:435
 msgid "Opacity:"
 msgstr "अपारदर्शिताः"
 
 #  IM Convo trans options
 #. IM Convo trans options
-#: plugins/win32/transparency/win2ktrans.c:368
+#: plugins/win32/transparency/win2ktrans.c:385
 msgid "IM Conversation Windows"
 msgstr "आईएम वार्तालाप विंडो"
 
-#: plugins/win32/transparency/win2ktrans.c:369
+#: plugins/win32/transparency/win2ktrans.c:386
 msgid "_IM window transparency"
 msgstr "आईएम विंडो पारदर्शिता (_I)"
 
-#: plugins/win32/transparency/win2ktrans.c:379
+#: plugins/win32/transparency/win2ktrans.c:396
 msgid "_Show slider bar in IM window"
 msgstr "आईएम विंडो में स्लाइडर बार दिखाएँ (_S)"
 
 #  Buddy List trans options
 #. Buddy List trans options
-#: plugins/win32/transparency/win2ktrans.c:404 src/gtkprefs.c:953
+#: plugins/win32/transparency/win2ktrans.c:421
 msgid "Buddy List Window"
 msgstr "बड्डी सूची विंडो"
 
-#: plugins/win32/transparency/win2ktrans.c:405
+#: plugins/win32/transparency/win2ktrans.c:422
 msgid "_Buddy List window transparency"
 msgstr "बड्डी सूची विंडो पारदर्शिता (_B)"
 
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: plugins/win32/transparency/win2ktrans.c:461
+#: plugins/win32/transparency/win2ktrans.c:480
 msgid "Transparency"
 msgstr "पारदर्शिता"
 
 #. *< name
 #. *< version
 #. *  summary
-#: plugins/win32/transparency/win2ktrans.c:464
+#: plugins/win32/transparency/win2ktrans.c:483
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr ""
 
@@ -1367,7 +1330,7 @@
 #  *< version
 #  *  summary
 #. *  description
-#: plugins/win32/transparency/win2ktrans.c:466
+#: plugins/win32/transparency/win2ktrans.c:485
 #, fuzzy
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
@@ -1378,88 +1341,88 @@
 "यह प्लगइन, वार्तालाप विंडो में बदलने योग्य अल्फा पारदर्शिता लाता है.\n"
 " टीपः इस प्लगइन के लिए विन2000 या विन एक्सपी आवश्यक है."
 
-#: plugins/win32/winprefs/winprefs.c:343
+#: plugins/win32/winprefs/winprefs.c:344
 msgid "GTK+ Runtime Version"
 msgstr "जीटीके+ रनटाइम संस्करण"
 
 #  Autostart
 #. Autostart
-#: plugins/win32/winprefs/winprefs.c:351
+#: plugins/win32/winprefs/winprefs.c:352
 msgid "Startup"
 msgstr "प्रारंभ-में"
 
-#: plugins/win32/winprefs/winprefs.c:352
+#: plugins/win32/winprefs/winprefs.c:353
 msgid "_Start Gaim on Windows startup"
 msgstr "गेम को विंडोस के प्रारंभ-में प्रारंभ करें (_S)"
 
 #  Buddy List
 #. Buddy List
-#: plugins/win32/winprefs/winprefs.c:361 src/gtkblist.c:3056
-#: src/gtkprefs.c:2416
+#: plugins/win32/winprefs/winprefs.c:362 src/gtkblist.c:3145
+#: src/gtkprefs.c:2178
 msgid "Buddy List"
 msgstr "बड्डी सूची"
 
-#: plugins/win32/winprefs/winprefs.c:362
+#: plugins/win32/winprefs/winprefs.c:363
 msgid "_Dockable Buddy List"
 msgstr "डाकेबल बड्डी सूची (_D)"
 
 #  Docked Blist On Top
 #. Docked Blist On Top
-#: plugins/win32/winprefs/winprefs.c:366
+#: plugins/win32/winprefs/winprefs.c:367
 msgid "Docked _Buddy List is always on top"
 msgstr "डाक्ड बड्डी सूची हमेशा ऊपर (_B)"
 
 #  Blist On Top
 #. Blist On Top
-#: plugins/win32/winprefs/winprefs.c:376
+#: plugins/win32/winprefs/winprefs.c:377
 msgid "_Keep Buddy List window on top"
 msgstr "बड्डी सूची विंडो को ऊपर रखें (_K)"
 
 #  Conversations
 #. Conversations
-#: plugins/win32/winprefs/winprefs.c:381 src/gtkprefs.c:1004
-#: src/gtkprefs.c:2417 src/protocols/msn/msn.c:1640
+#: plugins/win32/winprefs/winprefs.c:382 src/gtkprefs.c:910
+#: src/gtkprefs.c:2179 src/protocols/msn/msn.c:1838
 msgid "Conversations"
 msgstr "वार्तालाप"
 
-#: plugins/win32/winprefs/winprefs.c:382
+#: plugins/win32/winprefs/winprefs.c:383
 msgid "_Flash Window when messages are received"
 msgstr "जब संदेश मिलें तो विंडो चमकाएँ (_F)"
 
-#: plugins/win32/winprefs/winprefs.c:404
+#: plugins/win32/winprefs/winprefs.c:407
 msgid "WinGaim Options"
 msgstr "विन-गेम विकल्प"
 
-#: plugins/win32/winprefs/winprefs.c:406 plugins/win32/winprefs/winprefs.c:407
+#: plugins/win32/winprefs/winprefs.c:409 plugins/win32/winprefs/winprefs.c:410
 msgid "Options specific to Windows Gaim."
 msgstr "विंडोस गेम हेतु विशेष विकल्प"
 
-#: src/account.c:277 src/protocols/jabber/jabber.c:1001
+#: src/account.c:294 src/protocols/jabber/jabber.c:1043
 msgid "New passwords do not match."
 msgstr "नया पासवर्ड मेल नहीं खाता."
 
-#: src/account.c:286
+#: src/account.c:303
 msgid "Fill out all fields completely."
 msgstr "सभी फील्ड को पूरा भरें."
 
-#: src/account.c:311
+#: src/account.c:328
 msgid "Original password"
 msgstr "मूल पासवर्ड "
 
-#: src/account.c:318
+#: src/account.c:335
 msgid "New password"
 msgstr "नया पासवर्ड "
 
-#: src/account.c:325
+#: src/account.c:342
 msgid "New password (again)"
 msgstr "नया पासवर्ड (फिर से)"
 
-#: src/account.c:331
+#: src/account.c:348
 #, c-format
 msgid "Change password for %s"
 msgstr " %s: के लिए पासवर्ड बदला"
 
-#: src/account.c:339
+#: src/account.c:356
 msgid "Please enter your current password and your new password."
 msgstr "कृपया अपना वर्तमान पासवर्ड भरें तथा आपका नया  पासवर्ड भरें."
 
@@ -1468,20 +1431,20 @@
 #. *
 #. * A wrapper for gaim_request_action() that uses OK and Cancel buttons.
 #.
-#: src/account.c:342 src/connection.c:198 src/gtkblist.c:2384
-#: src/gtkdialogs.c:384 src/gtkdialogs.c:526 src/gtkdialogs.c:579
-#: src/gtkrequest.c:242 src/protocols/jabber/jabber.c:1048
-#: 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:3472
-#: src/protocols/oscar/oscar.c:3566 src/protocols/oscar/oscar.c:6829
-#: src/protocols/oscar/oscar.c:6921 src/protocols/oscar/oscar.c:6973
-#: src/protocols/oscar/oscar.c:7059 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:1691
-#: src/protocols/silc/silc.c:698 src/protocols/yahoo/yahoo.c:2804
-#: src/protocols/yahoo/yahoo.c:2813 src/request.h:1243
+#: src/account.c:359 src/connection.c:188 src/gtkblist.c:2419
+#: src/gtkdialogs.c:375 src/gtkdialogs.c:518 src/gtkdialogs.c:574
+#: src/gtkrequest.c:259 src/protocols/jabber/jabber.c:1090
+#: src/protocols/jabber/xdata.c:337 src/protocols/msn/msn.c:228
+#: src/protocols/msn/msn.c:243 src/protocols/msn/msn.c:258
+#: src/protocols/msn/msn.c:273 src/protocols/oscar/oscar.c:3533
+#: src/protocols/oscar/oscar.c:3627 src/protocols/oscar/oscar.c:6976
+#: src/protocols/oscar/oscar.c:7068 src/protocols/oscar/oscar.c:7120
+#: 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:1083
+#: src/protocols/silc/ops.c:1689 src/protocols/silc/silc.c:717
+#: src/protocols/yahoo/yahoo.c:2892 src/protocols/yahoo/yahoo.c:2901
+#: src/request.h:1244
 msgid "OK"
 msgstr "ठीक"
 
@@ -1489,40 +1452,39 @@
 # #-#-#-#-#  gnome-session.HEAD.hi.po (gnome-session VERSION)  #-#-#-#-#
 # gnome-session/session-properties.c:179
 #  Cancel button.
-#: src/account.c:343 src/account.c:381 src/away.c:366 src/connection.c:199
-#: src/gtkaccount.c:2010 src/gtkaccount.c:2506 src/gtkblist.c:2385
-#: src/gtkblist.c:4427 src/gtkconn.c:169 src/gtkdialogs.c:385
-#: src/gtkdialogs.c:527 src/gtkdialogs.c:580 src/gtkdialogs.c:678
-#: src/gtkdialogs.c:700 src/gtkdialogs.c:720 src/gtkdialogs.c:756
-#: src/gtkdialogs.c:816 src/gtkdialogs.c:858 src/gtkdialogs.c:879
-#: src/gtkimhtmltoolbar.c:420 src/gtkprivacy.c:586 src/gtkprivacy.c:599
-#: src/gtkprivacy.c:624 src/gtkprivacy.c:635 src/gtkrequest.c:243
-#: src/protocols/icq/gaim_icq.c:276 src/protocols/jabber/buddy.c:515
-#: src/protocols/jabber/chat.c:730 src/protocols/jabber/jabber.c:667
-#: src/protocols/jabber/jabber.c:1049 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:1495
-#: src/protocols/oscar/oscar.c:3432 src/protocols/oscar/oscar.c:3473
-#: src/protocols/oscar/oscar.c:3510 src/protocols/oscar/oscar.c:3567
-#: src/protocols/oscar/oscar.c:6830 src/protocols/oscar/oscar.c:6922
-#: src/protocols/oscar/oscar.c:6974 src/protocols/oscar/oscar.c:7043
-#: src/protocols/oscar/oscar.c:7060 src/protocols/silc/buddy.c:461
+#: src/account.c:360 src/account.c:398 src/connection.c:189
+#: src/gtkaccount.c:2014 src/gtkaccount.c:2510 src/gtkblist.c:2420
+#: src/gtkblist.c:4440 src/gtkconn.c:171 src/gtkdialogs.c:376
+#: src/gtkdialogs.c:519 src/gtkdialogs.c:575 src/gtkdialogs.c:673
+#: src/gtkdialogs.c:695 src/gtkdialogs.c:715 src/gtkdialogs.c:751
+#: src/gtkdialogs.c:813 src/gtkdialogs.c:855 src/gtkdialogs.c:893
+#: src/gtkimhtmltoolbar.c:440 src/gtkprivacy.c:588 src/gtkprivacy.c:601
+#: src/gtkprivacy.c:626 src/gtkprivacy.c:637 src/gtkrequest.c:260
+#: src/protocols/jabber/buddy.c:565 src/protocols/jabber/chat.c:772
+#: src/protocols/jabber/jabber.c:675 src/protocols/jabber/jabber.c:1091
+#: src/protocols/jabber/xdata.c:338 src/protocols/msn/msn.c:229
+#: src/protocols/msn/msn.c:244 src/protocols/msn/msn.c:259
+#: src/protocols/msn/msn.c:274 src/protocols/msn/msn.c:291
+#: src/protocols/oscar/oscar.c:1534 src/protocols/oscar/oscar.c:3491
+#: src/protocols/oscar/oscar.c:3534 src/protocols/oscar/oscar.c:3571
+#: src/protocols/oscar/oscar.c:3628 src/protocols/oscar/oscar.c:6977
+#: src/protocols/oscar/oscar.c:7069 src/protocols/oscar/oscar.c:7121
+#: src/protocols/oscar/oscar.c:7190 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:1692 src/protocols/silc/silc.c:699
-#: src/protocols/trepia/trepia.c:347 src/protocols/yahoo/yahoo.c:2805
-#: src/protocols/yahoo/yahoo.c:2814 src/request.h:1243 src/request.h:1253
+#: src/protocols/silc/ops.c:1690 src/protocols/silc/silc.c:718
+#: src/protocols/trepia/trepia.c:348 src/protocols/yahoo/yahoo.c:2893
+#: src/protocols/yahoo/yahoo.c:2902 src/request.h:1244 src/request.h:1254
 msgid "Cancel"
 msgstr "रद्द"
 
-#: src/account.c:372
+#: src/account.c:389
 #, c-format
 msgid "Change user information for %s"
 msgstr "उपयोगकर्ता %s हेतु जानकारी बदलें"
 
-#: src/account.c:380 src/gtkrequest.c:249 src/protocols/jabber/buddy.c:514
-#: src/protocols/trepia/trepia.c:346
+#: src/account.c:397 src/gtkrequest.c:266 src/protocols/jabber/buddy.c:564
+#: src/protocols/trepia/trepia.c:347
 msgid "Save"
 msgstr "सहेजें"
 
@@ -1530,89 +1492,17 @@
 # gnome-session/gsm-client-row.c:43
 # #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
 # gnome-session/gsm-client-row.c:43
-#: src/account.c:739 src/gtkft.c:158 src/gtkutils.c:591
-#: src/protocols/jabber/buddy.c:570 src/protocols/novell/novell.c:2810
+#: src/account.c:802 src/gtkft.c:158 src/protocols/jabber/buddy.c:621
+#: src/protocols/jabber/buddy.c:1064 src/protocols/jabber/buddy.c:1081
+#: src/protocols/novell/novell.c:2823
 msgid "Unknown"
 msgstr "अज्ञात"
 
-#: src/away.c:233
-#, fuzzy
-msgid "Away!"
-msgstr "दूर"
-
-#: src/away.c:303
-#, fuzzy
-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 ""
-
-#: src/away.c:364 src/away.c:455
-msgid "Remove Away Message"
-msgstr "दूर संदेश मिटाएँ"
-
-#. Remove button
-#: src/away.c:365 src/gtkconv.c:1400 src/gtkconv.c:3743 src/gtkconv.c:3814
-#: src/gtkrequest.c:248
-msgid "Remove"
-msgstr ""
-
-#: src/away.c:435
-msgid "New Away Message"
-msgstr "नया दूर संदेश"
-
-#: src/away.c:651
-msgid "Set All Away"
-msgstr "सबको दूर नियत करें"
-
-#: src/away.c:758
-msgid "You cannot save an away message with a blank title"
-msgstr ""
-
-#: src/away.c:760
-msgid ""
-"Please give the message a title, or choose \"Use\" to use without saving."
-msgstr ""
-
-#: src/away.c:770
-msgid "You cannot create an empty away message"
-msgstr ""
-
-#: src/away.c:835
-#, fuzzy
-msgid "New away message"
-msgstr "नया दूर संदेश"
-
-#: src/away.c:850
-msgid "Away title: "
-msgstr ""
-
-#: src/away.c:898
-#, fuzzy
-msgid "_Save"
-msgstr "सहेजें"
-
-#: src/away.c:902
-msgid "Sa_ve & Use"
-msgstr ""
-
-#: src/away.c:906
-#, fuzzy
-msgid "_Use"
-msgstr "नियत करें (_S)"
-
-#: src/blist.c:680
+#: src/blist.c:681
 msgid "Chats"
 msgstr "गपशप"
 
-#: src/blist.c:1337
+#: src/blist.c:1352
 #, c-format
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
@@ -1623,157 +1513,172 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/blist.c:1346
+#: src/blist.c:1361
 msgid "Group not removed"
 msgstr "समूह हटाए नहीं गए"
 
-#: src/blist.c:2043
+#: src/blist.c:2064
 #, fuzzy
 msgid ""
 "An error was encountered parsing your buddy list.  It has not been loaded, "
 "and the old file has moved to blist.xml~."
 msgstr "आपकी बड्डी सूची के विश्लेषण करने में त्रुटि हुई. यह लोड नहीं हुआ है."
 
-#: src/blist.c:2046
+#: src/blist.c:2067
 msgid "Buddy List Error"
 msgstr "बड्डी सूची त्रुटि"
 
-#: src/connection.c:118 src/connection.c:169
+#: src/connection.c:112 src/connection.c:161
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "%s हेतु प्रोटोकाल प्लगइन नहीं है."
 
-#: src/connection.c:123
+#: src/connection.c:116
 msgid "Registration Error"
 msgstr "रजिस्ट्रेशन त्रुटि"
 
-#: src/connection.c:174
+#: src/connection.c:165
 msgid "Connection Error"
 msgstr "कनेक्शन में त्रुटि"
 
-#: src/connection.c:195
+#: src/connection.c:185
 #, fuzzy, c-format
 msgid "Enter password for %s (%s)"
 msgstr " %s: के लिए पासवर्ड बदला"
 
-#: src/conversation.c:229
-msgid "Unable to send message. The message is too large."
-msgstr ""
-
-#: src/conversation.c:237
+#: src/conversation.c:236
+#, fuzzy
+msgid "Unable to send message: The message is too large."
+msgstr "दूर संदेश मिटाएँ"
+
+#: src/conversation.c:239
+#, fuzzy, c-format
+msgid "Unable to send message to %s."
+msgstr "दूर संदेश मिटाएँ"
+
+#: src/conversation.c:240
+msgid "The message is too large."
+msgstr ""
+
+#: src/conversation.c:249
 msgid "Unable to send message."
 msgstr ""
 
-#: src/conversation.c:1953
+#: src/conversation.c:252
+#, fuzzy, c-format
+msgid "Unable to send messge to %s."
+msgstr "दूर संदेश मिटाएँ"
+
+#: src/conversation.c:2005
 #, c-format
 msgid "%s entered the room."
 msgstr ""
 
-#: src/conversation.c:1956
+#: src/conversation.c:2008
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr ""
 
-#: src/conversation.c:2052
+#: src/conversation.c:2104
 #, c-format
 msgid "You are now known as %s"
 msgstr ""
 
-#: src/conversation.c:2055
+#: src/conversation.c:2107
 #, fuzzy, c-format
 msgid "%s is now known as %s"
 msgstr "अब %s  दूर नहीं है."
 
-#: src/conversation.c:2096
+#: src/conversation.c:2148
 #, c-format
 msgid "%s left the room (%s)."
 msgstr ""
 
-#: src/conversation.c:2098
+#: src/conversation.c:2150
 #, c-format
 msgid "%s left the room."
 msgstr ""
 
-#: src/conversation.c:2167
+#: src/conversation.c:2219
 #, c-format
 msgid "(+%d more)"
 msgstr ""
 
-#: src/conversation.c:2169
+#: src/conversation.c:2221
 #, c-format
 msgid " left the room (%s)."
 msgstr ""
 
-#: src/conversation.c:2574
+#: src/conversation.c:2626
 msgid "Last created window"
 msgstr ""
 
-#: src/conversation.c:2576
+#: src/conversation.c:2628
 #, fuzzy
 msgid "Separate IM and Chat windows"
 msgstr "आईएम विंडो में स्लाइडर बार दिखाएँ (_S)"
 
-#: src/conversation.c:2578 src/gtkprefs.c:1384
+#: src/conversation.c:2630 src/gtkprefs.c:1287
 #, fuzzy
 msgid "New window"
 msgstr "आईएम विंडोस (_I)"
 
-#: src/conversation.c:2580
+#: src/conversation.c:2632
 msgid "By group"
 msgstr ""
 
 #  And now for the buttons
-#: src/conversation.c:2582
+#: src/conversation.c:2634
 #, fuzzy
 msgid "By account"
 msgstr "खाता"
 
-#: src/ft.c:122
+#: src/ft.c:148 src/protocols/msn/msn.c:370
 #, fuzzy, c-format
 msgid ""
 "Error reading %s: \n"
 "%s.\n"
 msgstr "गपशप से ऐसे जुड़ें"
 
-#: src/ft.c:126
+#: src/ft.c:152
 #, fuzzy, c-format
 msgid ""
 "Error writing %s: \n"
 "%s.\n"
 msgstr "गपशप से ऐसे जुड़ें"
 
-#: src/ft.c:130
+#: src/ft.c:156
 #, c-format
 msgid ""
 "Error accessing %s: \n"
 "%s.\n"
 msgstr ""
 
-#: src/ft.c:161
+#: src/ft.c:188
 msgid "Cannot send a file of 0 bytes."
 msgstr ""
 
-#: src/ft.c:171
+#: src/ft.c:198
 #, fuzzy
 msgid "Cannot send a directory."
 msgstr "आपने भेजा"
 
-#: src/ft.c:178
+#: src/ft.c:205
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr ""
 
-#: src/ft.c:232
+#: src/ft.c:260
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr ""
 
-#: src/ft.c:267
+#: src/ft.c:302
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr ""
 
-#: src/ft.c:271
+#: src/ft.c:306
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1781,35 +1686,42 @@
 "Remote port: %d"
 msgstr ""
 
-#: src/ft.c:322
+#: src/ft.c:359
 #, fuzzy, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "अब %s निष्क्रिय नहीं है."
 
-#: src/ft.c:898
+#: src/ft.c:377
+#, fuzzy, c-format
+msgid "Offering to send %s to %s"
+msgstr "दूर संदेश मिटाएँ"
+
+#: src/ft.c:870
+#, fuzzy, c-format
+msgid "Transfer of %s complete"
+msgstr "फ़ाइल हस्तांतरण"
+
+#: src/ft.c:918
+#, c-format
+msgid "You canceled the transfer of %s"
+msgstr ""
+
+#: src/ft.c:970
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr ""
 
-#: src/ft.c:948
+#: src/ft.c:1020
 #, fuzzy, c-format
 msgid "File transfer to %s aborted.\n"
 msgstr "फ़ाइल हस्तांतरण"
 
-#: src/ft.c:950
+#: src/ft.c:1022
 #, c-format
 msgid "File transfer from %s aborted.\n"
 msgstr ""
 
-#: 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
+#: src/gaim-remote.c:104
 #, c-format
 msgid ""
 "Usage: %s command [OPTIONS] [URI]\n"
@@ -1819,19 +1731,33 @@
 "       away                     Popup the away dialog with the default "
 "message\n"
 "       back                     Remove the away dialog\n"
+"       send                     Send message\n"
 "       quit                     Close running copy of Gaim\n"
 "\n"
 "    OPTIONS:\n"
+"       -m, --message=MESG       Message to send or show in conversation "
+"window\n"
+"       -t, --to=SCREENNAME      Select a target for command\n"
+"       -p, --protocol=PROTO     Specify protocol to use\n"
+"       -f, --from=SCREENNAME    Specify screen name to use\n"
+"       -s, --session=SESSION    Specify which Gaim session to use\n"
 "       -h, --help [command]     Show help for command\n"
 msgstr ""
 
-#: src/gaim-remote.c:185 src/gaim-remote.c:203
-msgid ""
-"Gaim not running (on session 0)\n"
+#: src/gaim-remote.c:193
+#, c-format
+msgid ""
+"Gaim not running (on session %d)\n"
 "Is the \"Remote Control\" plugin loaded?\n"
 msgstr ""
 
-#: src/gaim-remote.c:219
+#: src/gaim-remote.c:280
+msgid ""
+"Insufficient arguments (-t, -f, -p, & -m are all required) or arguments "
+"greater than 9999 chars\n"
+msgstr ""
+
+#: src/gaim-remote.c:291
 msgid ""
 "\n"
 "Using AIM: URIs:\n"
@@ -1854,24 +1780,31 @@
 "...prompts you to add 'Penguin' to your buddy list.\n"
 msgstr ""
 
-#: src/gaim-remote.c:239
+#: src/gaim-remote.c:311
 msgid ""
 "\n"
 "Close running copy of Gaim\n"
 msgstr ""
 
-#: src/gaim-remote.c:243
+#: src/gaim-remote.c:315
 msgid ""
 "\n"
 "Mark all accounts as \"away\" with the default message.\n"
 msgstr ""
 
-#: src/gaim-remote.c:247
+#: src/gaim-remote.c:319
 msgid ""
 "\n"
 "Set all accounts as not away.\n"
 msgstr ""
 
+#: src/gaim-remote.c:323
+#, fuzzy
+msgid ""
+"\n"
+"Send instant message\n"
+msgstr "नया दूर संदेश"
+
 #: src/gtkaccount.c:325
 #, c-format
 msgid ""
@@ -1890,7 +1823,7 @@
 msgid "Protocol:"
 msgstr ""
 
-#: src/gtkaccount.c:647 src/gtkblist.c:4023
+#: src/gtkaccount.c:647 src/gtkblist.c:4025
 msgid "Screen Name:"
 msgstr ""
 
@@ -1899,7 +1832,7 @@
 msgid "Password:"
 msgstr "नया पासवर्ड "
 
-#: src/gtkaccount.c:725 src/gtkblist.c:4037 src/gtkblist.c:4375
+#: src/gtkaccount.c:725 src/gtkblist.c:4039 src/gtkblist.c:4388
 msgid "Alias:"
 msgstr ""
 
@@ -1908,6 +1841,11 @@
 msgid "Remember password"
 msgstr "नया पासवर्ड "
 
+#: src/gtkaccount.c:738
+#, fuzzy
+msgid "Auto log in"
+msgstr "स्वचालित - लॉगइन"
+
 #. Build the user options frame.
 #: src/gtkaccount.c:785
 msgid "User Options"
@@ -1955,7 +1893,7 @@
 msgstr ""
 
 #. Use Environmental Settings
-#: src/gtkaccount.c:1062 src/gtkaccount.c:1114 src/gtkprefs.c:1187
+#: src/gtkaccount.c:1062 src/gtkaccount.c:1114 src/gtkprefs.c:1090
 msgid "Use Environmental Settings"
 msgstr ""
 
@@ -1971,16 +1909,16 @@
 msgid "Proxy Options"
 msgstr ""
 
-#: src/gtkaccount.c:1191 src/gtkprefs.c:1181
+#: src/gtkaccount.c:1191 src/gtkprefs.c:1084
 #, fuzzy
 msgid "Proxy _type:"
 msgstr "आपने टाइप किया (_t):"
 
-#: src/gtkaccount.c:1200 src/gtkprefs.c:1208
+#: src/gtkaccount.c:1200 src/gtkprefs.c:1111
 msgid "_Host:"
 msgstr ""
 
-#: src/gtkaccount.c:1204 src/gtkprefs.c:1226
+#: src/gtkaccount.c:1204 src/gtkprefs.c:1129
 msgid "_Port:"
 msgstr ""
 
@@ -1988,456 +1926,543 @@
 msgid "_Username:"
 msgstr ""
 
-#: src/gtkaccount.c:1217 src/gtkprefs.c:1263
+#: src/gtkaccount.c:1217 src/gtkprefs.c:1166
 #, fuzzy
 msgid "Pa_ssword:"
 msgstr "नया पासवर्ड "
 
 #  And now for the buttons
-#: src/gtkaccount.c:1585
+#: src/gtkaccount.c:1589
 #, fuzzy
 msgid "Add Account"
 msgstr "खाता"
 
 #  And now for the buttons
-#: src/gtkaccount.c:1587
+#: src/gtkaccount.c:1591
 #, fuzzy
 msgid "Modify Account"
 msgstr "खाता"
 
 #. Add the disclosure
-#: src/gtkaccount.c:1611
+#: src/gtkaccount.c:1615
 msgid "Show more options"
 msgstr ""
 
-#: src/gtkaccount.c:1612
+#: src/gtkaccount.c:1616
 msgid "Show fewer options"
 msgstr ""
 
 #. Register button
-#: src/gtkaccount.c:1639 src/protocols/jabber/jabber.c:666
+#: src/gtkaccount.c:1643 src/protocols/jabber/jabber.c:674
 msgid "Register"
 msgstr ""
 
-#: src/gtkaccount.c:2004
+#: src/gtkaccount.c:2008
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr ""
 
-#: src/gtkaccount.c:2009 src/gtkrequest.c:246
+#: src/gtkaccount.c:2013 src/gtkrequest.c:263
 msgid "Delete"
 msgstr ""
 
-#: src/gtkaccount.c:2123 src/protocols/oscar/oscar.c:4114
+#: src/gtkaccount.c:2127 src/protocols/oscar/oscar.c:4179
 msgid "Screen Name"
 msgstr ""
 
-#: src/gtkaccount.c:2147 src/protocols/jabber/jabber.c:958
-#: src/protocols/oscar/oscar.c:654 src/protocols/oscar/oscar.c:5568
-#: src/protocols/oscar/oscar.c:6757 src/protocols/silc/silc.c:44
-#: src/protocols/yahoo/yahoo.c:2567 src/protocols/zephyr/zephyr.c:1365
-#: src/protocols/zephyr/zephyr.c:1377
+#. 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/gtkaccount.c:2151 src/protocols/gg/gg.c:272 src/protocols/irc/irc.c:161
+#: src/protocols/jabber/buddy.c:1070 src/protocols/jabber/jabber.c:975
+#: src/protocols/msn/msn.c:534 src/protocols/napster/napster.c:561
+#: src/protocols/oscar/oscar.c:683 src/protocols/oscar/oscar.c:6871
+#: src/protocols/silc/silc.c:48 src/protocols/yahoo/yahoo.c:2655
+#: src/protocols/yahoo/yahoo.c:3125 src/protocols/zephyr/zephyr.c:2218
 msgid "Online"
 msgstr ""
 
-#: src/gtkaccount.c:2168
+#: src/gtkaccount.c:2164
+#, fuzzy
+msgid "Auto Log In"
+msgstr "स्वचालित - लॉगइन"
+
+#: src/gtkaccount.c:2172
 msgid "Protocol"
 msgstr ""
 
-#: src/gtkaccount.c:2481
+#: src/gtkaccount.c:2485
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 msgstr ""
 
-#: src/gtkaccount.c:2495
+#: src/gtkaccount.c:2499
 msgid ""
 "\n"
 "\n"
 "Do you wish to add him or her to your buddy list?"
 msgstr ""
 
-#: src/gtkaccount.c:2499
+#: src/gtkaccount.c:2503
 msgid "Information"
 msgstr ""
 
-#: src/gtkaccount.c:2503
+#: src/gtkaccount.c:2507
 msgid "Add buddy to your list?"
 msgstr ""
 
 #. Add button
-#: src/gtkaccount.c:2505 src/gtkblist.c:4426 src/gtkconv.c:1402
-#: src/gtkconv.c:3736 src/gtkconv.c:3807 src/gtkrequest.c:247
-#: src/protocols/icq/gaim_icq.c:276 src/protocols/oscar/oscar.c:3741
-#: src/protocols/silc/chat.c:593
+#: src/gtkaccount.c:2509 src/gtkblist.c:4439 src/gtkconv.c:1476
+#: src/gtkconv.c:3790 src/gtkconv.c:3861 src/gtkrequest.c:264
+#: src/protocols/oscar/oscar.c:3805 src/protocols/silc/chat.c:593
 msgid "Add"
 msgstr ""
 
-#: src/gtkblist.c:792
+#: src/gtkblist.c:813
 #, fuzzy
 msgid "Join a Chat"
 msgstr "गपशप से जुड़ें"
 
-#: src/gtkblist.c:813
+#: src/gtkblist.c:834
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr ""
 
 #  And now for the buttons
-#: src/gtkblist.c:824 src/gtkpounce.c:411 src/gtkroomlist.c:354
+#: src/gtkblist.c:845 src/gtkpounce.c:415 src/gtkroomlist.c:354
 #, fuzzy
 msgid "_Account:"
 msgstr "खाता"
 
-#: src/gtkblist.c:1119 src/gtkblist.c:3209
+#: src/gtkblist.c:1117
 msgid "Get _Info"
 msgstr ""
 
-#: src/gtkblist.c:1122 src/gtkblist.c:3199
+#: src/gtkblist.c:1120
 msgid "I_M"
 msgstr ""
 
-#: src/gtkblist.c:1128
+#: src/gtkblist.c:1126
 #, fuzzy
 msgid "_Send File"
 msgstr "डाक देखें"
 
-#: src/gtkblist.c:1134
+#: src/gtkblist.c:1132
 msgid "Add Buddy _Pounce"
 msgstr ""
 
-#: src/gtkblist.c:1136
+#: src/gtkblist.c:1134 src/gtkblist.c:1231
 msgid "View _Log"
 msgstr ""
 
-#: src/gtkblist.c:1145 src/gtkblist.c:1226 src/gtkblist.c:1240
+#: src/gtkblist.c:1144
+#, fuzzy
+msgid "_Alias Buddy..."
+msgstr "डाकेबल बड्डी सूची (_D)"
+
+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
+#: src/gtkblist.c:1146
+#, fuzzy
+msgid "_Remove Buddy"
+msgstr "रिमोट कंट्रोल"
+
+#: src/gtkblist.c:1148
+#, fuzzy
+msgid "Alias Contact..."
+msgstr "गपशप से जुड़ें"
+
+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
+#: src/gtkblist.c:1151 src/gtkdialogs.c:749 src/gtkdialogs.c:750
+#, fuzzy
+msgid "Remove Contact"
+msgstr "रिमोट कंट्रोल"
+
+#: src/gtkblist.c:1155 src/gtkblist.c:1239 src/gtkblist.c:1253
 msgid "_Alias..."
 msgstr ""
 
-#: src/gtkblist.c:1147 src/gtkblist.c:1228 src/gtkblist.c:1245
-#: src/gtkconn.c:361
+#: src/gtkblist.c:1157 src/gtkblist.c:1241 src/gtkblist.c:1258
+#: src/gtkconn.c:367
 msgid "_Remove"
 msgstr ""
 
-#: src/gtkblist.c:1192
+#: src/gtkblist.c:1203
 msgid "Add a _Buddy"
 msgstr ""
 
-#: src/gtkblist.c:1194
+#: src/gtkblist.c:1205
 #, fuzzy
 msgid "Add a C_hat"
 msgstr "बड्डी गपशप"
 
-#: src/gtkblist.c:1196
+#: src/gtkblist.c:1207
 msgid "_Delete Group"
 msgstr ""
 
-#: src/gtkblist.c:1198
+#: src/gtkblist.c:1209
 msgid "_Rename"
 msgstr ""
 
 #. join button
-#: src/gtkblist.c:1216 src/gtkroomlist.c:264 src/gtkroomlist.c:409
-#: src/stock.c:88
+#: src/gtkblist.c:1227 src/gtkroomlist.c:264 src/gtkroomlist.c:409
+#: src/gtkstock.c:89
 #, fuzzy
 msgid "_Join"
 msgstr "जुड़ें"
 
-#: src/gtkblist.c:1218
+#: src/gtkblist.c:1229
 #, fuzzy
 msgid "Auto-Join"
 msgstr "स्वचालित - लॉगइन"
 
-#: src/gtkblist.c:1242 src/gtkblist.c:1267
+#: src/gtkblist.c:1255 src/gtkblist.c:1280
 msgid "_Collapse"
 msgstr ""
 
-#: src/gtkblist.c:1272
+#: src/gtkblist.c:1285
 msgid "_Expand"
 msgstr ""
 
-#: src/gtkblist.c:1919 src/gtkconv.c:4379 src/gtkpounce.c:314
+#: src/gtkblist.c:1502 src/gtkblist.c:1512 src/gtkblist.c:3284
+#: src/gtkblist.c:3287
+#, fuzzy
+msgid "/Tools/Mute Sounds"
+msgstr "आवाज बंद करें"
+
+#: src/gtkblist.c:1953 src/gtkconv.c:4356 src/gtkpounce.c:316
 #, fuzzy
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr "आप वर्तमान में किसी प्रोटोकाल में लॉगिन नहीं हैं जिसमें गपशप करने की क्षमता है."
 
 #. Buddies menu
-#: src/gtkblist.c:2329
+#: src/gtkblist.c:2363
 #, fuzzy
 msgid "/_Buddies"
 msgstr "बड्डीस"
 
-#: src/gtkblist.c:2330
+#: src/gtkblist.c:2364
 #, fuzzy
 msgid "/Buddies/New Instant _Message..."
 msgstr "नया संदेश..."
 
-#: src/gtkblist.c:2331
+#: src/gtkblist.c:2365
 #, fuzzy
 msgid "/Buddies/Join a _Chat..."
 msgstr "गपशप से जुडें..."
 
-#: src/gtkblist.c:2332
+#: src/gtkblist.c:2366
 msgid "/Buddies/Get User _Info..."
 msgstr ""
 
-#: src/gtkblist.c:2333
+#: src/gtkblist.c:2367
 #, fuzzy
 msgid "/Buddies/View User _Log..."
 msgstr "नया संदेश..."
 
-#: src/gtkblist.c:2335
+#: src/gtkblist.c:2369
 msgid "/Buddies/Show _Offline Buddies"
 msgstr ""
 
-#: src/gtkblist.c:2336
+#: src/gtkblist.c:2370
 msgid "/Buddies/Show _Empty Groups"
 msgstr ""
 
-#: src/gtkblist.c:2337
+#: src/gtkblist.c:2371
 msgid "/Buddies/_Add Buddy..."
 msgstr ""
 
-#: src/gtkblist.c:2338
+#: src/gtkblist.c:2372
 msgid "/Buddies/Add C_hat..."
 msgstr ""
 
-#: src/gtkblist.c:2339
+#: src/gtkblist.c:2373
 msgid "/Buddies/Add _Group..."
 msgstr ""
 
-#: src/gtkblist.c:2341
-msgid "/Buddies/_Signoff"
-msgstr ""
-
-#: src/gtkblist.c:2342
+#: src/gtkblist.c:2375
+#, fuzzy
+msgid "/Buddies/_Log Out"
+msgstr "बड्डीस"
+
+#: src/gtkblist.c:2376
 #, fuzzy
 msgid "/Buddies/_Quit"
 msgstr "बड्डीस"
 
 #. Tools
-#: src/gtkblist.c:2345
+#: src/gtkblist.c:2379
 msgid "/_Tools"
 msgstr ""
 
-#: src/gtkblist.c:2346
+#: src/gtkblist.c:2380
 msgid "/Tools/_Away"
 msgstr ""
 
-#: src/gtkblist.c:2347
+#: src/gtkblist.c:2381
 msgid "/Tools/Buddy _Pounce"
 msgstr ""
 
 #  And now for the buttons
-#: src/gtkblist.c:2348
+#: src/gtkblist.c:2382
 #, fuzzy
 msgid "/Tools/Account Ac_tions"
 msgstr "खाता"
 
 #  And now for the buttons
-#: src/gtkblist.c:2349
+#: src/gtkblist.c:2383
 #, fuzzy
 msgid "/Tools/Pl_ugin Actions"
 msgstr "खाता"
 
 #  And now for the buttons
-#: src/gtkblist.c:2351
+#: src/gtkblist.c:2385
 #, fuzzy
 msgid "/Tools/A_ccounts"
 msgstr "खाता"
 
-#: src/gtkblist.c:2352
+#: src/gtkblist.c:2386
 #, fuzzy
 msgid "/Tools/_File Transfers"
 msgstr "फ़ाइल हस्तांतरण"
 
-#: src/gtkblist.c:2353
+#: src/gtkblist.c:2387
 msgid "/Tools/R_oom List"
 msgstr ""
 
-#: src/gtkblist.c:2354
+#: src/gtkblist.c:2388
 #, fuzzy
 msgid "/Tools/Pr_eferences"
 msgstr "वरीयताएँ"
 
-#: src/gtkblist.c:2355
+#: src/gtkblist.c:2389
 msgid "/Tools/Pr_ivacy"
 msgstr ""
 
-#: src/gtkblist.c:2357
+#: src/gtkblist.c:2390
+#, fuzzy
+msgid "/Tools/Mute _Sounds"
+msgstr "आवाज बंद करें"
+
+#: src/gtkblist.c:2392
 msgid "/Tools/View System _Log"
 msgstr ""
 
 #. Help
-#: src/gtkblist.c:2360
+#: src/gtkblist.c:2395
 msgid "/_Help"
 msgstr ""
 
-#: src/gtkblist.c:2361
+#: src/gtkblist.c:2396
 msgid "/Help/Online _Help"
 msgstr ""
 
-#: src/gtkblist.c:2362
+#: src/gtkblist.c:2397
 msgid "/Help/_Debug Window"
 msgstr ""
 
-#: src/gtkblist.c:2363
+#: src/gtkblist.c:2398
 msgid "/Help/_About"
 msgstr ""
 
-#: src/gtkblist.c:2381
+#: src/gtkblist.c:2416
 msgid "Rename Group"
 msgstr ""
 
-#: src/gtkblist.c:2381
+#: src/gtkblist.c:2416
 msgid "New group name"
 msgstr ""
 
-#: src/gtkblist.c:2382
+#: src/gtkblist.c:2417
 msgid "Please enter a new name for the selected group."
 msgstr ""
 
-#: src/gtkblist.c:2410
+#: src/gtkblist.c:2446
 #, c-format
 msgid ""
 "\n"
 "<b>Account:</b> %s"
 msgstr ""
 
-#: src/gtkblist.c:2474
+#: src/gtkblist.c:2520
 msgid ""
 "\n"
 "<b>Status:</b> Offline"
 msgstr ""
 
-#: src/gtkblist.c:2489
+#: src/gtkblist.c:2535
 #, c-format
 msgid "%d%%"
 msgstr ""
 
-#: src/gtkblist.c:2505
+#: src/gtkblist.c:2551
 msgid ""
 "\n"
 "<b>Account:</b>"
 msgstr ""
 
-#: src/gtkblist.c:2506
+#: src/gtkblist.c:2552
 msgid ""
 "\n"
 "<b>Contact Alias:</b>"
 msgstr ""
 
-#: src/gtkblist.c:2507
+#: src/gtkblist.c:2553
 msgid ""
 "\n"
 "<b>Alias:</b>"
 msgstr ""
 
-#: src/gtkblist.c:2508
+#: src/gtkblist.c:2554
 msgid ""
 "\n"
 "<b>Nickname:</b>"
 msgstr ""
 
-#: src/gtkblist.c:2509
+#: src/gtkblist.c:2555
 msgid ""
 "\n"
 "<b>Logged In:</b>"
 msgstr ""
 
-#: src/gtkblist.c:2510
+#: src/gtkblist.c:2556
 msgid ""
 "\n"
 "<b>Idle:</b>"
 msgstr ""
 
-#: src/gtkblist.c:2511
+#: src/gtkblist.c:2556
+msgid ""
+"\n"
+"<b>Idle</b>"
+msgstr ""
+
+#: src/gtkblist.c:2558
 msgid ""
 "\n"
 "<b>Warned:</b>"
 msgstr ""
 
-#: src/gtkblist.c:2513
+#: src/gtkblist.c:2560
 msgid ""
 "\n"
 "<b>Description:</b> Spooky"
 msgstr ""
 
-#: src/gtkblist.c:2514
+#: src/gtkblist.c:2561
 msgid ""
 "\n"
 "<b>Status</b>: Awesome"
 msgstr ""
 
-#: src/gtkblist.c:2515
+#: src/gtkblist.c:2562
 msgid ""
 "\n"
 "<b>Status</b>: Rockin'"
 msgstr ""
 
-#: src/gtkblist.c:2797
+#: src/gtkblist.c:2864
 #, c-format
 msgid "Idle (%dh%02dm) "
 msgstr ""
 
-#: src/gtkblist.c:2799
+#: src/gtkblist.c:2866
 #, fuzzy, c-format
 msgid "Idle (%dm) "
 msgstr "निष्क्रिय समय"
 
-#: src/gtkblist.c:2804
+#: src/gtkblist.c:2869
+#, fuzzy
+msgid "Idle "
+msgstr "निष्क्रिय समय"
+
+#: src/gtkblist.c:2877
 #, c-format
 msgid "Warned (%d%%) "
 msgstr ""
 
-#: src/gtkblist.c:2807
+#: src/gtkblist.c:2881
 msgid "Offline "
 msgstr ""
 
 #. Make menu items sensitive/insensitive where appropriate
-#: src/gtkblist.c:2925
+#: src/gtkblist.c:3008
 #, fuzzy
 msgid "/Buddies/Join a Chat..."
 msgstr "गपशप से जुडें..."
 
-#: src/gtkblist.c:2928
+#: src/gtkblist.c:3011
 msgid "/Tools/Room List"
 msgstr ""
 
-#: src/gtkblist.c:2931
+#: src/gtkblist.c:3014
 #, fuzzy
 msgid "/Tools/Privacy"
 msgstr "वरीयताएँ"
 
-#: src/gtkblist.c:3013
+#: src/gtkblist.c:3070 src/gtkprefs.c:917 src/gtkprefs.c:1774
+#: src/protocols/jabber/jabber.c:935
+msgid "None"
+msgstr ""
+
+#: src/gtkblist.c:3072
 msgid "Alphabetical"
 msgstr ""
 
-#: src/gtkblist.c:3014
+#: src/gtkblist.c:3073
 msgid "By status"
 msgstr ""
 
-#: src/gtkblist.c:3015
+#: src/gtkblist.c:3074
 msgid "By log size"
 msgstr ""
 
-#: src/gtkblist.c:3081
+#  Autostart
+#: src/gtkblist.c:3110
+#, fuzzy
+msgid "Statuses"
+msgstr "प्रारंभ-में"
+
+#. FIXME: Status
+#: src/gtkblist.c:3174
 msgid "/Tools/Away"
 msgstr ""
 
-#: src/gtkblist.c:3084
+#: src/gtkblist.c:3177
 msgid "/Tools/Buddy Pounce"
 msgstr ""
 
 #  And now for the buttons
-#: src/gtkblist.c:3087
+#: src/gtkblist.c:3180
 #, fuzzy
 msgid "/Tools/Account Actions"
 msgstr "खाता"
 
 #  And now for the buttons
-#: src/gtkblist.c:3090
+#: src/gtkblist.c:3183
 #, fuzzy
 msgid "/Tools/Plugin Actions"
 msgstr "खाता"
@@ -2445,49 +2470,21 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: src/gtkblist.c:3178
+#: src/gtkblist.c:3280
 msgid "/Buddies/Show Offline Buddies"
 msgstr ""
 
-#: src/gtkblist.c:3180
+#: src/gtkblist.c:3282
 msgid "/Buddies/Show Empty Groups"
 msgstr ""
 
-#: src/gtkblist.c:3205
-msgid "Send a message to the selected buddy"
-msgstr ""
-
-#: src/gtkblist.c:3215
-msgid "Get information on the selected buddy"
-msgstr ""
-
-#: src/gtkblist.c:3219
-#, fuzzy
-msgid "_Chat"
-msgstr "गपशप"
-
-#: src/gtkblist.c:3224
-#, fuzzy
-msgid "Join a chat room"
-msgstr "गपशप से जुड़ें"
-
-#: src/gtkblist.c:3229
-#, fuzzy
-msgid "_Away"
-msgstr "दूर"
-
-#: src/gtkblist.c:3234
-#, fuzzy
-msgid "Set an away message"
-msgstr "नया दूर संदेश"
-
-#: src/gtkblist.c:3977 src/protocols/silc/buddy.c:731
+#: src/gtkblist.c:3979 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:2734
+#: src/protocols/silc/buddy.c:1124 src/protocols/yahoo/yahoo.c:2822
 msgid "Add Buddy"
 msgstr ""
 
-#: src/gtkblist.c:4001
+#: src/gtkblist.c:4003
 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. "
@@ -2496,63 +2493,63 @@
 
 #  And now for the buttons
 #. Set up stuff for the account box
-#: src/gtkblist.c:4061 src/gtkblist.c:4355
+#: src/gtkblist.c:4063 src/gtkblist.c:4368
 #, fuzzy
 msgid "Account:"
 msgstr "खाता"
 
-#: src/gtkblist.c:4288
+#: src/gtkblist.c:4301
 msgid "This protocol does not support chat rooms."
 msgstr ""
 
-#: src/gtkblist.c:4304
+#: src/gtkblist.c:4317
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "आप वर्तमान में किसी प्रोटोकाल में लॉगिन नहीं हैं जिसमें गपशप करने की क्षमता है."
 
-#: src/gtkblist.c:4321
+#: src/gtkblist.c:4334
 #, fuzzy
 msgid "Add Chat"
 msgstr "बड्डी गपशप"
 
-#: src/gtkblist.c:4345
+#: src/gtkblist.c:4358
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr ""
 
-#: src/gtkblist.c:4423
+#: src/gtkblist.c:4436
 msgid "Add Group"
 msgstr ""
 
-#: src/gtkblist.c:4424
+#: src/gtkblist.c:4437
 msgid "Please enter the name of the group to be added."
 msgstr ""
 
-#: src/gtkblist.c:4991 src/gtkblist.c:5088
+#: src/gtkblist.c:5011 src/gtkblist.c:5108
 msgid "No actions available"
 msgstr ""
 
-#: src/gtkconn.c:79 src/gtkconn.c:250 src/gtkconn.c:261
+#: src/gtkconn.c:81 src/gtkconn.c:254 src/gtkconn.c:267
 msgid "Done."
 msgstr ""
 
-#: src/gtkconn.c:158
-#, fuzzy
-msgid "Signon: "
-msgstr "साइनऑफ"
-
-#: src/gtkconn.c:204
-#, fuzzy
-msgid "Signon"
-msgstr "साइनऑफ"
+#: src/gtkconn.c:160
+#, fuzzy
+msgid "Logging in: "
+msgstr "विन-गेम विकल्प"
+
+#: src/gtkconn.c:206
+#, fuzzy
+msgid "Logging In"
+msgstr "जुड़ें"
 
 # #-#-#-#-#  anjuta.ANJUTA_1_2_0.hi.po (anjuta2 VERSION)  #-#-#-#-#
 # #-#-#-#-#  gnome-session.HEAD.hi.po (gnome-session VERSION)  #-#-#-#-#
 # gnome-session/session-properties.c:179
 #  Cancel button.
-#: src/gtkconn.c:216
+#: src/gtkconn.c:218
 #, fuzzy
 msgid "Cancel All"
 msgstr "रद्द"
@@ -2564,12 +2561,12 @@
 #  *< dependencies
 #  *< priority
 #  *< id
-#: src/gtkconn.c:361 src/gtkconn.c:593
+#: src/gtkconn.c:367 src/gtkconn.c:599
 #, fuzzy
 msgid "_Reconnect"
 msgstr "स्वचालित पुनःजुड़ें"
 
-#: src/gtkconn.c:557
+#: src/gtkconn.c:563
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
@@ -2582,11 +2579,16 @@
 # gnome-session/gsm-client-row.c:43
 # #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
 # gnome-session/gsm-client-row.c:43
-#: src/gtkconn.c:559
+#: src/gtkconn.c:565
 #, fuzzy
 msgid "Reason Unknown."
 msgstr "अज्ञात"
 
+#: src/gtkconn.c:573
+#, fuzzy
+msgid "Disconnected"
+msgstr "कनेक्शन में त्रुटि"
+
 #  *< api_version
 #  *< type
 #  *< ui_requirement
@@ -2594,469 +2596,476 @@
 #  *< dependencies
 #  *< priority
 #  *< id
-#: src/gtkconn.c:598
+#: src/gtkconn.c:604
 #, fuzzy
 msgid "Reconnect _All"
 msgstr "स्वचालित पुनःजुड़ें"
 
-#: src/gtkconn.c:628
+#: src/gtkconn.c:634
 #, fuzzy
 msgid "Time"
 msgstr "निष्क्रिय समय"
 
-#: src/gtkconv.c:327
+#: src/gtkconv.c:319
 #, c-format
 msgid "me is using Gaim v%s."
 msgstr ""
 
-#: src/gtkconv.c:336
+#: src/gtkconv.c:328
 msgid "Supported debug options are:  version"
 msgstr ""
 
-#: src/gtkconv.c:360
+#: src/gtkconv.c:352
 msgid "No such command (in this context)."
 msgstr ""
 
-#: src/gtkconv.c:363
+#: src/gtkconv.c:355
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
 msgstr ""
 
-#: src/gtkconv.c:435
+#: src/gtkconv.c:427
 msgid "No such command."
 msgstr ""
 
-#: src/gtkconv.c:442
+#: src/gtkconv.c:434
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 
-#: src/gtkconv.c:447
+#: src/gtkconv.c:439
 msgid "Your command failed for an unknown reason."
 msgstr ""
 
-#: src/gtkconv.c:454
+#: src/gtkconv.c:446
 msgid "That command only works in Chats, not IMs."
 msgstr ""
 
-#: src/gtkconv.c:457
+#: src/gtkconv.c:449
 msgid "That command only works in IMs, not Chats."
 msgstr ""
 
-#: src/gtkconv.c:461
+#: src/gtkconv.c:453
 msgid "That command doesn't work on this protocol."
 msgstr ""
 
+#: src/gtkconv.c:687 src/gtkconv.c:713
+msgid "That buddy is not on the same protocol as this chat"
+msgstr ""
+
 #: src/gtkconv.c:707
+#, fuzzy
+msgid ""
+"You are not currently signed on with an account that can invite that buddy."
+msgstr "आप वर्तमान में किसी प्रोटोकाल में लॉगिन नहीं हैं जिसमें गपशप करने की क्षमता है."
+
+#: src/gtkconv.c:761
 msgid "Invite Buddy Into Chat Room"
 msgstr ""
 
 #. Put our happy label in it.
-#: src/gtkconv.c:735
+#: src/gtkconv.c:791
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr ""
 
-#: src/gtkconv.c:756
+#: src/gtkconv.c:812
 msgid "_Buddy:"
 msgstr ""
 
-#: src/gtkconv.c:776
+#: src/gtkconv.c:832
 #, fuzzy
 msgid "_Message:"
 msgstr "नया संदेश..."
 
-#: src/gtkconv.c:813 src/gtkconv.c:2498 src/gtkdebug.c:182
+#: src/gtkconv.c:888 src/gtkconv.c:2559 src/gtkdebug.c:179
 #, fuzzy
 msgid "Unable to open file."
 msgstr "फ़ाइल हस्तांतरण"
 
 #  Conversations
-#: src/gtkconv.c:818
+#: src/gtkconv.c:893
 #, fuzzy, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "वार्तालाप"
 
 #  Conversations
-#: src/gtkconv.c:832
+#: src/gtkconv.c:907
 #, fuzzy
 msgid "Save Conversation"
 msgstr "वार्तालाप"
 
-#: src/gtkconv.c:909 src/gtkdebug.c:131
+#: src/gtkconv.c:992 src/gtkdebug.c:128
 #, fuzzy
 msgid "Find"
 msgstr "हिन्दी"
 
-#: src/gtkconv.c:935 src/gtkdebug.c:159
+#: src/gtkconv.c:1018 src/gtkdebug.c:156
 msgid "_Search for:"
 msgstr ""
 
-#: src/gtkconv.c:1350
+#: src/gtkconv.c:1437
 msgid "IM"
 msgstr ""
 
 #. Send File button
-#: src/gtkconv.c:1359 src/gtkconv.c:3729 src/protocols/oscar/oscar.c:569
+#: src/gtkconv.c:1443 src/gtkconv.c:3783 src/protocols/oscar/oscar.c:598
 msgid "Send File"
 msgstr ""
 
-#: src/gtkconv.c:1368
+#: src/gtkconv.c:1450
 msgid "Un-Ignore"
 msgstr ""
 
-#: src/gtkconv.c:1370 src/gtkprefs.c:828
+#: src/gtkconv.c:1453 src/gtkprefs.c:781
 msgid "Ignore"
 msgstr ""
 
 #. Info button
-#: src/gtkconv.c:1379 src/gtkconv.c:3750
+#: src/gtkconv.c:1458 src/gtkconv.c:3804
 msgid "Info"
 msgstr ""
 
-#: src/gtkconv.c:1388
-#, fuzzy
-msgid "Get Away Msg"
+#: src/gtkconv.c:1464
+#, fuzzy
+msgid "Get Away Message"
 msgstr "नया दूर संदेश"
 
-#: src/gtkconv.c:2506
+#. Remove button
+#: src/gtkconv.c:1473 src/gtkconv.c:3797 src/gtkconv.c:3868
+#: src/gtkrequest.c:265
+msgid "Remove"
+msgstr ""
+
+#: src/gtkconv.c:2567
 msgid "Unable to save icon file to disk."
 msgstr ""
 
-#: src/gtkconv.c:2527
+#: src/gtkconv.c:2588
 #, fuzzy
 msgid "Save Icon"
 msgstr "सहेजें"
 
-#: src/gtkconv.c:2557
+#: src/gtkconv.c:2618
 msgid "Animate"
 msgstr ""
 
-#: src/gtkconv.c:2562
+#: src/gtkconv.c:2623
 msgid "Hide Icon"
 msgstr ""
 
-#: src/gtkconv.c:2568
+#: src/gtkconv.c:2629
 msgid "Save Icon As..."
 msgstr ""
 
-#: src/gtkconv.c:2938
+#: src/gtkconv.c:2996
 msgid "User is typing..."
 msgstr ""
 
-#: src/gtkconv.c:2946
+#: src/gtkconv.c:3004
 msgid "User has typed something and paused"
 msgstr ""
 
 #. Build the Send As menu
-#: src/gtkconv.c:3049
+#: src/gtkconv.c:3107
 msgid "_Send As"
 msgstr ""
 
 #  Conversations
 #. Conversation menu
-#: src/gtkconv.c:3500
+#: src/gtkconv.c:3560
 #, fuzzy
 msgid "/_Conversation"
 msgstr "वार्तालाप"
 
-#: src/gtkconv.c:3502
+#: src/gtkconv.c:3562
 msgid "/Conversation/New Instant _Message..."
 msgstr ""
 
 #  Conversations
-#: src/gtkconv.c:3507
+#: src/gtkconv.c:3567
 #, fuzzy
 msgid "/Conversation/_Find..."
 msgstr "वार्तालाप"
 
 #  Conversations
-#: src/gtkconv.c:3509
+#: src/gtkconv.c:3569
 #, fuzzy
 msgid "/Conversation/View _Log"
 msgstr "वार्तालाप"
 
 #  Conversations
-#: src/gtkconv.c:3510
+#: src/gtkconv.c:3570
 #, fuzzy
 msgid "/Conversation/_Save As..."
 msgstr "वार्तालाप"
 
 #  Conversations
-#: src/gtkconv.c:3512
+#: src/gtkconv.c:3572
 #, fuzzy
 msgid "/Conversation/Clear"
 msgstr "वार्तालाप"
 
 #  Conversations
-#: src/gtkconv.c:3516
+#: src/gtkconv.c:3576
 #, fuzzy
 msgid "/Conversation/Se_nd File..."
 msgstr "वार्तालाप"
 
-#: src/gtkconv.c:3517
+#: src/gtkconv.c:3577
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr ""
 
 #  Conversations
-#: src/gtkconv.c:3519
+#: src/gtkconv.c:3579
 #, fuzzy
 msgid "/Conversation/_Get Info"
 msgstr "वार्तालाप"
 
 #  Conversations
-#: src/gtkconv.c:3521
+#: src/gtkconv.c:3581
 #, fuzzy
 msgid "/Conversation/_Warn..."
 msgstr "वार्तालाप"
 
 #  Conversations
-#: src/gtkconv.c:3523
+#: src/gtkconv.c:3583
 #, fuzzy
 msgid "/Conversation/In_vite..."
 msgstr "वार्तालाप"
 
 #  Conversations
-#: src/gtkconv.c:3528
+#: src/gtkconv.c:3588
 #, fuzzy
 msgid "/Conversation/A_lias..."
 msgstr "वार्तालाप"
 
 #  Conversations
-#: src/gtkconv.c:3530
+#: src/gtkconv.c:3590
 #, fuzzy
 msgid "/Conversation/_Block..."
 msgstr "वार्तालाप"
 
 #  Conversations
-#: src/gtkconv.c:3532
+#: src/gtkconv.c:3592
 #, fuzzy
 msgid "/Conversation/_Add..."
 msgstr "वार्तालाप"
 
 #  Conversations
-#: src/gtkconv.c:3534
+#: src/gtkconv.c:3594
 #, fuzzy
 msgid "/Conversation/_Remove..."
 msgstr "वार्तालाप"
 
 #  Conversations
-#: src/gtkconv.c:3539
+#: src/gtkconv.c:3599
 #, fuzzy
 msgid "/Conversation/Insert Lin_k..."
 msgstr "वार्तालाप"
 
 #  Conversations
-#: src/gtkconv.c:3541
+#: src/gtkconv.c:3601
 #, fuzzy
 msgid "/Conversation/Insert Imag_e..."
 msgstr "वार्तालाप"
 
 #  Conversations
-#: src/gtkconv.c:3546
+#: src/gtkconv.c:3606
 #, fuzzy
 msgid "/Conversation/_Close"
 msgstr "वार्तालाप"
 
 #. Options
-#: src/gtkconv.c:3550
+#: src/gtkconv.c:3610
 msgid "/_Options"
 msgstr ""
 
-#: src/gtkconv.c:3551
+#: src/gtkconv.c:3611
 msgid "/Options/Enable _Logging"
 msgstr ""
 
-#: src/gtkconv.c:3552
+#: src/gtkconv.c:3612
 msgid "/Options/Enable _Sounds"
 msgstr ""
 
-#: src/gtkconv.c:3553
+#: src/gtkconv.c:3613
 msgid "/Options/Show Formatting _Toolbar"
 msgstr ""
 
-#: src/gtkconv.c:3554
+#: src/gtkconv.c:3614
 #, fuzzy
 msgid "/Options/Show T_imestamps"
 msgstr "आईचैट अंकित समय"
 
 #  Conversations
-#: src/gtkconv.c:3596
+#: src/gtkconv.c:3656
 #, fuzzy
 msgid "/Conversation/View Log"
 msgstr "वार्तालाप"
 
 #  Conversations
-#: src/gtkconv.c:3601
+#: src/gtkconv.c:3661
 #, fuzzy
 msgid "/Conversation/Send File..."
 msgstr "वार्तालाप"
 
-#: src/gtkconv.c:3605
+#: src/gtkconv.c:3665
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr ""
 
 #  Conversations
-#: src/gtkconv.c:3611
+#: src/gtkconv.c:3671
 #, fuzzy
 msgid "/Conversation/Get Info"
 msgstr "वार्तालाप"
 
 #  Conversations
-#: src/gtkconv.c:3615
+#: src/gtkconv.c:3675
 #, fuzzy
 msgid "/Conversation/Warn..."
 msgstr "वार्तालाप"
 
 #  Conversations
-#: src/gtkconv.c:3619
+#: src/gtkconv.c:3679
 #, fuzzy
 msgid "/Conversation/Invite..."
 msgstr "वार्तालाप"
 
 #  Conversations
-#: src/gtkconv.c:3625
+#: src/gtkconv.c:3685
 #, fuzzy
 msgid "/Conversation/Alias..."
 msgstr "वार्तालाप"
 
 #  Conversations
-#: src/gtkconv.c:3629
+#: src/gtkconv.c:3689
 #, fuzzy
 msgid "/Conversation/Block..."
 msgstr "वार्तालाप"
 
 #  Conversations
-#: src/gtkconv.c:3633
+#: src/gtkconv.c:3693
 #, fuzzy
 msgid "/Conversation/Add..."
 msgstr "वार्तालाप"
 
 #  Conversations
-#: src/gtkconv.c:3637
+#: src/gtkconv.c:3697
 #, fuzzy
 msgid "/Conversation/Remove..."
 msgstr "वार्तालाप"
 
 #  Conversations
-#: src/gtkconv.c:3643
+#: src/gtkconv.c:3703
 #, fuzzy
 msgid "/Conversation/Insert Link..."
 msgstr "वार्तालाप"
 
 #  Conversations
-#: src/gtkconv.c:3647
+#: src/gtkconv.c:3707
 #, fuzzy
 msgid "/Conversation/Insert Image..."
 msgstr "वार्तालाप"
 
-#: src/gtkconv.c:3653
+#: src/gtkconv.c:3713
 msgid "/Options/Enable Logging"
 msgstr ""
 
-#: src/gtkconv.c:3656
+#: src/gtkconv.c:3716
 msgid "/Options/Enable Sounds"
 msgstr ""
 
-#: src/gtkconv.c:3659
+#: src/gtkconv.c:3719
 msgid "/Options/Show Formatting Toolbar"
 msgstr ""
 
-#: src/gtkconv.c:3662
+#: src/gtkconv.c:3722
 #, fuzzy
 msgid "/Options/Show Timestamps"
 msgstr "आईचैट अंकित समय"
 
 #. The buttons, from left to right
-#. Warn button
-#: src/gtkconv.c:3715
-msgid "Warn"
-msgstr ""
-
-#: src/gtkconv.c:3716
-msgid "Warn the user"
-msgstr ""
-
 #. Block button
-#: src/gtkconv.c:3722 src/gtkprivacy.c:623 src/gtkprivacy.c:634
+#: src/gtkconv.c:3776 src/gtkprivacy.c:625 src/gtkprivacy.c:636
 #, fuzzy
 msgid "Block"
 msgstr "पीछे"
 
-#: src/gtkconv.c:3723
+#: src/gtkconv.c:3777
 msgid "Block the user"
 msgstr ""
 
-#: src/gtkconv.c:3730
+#: src/gtkconv.c:3784
 msgid "Send a file to the user"
 msgstr ""
 
-#: src/gtkconv.c:3737
+#: src/gtkconv.c:3791
 msgid "Add the user to your buddy list"
 msgstr ""
 
-#: src/gtkconv.c:3744
+#: src/gtkconv.c:3798
 msgid "Remove the user from your buddy list"
 msgstr ""
 
-#: src/gtkconv.c:3751 src/gtkconv.c:4086
+#: src/gtkconv.c:3805 src/gtkconv.c:4126
 #, fuzzy
 msgid "Get the user's information"
 msgstr "उपयोगकर्ता %s हेतु जानकारी बदलें"
 
 #. Send button
-#: src/gtkconv.c:3757 src/gtkconv.c:3821
+#: src/gtkconv.c:3811 src/gtkconv.c:3875
 msgid "Send"
 msgstr ""
 
-#: src/gtkconv.c:3758 src/gtkconv.c:3822
+#: src/gtkconv.c:3812 src/gtkconv.c:3876
 #, fuzzy
 msgid "Send message"
 msgstr "नया संदेश..."
 
 #. The buttons, from left to right
 #. Invite
-#: src/gtkconv.c:3800
+#: src/gtkconv.c:3854
 msgid "Invite"
 msgstr ""
 
-#: src/gtkconv.c:3801
+#: src/gtkconv.c:3855
 msgid "Invite a user"
 msgstr ""
 
-#: src/gtkconv.c:3808
+#: src/gtkconv.c:3862
 msgid "Add the chat to your buddy list"
 msgstr ""
 
-#: src/gtkconv.c:3815
+#: src/gtkconv.c:3869
 msgid "Remove the chat from your buddy list"
 msgstr ""
 
-#: src/gtkconv.c:3939
+#: src/gtkconv.c:3993
 msgid "Topic:"
 msgstr ""
 
 #. Setup the label telling how many people are in the room.
-#: src/gtkconv.c:4002
+#: src/gtkconv.c:4042
 msgid "0 people in room"
 msgstr ""
 
-#: src/gtkconv.c:4063
+#: src/gtkconv.c:4103
 msgid "IM the user"
 msgstr ""
 
-#: src/gtkconv.c:4075
+#: src/gtkconv.c:4115
 msgid "Ignore the user"
 msgstr ""
 
 #  Conversations
-#: src/gtkconv.c:4669
+#: src/gtkconv.c:4634
 #, fuzzy
 msgid "Close conversation"
 msgstr "वार्तालाप"
 
-#: src/gtkconv.c:5202 src/gtkconv.c:5231 src/gtkconv.c:5327 src/gtkconv.c:5385
+#: src/gtkconv.c:5169 src/gtkconv.c:5198 src/gtkconv.c:5294 src/gtkconv.c:5352
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
@@ -3064,249 +3073,248 @@
 msgstr[1] ""
 
 #  Conversations
-#: src/gtkconv.c:5951 src/gtkconv.c:5954
+#: src/gtkconv.c:5925 src/gtkconv.c:5928
 #, fuzzy
 msgid "<main>/Conversation/Close"
 msgstr "वार्तालाप"
 
-#: src/gtkconv.c:6326
+#: src/gtkconv.c:6249
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr ""
 
-#: src/gtkconv.c:6329
+#: src/gtkconv.c:6252
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 
-#: src/gtkconv.c:6332
+#: src/gtkconv.c:6255
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr ""
 
-#: src/gtkconv.c:6336
+#: src/gtkconv.c:6259
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr ""
 
-#: src/gtkdebug.c:197
+#: src/gtkdebug.c:194
 msgid "Save Debug Log"
 msgstr ""
 
-#: src/gtkdebug.c:250
+#: src/gtkdebug.c:247
 msgid "Debug Window"
 msgstr ""
 
-#: src/gtkdebug.c:288
+#: src/gtkdebug.c:285
 msgid "Pause"
 msgstr ""
 
-#: src/gtkdebug.c:294
+#: src/gtkdebug.c:291
 #, fuzzy
 msgid "Timestamps"
 msgstr "अंकित समय"
 
-#: src/gtkdialogs.c:63
+#: src/gtkdialogs.c:66
 msgid "maintainer"
 msgstr "मेन्टेनर"
 
-#: src/gtkdialogs.c:64
+#: src/gtkdialogs.c:67
 msgid "lead developer"
 msgstr "मुख्य डेवलपर"
 
-#: src/gtkdialogs.c:65
+#: src/gtkdialogs.c:68
 msgid "developer & webmaster"
 msgstr "डेवलपर & वेब मास्टर"
 
-#: src/gtkdialogs.c:66
+#: src/gtkdialogs.c:69
 msgid "win32 port"
 msgstr "विन32 पोर्ट"
 
-#: src/gtkdialogs.c:67 src/gtkdialogs.c:68 src/gtkdialogs.c:69
-#: src/gtkdialogs.c:70
+#: src/gtkdialogs.c:70 src/gtkdialogs.c:71 src/gtkdialogs.c:72
+#: src/gtkdialogs.c:73 src/gtkdialogs.c:75
 msgid "developer"
 msgstr "डेवलपर"
 
-#: src/gtkdialogs.c:71
+#: src/gtkdialogs.c:74
 msgid "support"
 msgstr "समर्थन"
 
-#: src/gtkdialogs.c:76
+#: src/gtkdialogs.c:80
 msgid "former libfaim maintainer"
 msgstr "पूर्व लिबफेम मेंटेनर"
 
-#: src/gtkdialogs.c:77
+#: src/gtkdialogs.c:81
 msgid "former lead developer"
 msgstr "पूर्व मुख्य डेवलपर"
 
-#: src/gtkdialogs.c:78
+#: src/gtkdialogs.c:82
 msgid "former maintainer"
 msgstr "पूर्व मेंटेनर"
 
-#: src/gtkdialogs.c:79
+#: src/gtkdialogs.c:83
 msgid "former Jabber developer"
 msgstr "पूर्व जेबर डेवलपर्स"
 
-#: src/gtkdialogs.c:80
+#: src/gtkdialogs.c:84
 msgid "original author"
 msgstr "मूल लेखक"
 
-#: src/gtkdialogs.c:81
+#: src/gtkdialogs.c:85
 msgid "hacker and designated driver [lazy bum]"
 msgstr "हेकर तथा ओहदेदार चालक [लेज़ी बम]"
 
-#: src/gtkdialogs.c:86 src/gtkdialogs.c:123
+#: src/gtkdialogs.c:90 src/gtkdialogs.c:128
 msgid "Bulgarian"
 msgstr "बुल्गारियाई"
 
-#: src/gtkdialogs.c:87 src/gtkdialogs.c:124
+#: src/gtkdialogs.c:91 src/gtkdialogs.c:129 src/gtkdialogs.c:130
 msgid "Catalan"
 msgstr "केटालन"
 
-#: src/gtkdialogs.c:88 src/gtkdialogs.c:125
+#: src/gtkdialogs.c:92 src/gtkdialogs.c:131
 msgid "Czech"
 msgstr "चेक"
 
-#: src/gtkdialogs.c:89
+#: src/gtkdialogs.c:93
 msgid "Danish"
 msgstr "डेनिश"
 
-#: src/gtkdialogs.c:90
+#: src/gtkdialogs.c:94
+msgid "Australian English"
+msgstr ""
+
+#: src/gtkdialogs.c:95
 msgid "British English"
 msgstr ""
 
-#: src/gtkdialogs.c:91
+#: src/gtkdialogs.c:96
 msgid "Canadian English"
 msgstr ""
 
-#: src/gtkdialogs.c:92 src/gtkdialogs.c:126
+#: src/gtkdialogs.c:97 src/gtkdialogs.c:132
 msgid "German"
 msgstr "जर्मनी"
 
-#: src/gtkdialogs.c:93 src/gtkdialogs.c:127
+#: src/gtkdialogs.c:98 src/gtkdialogs.c:133
 msgid "Spanish"
 msgstr "स्पेनी"
 
-#: src/gtkdialogs.c:94 src/gtkdialogs.c:128
+#: src/gtkdialogs.c:99 src/gtkdialogs.c:134
 msgid "Finnish"
 msgstr "फिनिश"
 
-#: src/gtkdialogs.c:95 src/gtkdialogs.c:129
+#: src/gtkdialogs.c:100 src/gtkdialogs.c:135
 msgid "French"
 msgstr "फ्रेंच"
 
-#: src/gtkdialogs.c:96
+#: src/gtkdialogs.c:101
 msgid "Hebrew"
 msgstr " हिब्रू"
 
-#: src/gtkdialogs.c:97
+#: src/gtkdialogs.c:102
 msgid "Hindi"
 msgstr "हिन्दी"
 
-#: src/gtkdialogs.c:98
+#: src/gtkdialogs.c:103
 msgid "Hungarian"
 msgstr "हंगेरियाई"
 
-#: src/gtkdialogs.c:99 src/gtkdialogs.c:130
+#: src/gtkdialogs.c:104 src/gtkdialogs.c:136
 msgid "Italian"
 msgstr "इतालवी"
 
-#: src/gtkdialogs.c:100 src/gtkdialogs.c:131
+#: src/gtkdialogs.c:105 src/gtkdialogs.c:137
 msgid "Japanese"
 msgstr "जापानी"
 
-#: src/gtkdialogs.c:101
+#: src/gtkdialogs.c:106
 msgid "Lithuanian"
 msgstr ""
 
-#: src/gtkdialogs.c:102 src/gtkdialogs.c:132
+#: src/gtkdialogs.c:107 src/gtkdialogs.c:138
 msgid "Korean"
 msgstr "कोरियाई"
 
-#: src/gtkdialogs.c:103
+#: src/gtkdialogs.c:108
 msgid "Dutch; Flemish"
 msgstr "डच; फ्लेमिश"
 
-#: src/gtkdialogs.c:104
+#: src/gtkdialogs.c:109
 msgid "Macedonian"
 msgstr ""
 
-#: src/gtkdialogs.c:105
+#: src/gtkdialogs.c:110
 msgid "Norwegian"
 msgstr "नारवेजियन "
 
-#: src/gtkdialogs.c:106 src/gtkdialogs.c:133
+#: src/gtkdialogs.c:111 src/gtkdialogs.c:139
 msgid "Polish"
 msgstr "पोलिष"
 
-#: src/gtkdialogs.c:107
+#: src/gtkdialogs.c:112
 msgid "Portuguese"
 msgstr "पुर्तगाली"
 
-#: src/gtkdialogs.c:108
+#: src/gtkdialogs.c:113
 msgid "Portuguese-Brazil"
 msgstr "पुर्तगाली (ब्राजीलीयाइ)"
 
-#: src/gtkdialogs.c:109
+#: src/gtkdialogs.c:114
 msgid "Romanian"
 msgstr "रोमानी"
 
-#: src/gtkdialogs.c:110 src/gtkdialogs.c:134 src/gtkdialogs.c:135
+#: src/gtkdialogs.c:115 src/gtkdialogs.c:140 src/gtkdialogs.c:141
 msgid "Russian"
 msgstr "रूसी"
 
-#: src/gtkdialogs.c:111
+#: src/gtkdialogs.c:116
 msgid "Serbian"
 msgstr "सर्बियाइ"
 
-#: src/gtkdialogs.c:112
+#: src/gtkdialogs.c:117
 #, fuzzy
 msgid "Slovenian"
 msgstr "स्लोवाक"
 
-#: src/gtkdialogs.c:113 src/gtkdialogs.c:137
+#: src/gtkdialogs.c:118 src/gtkdialogs.c:143
 msgid "Swedish"
 msgstr "स्वीडिश"
 
-#: src/gtkdialogs.c:114
+#: src/gtkdialogs.c:119
 msgid "Vietnamese"
 msgstr ""
 
-#: src/gtkdialogs.c:114
+#: src/gtkdialogs.c:119
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr ""
 
-#: src/gtkdialogs.c:115
+#: src/gtkdialogs.c:120
 msgid "Simplified Chinese"
 msgstr "सरलीकृत चीनी"
 
-#: src/gtkdialogs.c:116
+#: src/gtkdialogs.c:121
 msgid "Traditional Chinese"
 msgstr "पारम्परिक चीनी"
 
-#: src/gtkdialogs.c:122
+#: src/gtkdialogs.c:127
 msgid "Amharic"
 msgstr "अम्हारिक"
 
-#: src/gtkdialogs.c:136
+#: src/gtkdialogs.c:142
 msgid "Slovak"
 msgstr "स्लोवाक"
 
-#: src/gtkdialogs.c:138
+#: src/gtkdialogs.c:144
 msgid "Chinese"
 msgstr "चीनी"
 
-#: src/gtkdialogs.c:180
+#: src/gtkdialogs.c:185
 #, fuzzy
 msgid "About Gaim"
 msgstr "गेम v%s के बारे में"
 
-#: src/gtkdialogs.c:195
-#, c-format
-msgid "<span weight=\"bold\" size=\"larger\">Gaim v%s</span>"
-msgstr ""
-
-#: src/gtkdialogs.c:216
+#: src/gtkdialogs.c:208
 #, fuzzy
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
@@ -3317,73 +3325,73 @@
 "ज़ेबल, नेपस्टर, ज़ेफायर, तथा गडू-गडू इन सभी को एक साथ उपयोग में ला सकता है. इसे जीटीके+ के "
 "उपयोग से लिखा गया है और जीपीएल लाइसेंस के तहत है.<BR><BR>"
 
-#: src/gtkdialogs.c:225
+#: src/gtkdialogs.c:217
 #, fuzzy
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"3\">IRC:</FONT> #गेम irc.freenode.net पर<BR><BR>"
 
-#: src/gtkdialogs.c:230
+#: src/gtkdialogs.c:222
 msgid "Active Developers"
 msgstr "सक्रिय डेवलपर्स"
 
-#: src/gtkdialogs.c:245
+#: src/gtkdialogs.c:237
 msgid "Crazy Patch Writers"
 msgstr "क्रेजी पैच लेखकगण"
 
-#: src/gtkdialogs.c:260
+#: src/gtkdialogs.c:252
 msgid "Retired Developers"
 msgstr "सेवानिवृत्त डेवलपर्स"
 
-#: src/gtkdialogs.c:275
+#: src/gtkdialogs.c:267
 msgid "Current Translators"
 msgstr "वर्तमान अनुवादक - रविशंकर श्रीवास्तव (raviratlami@yahoo.com)"
 
-#: src/gtkdialogs.c:295
+#: src/gtkdialogs.c:287
 msgid "Past Translators"
 msgstr "पूर्व अनुवादकः रविशंकर श्रीवास्तव (raviratlami@yahoo.com)"
 
-#: src/gtkdialogs.c:366 src/gtkdialogs.c:508 src/gtkdialogs.c:560
+#: src/gtkdialogs.c:357 src/gtkdialogs.c:500 src/gtkdialogs.c:555
 msgid "_Screen name"
 msgstr ""
 
 #  And now for the buttons
-#: src/gtkdialogs.c:372 src/gtkdialogs.c:514 src/gtkdialogs.c:566
+#: src/gtkdialogs.c:363 src/gtkdialogs.c:506 src/gtkdialogs.c:561
 #, fuzzy
 msgid "_Account"
 msgstr "खाता"
 
-#: src/gtkdialogs.c:379
+#: src/gtkdialogs.c:370
 #, fuzzy
 msgid "New Instant Message"
 msgstr "नया दूर संदेश"
 
-#: src/gtkdialogs.c:381
+#: src/gtkdialogs.c:372
 msgid "Please enter the screen name of the person you would like to IM."
 msgstr ""
 
-#: src/gtkdialogs.c:521
+#: src/gtkdialogs.c:513
 msgid "Get User Info"
 msgstr ""
 
-#: src/gtkdialogs.c:523
+#: src/gtkdialogs.c:515
 msgid ""
 "Please enter the screen name of the person whose info you would like to view."
 msgstr ""
 
-#: src/gtkdialogs.c:574
+#: src/gtkdialogs.c:569
 msgid "Get User Log"
 msgstr ""
 
-#: src/gtkdialogs.c:576
+#: src/gtkdialogs.c:571
 msgid ""
 "Please enter the screen name of the person whose log you would like to view."
 msgstr ""
 
-#: src/gtkdialogs.c:616
+#: src/gtkdialogs.c:611
 msgid "Warn User"
 msgstr ""
 
-#: src/gtkdialogs.c:637
+#: src/gtkdialogs.c:632
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
@@ -3392,65 +3400,53 @@
 "harsher rate limiting.\n"
 msgstr ""
 
-#: src/gtkdialogs.c:646
+#: src/gtkdialogs.c:641
 msgid "Warn _anonymously?"
 msgstr ""
 
-#: src/gtkdialogs.c:653
+#: src/gtkdialogs.c:648
 msgid "<b>Anonymous warnings are less severe.</b>"
 msgstr ""
 
-#: src/gtkdialogs.c:674
+#: src/gtkdialogs.c:669
 msgid "Alias Contact"
 msgstr ""
 
-#: src/gtkdialogs.c:675
+#: src/gtkdialogs.c:670
 msgid "Enter an alias for this contact."
 msgstr ""
 
-#: src/gtkdialogs.c:677 src/gtkdialogs.c:699 src/gtkdialogs.c:719
-#: src/gtkrequest.c:250 src/protocols/silc/chat.c:584
+#: src/gtkdialogs.c:672 src/gtkdialogs.c:694 src/gtkdialogs.c:714
+#: src/gtkrequest.c:267 src/protocols/silc/chat.c:584
 msgid "Alias"
 msgstr ""
 
-#: src/gtkdialogs.c:695
+#: src/gtkdialogs.c:690
 #, c-format
 msgid "Enter an alias for %s."
 msgstr ""
 
-#: src/gtkdialogs.c:697
+#: src/gtkdialogs.c:692
 msgid "Alias Buddy"
 msgstr ""
 
-#: src/gtkdialogs.c:716
+#: src/gtkdialogs.c:711
 #, fuzzy
 msgid "Alias Chat"
 msgstr "गपशप से जुड़ें"
 
-#: src/gtkdialogs.c:717
+#: src/gtkdialogs.c:712
 msgid "Enter an alias for this chat."
 msgstr ""
 
-#: src/gtkdialogs.c:751
+#: src/gtkdialogs.c:746
 #, 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 ""
 
-#  *< api_version
-#  *< type
-#  *< ui_requirement
-#  *< flags
-#  *< dependencies
-#  *< priority
-#  *< id
-#: src/gtkdialogs.c:754 src/gtkdialogs.c:755
-#, fuzzy
-msgid "Remove Contact"
-msgstr "रिमोट कंट्रोल"
-
-#: src/gtkdialogs.c:811
+#: src/gtkdialogs.c:808
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -3464,22 +3460,22 @@
 #  *< dependencies
 #  *< priority
 #  *< id
-#: src/gtkdialogs.c:814 src/gtkdialogs.c:815
+#: src/gtkdialogs.c:811 src/gtkdialogs.c:812
 #, fuzzy
 msgid "Remove Group"
 msgstr "रिमोट कंट्रोल"
 
-#: src/gtkdialogs.c:853
+#: src/gtkdialogs.c:850
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr ""
 
-#: src/gtkdialogs.c:856 src/gtkdialogs.c:857
+#: src/gtkdialogs.c:853 src/gtkdialogs.c:854
 msgid "Remove Buddy"
 msgstr ""
 
-#: src/gtkdialogs.c:873
+#: src/gtkdialogs.c:887
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -3493,7 +3489,7 @@
 #  *< dependencies
 #  *< priority
 #  *< id
-#: src/gtkdialogs.c:877 src/gtkdialogs.c:878
+#: src/gtkdialogs.c:891 src/gtkdialogs.c:892
 #, fuzzy
 msgid "Remove Chat"
 msgstr "रिमोट कंट्रोल"
@@ -3603,7 +3599,7 @@
 msgstr "फ़ाइल हस्तांतरण"
 
 #. Pause button
-#: src/gtkft.c:714 src/stock.c:92
+#: src/gtkft.c:714 src/gtkstock.c:93
 msgid "_Pause"
 msgstr ""
 
@@ -3616,152 +3612,160 @@
 msgid "Failed"
 msgstr ""
 
-#: src/gtkimhtml.c:602
+#: src/gtkgaim-disclosure.c:258
+msgid "Expander Size"
+msgstr ""
+
+#: src/gtkgaim-disclosure.c:259
+msgid "Size of the expander arrow"
+msgstr ""
+
+#: src/gtkimhtml.c:536
 msgid "Pa_ste As Text"
 msgstr ""
 
-#: src/gtkimhtml.c:1047
+#: src/gtkimhtml.c:1019
 msgid "Hyperlink color"
 msgstr ""
 
-#: src/gtkimhtml.c:1048
+#: src/gtkimhtml.c:1020
 msgid "Color to draw hyperlinks."
 msgstr ""
 
-#: src/gtkimhtml.c:1253
+#: src/gtkimhtml.c:1237
 msgid "_Copy E-Mail Address"
 msgstr ""
 
-#: src/gtkimhtml.c:1265
+#: src/gtkimhtml.c:1249
 msgid "_Copy Link Location"
 msgstr ""
 
-#: src/gtkimhtml.c:1275
+#: src/gtkimhtml.c:1259
 msgid "_Open Link in Browser"
 msgstr ""
 
-#: src/gtkimhtml.c:2819
+#: src/gtkimhtml.c:2817
 msgid ""
 "Unable to guess the image type based on the file extension supplied.  "
 "Defaulting to PNG."
 msgstr ""
 
-#: src/gtkimhtml.c:2827
+#: src/gtkimhtml.c:2825
 #, c-format
 msgid "Error saving image: %s"
 msgstr ""
 
-#: src/gtkimhtml.c:2904 src/gtkimhtml.c:2916
+#: src/gtkimhtml.c:2902 src/gtkimhtml.c:2914
 msgid "Save Image"
 msgstr ""
 
-#: src/gtkimhtml.c:2944
+#: src/gtkimhtml.c:2942
 msgid "_Save Image..."
 msgstr ""
 
-#: src/gtkimhtmltoolbar.c:164
+#: src/gtkimhtmltoolbar.c:180
 msgid "Select Font"
 msgstr ""
 
-#: src/gtkimhtmltoolbar.c:239
+#: src/gtkimhtmltoolbar.c:258
 msgid "Select Text Color"
 msgstr ""
 
-#: src/gtkimhtmltoolbar.c:312
+#: src/gtkimhtmltoolbar.c:332
 msgid "Select Background Color"
 msgstr ""
 
-#: src/gtkimhtmltoolbar.c:395
+#: src/gtkimhtmltoolbar.c:415
 msgid "_URL"
 msgstr ""
 
-#: src/gtkimhtmltoolbar.c:403
+#: src/gtkimhtmltoolbar.c:423
 msgid "_Description"
 msgstr ""
 
-#: src/gtkimhtmltoolbar.c:406
+#: src/gtkimhtmltoolbar.c:426
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 msgstr ""
 
-#: src/gtkimhtmltoolbar.c:410
+#: src/gtkimhtmltoolbar.c:430
 msgid "Please enter the URL of the link that you want to insert."
 msgstr ""
 
-#: src/gtkimhtmltoolbar.c:415
+#: src/gtkimhtmltoolbar.c:435
 msgid "Insert Link"
 msgstr ""
 
-#: src/gtkimhtmltoolbar.c:419
+#: src/gtkimhtmltoolbar.c:439
 msgid "_Insert"
 msgstr ""
 
-#: src/gtkimhtmltoolbar.c:488
+#: src/gtkimhtmltoolbar.c:508
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr ""
 
-#: src/gtkimhtmltoolbar.c:514 src/gtkimhtmltoolbar.c:524
+#: src/gtkimhtmltoolbar.c:534 src/gtkimhtmltoolbar.c:544
 msgid "Insert Image"
 msgstr ""
 
-#: src/gtkimhtmltoolbar.c:662
+#: src/gtkimhtmltoolbar.c:703 src/gtkimhtmltoolbar.c:781
 msgid "This theme has no available smileys."
 msgstr ""
 
 #. show everything
-#: src/gtkimhtmltoolbar.c:677
+#: src/gtkimhtmltoolbar.c:795
 msgid "Smile!"
 msgstr ""
 
-#: src/gtkimhtmltoolbar.c:895
+#: src/gtkimhtmltoolbar.c:974
 msgid "Bold"
 msgstr ""
 
-#: src/gtkimhtmltoolbar.c:906
+#: src/gtkimhtmltoolbar.c:985
 #, fuzzy
 msgid "Italic"
 msgstr "इतालवी"
 
-#: src/gtkimhtmltoolbar.c:917
+#: src/gtkimhtmltoolbar.c:996
 msgid "Underline"
 msgstr ""
 
-#: src/gtkimhtmltoolbar.c:933
+#: src/gtkimhtmltoolbar.c:1012
 msgid "Larger font size"
 msgstr ""
 
-#: src/gtkimhtmltoolbar.c:945
+#: src/gtkimhtmltoolbar.c:1024
 msgid "Smaller font size"
 msgstr ""
 
-#: src/gtkimhtmltoolbar.c:962
+#: src/gtkimhtmltoolbar.c:1041
 msgid "Font Face"
 msgstr ""
 
-#: src/gtkimhtmltoolbar.c:974
+#: src/gtkimhtmltoolbar.c:1053
 msgid "Foreground font color"
 msgstr ""
 
-#: src/gtkimhtmltoolbar.c:986
+#: src/gtkimhtmltoolbar.c:1065
 msgid "Background color"
 msgstr ""
 
-#: src/gtkimhtmltoolbar.c:1001
+#: src/gtkimhtmltoolbar.c:1080
 msgid "Insert link"
 msgstr ""
 
-#: src/gtkimhtmltoolbar.c:1011
+#: src/gtkimhtmltoolbar.c:1090
 msgid "Insert image"
 msgstr ""
 
-#: src/gtkimhtmltoolbar.c:1022
+#: src/gtkimhtmltoolbar.c:1101
 msgid "Insert smiley"
 msgstr ""
 
 #  Conversations
-#: src/gtklog.c:302
+#: src/gtklog.c:303
 #, fuzzy, c-format
 msgid "Conversations with %s"
 msgstr "वार्तालाप"
@@ -3774,30 +3778,105 @@
 #  *< priority
 #  *< id
 #. Window **********
-#: src/gtklog.c:395 src/gtklog.c:411
+#: src/gtklog.c:391 src/gtklog.c:407
 #, fuzzy
 msgid "System Log"
 msgstr "तंत्र तश्तरी आइकन"
 
+#: src/gtkmain.c:151
+msgid "Please create an account."
+msgstr ""
+
+#: src/gtkmain.c:233
+#, fuzzy
+msgid "Login"
+msgstr "जुड़ें"
+
+#  And now for the buttons
+#: src/gtkmain.c:249
+#, fuzzy
+msgid "<b>_Account:</b>"
+msgstr "खाता"
+
+#: src/gtkmain.c:263
+#, fuzzy
+msgid "<b>_Password:</b>"
+msgstr "नया पासवर्ड "
+
+#  And now for the buttons
+#. And now for the buttons
+#: src/gtkmain.c:280
+#, fuzzy
+msgid "A_ccounts"
+msgstr "खाता"
+
+#: src/gtkmain.c:286
+#, fuzzy
+msgid "P_references"
+msgstr "वरीयताएँ"
+
+#: src/gtkmain.c:292
+#, fuzzy
+msgid "_Log in"
+msgstr "जुड़ें"
+
+#. full help text
+#: src/gtkmain.c:517
+#, 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 ""
+
+#. short message
+#: src/gtkmain.c:532
+#, c-format
+msgid "Gaim %s. Try `%s -h' for more information.\n"
+msgstr ""
+
+#: src/gtkmain.c:899
+#, fuzzy
+msgid "Unable to load preferences"
+msgstr "फ़ाइल हस्तांतरण"
+
+#: src/gtkmain.c:899
+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 ""
+
 #. Descriptive label
-#: src/gtknotify.c:216
+#: src/gtknotify.c:218
 #, fuzzy, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s दूर चला गया."
 msgstr[1] "%s दूर चला गया."
 
-#: src/gtknotify.c:230
+#: src/gtknotify.c:232
 #, c-format
 msgid "<span weight=\"bold\">From:</span> %s\n"
 msgstr ""
 
-#: src/gtknotify.c:239
+#: src/gtknotify.c:241
 #, c-format
 msgid "<span weight=\"bold\">Subject:</span> %s\n"
 msgstr ""
 
-#: src/gtknotify.c:244
+#: src/gtknotify.c:246
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3805,7 +3884,7 @@
 "%s%s%s%s"
 msgstr ""
 
-#: src/gtknotify.c:260
+#: src/gtknotify.c:262
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
@@ -3813,22 +3892,22 @@
 "%s"
 msgstr ""
 
-#: src/gtknotify.c:430
+#: src/gtknotify.c:419
 #, c-format
 msgid "The browser command <b>%s</b> is invalid."
 msgstr ""
 
-#: src/gtknotify.c:432 src/gtknotify.c:444 src/gtknotify.c:457
-#: src/gtknotify.c:576
+#: src/gtknotify.c:421 src/gtknotify.c:433 src/gtknotify.c:446
+#: src/gtknotify.c:570
 msgid "Unable to open URL"
 msgstr ""
 
-#: src/gtknotify.c:442 src/gtknotify.c:455
+#: src/gtknotify.c:431 src/gtknotify.c:444
 #, c-format
 msgid "Error launching <b>%s</b>: %s"
 msgstr ""
 
-#: src/gtknotify.c:577
+#: src/gtknotify.c:571
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
@@ -3842,621 +3921,587 @@
 msgstr ""
 
 #. "New Buddy Pounce"
-#: src/gtkpounce.c:387 src/gtkpounce.c:889
+#: src/gtkpounce.c:391 src/gtkpounce.c:901
 msgid "New Buddy Pounce"
 msgstr ""
 
-#: src/gtkpounce.c:387
+#: src/gtkpounce.c:391
 msgid "Edit Buddy Pounce"
 msgstr ""
 
 #. Create the "Pounce Who" frame.
-#: src/gtkpounce.c:404
+#: src/gtkpounce.c:408
 msgid "Pounce Who"
 msgstr ""
 
-#: src/gtkpounce.c:431
+#: src/gtkpounce.c:435
 #, fuzzy
 msgid "_Buddy name:"
 msgstr "बड्डी गपशप"
 
 #. Create the "Pounce When" frame.
-#: src/gtkpounce.c:455
+#: src/gtkpounce.c:459
 msgid "Pounce When"
 msgstr ""
 
-#: src/gtkpounce.c:463
+#: src/gtkpounce.c:467
 #, fuzzy
 msgid "Si_gn on"
 msgstr "साइनऑफ"
 
-#: src/gtkpounce.c:465
+#: src/gtkpounce.c:469
 #, fuzzy
 msgid "Sign _off"
 msgstr "साइनऑफ"
 
-#: src/gtkpounce.c:467
+#: src/gtkpounce.c:471
 #, fuzzy
 msgid "A_way"
 msgstr "दूर"
 
-#: src/gtkpounce.c:469
+#: src/gtkpounce.c:473
 msgid "_Return from away"
 msgstr ""
 
-#: src/gtkpounce.c:471
-msgid "_Idle"
-msgstr ""
-
-#: src/gtkpounce.c:473
-msgid "Retur_n from idle"
-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 ""
 
 #  Buddy List trans options
-#: src/gtkpounce.c:477
+#: src/gtkpounce.c:481
 #, fuzzy
 msgid "Buddy stops t_yping"
 msgstr "बड्डी सूची विंडो"
 
 #. Create the "Pounce Action" frame.
-#: src/gtkpounce.c:506
+#: src/gtkpounce.c:510
 msgid "Pounce Action"
 msgstr ""
 
-#: src/gtkpounce.c:514
+#: src/gtkpounce.c:518
 #, fuzzy
 msgid "Op_en an IM window"
 msgstr "आईएम विंडोस (_I)"
 
-#: src/gtkpounce.c:516
+#: src/gtkpounce.c:520
 #, fuzzy
 msgid "_Popup notification"
 msgstr "संदेश सूचना"
 
-#: src/gtkpounce.c:518
+#: src/gtkpounce.c:522
 #, fuzzy
 msgid "Send a _message"
 msgstr "नया दूर संदेश"
 
-#: src/gtkpounce.c:520
+#: src/gtkpounce.c:524
 msgid "E_xecute a command"
 msgstr ""
 
-#: src/gtkpounce.c:522
-msgid "P_lay a sound"
-msgstr ""
-
 #: src/gtkpounce.c:526
+msgid "P_lay a sound"
+msgstr ""
+
+#: src/gtkpounce.c:530
 msgid "B_rowse..."
 msgstr ""
 
-#: src/gtkpounce.c:528
+#: src/gtkpounce.c:532
 msgid "Bro_wse..."
 msgstr ""
 
-#: src/gtkpounce.c:529
+#: src/gtkpounce.c:533
 msgid "Pre_view"
 msgstr ""
 
-#: src/gtkpounce.c:612
+#: src/gtkpounce.c:616
 msgid "Sav_e this pounce after activation"
 msgstr ""
 
 #. "Remove Buddy Pounce"
-#: src/gtkpounce.c:896
+#: src/gtkpounce.c:908
 msgid "Remove Buddy Pounce"
 msgstr ""
 
-#: src/gtkpounce.c:954
+#: src/gtkpounce.c:969
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr ""
 
-#: src/gtkpounce.c:956
+#: src/gtkpounce.c:971
 #, fuzzy, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s दूर चला गया."
 
-#: src/gtkpounce.c:958
+#: src/gtkpounce.c:973
 #, fuzzy, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s निष्क्रिय हो गया है."
 
-#: src/gtkpounce.c:960
+#: src/gtkpounce.c:975
 #, fuzzy, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s निष्क्रिय हो गया है."
 
-#: src/gtkpounce.c:962
+#: src/gtkpounce.c:977
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr ""
 
-#: src/gtkpounce.c:964
+#: src/gtkpounce.c:979
 #, fuzzy, c-format
 msgid "%s has signed off (%s)"
 msgstr "गेम - साइन्ड ऑफ"
 
-#: src/gtkpounce.c:966
+#: src/gtkpounce.c:981
 #, fuzzy, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s निष्क्रिय हो गया है."
 
-#: src/gtkpounce.c:968
+#: src/gtkpounce.c:983
 #, fuzzy, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s दूर चला गया."
 
-#: src/gtkpounce.c:969
+#: src/gtkpounce.c:984
 msgid "Unknown pounce event. Please report this!"
 msgstr ""
 
-#: src/gtkprefs.c:447
+#: src/gtkprefs.c:398
 #, fuzzy
 msgid "Interface Options"
 msgstr "विन-गेम विकल्प"
 
-#: src/gtkprefs.c:449
+#: src/gtkprefs.c:400
 msgid "D_isplay remote nicknames if no alias is set"
 msgstr ""
 
-#: src/gtkprefs.c:678
+#: src/gtkprefs.c:632
 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:718
+#: src/gtkprefs.c:672
 msgid "Icon"
 msgstr ""
 
-#: src/gtkprefs.c:725 src/gtkprefs.c:2201 src/protocols/jabber/buddy.c:264
-#: src/protocols/jabber/buddy.c:748 src/protocols/jabber/chat.c:721
+#: src/gtkprefs.c:679 src/gtkprefs.c:2117 src/protocols/jabber/buddy.c:267
+#: src/protocols/jabber/buddy.c:799 src/protocols/jabber/chat.c:761
 msgid "Description"
 msgstr ""
 
-#: src/gtkprefs.c:821
+#: src/gtkprefs.c:774
 #, fuzzy
 msgid "Display"
 msgstr "देरी"
 
-#: src/gtkprefs.c:822
+#: src/gtkprefs.c:775
 msgid "Show _timestamp on messages"
 msgstr ""
 
-#: src/gtkprefs.c:825
+#: src/gtkprefs.c:778
 msgid "_Highlight misspelled words"
 msgstr ""
 
-#: src/gtkprefs.c:829
+#: src/gtkprefs.c:782
 msgid "Ignore c_olors"
 msgstr ""
 
-#: src/gtkprefs.c:831
+#: src/gtkprefs.c:784
 msgid "Ignore font _faces"
 msgstr ""
 
-#: src/gtkprefs.c:833
+#: src/gtkprefs.c:786
 msgid "Ignore font si_zes"
 msgstr ""
 
-#: src/gtkprefs.c:836
+#: src/gtkprefs.c:789
 msgid "Default Formatting"
 msgstr ""
 
-#: src/gtkprefs.c:838
+#: src/gtkprefs.c:791
 msgid "_Send default formatting with outgoing messages"
 msgstr ""
 
-#: src/gtkprefs.c:870
+#: src/gtkprefs.c:801
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting. :)"
 msgstr ""
 
-#: src/gtkprefs.c:873
+#: src/gtkprefs.c:804
 msgid "_Clear Formatting"
 msgstr ""
 
-#: src/gtkprefs.c:910
-#, fuzzy
-msgid "Send Message"
-msgstr "नया संदेश..."
-
-#: src/gtkprefs.c:911
-msgid "Enter _sends message"
-msgstr ""
-
-#: src/gtkprefs.c:913
-msgid "C_ontrol-Enter sends message"
+#: src/gtkprefs.c:841
+msgid "Window Closing"
+msgstr ""
+
+#: src/gtkprefs.c:842
+msgid "_Escape closes window"
+msgstr ""
+
+#: src/gtkprefs.c:858
+#, fuzzy
+msgid "Buddy List Sorting"
+msgstr "बड्डी सूची त्रुटि"
+
+#: src/gtkprefs.c:867
+msgid "_Sorting:"
+msgstr ""
+
+#: src/gtkprefs.c:872
+#, fuzzy
+msgid "Buddy Display"
+msgstr "बड्डी दूर हैः"
+
+#: src/gtkprefs.c:873 src/gtkprefs.c:933
+msgid "Show buddy _icons"
+msgstr ""
+
+#: src/gtkprefs.c:875
+msgid "Show _warning levels"
+msgstr ""
+
+#: src/gtkprefs.c:877
+msgid "Show idle _times"
+msgstr ""
+
+#: src/gtkprefs.c:879
+msgid "_Automatically expand contacts"
+msgstr ""
+
+#: src/gtkprefs.c:912
+msgid "Show _buttons as:"
+msgstr ""
+
+#: src/gtkprefs.c:914
+msgid "Pictures"
+msgstr ""
+
+#: src/gtkprefs.c:915
+msgid "Text"
 msgstr ""
 
 #: src/gtkprefs.c:916
-msgid "Window Closing"
-msgstr ""
-
-#: src/gtkprefs.c:917
-msgid "_Escape closes window"
-msgstr ""
-
-#  Conversations
-#: src/gtkprefs.c:920
-#, fuzzy
-msgid "Insertions"
-msgstr "वार्तालाप"
-
-#: src/gtkprefs.c:921
-msgid "Control-{B/I/U} changes _formatting"
+msgid "Pictures and text"
 msgstr ""
 
 #: src/gtkprefs.c:923
-msgid "Control-(number) _inserts smileys"
+msgid "Enable \"_slash\" commands"
+msgstr ""
+
+#: src/gtkprefs.c:926
+msgid "Send unknown \"_slash\" commands as messages"
+msgstr ""
+
+#: src/gtkprefs.c:929
+msgid "Show _formatting toolbar"
+msgstr ""
+
+#: src/gtkprefs.c:931
+msgid "Show _aliases in tabs/titles"
+msgstr ""
+
+#: src/gtkprefs.c:935
+msgid "Enable buddy ic_on animation"
+msgstr ""
+
+#: src/gtkprefs.c:937
+msgid "_Notify buddies that you are typing to them"
 msgstr ""
 
 #: src/gtkprefs.c:939
-#, fuzzy
-msgid "Buddy List Sorting"
-msgstr "बड्डी सूची त्रुटि"
+msgid "_Raise IM window on events"
+msgstr ""
+
+#: src/gtkprefs.c:942
+msgid "Raise chat _window on events"
+msgstr ""
+
+#. All the tab options!
+#: src/gtkprefs.c:946
+#, fuzzy
+msgid "Tab Options"
+msgstr "विन-गेम विकल्प"
 
 #: src/gtkprefs.c:948
-msgid "_Sorting:"
-msgstr ""
-
-#: src/gtkprefs.c:954 src/gtkprefs.c:1006
-msgid "Show _buttons as:"
-msgstr ""
-
-#: src/gtkprefs.c:956 src/gtkprefs.c:1008
-msgid "Pictures"
-msgstr ""
-
-#: src/gtkprefs.c:957 src/gtkprefs.c:1009
-msgid "Text"
-msgstr ""
-
-#: src/gtkprefs.c:958 src/gtkprefs.c:1010
-msgid "Pictures and text"
-msgstr ""
-
-#: src/gtkprefs.c:961
-msgid "_Raise window on events"
-msgstr ""
-
-#: src/gtkprefs.c:964
-#, fuzzy
-msgid "Buddy Display"
-msgstr "बड्डी दूर हैः"
-
-#: src/gtkprefs.c:965 src/gtkprefs.c:1027
-msgid "Show buddy _icons"
-msgstr ""
+#, fuzzy
+msgid "Show IMs and chats in _tabbed windows"
+msgstr "आईएम विंडो में स्लाइडर बार दिखाएँ (_S)"
+
+#: src/gtkprefs.c:962
+msgid "Show close b_utton on tabs"
+msgstr ""
+
+#: src/gtkprefs.c:965
+#, fuzzy
+msgid "Tab p_lacement:"
+msgstr "बदलने हेतु पाठ"
 
 #: src/gtkprefs.c:967
-msgid "Show _warning levels"
+msgid "Top"
+msgstr ""
+
+#: src/gtkprefs.c:968
+msgid "Bottom"
 msgstr ""
 
 #: src/gtkprefs.c:969
-msgid "Show idle _times"
-msgstr ""
-
-#: src/gtkprefs.c:971
-msgid "Dim i_dle buddies"
-msgstr ""
-
-#: src/gtkprefs.c:973
-msgid "_Automatically expand contacts"
-msgstr ""
-
-#: src/gtkprefs.c:1017
-msgid "Enable \"_slash\" commands"
-msgstr ""
-
-#: src/gtkprefs.c:1020
-msgid "Send unknown \"_slash\" commands as messages"
-msgstr ""
-
-#: src/gtkprefs.c:1023
-msgid "Show _formatting toolbar"
-msgstr ""
-
-#: src/gtkprefs.c:1025
-msgid "Show _aliases in tabs/titles"
-msgstr ""
-
-#: src/gtkprefs.c:1029
-msgid "Enable buddy ic_on animation"
-msgstr ""
-
-#: src/gtkprefs.c:1031
-msgid "_Notify buddies that you are typing to them"
-msgstr ""
-
-#: src/gtkprefs.c:1033
-msgid "_Raise IM window on events"
-msgstr ""
-
-#: src/gtkprefs.c:1036
-msgid "Raise chat _window on events"
-msgstr ""
-
-#: src/gtkprefs.c:1038
-msgid "Use _multi-colored screen names in chats"
-msgstr ""
-
-#. All the tab options!
-#: src/gtkprefs.c:1042
-#, fuzzy
-msgid "Tab Options"
-msgstr "विन-गेम विकल्प"
-
-#: src/gtkprefs.c:1044
-#, fuzzy
-msgid "Show IMs and chats in _tabbed windows"
-msgstr "आईएम विंडो में स्लाइडर बार दिखाएँ (_S)"
-
-#: src/gtkprefs.c:1059
-msgid "Show _close button on tabs"
-msgstr ""
-
-#: src/gtkprefs.c:1062
-#, fuzzy
-msgid "Tab p_lacement:"
-msgstr "बदलने हेतु पाठ"
-
-#: src/gtkprefs.c:1064
-msgid "Top"
-msgstr ""
-
-#: src/gtkprefs.c:1065
-msgid "Bottom"
-msgstr ""
-
-#: src/gtkprefs.c:1066
 msgid "Left"
 msgstr ""
 
-#: src/gtkprefs.c:1067
+#: src/gtkprefs.c:970
 msgid "Right"
 msgstr ""
 
 #  Conversations
-#: src/gtkprefs.c:1073
+#: src/gtkprefs.c:976
 #, fuzzy
 msgid "New conversation _placement:"
 msgstr "वार्तालाप"
 
-#: src/gtkprefs.c:1124 src/protocols/oscar/oscar.c:712
-#: src/protocols/oscar/oscar.c:4974
+#: src/gtkprefs.c:1027 src/protocols/oscar/oscar.c:749
+#: src/protocols/oscar/oscar.c:5045
 msgid "IP Address"
 msgstr ""
 
-#: src/gtkprefs.c:1126
+#: src/gtkprefs.c:1029
 msgid "_Autodetect IP Address"
 msgstr ""
 
-#: src/gtkprefs.c:1135
+#: src/gtkprefs.c:1038
 msgid "Public _IP:"
 msgstr ""
 
-#: src/gtkprefs.c:1159
+#: src/gtkprefs.c:1062
 #, fuzzy
 msgid "Ports"
 msgstr "पुर्तगाली"
 
-#: src/gtkprefs.c:1162
+#: src/gtkprefs.c:1065
 msgid "_Manually specify range of ports to listen on"
 msgstr ""
 
-#: src/gtkprefs.c:1165
+#: src/gtkprefs.c:1068
 msgid "_Start Port:"
 msgstr ""
 
-#: src/gtkprefs.c:1172
+#: src/gtkprefs.c:1075
 msgid "_End Port:"
 msgstr ""
 
-#: src/gtkprefs.c:1179
+#: src/gtkprefs.c:1082
 #, fuzzy
 msgid "Proxy Server"
 msgstr "डाक सर्वर"
 
-#: src/gtkprefs.c:1183
+#: src/gtkprefs.c:1086
 msgid "No proxy"
 msgstr ""
 
-#: src/gtkprefs.c:1245
+#: src/gtkprefs.c:1148
 msgid "_User:"
 msgstr ""
 
-#: src/gtkprefs.c:1301
+#: src/gtkprefs.c:1204
 msgid "Epiphany"
 msgstr ""
 
+#: src/gtkprefs.c:1205
+msgid "Firebird"
+msgstr ""
+
+#: src/gtkprefs.c:1206
+msgid "Firefox"
+msgstr ""
+
+#: src/gtkprefs.c:1207
+msgid "Galeon"
+msgstr ""
+
+#: src/gtkprefs.c:1208
+msgid "Gnome Default"
+msgstr ""
+
+#: src/gtkprefs.c:1209
+msgid "Konqueror"
+msgstr ""
+
+#: src/gtkprefs.c:1210
+msgid "Mozilla"
+msgstr ""
+
+#: src/gtkprefs.c:1211
+msgid "Netscape"
+msgstr ""
+
+#: src/gtkprefs.c:1212
+msgid "Opera"
+msgstr ""
+
+#: src/gtkprefs.c:1221
+msgid "Manual"
+msgstr ""
+
+#: src/gtkprefs.c:1272
+msgid "Browser Selection"
+msgstr ""
+
+#: src/gtkprefs.c:1276
+msgid "_Browser:"
+msgstr ""
+
+#: src/gtkprefs.c:1283
+msgid "_Open link in:"
+msgstr ""
+
+#: src/gtkprefs.c:1285
+msgid "Browser default"
+msgstr ""
+
+#: src/gtkprefs.c:1286
+msgid "Existing window"
+msgstr ""
+
+#: src/gtkprefs.c:1288
+msgid "New tab"
+msgstr ""
+
 #: src/gtkprefs.c:1302
-msgid "Firebird"
-msgstr ""
-
-#: src/gtkprefs.c:1303
-msgid "Firefox"
-msgstr ""
-
-#: src/gtkprefs.c:1304
-msgid "Galeon"
-msgstr ""
-
-#: src/gtkprefs.c:1305
-msgid "Gnome Default"
-msgstr ""
-
-#: src/gtkprefs.c:1306
-msgid "Konqueror"
-msgstr ""
-
-#: src/gtkprefs.c:1307
-msgid "Mozilla"
-msgstr ""
-
-#: src/gtkprefs.c:1308
-msgid "Netscape"
-msgstr ""
-
-#: src/gtkprefs.c:1309
-msgid "Opera"
-msgstr ""
-
-#: src/gtkprefs.c:1318
-msgid "Manual"
-msgstr ""
-
-#: src/gtkprefs.c:1369
-msgid "Browser Selection"
-msgstr ""
-
-#: src/gtkprefs.c:1373
-msgid "_Browser:"
-msgstr ""
-
-#: src/gtkprefs.c:1380
-msgid "_Open link in:"
-msgstr ""
-
-#: src/gtkprefs.c:1382
-msgid "Browser default"
-msgstr ""
-
-#: src/gtkprefs.c:1383
-msgid "Existing window"
-msgstr ""
-
-#: src/gtkprefs.c:1385
-msgid "New tab"
-msgstr ""
-
-#: src/gtkprefs.c:1399
 #, c-format
 msgid ""
 "_Manual:\n"
 "(%s for URL)"
 msgstr ""
 
-#: src/gtkprefs.c:1436
+#: src/gtkprefs.c:1339
 msgid "Message Logs"
 msgstr ""
 
-#: src/gtkprefs.c:1439
+#: src/gtkprefs.c:1342
 msgid "Log _Format:"
 msgstr ""
 
-#: src/gtkprefs.c:1442
+#: src/gtkprefs.c:1345
 msgid "_Log all instant messages"
 msgstr ""
 
-#: src/gtkprefs.c:1444
+#: src/gtkprefs.c:1347
 msgid "Log all c_hats"
 msgstr ""
 
-#: src/gtkprefs.c:1447
+#: src/gtkprefs.c:1350
 msgid "System Logs"
 msgstr ""
 
-#: src/gtkprefs.c:1449
+#: src/gtkprefs.c:1352
 msgid "_Enable system log"
 msgstr ""
 
-#: src/gtkprefs.c:1452
-msgid "Log when buddies _sign on/sign off"
-msgstr ""
-
-#: src/gtkprefs.c:1458
+#: src/gtkprefs.c:1355
+msgid "Log when buddies log in/log _out"
+msgstr ""
+
+#: src/gtkprefs.c:1361
 msgid "Log when buddies become _idle/un-idle"
 msgstr ""
 
-#: src/gtkprefs.c:1464
+#: src/gtkprefs.c:1367
 msgid "Log when buddies go away/come _back"
 msgstr ""
 
-#: src/gtkprefs.c:1470
-msgid "Log your _own signons/idleness/awayness"
-msgstr ""
-
-#: src/gtkprefs.c:1596
+#: src/gtkprefs.c:1373
+msgid "Log your own _signons/idleness/awayness"
+msgstr ""
+
+#: src/gtkprefs.c:1509
 msgid "Sound Selection"
 msgstr ""
 
-#: src/gtkprefs.c:1647
+#: src/gtkprefs.c:1561
+msgid "Sound Method"
+msgstr ""
+
+#: src/gtkprefs.c:1562
+msgid "_Method:"
+msgstr ""
+
+#: src/gtkprefs.c:1564
+msgid "Console beep"
+msgstr ""
+
+#: src/gtkprefs.c:1566
+#, fuzzy
+msgid "Automatic"
+msgstr "अम्हारिक"
+
+#: src/gtkprefs.c:1573
+msgid "Command"
+msgstr ""
+
+#: src/gtkprefs.c:1574
+#, fuzzy
+msgid "No sounds"
+msgstr "आवाज बंद करें"
+
+#: src/gtkprefs.c:1582
+#, c-format
+msgid ""
+"Sound c_ommand:\n"
+"(%s for filename)"
+msgstr ""
+
+#: src/gtkprefs.c:1609
 #, fuzzy
 msgid "Sound Options"
 msgstr "विन-गेम विकल्प"
 
 #  Remove on focus button
-#: src/gtkprefs.c:1648
+#: src/gtkprefs.c:1610
 #, fuzzy
 msgid "Sounds when conversation has _focus"
 msgstr "वार्तालाप विंडो पर केंद्र प्राप्त हो तो हटाएँ (_g)"
 
-#: src/gtkprefs.c:1650
+#: src/gtkprefs.c:1612
 msgid "_Sounds while away"
 msgstr ""
 
-#: src/gtkprefs.c:1654
-msgid "Sound Method"
-msgstr ""
-
-#: src/gtkprefs.c:1655
-msgid "_Method:"
-msgstr ""
-
-#: src/gtkprefs.c:1657
-msgid "Console beep"
-msgstr ""
-
-#: src/gtkprefs.c:1659
-#, fuzzy
-msgid "Automatic"
-msgstr "अम्हारिक"
-
-#: src/gtkprefs.c:1666
-msgid "Command"
-msgstr ""
-
-#: src/gtkprefs.c:1674
-#, c-format
-msgid ""
-"Sound c_ommand:\n"
-"(%s for filename)"
-msgstr ""
-
-#: src/gtkprefs.c:1701
+#: src/gtkprefs.c:1622
 msgid "Sound Events"
 msgstr ""
 
-#: src/gtkprefs.c:1752
+#: src/gtkprefs.c:1673
 #, fuzzy
 msgid "Play"
 msgstr "देरी"
 
-#: src/gtkprefs.c:1759
+#: src/gtkprefs.c:1680
 msgid "Event"
 msgstr ""
 
-#: src/gtkprefs.c:1778
+#: src/gtkprefs.c:1699
 #, fuzzy
 msgid "Test"
 msgstr "अंकित समय"
 
-#: src/gtkprefs.c:1782
+#: src/gtkprefs.c:1703
 msgid "Reset"
 msgstr ""
 
-#: src/gtkprefs.c:1786
+#: src/gtkprefs.c:1707
 msgid "Choose..."
 msgstr ""
 
-#: src/gtkprefs.c:1810
+#: src/gtkprefs.c:1761
 msgid "_Queue new messages when away"
 msgstr ""
 
@@ -4467,68 +4512,68 @@
 #  *< dependencies
 #  *< priority
 #  *< id
-#: src/gtkprefs.c:1813
+#: src/gtkprefs.c:1764
 #, fuzzy
 msgid "_Auto-reply:"
 msgstr "स्वचालित पुनःजुड़ें"
 
-#: src/gtkprefs.c:1815
+#: src/gtkprefs.c:1766
 #, fuzzy
 msgid "Never"
 msgstr "डाक सर्वर"
 
-#: src/gtkprefs.c:1816
+#: src/gtkprefs.c:1767
 #, fuzzy
 msgid "When away"
 msgstr "%s दूर चला गया."
 
-#: src/gtkprefs.c:1817
+#: src/gtkprefs.c:1768
 msgid "When away and idle"
 msgstr ""
 
-#: src/gtkprefs.c:1820 src/protocols/msn/msn.c:1180
-#: src/protocols/msn/state.c:32 src/protocols/novell/novell.c:2804
-#: src/protocols/oscar/oscar.c:4127 src/protocols/yahoo/yahoo.c:2563
-#: src/protocols/yahoo/yahoo_profile.c:664
+#: src/gtkprefs.c:1771 src/protocols/msn/msn.c:507
+#: src/protocols/msn/msn.c:1356 src/protocols/msn/state.c:32
+#: src/protocols/novell/novell.c:2817 src/protocols/oscar/oscar.c:4194
+#: src/protocols/yahoo/yahoo.c:2651 src/protocols/yahoo/yahoo_profile.c:665
 #, fuzzy
 msgid "Idle"
 msgstr "निष्क्रिय समय"
 
-#: src/gtkprefs.c:1821
+#: src/gtkprefs.c:1772
 msgid "Idle _time reporting:"
 msgstr ""
 
-#: src/gtkprefs.c:1824
+#: src/gtkprefs.c:1775
 msgid "Gaim usage"
 msgstr ""
 
-#: src/gtkprefs.c:1827
+#: src/gtkprefs.c:1778
 msgid "X usage"
 msgstr ""
 
-#: src/gtkprefs.c:1829
+#: src/gtkprefs.c:1780
 msgid "Windows usage"
 msgstr ""
 
-#: src/gtkprefs.c:1837
+#: src/gtkprefs.c:1788
 #, fuzzy
 msgid "Auto-away"
 msgstr "दूर"
 
-#: src/gtkprefs.c:1838
+#: src/gtkprefs.c:1789
 msgid "Set away _when idle"
 msgstr ""
 
-#: src/gtkprefs.c:1842
+#: src/gtkprefs.c:1793
 msgid "_Minutes before setting away:"
 msgstr ""
 
-#: src/gtkprefs.c:1850
+#: src/gtkprefs.c:1801
 #, fuzzy
 msgid "Away m_essage:"
 msgstr "नया दूर संदेश"
 
-#: src/gtkprefs.c:1919
+#: src/gtkprefs.c:1859
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4538,7 +4583,7 @@
 "<span weight=\"bold\">File name:</span>\t%s"
 msgstr ""
 
-#: src/gtkprefs.c:1924
+#: src/gtkprefs.c:1864
 #, c-format
 msgid ""
 "<span size=\"larger\">%s %s</span>\n"
@@ -4548,67 +4593,57 @@
 "<span weight=\"bold\">File name:</span>  %s"
 msgstr ""
 
-#: src/gtkprefs.c:2157
+#: src/gtkprefs.c:2073
 msgid "Load"
 msgstr ""
 
-#: src/gtkprefs.c:2171
+#: src/gtkprefs.c:2087
 msgid "Summary"
 msgstr ""
 
-#: src/gtkprefs.c:2219
+#: src/gtkprefs.c:2135
 #, fuzzy
 msgid "Details"
 msgstr "डेनिश"
 
-#: src/gtkprefs.c:2379
-msgid "_Edit"
-msgstr ""
-
-#: src/gtkprefs.c:2415
+#: src/gtkprefs.c:2177
 msgid "Interface"
 msgstr ""
 
-#: src/gtkprefs.c:2418
+#: src/gtkprefs.c:2180
 msgid "Message Text"
 msgstr ""
 
-#: src/gtkprefs.c:2419
+#: src/gtkprefs.c:2181
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gtkprefs.c:2420
+#: src/gtkprefs.c:2182
 msgid "Smiley Themes"
 msgstr ""
 
-#: src/gtkprefs.c:2421
+#: src/gtkprefs.c:2183
 #, fuzzy
 msgid "Sounds"
 msgstr "आवाज बंद करें"
 
-#: src/gtkprefs.c:2422
+#: src/gtkprefs.c:2184
 msgid "Network"
 msgstr ""
 
-#. We use the registered default browser in windows
-#: src/gtkprefs.c:2425
+#: src/gtkprefs.c:2189
 msgid "Browser"
 msgstr ""
 
-#: src/gtkprefs.c:2427
+#: src/gtkprefs.c:2192
 msgid "Logging"
 msgstr ""
 
-#: src/gtkprefs.c:2428
+#: src/gtkprefs.c:2193
 msgid "Away / Idle"
 msgstr ""
 
-#: src/gtkprefs.c:2429
-#, fuzzy
-msgid "Away Messages"
-msgstr "नया दूर संदेश"
-
-#: src/gtkprefs.c:2432
+#: src/gtkprefs.c:2196
 #, fuzzy
 msgid "Plugins"
 msgstr "पोलिष"
@@ -4633,106 +4668,108 @@
 msgid "Block only the users below"
 msgstr ""
 
-#: src/gtkprivacy.c:386 src/protocols/jabber/jabber.c:1466
+#: src/gtkprivacy.c:388 src/protocols/jabber/jabber.c:1508
 msgid "Privacy"
 msgstr ""
 
-#: src/gtkprivacy.c:399
+#: src/gtkprivacy.c:401
 msgid "Changes to privacy settings take effect immediately."
 msgstr ""
 
 #. "Set privacy for:" label
-#: src/gtkprivacy.c:411
+#: src/gtkprivacy.c:413
 msgid "Set privacy for:"
 msgstr ""
 
-#: src/gtkprivacy.c:580 src/gtkprivacy.c:596
+#: src/gtkprivacy.c:582 src/gtkprivacy.c:598
 msgid "Permit User"
 msgstr ""
 
-#: src/gtkprivacy.c:581
+#: src/gtkprivacy.c:583
 msgid "Type a user you permit to contact you."
 msgstr ""
 
-#: src/gtkprivacy.c:582
+#: src/gtkprivacy.c:584
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr ""
 
-#: src/gtkprivacy.c:585 src/gtkprivacy.c:598
+#: src/gtkprivacy.c:587 src/gtkprivacy.c:600
 msgid "Permit"
 msgstr ""
 
-#: src/gtkprivacy.c:590
-#, c-format
-msgid "Allow %s to contact you?"
-msgstr ""
-
 #: src/gtkprivacy.c:592
 #, c-format
+msgid "Allow %s to contact you?"
+msgstr ""
+
+#: src/gtkprivacy.c:594
+#, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr ""
 
-#: src/gtkprivacy.c:619 src/gtkprivacy.c:632
+#: src/gtkprivacy.c:621 src/gtkprivacy.c:634
 msgid "Block User"
 msgstr ""
 
-#: src/gtkprivacy.c:620
+#: src/gtkprivacy.c:622
 msgid "Type a user to block."
 msgstr ""
 
-#: src/gtkprivacy.c:621
+#: src/gtkprivacy.c:623
 msgid "Please enter the name of the user you wish to block."
 msgstr ""
 
-#: src/gtkprivacy.c:628
-#, c-format
-msgid "Block %s?"
-msgstr ""
-
 #: src/gtkprivacy.c:630
 #, c-format
+msgid "Block %s?"
+msgstr ""
+
+#: src/gtkprivacy.c:632
+#, c-format
 msgid "Are you sure you want to block %s?"
 msgstr ""
 
 #. *
 #. * A wrapper for gaim_request_action() that uses Yes and No buttons.
 #.
-#: src/gtkrequest.c:240 src/protocols/gg/gg.c:949
-#: src/protocols/novell/novell.c:1890 src/protocols/silc/buddy.c:307
-#: src/protocols/silc/pk.c:116 src/request.h:1234
+#: src/gtkrequest.c:257 src/protocols/gg/gg.c:1013 src/protocols/msn/msn.c:514
+#: src/protocols/msn/msn.c:517 src/protocols/novell/novell.c:1901
+#: src/protocols/silc/buddy.c:307 src/protocols/silc/pk.c:117
+#: src/request.h:1235
 msgid "Yes"
 msgstr ""
 
-#: src/gtkrequest.c:241 src/protocols/gg/gg.c:949
-#: src/protocols/novell/novell.c:1891 src/protocols/silc/buddy.c:308
-#: src/protocols/silc/pk.c:117 src/request.h:1234
+#: src/gtkrequest.c:258 src/protocols/gg/gg.c:1013 src/protocols/msn/msn.c:514
+#: src/protocols/msn/msn.c:517 src/protocols/novell/novell.c:1902
+#: src/protocols/silc/buddy.c:308 src/protocols/silc/pk.c:118
+#: src/request.h:1235
 #, fuzzy
 msgid "No"
 msgstr "(नहीं"
 
-#: src/gtkrequest.c:244
+#: src/gtkrequest.c:261
 #, fuzzy
 msgid "Apply"
 msgstr "लागू करें (_A)"
 
-#: src/gtkrequest.c:245 src/protocols/msn/msn.c:314
+#: src/gtkrequest.c:262 src/protocols/msn/msn.c:316
 #: src/protocols/silc/util.c:332
 msgid "Close"
 msgstr "बंद करें"
 
-#: src/gtkrequest.c:1392
+#: src/gtkrequest.c:1483
 msgid "That file already exists"
 msgstr ""
 
-#: src/gtkrequest.c:1393
+#: src/gtkrequest.c:1484
 msgid "Would you like to overwrite it?"
 msgstr ""
 
-#: src/gtkrequest.c:1431 src/gtkrequest.c:1452
+#: src/gtkrequest.c:1522 src/gtkrequest.c:1543
 msgid "Save File..."
 msgstr ""
 
-#: src/gtkrequest.c:1432 src/gtkrequest.c:1453
+#: src/gtkrequest.c:1523 src/gtkrequest.c:1544
 #, fuzzy
 msgid "Open File..."
 msgstr "नया..."
@@ -4747,531 +4784,572 @@
 msgstr ""
 
 #  Buddy List trans options
-#: src/gtksound.c:63
+#: src/gtksound.c:65
 #, fuzzy
 msgid "Buddy logs in"
 msgstr "बड्डी सूची विंडो"
 
 #  Buddy List
-#: src/gtksound.c:64
+#: src/gtksound.c:66
 #, fuzzy
 msgid "Buddy logs out"
 msgstr "बड्डी सूची"
 
-#: src/gtksound.c:65
+#: src/gtksound.c:67
 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"
+msgid "Message received begins conversation"
 msgstr ""
 
 #: src/gtksound.c:69
-msgid "Person leaves chat"
+msgid "Message sent"
 msgstr ""
 
 #: src/gtksound.c:70
-msgid "You talk in chat"
+msgid "Person enters chat"
 msgstr ""
 
 #: src/gtksound.c:71
+msgid "Person leaves chat"
+msgstr ""
+
+#: src/gtksound.c:72
+msgid "You talk in chat"
+msgstr ""
+
+#: src/gtksound.c:73
 msgid "Others talk in chat"
 msgstr ""
 
-#: src/gtksound.c:74
+#: src/gtksound.c:76
 msgid "Someone says your name in chat"
 msgstr ""
 
-#: src/gtksound.c:158
+#: src/gtksound.c:180
 #, c-format
 msgid "Unable to play sound because the chosen file (%s) does not exist."
 msgstr ""
 
-#: src/gtksound.c:174
+#: src/gtksound.c:196
 msgid ""
 "Unable to play sound because the 'Command' sound method has been chosen, but "
 "no command has been set."
 msgstr ""
 
-#: src/gtksound.c:186
+#: src/gtksound.c:208
 #, c-format
 msgid ""
 "Unable to play sound because the configured sound command could not be "
 "launched: %s"
 msgstr ""
 
-#: src/log.c:106
+#: src/gtkstock.c:88
+msgid "_Alias"
+msgstr ""
+
+#: src/gtkstock.c:90
+msgid "_Invite"
+msgstr ""
+
+#: src/gtkstock.c:91
+msgid "_Modify"
+msgstr ""
+
+#: src/gtkstock.c:92
+#, fuzzy
+msgid "_Open Mail"
+msgstr "डाक देखें"
+
+#: src/gtkstock.c:94
+msgid "_Warn"
+msgstr ""
+
+#: src/gtkutils.c:1399 src/gtkutils.c:1424
+#, c-format
+msgid "The following error has occurred loading %s: %s"
+msgstr ""
+
+#: src/gtkutils.c:1401 src/gtkutils.c:1426
+msgid "Failed to load image"
+msgstr ""
+
+#: src/gtkutils.c:1487
+#, fuzzy, c-format
+msgid "Cannot send folder %s."
+msgstr "आपने भेजा"
+
+#: src/gtkutils.c:1489
+msgid ""
+"Gaim cannot transfer a folder. You will need to send the files within "
+"individually"
+msgstr ""
+
+#: src/gtkutils.c:1516 src/gtkutils.c:1525 src/gtkutils.c:1530
+msgid "You have dragged an image"
+msgstr ""
+
+#: src/gtkutils.c:1517
+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:1521 src/gtkutils.c:1536
+#, fuzzy
+msgid "Set as buddy icon"
+msgstr "बड्डी टिकर"
+
+#: src/gtkutils.c:1522 src/gtkutils.c:1537
+#, fuzzy
+msgid "Send image file"
+msgstr "नया संदेश..."
+
+#: src/gtkutils.c:1523 src/gtkutils.c:1537
+#, fuzzy
+msgid "Insert in message"
+msgstr "नया दूर संदेश"
+
+#: src/gtkutils.c:1526
+msgid "Would you like to set it as the buddy icon for this user?"
+msgstr ""
+
+#: src/gtkutils.c:1531
+msgid ""
+"You can send this image as a file transfer orembed it into this message, or "
+"use it as the buddy icon for this user."
+msgstr ""
+
+#: src/gtkutils.c:1533
+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
+#. * 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:1587
+#, fuzzy
+msgid "Cannot send launcher"
+msgstr "आपने भेजा"
+
+#: src/gtkutils.c:1587
+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:104
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr ""
 
-#: src/log.c:545
+#: src/log.c:528
 msgid "XML"
 msgstr ""
 
-#: src/log.c:604
+#: src/log.c:591
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 msgstr ""
 
-#: src/log.c:606
+#: src/log.c:593
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 msgstr ""
 
-#: src/log.c:657 src/log.c:787
+#: src/log.c:644 src/log.c:774
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr ""
 
-#: src/log.c:667 src/log.c:799
+#: src/log.c:654 src/log.c:786
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr ""
 
-#: src/log.c:671
+#: src/log.c:658
 msgid "HTML"
 msgstr ""
 
-#: src/log.c:732
+#: src/log.c:719
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr ""
 
-#: src/log.c:803
+#: src/log.c:790
 msgid "Plain text"
 msgstr ""
 
-#: src/main.c:150
-msgid "Please create an account."
-msgstr ""
-
-#: src/main.c:232
-#, fuzzy
-msgid "Login"
-msgstr "जुड़ें"
-
-#  And now for the buttons
-#: src/main.c:248
-#, fuzzy
-msgid "<b>_Account:</b>"
-msgstr "खाता"
-
-#: src/main.c:262
-#, fuzzy
-msgid "<b>_Password:</b>"
-msgstr "नया पासवर्ड "
-
-#  And now for the buttons
-#. And now for the buttons
-#: src/main.c:279
-#, fuzzy
-msgid "_Accounts"
-msgstr "खाता"
-
-#: src/main.c:285
-#, fuzzy
-msgid "_Preferences"
-msgstr "वरीयताएँ"
-
-#: src/main.c:291
-#, fuzzy
-msgid "_Sign on"
-msgstr "साइनऑफ"
-
-#. full help text
-#: src/main.c:517
-#, 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 ""
-
-#. short message
-#: src/main.c:532
-#, c-format
-msgid "Gaim %s. Try `%s -h' for more information.\n"
-msgstr ""
-
-#: src/main.c:845
-#, fuzzy
-msgid "Unable to load preferences"
-msgstr "फ़ाइल हस्तांतरण"
-
-#: src/main.c:845
-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:286
+#: src/plugin.c:304
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 msgstr ""
 
-#: src/plugin.c:291 src/plugin.c:319
+#: src/plugin.c:309 src/plugin.c:337
 msgid "Gaim was unable to load your plugin."
 msgstr ""
 
-#: src/plugin.c:315
+#: src/plugin.c:333
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr ""
 
-#: src/prefs.c:113 src/status.c:273
+#: src/prefs.c:114
 msgid "Slightly less boring default"
 msgstr ""
 
-#: src/protocols/gg/gg.c:49 src/protocols/jabber/jutil.c:44
-#: src/protocols/msn/msn.c:463 src/protocols/msn/state.c:29
+#: src/protocols/gg/gg.c:50 src/protocols/irc/irc.c:165
+#: src/protocols/msn/msn.c:538 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:2795
-#: src/protocols/novell/novell.c:2914 src/protocols/novell/novell.c:2965
-#: src/protocols/oscar/oscar.c:734 src/protocols/yahoo/yahoo.c:2908
-#: src/protocols/yahoo/yahoo.c:3024
+#: src/protocols/msn/state.c:38 src/protocols/novell/novell.c:2808
+#: src/protocols/novell/novell.c:2927 src/protocols/novell/novell.c:2978
+#: src/protocols/oscar/oscar.c:771 src/protocols/oscar/oscar.c:6876
+#: src/protocols/yahoo/yahoo.c:3128
 msgid "Available"
 msgstr ""
 
-#: src/protocols/gg/gg.c:50
+#: src/protocols/gg/gg.c:51
 msgid "Available for friends only"
 msgstr ""
 
-#: src/protocols/gg/gg.c:52
+#: src/protocols/gg/gg.c:53
 msgid "Away for friends only"
 msgstr ""
 
-#: src/protocols/gg/gg.c:53 src/protocols/jabber/jabber.c:964
-#: src/protocols/jabber/presence.c:133 src/protocols/oscar/oscar.c:652
-#: src/protocols/oscar/oscar.c:5483 src/protocols/oscar/oscar.c:5561
-#: src/protocols/oscar/oscar.c:5585 src/protocols/oscar/oscar.c:6763
-#: src/protocols/oscar/oscar.c:6768 src/protocols/yahoo/yahoo.c:2561
-#: src/protocols/yahoo/yahoo.c:2928 src/protocols/yahoo/yahoo.c:3036
+#: src/protocols/gg/gg.c:54 src/protocols/oscar/oscar.c:681
+#: src/protocols/oscar/oscar.c:6890 src/protocols/yahoo/yahoo.c:2649
+#: src/protocols/yahoo/yahoo.c:3172
 msgid "Invisible"
 msgstr ""
 
-#: src/protocols/gg/gg.c:54
-msgid "Invisible for friends only"
-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:136
+#: src/protocols/gg/gg.c:137
 msgid "Unable to resolve hostname."
 msgstr ""
 
-#: src/protocols/gg/gg.c:139 src/protocols/novell/novell.c:1710
+#: src/protocols/gg/gg.c:140 src/protocols/novell/novell.c:1720
 msgid "Unable to connect to server."
 msgstr ""
 
-#: src/protocols/gg/gg.c:142 src/protocols/jabber/auth.c:130
-#: src/protocols/jabber/auth.c:204 src/protocols/jabber/auth.c:354
-#: src/protocols/jabber/auth.c:452 src/protocols/jabber/auth.c:464
-#: src/protocols/jabber/jabber.c:106
+#: src/protocols/gg/gg.c:143 src/protocols/jabber/auth.c:130
+#: src/protocols/jabber/auth.c:204 src/protocols/jabber/auth.c:365
+#: src/protocols/jabber/auth.c:463 src/protocols/jabber/auth.c:475
+#: src/protocols/jabber/jabber.c:108
 msgid "Invalid response from server."
 msgstr ""
 
-#: src/protocols/gg/gg.c:145
+#: src/protocols/gg/gg.c:146
 msgid "Error while reading from socket."
 msgstr ""
 
-#: src/protocols/gg/gg.c:148
+#: src/protocols/gg/gg.c:149
 msgid "Error while writing to socket."
 msgstr ""
 
-#: src/protocols/gg/gg.c:151
+#: src/protocols/gg/gg.c:152
 msgid "Authentication failed."
 msgstr ""
 
-#: src/protocols/gg/gg.c:154
+#: src/protocols/gg/gg.c:155
 msgid "Unknown Error Code."
 msgstr ""
 
-#: src/protocols/gg/gg.c:242 src/protocols/oscar/oscar.c:3930
+#: src/protocols/gg/gg.c:233 src/protocols/oscar/oscar.c:3994
 #, c-format
 msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 msgstr ""
 
 #. 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:243 src/protocols/gg/gg.c:1011
-#: src/protocols/napster/napster.c:392 src/protocols/oscar/oscar.c:3934
-#: src/protocols/oscar/oscar.c:4156 src/protocols/silc/ops.c:1086
-#: src/protocols/silc/ops.c:1148 src/protocols/toc/toc.c:467
-#: src/protocols/zephyr/zephyr.c:643
+#: src/protocols/gg/gg.c:234 src/protocols/gg/gg.c:1075
+#: src/protocols/napster/napster.c:404 src/protocols/oscar/oscar.c:3998
+#: src/protocols/oscar/oscar.c:4223 src/protocols/silc/ops.c:1088
+#: src/protocols/silc/ops.c:1151 src/protocols/toc/toc.c:469
+#: src/protocols/zephyr/zephyr.c:721 src/protocols/zephyr/zephyr.c:1136
 msgid "Buddy Information"
 msgstr ""
 
-#: src/protocols/gg/gg.c:293
+#: src/protocols/gg/gg.c:268 src/protocols/irc/irc.c:157
+#: src/protocols/jabber/buddy.c:1068 src/protocols/jabber/jabber.c:970
+#: src/protocols/msn/msn.c:530 src/protocols/napster/napster.c:556
+#: src/protocols/novell/novell.c:2820 src/protocols/oscar/oscar.c:739
+#: src/protocols/oscar/oscar.c:6672 src/protocols/oscar/oscar.c:6866
+#: src/protocols/silc/silc.c:46 src/protocols/yahoo/yahoo.c:2653
+#: src/protocols/yahoo/yahoo.c:3122
+msgid "Offline"
+msgstr ""
+
+#: src/protocols/gg/gg.c:278 src/protocols/gg/gg.c:284
+#: src/protocols/gg/gg.c:290 src/protocols/gg/gg.c:296
+#: src/protocols/gg/gg.c:302 src/protocols/gg/gg.c:308
+#: src/protocols/gg/gg.c:314 src/protocols/irc/irc.c:170
+#: src/protocols/jabber/jabber.c:970 src/protocols/jabber/jabber.c:976
+#: src/protocols/jabber/jabber.c:982 src/protocols/jabber/jabber.c:988
+#: src/protocols/jabber/jabber.c:994 src/protocols/jabber/jabber.c:1000
+#: src/protocols/novell/novell.c:2831 src/protocols/oscar/oscar.c:6877
+#: src/protocols/oscar/oscar.c:6884 src/protocols/yahoo/yahoo.c:3134
+#: src/protocols/yahoo/yahoo.c:3168 src/protocols/zephyr/zephyr.c:2226
+#, fuzzy
+msgid "Message"
+msgstr "नया संदेश..."
+
+#: src/protocols/gg/gg.c:327
 #, c-format
 msgid "Status: %s"
 msgstr ""
 
-#: src/protocols/gg/gg.c:446
+#: src/protocols/gg/gg.c:481
 msgid "Could not connect"
 msgstr ""
 
-#: src/protocols/gg/gg.c:453
+#: src/protocols/gg/gg.c:488
 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:474 src/protocols/napster/napster.c:505
-#: src/protocols/toc/toc.c:169 src/protocols/yahoo/yahoo.c:2199
-#: src/protocols/yahoo/yahoo.c:2228 src/protocols/yahoo/yahoo.c:2291
-#: src/protocols/yahoo/yahoo_filexfer.c:68
+#: src/protocols/gg/gg.c:738 src/protocols/napster/napster.c:486
+#: src/protocols/napster/napster.c:517 src/protocols/toc/toc.c:171
+#: src/protocols/yahoo/yahoo.c:2280 src/protocols/yahoo/yahoo.c:2309
+#: src/protocols/yahoo/yahoo.c:2372 src/protocols/yahoo/yahoo_filexfer.c:68
 #: src/protocols/yahoo/yahoo_filexfer.c:109 src/protocols/yahoo/ycht.c:482
 msgid "Unable to connect."
 msgstr ""
 
-#: src/protocols/gg/gg.c:690
+#: src/protocols/gg/gg.c:754
 msgid "Reading data"
 msgstr ""
 
-#: src/protocols/gg/gg.c:693
+#: src/protocols/gg/gg.c:757
 msgid "Balancer handshake"
 msgstr ""
 
-#: src/protocols/gg/gg.c:696
+#: src/protocols/gg/gg.c:760
 msgid "Reading server key"
 msgstr ""
 
-#: src/protocols/gg/gg.c:699
+#: src/protocols/gg/gg.c:763
 msgid "Exchanging key hash"
 msgstr ""
 
-#: src/protocols/gg/gg.c:709
+#: src/protocols/gg/gg.c:773
 msgid "Critical error in GG library\n"
 msgstr ""
 
-#: src/protocols/gg/gg.c:727 src/protocols/gg/gg.c:818
-#: src/protocols/toc/toc.c:145
+#: src/protocols/gg/gg.c:791 src/protocols/gg/gg.c:882
+#: src/protocols/toc/toc.c:147
 #, c-format
 msgid "Connect to %s failed"
 msgstr ""
 
-#: src/protocols/gg/gg.c:775
+#: src/protocols/gg/gg.c:839
 msgid "Unable to ping server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:787
+#: src/protocols/gg/gg.c:851
 #, fuzzy
 msgid "Send as message"
 msgstr "नया दूर संदेश"
 
-#: src/protocols/gg/gg.c:792
+#: src/protocols/gg/gg.c:856
 msgid "Looking up GG server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:795
+#: src/protocols/gg/gg.c:859
 msgid "Invalid Gadu-Gadu UIN specified"
 msgstr ""
 
-#: src/protocols/gg/gg.c:842
+#: src/protocols/gg/gg.c:906
 msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 msgstr ""
 
-#: src/protocols/gg/gg.c:917
+#: src/protocols/gg/gg.c:981
 msgid "Couldn't get search results"
 msgstr ""
 
-#: src/protocols/gg/gg.c:922
+#: src/protocols/gg/gg.c:986
 msgid "Gadu-Gadu Search Engine"
 msgstr ""
 
-#: src/protocols/gg/gg.c:948
+#: src/protocols/gg/gg.c:1012
 msgid "Active"
 msgstr ""
 
-#: src/protocols/gg/gg.c:953 src/protocols/oscar/oscar.c:4966
+#: src/protocols/gg/gg.c:1017 src/protocols/oscar/oscar.c:5037
 msgid "UIN"
 msgstr ""
 
 #. First Name
-#: src/protocols/gg/gg.c:957 src/protocols/jabber/jabber.c:613
-#: src/protocols/oscar/oscar.c:4977 src/protocols/silc/ops.c:808
-#: src/protocols/trepia/trepia.c:267
+#: src/protocols/gg/gg.c:1021 src/protocols/jabber/jabber.c:621
+#: src/protocols/oscar/oscar.c:5048 src/protocols/silc/ops.c:810
+#: src/protocols/trepia/trepia.c:268
 msgid "First Name"
 msgstr ""
 
 #. Last Name
-#: src/protocols/gg/gg.c:962 src/protocols/jabber/jabber.c:618
-#: src/protocols/oscar/oscar.c:4978 src/protocols/trepia/trepia.c:274
+#: src/protocols/gg/gg.c:1026 src/protocols/jabber/jabber.c:626
+#: src/protocols/oscar/oscar.c:5049 src/protocols/trepia/trepia.c:275
 msgid "Last Name"
 msgstr ""
 
-#: src/protocols/gg/gg.c:966 src/protocols/gg/gg.c:1708
-#: src/protocols/irc/msgs.c:182 src/protocols/oscar/oscar.c:4967
-#: src/protocols/silc/ops.c:1204
+#: src/protocols/gg/gg.c:1030 src/protocols/gg/gg.c:1775
+#: src/protocols/irc/msgs.c:182 src/protocols/oscar/oscar.c:5038
+#: src/protocols/silc/ops.c:1202
 msgid "Nick"
 msgstr ""
 
-#: src/protocols/gg/gg.c:973 src/protocols/gg/gg.c:976
+#: src/protocols/gg/gg.c:1037 src/protocols/gg/gg.c:1040
 msgid "Birth Year"
 msgstr ""
 
-#: src/protocols/gg/gg.c:982 src/protocols/gg/gg.c:984
-#: src/protocols/gg/gg.c:986
+#: src/protocols/gg/gg.c:1046 src/protocols/gg/gg.c:1048
+#: src/protocols/gg/gg.c:1050
 #, fuzzy
 msgid "Sex"
 msgstr "नियत"
 
 #. City
-#: src/protocols/gg/gg.c:990 src/protocols/jabber/jabber.c:628
-#: src/protocols/oscar/oscar.c:5021 src/protocols/oscar/oscar.c:5029
-#: src/protocols/trepia/trepia.c:331 src/protocols/trepia/trepia.c:410
+#: src/protocols/gg/gg.c:1054 src/protocols/jabber/jabber.c:636
+#: src/protocols/oscar/oscar.c:5092 src/protocols/oscar/oscar.c:5100
+#: src/protocols/trepia/trepia.c:332 src/protocols/trepia/trepia.c:411
 msgid "City"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1033
+#: src/protocols/gg/gg.c:1097
 msgid "There is no Buddy List stored on the Gadu-Gadu server."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1041
+#: src/protocols/gg/gg.c:1105
 msgid "Couldn't Import Buddy List from Server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1103
+#: src/protocols/gg/gg.c:1167
 msgid "Buddy List successfully transferred to Gadu-Gadu server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1111
+#: src/protocols/gg/gg.c:1175
 msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1119
+#: src/protocols/gg/gg.c:1183
 msgid "Buddy List successfully deleted from Gadu-Gadu server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1127
+#: src/protocols/gg/gg.c:1191
 msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1136
+#: src/protocols/gg/gg.c:1200
 msgid "Password changed successfully"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1143
+#: src/protocols/gg/gg.c:1207
 msgid "Password couldn't be changed"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1262
+#: src/protocols/gg/gg.c:1326
 msgid "Error communicating with Gadu-Gadu server"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1263
+#: src/protocols/gg/gg.c:1327
 msgid ""
 "Gaim was unable to complete your request due to a problem communicating with "
 "the Gadu-Gadu HTTP server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1292
+#: src/protocols/gg/gg.c:1356
 msgid "Unable to import Gadu-Gadu buddy list"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1293
+#: src/protocols/gg/gg.c:1357
 msgid ""
 "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please try "
 "again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1366
+#: src/protocols/gg/gg.c:1430
 msgid "Couldn't export buddy list"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1367 src/protocols/gg/gg.c:1390
+#: src/protocols/gg/gg.c:1431 src/protocols/gg/gg.c:1454
 msgid ""
 "Gaim was unable to connect to the buddy list server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1389
+#: src/protocols/gg/gg.c:1453
 msgid "Unable to delete Gadu-Gadu buddy list"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1440
+#: src/protocols/gg/gg.c:1504
 msgid "Unable to access directory"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1441
+#: src/protocols/gg/gg.c:1505
 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:1475
+#: src/protocols/gg/gg.c:1539
 msgid "Unable to change Gadu-Gadu password"
 msgstr ""
 
-#: src/protocols/gg/gg.c:1476
+#: src/protocols/gg/gg.c:1540
 msgid ""
 "Gaim was unable to change your password due to an error connecting to the "
 "Gadu-Gadu server.  Please try again later."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1492
+#: src/protocols/gg/gg.c:1556
 msgid "Directory Search"
 msgstr ""
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: src/protocols/gg/gg.c:1497 src/protocols/jabber/jabber.c:1062
-#: src/protocols/toc/toc.c:1562
+#: src/protocols/gg/gg.c:1561 src/protocols/jabber/jabber.c:1104
+#: src/protocols/toc/toc.c:1571
 #, fuzzy
 msgid "Change Password"
 msgstr " %s: के लिए पासवर्ड बदला"
 
-#: src/protocols/gg/gg.c:1501
+#: src/protocols/gg/gg.c:1565
 #, fuzzy
 msgid "Import Buddy List from Server"
 msgstr "बड्डी सूची त्रुटि"
 
-#: src/protocols/gg/gg.c:1505
+#: src/protocols/gg/gg.c:1569
 #, fuzzy
 msgid "Export Buddy List to Server"
 msgstr "बड्डी सूची त्रुटि"
 
-#: src/protocols/gg/gg.c:1509
+#: src/protocols/gg/gg.c:1573
 #, fuzzy
 msgid "Delete Buddy List from Server"
 msgstr "बड्डी सूची त्रुटि"
 
-#: src/protocols/gg/gg.c:1542
+#: src/protocols/gg/gg.c:1606
 msgid "Unable to access user profile."
 msgstr ""
 
-#: src/protocols/gg/gg.c:1543
+#: src/protocols/gg/gg.c:1607
 msgid ""
 "Gaim was unable to access this user's profile due to an error connecting to "
 "the directory server.  Please try again later."
 msgstr ""
 
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5282,64 +5360,23 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/gg/gg.c:1687 src/protocols/gg/gg.c:1689
+#: src/protocols/gg/gg.c:1754 src/protocols/gg/gg.c:1756
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr ""
 
-#: src/protocols/icq/gaim_icq.c:223
-msgid "Gaim encountered an error communicating with the ICQ server."
-msgstr ""
-
-#: src/protocols/icq/gaim_icq.c:293
-#, c-format
-msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
-msgstr ""
-
-#: src/protocols/icq/gaim_icq.c:296 src/protocols/jabber/presence.c:241
-#: src/protocols/msn/userlist.c:100 src/protocols/oscar/oscar.c:3669
-#: src/protocols/oscar/oscar.c:6215
-msgid "Authorize"
-msgstr ""
-
-#: src/protocols/icq/gaim_icq.c:296 src/protocols/jabber/presence.c:242
-#: src/protocols/msn/userlist.c:101 src/protocols/oscar/oscar.c:3671
-#: src/protocols/oscar/oscar.c:6216
-#, fuzzy
-msgid "Deny"
-msgstr "देरी"
-
-#: src/protocols/icq/gaim_icq.c:309
-msgid "Send message through server"
-msgstr ""
-
-#: src/protocols/icq/gaim_icq.c:351
-#, fuzzy
-msgid "Connecting..."
-msgstr "कनेक्शन में त्रुटि"
-
-#: src/protocols/icq/gaim_icq.c:497
-msgid "Nick:"
-msgstr ""
-
-#  *  DEFINES, MACROS & DATA TYPES
-#: src/protocols/icq/gaim_icq.c:498
-#, fuzzy
-msgid "Gaim User"
-msgstr "गेम"
-
-#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1294
+#: src/protocols/irc/cmds.c:43 src/protocols/silc/silc.c:1310
 #, c-format
 msgid "Unknown command: %s"
 msgstr ""
 
-#: src/protocols/irc/cmds.c:450 src/protocols/jabber/chat.c:562
-#: src/protocols/silc/silc.c:1002
+#: src/protocols/irc/cmds.c:450 src/protocols/jabber/chat.c:584
+#: src/protocols/silc/silc.c:1018
 #, c-format
 msgid "current topic is: %s"
 msgstr ""
 
-#: src/protocols/irc/cmds.c:454 src/protocols/jabber/chat.c:566
-#: src/protocols/silc/silc.c:1006
+#: src/protocols/irc/cmds.c:454 src/protocols/jabber/chat.c:588
+#: src/protocols/silc/silc.c:1022
 msgid "No topic is set"
 msgstr ""
 
@@ -5355,28 +5392,28 @@
 msgid "Gaim could not open a listening port."
 msgstr ""
 
-#: src/protocols/irc/irc.c:74
+#: src/protocols/irc/irc.c:75
 msgid "Error displaying MOTD"
 msgstr ""
 
-#: src/protocols/irc/irc.c:74
-msgid "No MOTD available"
-msgstr ""
-
 #: src/protocols/irc/irc.c:75
+msgid "No MOTD available"
+msgstr ""
+
+#: src/protocols/irc/irc.c:76
 msgid "There is no MOTD associated with this connection."
 msgstr ""
 
-#: src/protocols/irc/irc.c:78
+#: src/protocols/irc/irc.c:79
 #, c-format
 msgid "MOTD for %s"
 msgstr ""
 
-#: src/protocols/irc/irc.c:92 src/protocols/irc/irc.c:399
+#: src/protocols/irc/irc.c:93 src/protocols/irc/irc.c:412
 msgid "Server has disconnected"
 msgstr ""
 
-#: src/protocols/irc/irc.c:157
+#: src/protocols/irc/irc.c:181
 msgid "View MOTD"
 msgstr ""
 
@@ -5384,50 +5421,49 @@
 # #-#-#-#-#  gnome-session.HEAD.hi.po (gnome-session VERSION)  #-#-#-#-#
 # gnome-session/session-properties.c:179
 #  Cancel button.
-#: src/protocols/irc/irc.c:179 src/protocols/silc/chat.c:32
+#: src/protocols/irc/irc.c:193 src/protocols/silc/chat.c:32
 #, fuzzy
 msgid "_Channel:"
 msgstr "रद्द"
 
-#: src/protocols/irc/irc.c:184 src/protocols/jabber/chat.c:56
+#: src/protocols/irc/irc.c:198 src/protocols/jabber/chat.c:56
 #, fuzzy
 msgid "_Password:"
 msgstr "नया पासवर्ड "
 
-#: src/protocols/irc/irc.c:216
+#: src/protocols/irc/irc.c:230
 msgid "IRC nicks may not contain whitespace"
 msgstr ""
 
-#: src/protocols/irc/irc.c:235 src/protocols/toc/toc.c:197
-#, c-format
-msgid "Signon: %s"
-msgstr ""
-
-#: src/protocols/irc/irc.c:244
+#: src/protocols/irc/irc.c:249
+#, fuzzy, c-format
+msgid "Logging in: %s"
+msgstr "विन-गेम विकल्प"
+
+#: src/protocols/irc/irc.c:258
 msgid "Couldn't create socket"
 msgstr ""
 
-#: src/protocols/irc/irc.c:259 src/protocols/jabber/jabber.c:297
-#: src/protocols/oscar/oscar.c:1651 src/protocols/oscar/oscar.c:1715
+#: src/protocols/irc/irc.c:273 src/protocols/jabber/jabber.c:301
+#: src/protocols/oscar/oscar.c:1690 src/protocols/oscar/oscar.c:1757
 #, fuzzy
 msgid "Couldn't connect to host"
 msgstr "एआईएम से कनेक्टेड नहीं है."
 
-#: src/protocols/irc/irc.c:396 src/protocols/trepia/trepia.c:926
+#: src/protocols/irc/irc.c:409 src/protocols/trepia/trepia.c:929
 msgid "Read error"
 msgstr ""
 
-#: src/protocols/irc/irc.c:547 src/protocols/silc/chat.c:1368
-#: src/protocols/yahoo/yahoochat.c:1393
+#: src/protocols/irc/irc.c:564 src/protocols/silc/chat.c:1373
+#: src/protocols/yahoo/yahoochat.c:1398
 msgid "Users"
 msgstr ""
 
-#: src/protocols/irc/irc.c:550 src/protocols/silc/chat.c:1371
-#: src/protocols/silc/ops.c:1166 src/protocols/yahoo/yahoochat.c:1402
+#: src/protocols/irc/irc.c:567 src/protocols/silc/chat.c:1376
+#: src/protocols/silc/ops.c:1170 src/protocols/yahoo/yahoochat.c:1407
 msgid "Topic"
 msgstr ""
 
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -5436,40 +5472,43 @@
 #. *< id
 #. *< name
 #. *< version
-#: src/protocols/irc/irc.c:655
+#: src/protocols/irc/irc.c:674
 msgid "IRC Protocol Plugin"
 msgstr ""
 
 #. *  summary
-#: src/protocols/irc/irc.c:656
+#: src/protocols/irc/irc.c:675
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr ""
 
-#: src/protocols/irc/irc.c:675 src/protocols/irc/msgs.c:201
-#: src/protocols/jabber/jabber.c:1577 src/protocols/napster/napster.c:656
-#: src/protocols/silc/ops.c:1026 src/protocols/silc/ops.c:1129
+#: src/protocols/irc/irc.c:694 src/protocols/irc/msgs.c:201
+#: src/protocols/jabber/jabber.c:1621 src/protocols/napster/napster.c:691
+#: src/protocols/silc/ops.c:1028 src/protocols/silc/ops.c:1132
 #, fuzzy
 msgid "Server"
 msgstr "डाक सर्वर"
 
-#: src/protocols/irc/irc.c:678 src/protocols/jabber/jabber.c:1598
-#: src/protocols/msn/msn.c:1761 src/protocols/napster/napster.c:661
-#: src/protocols/silc/silc.c:1586 src/protocols/trepia/trepia.c:1298
+#: src/protocols/irc/irc.c:697 src/protocols/jabber/jabber.c:1642
+#: src/protocols/msn/msn.c:1961 src/protocols/napster/napster.c:696
+#: src/protocols/silc/silc.c:1604 src/protocols/trepia/trepia.c:1303
 msgid "Port"
 msgstr ""
 
-#: src/protocols/irc/irc.c:681 src/protocols/oscar/oscar.c:7348
-#: src/protocols/zephyr/zephyr.c:1922
-msgid "Encoding"
-msgstr ""
-
-#: src/protocols/irc/irc.c:684 src/protocols/irc/msgs.c:195
-#: src/protocols/jabber/jabber.c:588 src/protocols/silc/buddy.c:1445
-#: src/protocols/silc/ops.c:973 src/protocols/silc/ops.c:975
-#: src/protocols/silc/ops.c:1123 src/protocols/silc/ops.c:1125
+#: src/protocols/irc/irc.c:700
+msgid "Encodings"
+msgstr ""
+
+#: src/protocols/irc/irc.c:703 src/protocols/irc/msgs.c:195
+#: src/protocols/jabber/jabber.c:596 src/protocols/silc/buddy.c:1450
+#: src/protocols/silc/ops.c:975 src/protocols/silc/ops.c:977
+#: src/protocols/silc/ops.c:1126 src/protocols/silc/ops.c:1128
 msgid "Username"
 msgstr ""
 
+#: src/protocols/irc/irc.c:706
+msgid "Real name"
+msgstr ""
+
 #: src/protocols/irc/msgs.c:97
 msgid "Bad mode"
 msgstr ""
@@ -5499,17 +5538,17 @@
 
 #: src/protocols/irc/msgs.c:189 src/protocols/irc/msgs.c:195
 #: src/protocols/irc/msgs.c:196 src/protocols/irc/msgs.c:207
-#: src/protocols/msn/msn.c:1180 src/protocols/yahoo/yahoo_profile.c:664
+#: src/protocols/msn/msn.c:1356 src/protocols/yahoo/yahoo_profile.c:665
 #, c-format
 msgid "<b>%s:</b> %s<br>"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:196 src/protocols/silc/ops.c:967
-#: src/protocols/silc/ops.c:1117 src/protocols/yahoo/yahoo_profile.c:1005
+#: src/protocols/irc/msgs.c:196 src/protocols/silc/ops.c:969
+#: src/protocols/silc/ops.c:1120 src/protocols/yahoo/yahoo_profile.c:1007
 msgid "Realname"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:207 src/protocols/silc/ops.c:1039
+#: src/protocols/irc/msgs.c:207 src/protocols/silc/ops.c:1041
 msgid "Currently on"
 msgstr ""
 
@@ -5596,224 +5635,219 @@
 msgid "Invitation only"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:625
+#: src/protocols/irc/msgs.c:623
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:630
+#: src/protocols/irc/msgs.c:628
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:651
+#: src/protocols/irc/msgs.c:649
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:760
+#: src/protocols/irc/msgs.c:758
 msgid "Could not change nick"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:761
+#: src/protocols/irc/msgs.c:759
 msgid "Cannot change nick"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:782
+#: src/protocols/irc/msgs.c:780
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr ""
 
+#: src/protocols/irc/msgs.c:820
+msgid "Error: invalid PONG from server"
+msgstr ""
+
 #: src/protocols/irc/msgs.c:822
-msgid "Error: invalid PONG from server"
-msgstr ""
-
-#: src/protocols/irc/msgs.c:824
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:899
+#: src/protocols/irc/msgs.c:897
 #, c-format
 msgid "Cannot join %s:"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:900 src/protocols/silc/ops.c:912
+#: src/protocols/irc/msgs.c:898 src/protocols/silc/ops.c:914
 msgid "Cannot join channel"
 msgstr ""
 
-#: src/protocols/irc/msgs.c:936
+#: src/protocols/irc/msgs.c:934
 #, c-format
 msgid "Wallops from %s"
 msgstr ""
 
-#: src/protocols/irc/parse.c:109
-msgid "action &lt;action to perform&gt;:  Perform an action."
-msgstr ""
-
 #: src/protocols/irc/parse.c:110
-msgid ""
-"away [message]:  Set an away message, or use no message to return from being "
-"away."
+msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr ""
 
 #: src/protocols/irc/parse.c:111
 msgid ""
-"deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
-"someone. You must be a channel operator to do this."
+"away [message]:  Set an away message, or use no message to return from being "
+"away."
 msgstr ""
 
 #: src/protocols/irc/parse.c:112
 msgid ""
+"deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
+"someone. You must be a channel operator to do this."
+msgstr ""
+
+#: src/protocols/irc/parse.c:113
+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 ""
 
-#: src/protocols/irc/parse.c:113
+#: src/protocols/irc/parse.c:114
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
 msgstr ""
 
-#: src/protocols/irc/parse.c:114
+#: src/protocols/irc/parse.c:115
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
 
-#: src/protocols/irc/parse.c:115
-msgid ""
-"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
-"channels, optionally providing a channel key for each if needed."
-msgstr ""
-
 #: src/protocols/irc/parse.c:116
 msgid ""
-"kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
-"channel operator to do this."
+"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
 msgstr ""
 
 #: src/protocols/irc/parse.c:117
 msgid ""
-"list:  Display a list of chat rooms on the network. <i>Warning, some servers "
-"may disconnect you upon doing this.</i>"
+"kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
+"channel operator to do this."
 msgstr ""
 
 #: src/protocols/irc/parse.c:118
-msgid "me &lt;action to perform&gt;:  Perform an action."
+msgid ""
+"list:  Display a list of chat rooms on the network. <i>Warning, some servers "
+"may disconnect you upon doing this.</i>"
 msgstr ""
 
 #: src/protocols/irc/parse.c:119
+msgid "me &lt;action to perform&gt;:  Perform an action."
+msgstr ""
+
+#: src/protocols/irc/parse.c:120
 msgid ""
 "mode &lt;nick|channel&gt; &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a channel "
 "or user mode."
 msgstr ""
 
-#: src/protocols/irc/parse.c:120
-msgid ""
-"msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
-"opposed to a channel)."
-msgstr ""
-
 #: src/protocols/irc/parse.c:121
+msgid ""
+"msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr ""
+
+#: src/protocols/irc/parse.c:122
 msgid "names [channel]:  List the users currently in a channel."
 msgstr ""
 
-#: src/protocols/irc/parse.c:122 src/protocols/jabber/jabber.c:1410
+#: src/protocols/irc/parse.c:123 src/protocols/jabber/jabber.c:1452
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr ""
 
-#: src/protocols/irc/parse.c:123
-msgid ""
-"op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
-"must be a channel operator to do this."
-msgstr ""
-
 #: src/protocols/irc/parse.c:124
 msgid ""
-"operwall &lt;message&gt;:  If you don't know what this is, you probably "
-"can't use it."
+"op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
+"must be a channel operator to do this."
 msgstr ""
 
 #: src/protocols/irc/parse.c:125
 msgid ""
+"operwall &lt;message&gt;:  If you don't know what this is, you probably "
+"can't use it."
+msgstr ""
+
+#: src/protocols/irc/parse.c:126
+msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
 msgstr ""
 
-#: src/protocols/irc/parse.c:126
+#: src/protocols/irc/parse.c:127
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
 msgstr ""
 
-#: src/protocols/irc/parse.c:127
+#: src/protocols/irc/parse.c:128
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr ""
 
-#: src/protocols/irc/parse.c:128
+#: src/protocols/irc/parse.c:129
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr ""
 
-#: src/protocols/irc/parse.c:129
-msgid "quote [...]:  Send a raw command to the server."
-msgstr ""
-
 #: src/protocols/irc/parse.c:130
+msgid "quote [...]:  Send a raw command to the server."
+msgstr ""
+
+#: src/protocols/irc/parse.c:131
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
 msgstr ""
 
-#: src/protocols/irc/parse.c:131
+#: src/protocols/irc/parse.c:132
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr ""
 
-#: src/protocols/irc/parse.c:132
-msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
-msgstr ""
-
 #: src/protocols/irc/parse.c:133
-msgid ""
-"voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
-"must be a channel operator to do this."
+msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr ""
 
 #: src/protocols/irc/parse.c:134
 msgid ""
-"wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
-"use it."
+"voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
+"must be a channel operator to do this."
 msgstr ""
 
 #: src/protocols/irc/parse.c:135
+msgid ""
+"wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
+"use it."
+msgstr ""
+
+#: src/protocols/irc/parse.c:136
 msgid "whois &lt;nick&gt;:  Get information on a user."
 msgstr ""
 
-#: src/protocols/irc/parse.c:242 src/protocols/zephyr/zephyr.c:264
-msgid ""
-"(There was an error converting this message.  Check the 'Encoding' option in "
-"the Account Editor)"
-msgstr ""
-
-#: src/protocols/irc/parse.c:394
+#: src/protocols/irc/parse.c:414
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr ""
 
-#: src/protocols/irc/parse.c:395
+#: src/protocols/irc/parse.c:415
 msgid "PONG"
 msgstr ""
 
-#: src/protocols/irc/parse.c:395
+#: src/protocols/irc/parse.c:415
 msgid "CTCP PING reply"
 msgstr ""
 
-#: src/protocols/irc/parse.c:497 src/protocols/oscar/oscar.c:1548
-#: src/protocols/toc/toc.c:187 src/protocols/toc/toc.c:595
-#: src/protocols/toc/toc.c:611 src/protocols/toc/toc.c:688
+#: src/protocols/irc/parse.c:518 src/protocols/irc/parse.c:522
+#: src/protocols/oscar/oscar.c:1587 src/protocols/toc/toc.c:189
+#: src/protocols/toc/toc.c:597 src/protocols/toc/toc.c:613
+#: src/protocols/toc/toc.c:690
 msgid "Disconnected."
 msgstr ""
 
@@ -5840,178 +5874,198 @@
 msgid "Server does not use any supported authentication method"
 msgstr ""
 
-#: src/protocols/jabber/auth.c:375
+#: src/protocols/jabber/auth.c:386
 msgid "Invalid challenge from server"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:246 src/protocols/jabber/buddy.c:604
-#: src/protocols/silc/ops.c:804
+#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:655
+#: src/protocols/silc/ops.c:806
 msgid "Full Name"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:247 src/protocols/jabber/buddy.c:617
-#: src/protocols/silc/ops.c:816
+#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/buddy.c:668
+#: src/protocols/silc/ops.c:818
 msgid "Family Name"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:248 src/protocols/jabber/buddy.c:621
+#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:672
 msgid "Given Name"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:249 src/protocols/jabber/buddy.c:635
-#: src/protocols/jabber/jabber.c:608 src/protocols/msn/msn.c:1173
-#: src/protocols/silc/buddy.c:1442 src/protocols/silc/ops.c:820
-#: src/protocols/silc/ops.c:963 src/protocols/silc/ops.c:1113
-#: src/protocols/yahoo/yahoo_profile.c:1000
+#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:686
+#: src/protocols/jabber/jabber.c:616 src/protocols/msn/msn.c:1346
+#: src/protocols/silc/buddy.c:1447 src/protocols/silc/ops.c:822
+#: src/protocols/silc/ops.c:965 src/protocols/silc/ops.c:1116
+#: src/protocols/yahoo/yahoo_profile.c:1002
 msgid "Nickname"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:250 src/protocols/jabber/jabber.c:648
+#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/jabber.c:656
 msgid "URL"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:251 src/protocols/jabber/buddy.c:663
+#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:714
 msgid "Street Address"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:252 src/protocols/jabber/buddy.c:659
+#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:710
 msgid "Extended Address"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:253 src/protocols/jabber/buddy.c:667
+#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:718
 msgid "Locality"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:254 src/protocols/jabber/buddy.c:671
+#: src/protocols/jabber/buddy.c:257 src/protocols/jabber/buddy.c:722
 msgid "Region"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:255 src/protocols/jabber/buddy.c:675
-#: src/protocols/jabber/jabber.c:638
+#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:726
+#: src/protocols/jabber/jabber.c:646
 msgid "Postal Code"
 msgstr ""
 
 #. Country
-#: src/protocols/jabber/buddy.c:256 src/protocols/jabber/buddy.c:680
-#: src/protocols/trepia/trepia.c:339 src/protocols/trepia/trepia.c:416
+#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:731
+#: 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:691
-#: src/protocols/jabber/buddy.c:698
+#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:742
+#: src/protocols/jabber/buddy.c:749
 msgid "Telephone"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:258 src/protocols/jabber/buddy.c:709
-#: src/protocols/jabber/buddy.c:717 src/protocols/silc/silc.c:643
-#: src/protocols/silc/util.c:508 src/protocols/yahoo/yahoo_profile.c:995
+#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:760
+#: src/protocols/jabber/buddy.c:768 src/protocols/silc/silc.c:662
+#: src/protocols/silc/util.c:508 src/protocols/yahoo/yahoo_profile.c:997
 msgid "Email"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:259 src/protocols/jabber/buddy.c:732
+#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:783
 msgid "Organization Name"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:260 src/protocols/jabber/buddy.c:736
+#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:787
 msgid "Organization Unit"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:261 src/protocols/jabber/buddy.c:742
-#: src/protocols/novell/novell.c:1450
+#: src/protocols/jabber/buddy.c:264 src/protocols/jabber/buddy.c:793
+#: src/protocols/novell/novell.c:1460
 msgid "Title"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:262 src/protocols/jabber/buddy.c:745
+#: src/protocols/jabber/buddy.c:265 src/protocols/jabber/buddy.c:796
 msgid "Role"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:263 src/protocols/jabber/buddy.c:638
-#: src/protocols/oscar/oscar.c:5002
+#: src/protocols/jabber/buddy.c:266 src/protocols/jabber/buddy.c:689
+#: src/protocols/oscar/oscar.c:5073
 msgid "Birthday"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:509 src/protocols/jabber/buddy.c:510
+#: src/protocols/jabber/buddy.c:559 src/protocols/jabber/buddy.c:560
 msgid "Edit Jabber vCard"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:511
+#: src/protocols/jabber/buddy.c:561
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:553
+#: src/protocols/jabber/buddy.c:604
 msgid "Jabber ID"
 msgstr ""
 
 #  Autostart
-#: src/protocols/jabber/buddy.c:563 src/protocols/jabber/buddy.c:570
-#: src/protocols/jabber/buddy.c:581 src/protocols/jabber/jabber.c:938
-#: src/protocols/msn/msn.c:451 src/protocols/novell/novell.c:2817
-#: src/protocols/novell/novell.c:2821 src/protocols/oscar/oscar.c:694
-#: src/protocols/oscar/oscar.c:700 src/protocols/oscar/oscar.c:702
-#: src/protocols/yahoo/yahoo.c:2686
+#: src/protocols/jabber/buddy.c:614 src/protocols/jabber/buddy.c:621
+#: src/protocols/jabber/buddy.c:632 src/protocols/jabber/jabber.c:949
+#: src/protocols/msn/msn.c:505 src/protocols/novell/novell.c:2830
+#: src/protocols/novell/novell.c:2834 src/protocols/oscar/oscar.c:731
+#: src/protocols/oscar/oscar.c:737 src/protocols/oscar/oscar.c:739
+#: src/protocols/yahoo/yahoo.c:2774
 #, fuzzy
 msgid "Status"
 msgstr "प्रारंभ-में"
 
-#: src/protocols/jabber/buddy.c:579 src/protocols/jabber/jabber.c:1580
+#: src/protocols/jabber/buddy.c:630 src/protocols/jabber/jabber.c:1624
 msgid "Resource"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:625 src/protocols/silc/ops.c:812
+#: src/protocols/jabber/buddy.c:676 src/protocols/silc/ops.c:814
 #, fuzzy
 msgid "Middle Name"
 msgstr "निष्क्रिय समय"
 
-#: src/protocols/jabber/buddy.c:643 src/protocols/jabber/jabber.c:623
-#: src/protocols/oscar/oscar.c:5020 src/protocols/oscar/oscar.c:5028
-#: src/protocols/silc/ops.c:848
+#: src/protocols/jabber/buddy.c:694 src/protocols/jabber/jabber.c:631
+#: src/protocols/oscar/oscar.c:5091 src/protocols/oscar/oscar.c:5099
+#: src/protocols/silc/ops.c:850
 msgid "Address"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:655
+#: src/protocols/jabber/buddy.c:706
 msgid "P.O. Box"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:761
+#: src/protocols/jabber/buddy.c:812
 msgid "Photo"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:761
+#: src/protocols/jabber/buddy.c:812
 msgid "Logo"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:777
+#: src/protocols/jabber/buddy.c:834
 msgid "Jabber Profile"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:932
+#: src/protocols/jabber/buddy.c:1016
 msgid "Un-hide From"
 msgstr ""
 
-#: src/protocols/jabber/buddy.c:935
+#: src/protocols/jabber/buddy.c:1019
 msgid "Temporarily Hide From"
 msgstr ""
 
 #. && NOT ME
-#: src/protocols/jabber/buddy.c:942
+#: src/protocols/jabber/buddy.c:1026
 #, fuzzy
 msgid "Cancel Presence Notification"
 msgstr "संदेश सूचना"
 
-#: src/protocols/jabber/buddy.c:948
+#: src/protocols/jabber/buddy.c:1032
 msgid "(Re-)Request authorization"
 msgstr ""
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: src/protocols/jabber/buddy.c:956
+#: src/protocols/jabber/buddy.c:1040
 msgid "Unsubscribe"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:6286
+#: src/protocols/jabber/buddy.c:1066 src/protocols/jabber/chat.c:669
+#: src/protocols/jabber/chat.c:680 src/protocols/jabber/jabber.c:957
+#: src/protocols/silc/ops.c:1239
+msgid "Error"
+msgstr ""
+
+#: src/protocols/jabber/buddy.c:1072 src/protocols/jabber/jabber.c:981
+#, fuzzy
+msgid "Chatty"
+msgstr "गपशप"
+
+#: src/protocols/jabber/buddy.c:1076 src/protocols/jabber/jabber.c:993
+msgid "Extended Away"
+msgstr ""
+
+#: src/protocols/jabber/buddy.c:1078 src/protocols/jabber/jabber.c:999
+#: src/protocols/oscar/oscar.c:671 src/protocols/oscar/oscar.c:6910
+msgid "Do Not Disturb"
+msgstr ""
+
+#: src/protocols/jabber/chat.c:41 src/protocols/oscar/oscar.c:6371
 #: src/protocols/yahoo/yahoochat.c:1003
 msgid "_Room:"
 msgstr ""
@@ -6025,134 +6079,130 @@
 msgid "_Handle:"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:200
+#: src/protocols/jabber/chat.c:217
 #, c-format
 msgid "%s is not a valid room name"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:201
+#: src/protocols/jabber/chat.c:218
 #, fuzzy
 msgid "Invalid Room Name"
 msgstr "अवैध समूह-नाम"
 
-#: src/protocols/jabber/chat.c:206
+#: src/protocols/jabber/chat.c:223
 #, c-format
 msgid "%s is not a valid server name"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:207 src/protocols/jabber/chat.c:208
+#: src/protocols/jabber/chat.c:224 src/protocols/jabber/chat.c:225
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "अवैध समूह-नाम"
 
-#: src/protocols/jabber/chat.c:212
+#: src/protocols/jabber/chat.c:229
 #, fuzzy, c-format
 msgid "%s is not a valid room handle"
 msgstr "अब %s निष्क्रिय नहीं है."
 
-#: src/protocols/jabber/chat.c:213 src/protocols/jabber/chat.c:214
+#: src/protocols/jabber/chat.c:230 src/protocols/jabber/chat.c:231
 #, fuzzy
 msgid "Invalid Room Handle"
 msgstr "अवैध समूह-नाम"
 
-#: src/protocols/jabber/chat.c:365
+#: src/protocols/jabber/chat.c:387
 #, fuzzy
 msgid "Configuration error"
 msgstr "कनेक्शन में त्रुटि"
 
-#: src/protocols/jabber/chat.c:374 src/protocols/jabber/chat.c:519
+#: src/protocols/jabber/chat.c:396 src/protocols/jabber/chat.c:541
 msgid "Unable to configure"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:390
+#: src/protocols/jabber/chat.c:412
 #, fuzzy
 msgid "Room Configuration Error"
 msgstr "रजिस्ट्रेशन त्रुटि"
 
-#: src/protocols/jabber/chat.c:391
+#: src/protocols/jabber/chat.c:413
 msgid "This room is not capable of being configured"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:441 src/protocols/jabber/chat.c:510
+#: src/protocols/jabber/chat.c:463 src/protocols/jabber/chat.c:532
 #, fuzzy
 msgid "Registration error"
 msgstr "रजिस्ट्रेशन त्रुटि"
 
-#: src/protocols/jabber/chat.c:593
+#: src/protocols/jabber/chat.c:620
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:637 src/protocols/jabber/chat.c:648
-#, fuzzy
-msgid "Roomlist Error"
-msgstr "रजिस्ट्रेशन त्रुटि"
-
-#: src/protocols/jabber/chat.c:638 src/protocols/jabber/chat.c:649
-msgid "Error retreiving roomlist"
-msgstr ""
-
-#: src/protocols/jabber/chat.c:689
+#: src/protocols/jabber/chat.c:670 src/protocols/jabber/chat.c:681
+#: src/protocols/silc/ops.c:1239
+msgid "Error retrieving room list"
+msgstr ""
+
+#: src/protocols/jabber/chat.c:729
 #, fuzzy
 msgid "Invalid Server"
 msgstr "डाक सर्वर"
 
-#: src/protocols/jabber/chat.c:726
+#: src/protocols/jabber/chat.c:767
 msgid "Enter a Conference Server"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:727
+#: src/protocols/jabber/chat.c:768
 msgid "Select a conference server to query"
 msgstr ""
 
-#: src/protocols/jabber/chat.c:730
+#: src/protocols/jabber/chat.c:771
 msgid "Find Rooms"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:76
+#: src/protocols/jabber/jabber.c:77
 msgid "Error initializing session"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:206 src/protocols/msn/httpmethod.c:266
-#: src/protocols/trepia/trepia.c:247 src/protocols/trepia/trepia.c:698
-#: src/protocols/trepia/trepia.c:987 src/protocols/trepia/trepia.c:1031
-#: src/protocols/trepia/trepia.c:1130 src/protocols/trepia/trepia.c:1176
+#: src/protocols/jabber/jabber.c:210 src/protocols/msn/httpmethod.c:266
+#: src/protocols/trepia/trepia.c:248 src/protocols/trepia/trepia.c:699
+#: src/protocols/trepia/trepia.c:990 src/protocols/trepia/trepia.c:1034
+#: src/protocols/trepia/trepia.c:1133 src/protocols/trepia/trepia.c:1179
 msgid "Write error"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:244 src/protocols/jabber/jabber.c:264
+#: src/protocols/jabber/jabber.c:248 src/protocols/jabber/jabber.c:268
 #, fuzzy
 msgid "Read Error"
 msgstr "रजिस्ट्रेशन त्रुटि"
 
-#: src/protocols/jabber/jabber.c:324
+#: src/protocols/jabber/jabber.c:328
 #, fuzzy
 msgid "Connection Failed"
 msgstr "कनेक्शन में त्रुटि"
 
-#: src/protocols/jabber/jabber.c:327
+#: src/protocols/jabber/jabber.c:331
 msgid "SSL Handshake Failed"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:370 src/protocols/jabber/jabber.c:699
+#: src/protocols/jabber/jabber.c:375 src/protocols/jabber/jabber.c:708
 #, fuzzy
 msgid "Invalid Jabber ID"
 msgstr "अवैध एआईएम यूआरआई"
 
-#: src/protocols/jabber/jabber.c:398 src/protocols/jabber/jabber.c:726
+#: src/protocols/jabber/jabber.c:406 src/protocols/jabber/jabber.c:738
 msgid "SSL support unavailable"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:408 src/protocols/jabber/jabber.c:736
-#: src/protocols/trepia/trepia.c:1070
+#: src/protocols/jabber/jabber.c:416 src/protocols/jabber/jabber.c:748
+#: src/protocols/trepia/trepia.c:1073
 msgid "Unable to create socket"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:433
+#: src/protocols/jabber/jabber.c:441
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:435 src/protocols/jabber/jabber.c:436
+#: src/protocols/jabber/jabber.c:443 src/protocols/jabber/jabber.c:444
 #, fuzzy
 msgid "Registration Successful"
 msgstr "रजिस्ट्रेशन त्रुटि"
@@ -6161,287 +6211,275 @@
 # gnome-session/gsm-client-row.c:43
 # #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
 # gnome-session/gsm-client-row.c:43
-#: src/protocols/jabber/jabber.c:442 src/protocols/jabber/jabber.c:1181
+#: src/protocols/jabber/jabber.c:450 src/protocols/jabber/jabber.c:1223
 #, fuzzy
 msgid "Unknown Error"
 msgstr "अज्ञात"
 
-#: src/protocols/jabber/jabber.c:444 src/protocols/jabber/jabber.c:445
+#: src/protocols/jabber/jabber.c:452 src/protocols/jabber/jabber.c:453
 #, fuzzy
 msgid "Registration Failed"
 msgstr "रजिस्ट्रेशन त्रुटि"
 
-#: src/protocols/jabber/jabber.c:556 src/protocols/jabber/jabber.c:557
+#: src/protocols/jabber/jabber.c:564 src/protocols/jabber/jabber.c:565
 msgid "Already Registered"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:592 src/protocols/jabber/jabber.c:1036
+#: src/protocols/jabber/jabber.c:600 src/protocols/jabber/jabber.c:1078
 #, fuzzy
 msgid "Password"
 msgstr "नया पासवर्ड "
 
-#: src/protocols/jabber/jabber.c:603
+#: src/protocols/jabber/jabber.c:611
 msgid "E-Mail"
 msgstr ""
 
 #. State
-#: src/protocols/jabber/jabber.c:633 src/protocols/oscar/oscar.c:5022
-#: src/protocols/oscar/oscar.c:5030 src/protocols/trepia/trepia.c:335
-#: src/protocols/trepia/trepia.c:413
+#: src/protocols/jabber/jabber.c:641 src/protocols/oscar/oscar.c:5093
+#: src/protocols/oscar/oscar.c:5101 src/protocols/trepia/trepia.c:336
+#: src/protocols/trepia/trepia.c:414
 #, fuzzy
 msgid "State"
 msgstr "सहेजें"
 
-#: src/protocols/jabber/jabber.c:643 src/protocols/silc/ops.c:853
-#: src/protocols/silc/silc.c:645 src/protocols/silc/util.c:510
+#: src/protocols/jabber/jabber.c:651 src/protocols/silc/ops.c:855
+#: src/protocols/silc/silc.c:664 src/protocols/silc/util.c:510
 msgid "Phone"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:653
-msgid "Date"
-msgstr ""
-
 #: src/protocols/jabber/jabber.c:661
+msgid "Date"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:669
 msgid "Please fill out the information below to register your new account."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:664 src/protocols/jabber/jabber.c:665
+#: src/protocols/jabber/jabber.c:672 src/protocols/jabber/jabber.c:673
 msgid "Register New Jabber Account"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:744
-msgid "Logged out"
-msgstr ""
-
 #. connect to the server
-#: src/protocols/jabber/jabber.c:783 src/protocols/msn/msn.c:609
-#: src/protocols/napster/napster.c:498 src/protocols/novell/novell.c:2150
-#: src/protocols/oscar/oscar.c:1719 src/protocols/trepia/trepia.c:1064
-#: src/protocols/yahoo/yahoo.c:2422 src/protocols/zephyr/zephyr.c:1020
+#: src/protocols/jabber/jabber.c:800 src/protocols/msn/msn.c:697
+#: src/protocols/napster/napster.c:510 src/protocols/novell/novell.c:2163
+#: src/protocols/oscar/oscar.c:1761 src/protocols/trepia/trepia.c:1067
+#: src/protocols/yahoo/yahoo.c:2503 src/protocols/zephyr/zephyr.c:1492
 #, fuzzy
 msgid "Connecting"
 msgstr "कनेक्शन में त्रुटि"
 
-#: src/protocols/jabber/jabber.c:787
+#: src/protocols/jabber/jabber.c:804
 msgid "Initializing Stream"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:793
+#: src/protocols/jabber/jabber.c:810
 msgid "Authenticating"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:802
+#: src/protocols/jabber/jabber.c:819
 msgid "Re-initializing Stream"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:882 src/protocols/jabber/jabber.c:1159
-#: src/protocols/jabber/jabber.c:1200 src/protocols/jabber/jabber.c:1233
-#: src/protocols/oscar/oscar.c:700 src/protocols/oscar/oscar.c:6566
+#: src/protocols/jabber/jabber.c:891 src/protocols/jabber/jabber.c:1201
+#: src/protocols/jabber/jabber.c:1242 src/protocols/jabber/jabber.c:1275
+#: src/protocols/oscar/oscar.c:737 src/protocols/oscar/oscar.c:6670
 msgid "Not Authorized"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:913
+#: src/protocols/jabber/jabber.c:924
 msgid "Both"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:915
-msgid "From (To pending)"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:917
-msgid "From"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:920
-msgid "To"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:922
-msgid "None (To pending)"
-msgstr ""
-
 #: src/protocols/jabber/jabber.c:926
+msgid "From (To pending)"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:928
+msgid "From"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:931
+msgid "To"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:933
+msgid "None (To pending)"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:937
 msgid "Subscription"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:946
-msgid "Error"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:959 src/protocols/jabber/jutil.c:35
-#: src/protocols/jabber/presence.c:66 src/protocols/jabber/presence.c:124
-#, fuzzy
-msgid "Chatty"
-msgstr "गपशप"
-
-#: src/protocols/jabber/jabber.c:961 src/protocols/jabber/jutil.c:38
-#: src/protocols/jabber/presence.c:68 src/protocols/jabber/presence.c:129
-msgid "Extended Away"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:962 src/protocols/jabber/jutil.c:41
-#: src/protocols/jabber/presence.c:70 src/protocols/jabber/presence.c:131
-#: src/protocols/oscar/oscar.c:642 src/protocols/oscar/oscar.c:5573
-#: src/protocols/oscar/oscar.c:6759
-msgid "Do Not Disturb"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:979
+#  *< api_version
+#  *< type
+#  *< ui_requirement
+#  *< flags
+#  *< dependencies
+#  *< priority
+#  *< id
+#: src/protocols/jabber/jabber.c:975 src/protocols/jabber/jabber.c:981
+#: src/protocols/jabber/jabber.c:987 src/protocols/jabber/jabber.c:993
+#: src/protocols/jabber/jabber.c:999
+#, fuzzy
+msgid "Priority"
+msgstr "सम्पर्क प्राथमिकता"
+
+#: src/protocols/jabber/jabber.c:1021
 msgid "Password Changed"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:980
+#: src/protocols/jabber/jabber.c:1022
 msgid "Your password has been changed."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:984 src/protocols/jabber/jabber.c:985
+#: src/protocols/jabber/jabber.c:1026 src/protocols/jabber/jabber.c:1027
 #, fuzzy
 msgid "Error changing password"
 msgstr "मूल पासवर्ड "
 
-#: src/protocols/jabber/jabber.c:1041
+#: src/protocols/jabber/jabber.c:1083
 #, fuzzy
 msgid "Password (again)"
 msgstr "नया पासवर्ड (फिर से)"
 
-#: src/protocols/jabber/jabber.c:1046 src/protocols/jabber/jabber.c:1047
+#: src/protocols/jabber/jabber.c:1088 src/protocols/jabber/jabber.c:1089
 #, fuzzy
 msgid "Change Jabber Password"
 msgstr " %s: के लिए पासवर्ड बदला"
 
-#: src/protocols/jabber/jabber.c:1047
+#: src/protocols/jabber/jabber.c:1089
 #, fuzzy
 msgid "Please enter your new password"
 msgstr "कृपया अपना वर्तमान पासवर्ड भरें तथा आपका नया  पासवर्ड भरें."
 
-#: src/protocols/jabber/jabber.c:1057 src/protocols/toc/toc.c:1552
+#: src/protocols/jabber/jabber.c:1099 src/protocols/toc/toc.c:1561
 msgid "Set User Info"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1139
+#: src/protocols/jabber/jabber.c:1181
 msgid "Bad Request"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1141
+#: src/protocols/jabber/jabber.c:1183
 msgid "Conflict"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1143
+#: src/protocols/jabber/jabber.c:1185
 msgid "Feature Not Implemented"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1145
+#: src/protocols/jabber/jabber.c:1187
 msgid "Forbidden"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1147
+#: src/protocols/jabber/jabber.c:1189
 msgid "Gone"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1149 src/protocols/jabber/jabber.c:1223
+#: src/protocols/jabber/jabber.c:1191 src/protocols/jabber/jabber.c:1265
 msgid "Internal Server Error"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1151
+#: src/protocols/jabber/jabber.c:1193
 msgid "Item Not Found"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1153
+#: src/protocols/jabber/jabber.c:1195
 #, fuzzy
 msgid "Malformed Jabber ID"
 msgstr "पूर्व जेबर डेवलपर्स"
 
-#: src/protocols/jabber/jabber.c:1155
+#: src/protocols/jabber/jabber.c:1197
 msgid "Not Acceptable"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1157
+#: src/protocols/jabber/jabber.c:1199
 msgid "Not Allowed"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1161
+#: src/protocols/jabber/jabber.c:1203
 msgid "Payment Required"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1163
+#: src/protocols/jabber/jabber.c:1205
 msgid "Recipient Unavailable"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1167
+#: src/protocols/jabber/jabber.c:1209
 #, fuzzy
 msgid "Registration Required"
 msgstr "रजिस्ट्रेशन त्रुटि"
 
-#: src/protocols/jabber/jabber.c:1169
+#: src/protocols/jabber/jabber.c:1211
 msgid "Remote Server Not Found"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1171
-msgid "Remote Server Timeout"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1173
-msgid "Server Overloaded"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1175
-msgid "Service Unavailable"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1177
-msgid "Subscription Required"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1179
-msgid "Unexpected Request"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1186
-msgid "Authorization Aborted"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1188
-msgid "Incorrect encoding in authorization"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1191
-msgid "Invalid authzid"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1194
-msgid "Invalid Authorization Mechanism"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1197
-msgid "Authorization mechanism too weak"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1202
-msgid "Temporary Authentication Failure"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1204
-msgid "Authentication Failure"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1208
-msgid "Bad Format"
-msgstr ""
-
-#: src/protocols/jabber/jabber.c:1210
-msgid "Bad Namespace Prefix"
-msgstr ""
-
 #: src/protocols/jabber/jabber.c:1213
+msgid "Remote Server Timeout"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1215
+msgid "Server Overloaded"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1217
+msgid "Service Unavailable"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1219
+msgid "Subscription Required"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1221
+msgid "Unexpected Request"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1228
+msgid "Authorization Aborted"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1230
+msgid "Incorrect encoding in authorization"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1233
+msgid "Invalid authzid"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1236
+msgid "Invalid Authorization Mechanism"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1239
+msgid "Authorization mechanism too weak"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1244
+msgid "Temporary Authentication Failure"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1246
+msgid "Authentication Failure"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1250
+msgid "Bad Format"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1252
+msgid "Bad Namespace Prefix"
+msgstr ""
+
+#: src/protocols/jabber/jabber.c:1255
 msgid "Resource Conflict"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1215 src/protocols/silc/ops.c:1511
+#: src/protocols/jabber/jabber.c:1257 src/protocols/silc/ops.c:1509
 #, fuzzy
 msgid "Connection Timeout"
 msgstr "कनेक्शन में त्रुटि"
 
-#: src/protocols/jabber/jabber.c:1217
+#: src/protocols/jabber/jabber.c:1259
 msgid "Host Gone"
 msgstr ""
 
@@ -6449,35 +6487,35 @@
 # gnome-session/gsm-client-row.c:43
 # #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
 # gnome-session/gsm-client-row.c:43
-#: src/protocols/jabber/jabber.c:1219
+#: src/protocols/jabber/jabber.c:1261
 #, fuzzy
 msgid "Host Unknown"
 msgstr "अज्ञात"
 
-#: src/protocols/jabber/jabber.c:1221
+#: src/protocols/jabber/jabber.c:1263
 msgid "Improper Addressing"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1225
+#: src/protocols/jabber/jabber.c:1267
 #, fuzzy
 msgid "Invalid ID"
 msgstr "अवैध एआईएम यूआरआई"
 
-#: src/protocols/jabber/jabber.c:1227
+#: src/protocols/jabber/jabber.c:1269
 #, fuzzy
 msgid "Invalid Namespace"
 msgstr "अवैध समूह-नाम"
 
-#: src/protocols/jabber/jabber.c:1229
+#: src/protocols/jabber/jabber.c:1271
 #, fuzzy
 msgid "Invalid XML"
 msgstr "अवैध एआईएम यूआरआई"
 
-#: src/protocols/jabber/jabber.c:1231
+#: src/protocols/jabber/jabber.c:1273
 msgid "Non-matching Hosts"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1235
+#: src/protocols/jabber/jabber.c:1277
 msgid "Policy Violation"
 msgstr ""
 
@@ -6488,7 +6526,7 @@
 #  *< dependencies
 #  *< priority
 #  *< id
-#: src/protocols/jabber/jabber.c:1237
+#: src/protocols/jabber/jabber.c:1279
 #, fuzzy
 msgid "Remote Connection Failed"
 msgstr "रिमोट कंट्रोल"
@@ -6500,106 +6538,105 @@
 #  *< dependencies
 #  *< priority
 #  *< id
-#: src/protocols/jabber/jabber.c:1239
+#: src/protocols/jabber/jabber.c:1281
 #, fuzzy
 msgid "Resource Constraint"
 msgstr "रिमोट कंट्रोल"
 
-#: src/protocols/jabber/jabber.c:1241
+#: src/protocols/jabber/jabber.c:1283
 msgid "Restricted XML"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1243
+#: src/protocols/jabber/jabber.c:1285
 msgid "See Other Host"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1245
+#: src/protocols/jabber/jabber.c:1287
 msgid "System Shutdown"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1247
+#: src/protocols/jabber/jabber.c:1289
 msgid "Undefined Condition"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1249
+#: src/protocols/jabber/jabber.c:1291
 msgid "Unsupported Encoding"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1251
+#: src/protocols/jabber/jabber.c:1293
 msgid "Unsupported Stanza Type"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1253
+#: src/protocols/jabber/jabber.c:1295
 msgid "Unsupported Version"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1255
+#: src/protocols/jabber/jabber.c:1297
 msgid "XML Not Well Formed"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1257
+#: src/protocols/jabber/jabber.c:1299
 #, fuzzy
 msgid "Stream Error"
 msgstr "रजिस्ट्रेशन त्रुटि"
 
-#: src/protocols/jabber/jabber.c:1324
+#: src/protocols/jabber/jabber.c:1366
 #, fuzzy, c-format
 msgid "Unable to ban user %s"
 msgstr "फ़ाइल हस्तांतरण"
 
-#: src/protocols/jabber/jabber.c:1376
+#: src/protocols/jabber/jabber.c:1418
 #, fuzzy, c-format
 msgid "Unable to kick user %s"
 msgstr "फ़ाइल हस्तांतरण"
 
-#: src/protocols/jabber/jabber.c:1402
+#: src/protocols/jabber/jabber.c:1444
 #, fuzzy
 msgid "config:  Configure a chat room."
 msgstr "गपशप से जुड़ें"
 
-#: src/protocols/jabber/jabber.c:1406
+#: src/protocols/jabber/jabber.c:1448
 #, fuzzy
 msgid "configure:  Configure a chat room."
 msgstr "गपशप से जुड़ें"
 
-#: src/protocols/jabber/jabber.c:1415
+#: src/protocols/jabber/jabber.c:1457
 msgid "part [room]:  Leave the room."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1420
+#: src/protocols/jabber/jabber.c:1462
 msgid "register:  Register with a chat room."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1426
+#: src/protocols/jabber/jabber.c:1468
 msgid "topic [new topic]:  View or change the topic."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1432
+#: src/protocols/jabber/jabber.c:1474
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1438
+#: src/protocols/jabber/jabber.c:1480
 msgid "invite &lt;user&gt; [room]:  Invite a user to the room."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1444
+#: src/protocols/jabber/jabber.c:1486
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1450
+#: src/protocols/jabber/jabber.c:1492
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1455
+#: src/protocols/jabber/jabber.c:1497
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1470
+#: src/protocols/jabber/jabber.c:1512
 msgid "Hide Operating System"
 msgstr ""
 
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6610,24 +6647,24 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/jabber/jabber.c:1555 src/protocols/jabber/jabber.c:1557
+#: src/protocols/jabber/jabber.c:1599 src/protocols/jabber/jabber.c:1601
 msgid "Jabber Protocol Plugin"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1583
+#: src/protocols/jabber/jabber.c:1627
 msgid "Use TLS if available"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1588
+#: src/protocols/jabber/jabber.c:1632
 msgid "Force old SSL"
 msgstr ""
 
-#: src/protocols/jabber/jabber.c:1593
+#: src/protocols/jabber/jabber.c:1637
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr ""
 
 #. Account options
-#: src/protocols/jabber/jabber.c:1602 src/protocols/silc/silc.c:1582
+#: src/protocols/jabber/jabber.c:1646 src/protocols/silc/silc.c:1600
 #, fuzzy
 msgid "Connect server"
 msgstr "कनेक्शन में त्रुटि"
@@ -6665,39 +6702,50 @@
 msgid "XML Parse error"
 msgstr ""
 
-#: src/protocols/jabber/presence.c:233
+#: src/protocols/jabber/presence.c:255
 msgid "Unknown Error in presence"
 msgstr ""
 
-#: src/protocols/jabber/presence.c:236
+#: src/protocols/jabber/presence.c:258
 #, c-format
 msgid "The user %s wants to add you to their buddy list."
 msgstr ""
 
-#: src/protocols/jabber/presence.c:289 src/protocols/jabber/presence.c:290
+#: src/protocols/jabber/presence.c:264 src/protocols/msn/userlist.c:102
+#: src/protocols/oscar/oscar.c:3733 src/protocols/oscar/oscar.c:6300
+msgid "Authorize"
+msgstr ""
+
+#: src/protocols/jabber/presence.c:265 src/protocols/msn/userlist.c:103
+#: src/protocols/oscar/oscar.c:3735 src/protocols/oscar/oscar.c:6301
+#, fuzzy
+msgid "Deny"
+msgstr "देरी"
+
+#: src/protocols/jabber/presence.c:312 src/protocols/jabber/presence.c:313
 msgid "Create New Room"
 msgstr ""
 
-#: src/protocols/jabber/presence.c:291
+#: src/protocols/jabber/presence.c:314
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr ""
 
-#: src/protocols/jabber/presence.c:293
+#: src/protocols/jabber/presence.c:316
 msgid "Configure Room"
 msgstr ""
 
-#: src/protocols/jabber/presence.c:295
+#: src/protocols/jabber/presence.c:318
 msgid "Accept Defaults"
 msgstr ""
 
-#: src/protocols/jabber/presence.c:323
+#: src/protocols/jabber/presence.c:355
 #, fuzzy, c-format
 msgid "Error in chat %s"
 msgstr "गपशप से ऐसे जुड़ें"
 
-#: src/protocols/jabber/presence.c:326
+#: src/protocols/jabber/presence.c:358
 #, c-format
 msgid "Error joining chat %s"
 msgstr ""
@@ -6711,15 +6759,15 @@
 msgid "File Send Failed"
 msgstr ""
 
-#: src/protocols/msn/cmdproc.c:342
+#: src/protocols/msn/cmdproc.c:358
 msgid "Miscellaneous error"
 msgstr ""
 
-#: src/protocols/msn/cmdproc.c:345
+#: src/protocols/msn/cmdproc.c:361
 msgid "You have signed on from another location."
 msgstr ""
 
-#: src/protocols/msn/cmdproc.c:347
+#: src/protocols/msn/cmdproc.c:363
 msgid "The MSN servers are going down temporarily."
 msgstr ""
 
@@ -6769,7 +6817,7 @@
 msgid "Not on list"
 msgstr ""
 
-#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:601
+#: src/protocols/msn/error.c:70 src/protocols/zephyr/zephyr.c:681
 #, fuzzy
 msgid "User is offline"
 msgstr "बड्डी ऑफलाइन है:"
@@ -6823,7 +6871,7 @@
 msgid "Too many hits to a FND"
 msgstr ""
 
-#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:189
+#: src/protocols/msn/error.c:112 src/protocols/oscar/oscar.c:194
 msgid "Not logged in"
 msgstr ""
 
@@ -6919,8 +6967,8 @@
 msgid "Server too busy"
 msgstr ""
 
-#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2150
-#: src/protocols/silc/ops.c:1500 src/protocols/toc/toc.c:629
+#: src/protocols/msn/error.c:198 src/protocols/oscar/oscar.c:2194
+#: src/protocols/silc/ops.c:1498 src/protocols/toc/toc.c:631
 msgid "Authentication failed"
 msgstr ""
 
@@ -6955,254 +7003,248 @@
 msgid "MSN Error: %s\n"
 msgstr ""
 
-#: src/protocols/msn/msn.c:114
+#: src/protocols/msn/msn.c:116
 msgid "Your new MSN friendly name is too long."
 msgstr ""
 
-#: src/protocols/msn/msn.c:222
+#: src/protocols/msn/msn.c:224
 msgid "Set your friendly name."
 msgstr ""
 
-#: src/protocols/msn/msn.c:223
+#: src/protocols/msn/msn.c:225
 msgid "This is the name that other MSN buddies will see you as."
 msgstr ""
 
-#: src/protocols/msn/msn.c:239
+#: src/protocols/msn/msn.c:241
 msgid "Set your home phone number."
 msgstr ""
 
-#: src/protocols/msn/msn.c:254
+#: src/protocols/msn/msn.c:256
 msgid "Set your work phone number."
 msgstr ""
 
-#: src/protocols/msn/msn.c:269
+#: src/protocols/msn/msn.c:271
 msgid "Set your mobile phone number."
 msgstr ""
 
-#: src/protocols/msn/msn.c:282
+#: src/protocols/msn/msn.c:284
 msgid "Allow MSN Mobile pages?"
 msgstr ""
 
-#: src/protocols/msn/msn.c:283
+#: src/protocols/msn/msn.c:285
 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 ""
 
-#: src/protocols/msn/msn.c:287
+#: src/protocols/msn/msn.c:289
 msgid "Allow"
 msgstr ""
 
-#: src/protocols/msn/msn.c:288
+#: src/protocols/msn/msn.c:290
 msgid "Disallow"
 msgstr ""
 
-#: src/protocols/msn/msn.c:311
-msgid "Send a mobile message."
-msgstr ""
-
 #: src/protocols/msn/msn.c:313
+msgid "Send a mobile message."
+msgstr ""
+
+#: src/protocols/msn/msn.c:315
 #, fuzzy
 msgid "Page"
 msgstr "बदलें"
 
-#: src/protocols/msn/msn.c:451 src/protocols/yahoo/yahoo.c:2686
+#: src/protocols/msn/msn.c:505 src/protocols/msn/msn.c:512
+#: src/protocols/msn/msn.c:515 src/protocols/yahoo/yahoo.c:2774
 #, c-format
 msgid ""
 "\n"
 "<b>%s:</b> %s"
 msgstr ""
 
-#: src/protocols/msn/msn.c:464 src/protocols/msn/msn.c:757
-#: src/protocols/msn/state.c:34
-msgid "Away From Computer"
-msgstr ""
-
-#: src/protocols/msn/msn.c:465 src/protocols/msn/msn.c:759
-#: src/protocols/msn/state.c:33 src/protocols/yahoo/yahoo.c:2543
-#: src/protocols/yahoo/yahoo.c:2910 src/protocols/yahoo/yahoo.c:3026
+#: src/protocols/msn/msn.c:512
+msgid "Has you"
+msgstr ""
+
+#: src/protocols/msn/msn.c:515
+#, fuzzy
+msgid "Blocked"
+msgstr "पीछे"
+
+#: src/protocols/msn/msn.c:546 src/protocols/msn/state.c:33
+#: src/protocols/yahoo/yahoo.c:2631 src/protocols/yahoo/yahoo.c:3139
 msgid "Be Right Back"
 msgstr ""
 
-#: src/protocols/msn/msn.c:466 src/protocols/msn/msn.c:761
-#: src/protocols/msn/state.c:31 src/protocols/novell/novell.c:2801
-#: src/protocols/novell/novell.c:2916 src/protocols/novell/novell.c:2970
-#: src/protocols/silc/buddy.c:1383 src/protocols/silc/silc.c:47
-#: src/protocols/silc/silc.c:78 src/protocols/yahoo/yahoo.c:2545
-#: src/protocols/yahoo/yahoo.c:2912 src/protocols/yahoo/yahoo.c:3027
+#: src/protocols/msn/msn.c:550 src/protocols/msn/state.c:31
+#: src/protocols/novell/novell.c:2814 src/protocols/novell/novell.c:2929
+#: src/protocols/novell/novell.c:2983 src/protocols/silc/buddy.c:1388
+#: src/protocols/silc/silc.c:54 src/protocols/yahoo/yahoo.c:2633
+#: src/protocols/yahoo/yahoo.c:3142
 msgid "Busy"
 msgstr ""
 
-#: src/protocols/msn/msn.c:467 src/protocols/msn/msn.c:763
-#: src/protocols/msn/state.c:35 src/protocols/yahoo/yahoo.c:2553
-#: src/protocols/yahoo/yahoo.c:2920 src/protocols/yahoo/yahoo.c:3031
+#: src/protocols/msn/msn.c:554 src/protocols/msn/state.c:35
+#: src/protocols/yahoo/yahoo.c:2641 src/protocols/yahoo/yahoo.c:3154
 msgid "On The Phone"
 msgstr ""
 
-#: src/protocols/msn/msn.c:468 src/protocols/msn/msn.c:765
-#: src/protocols/msn/state.c:36 src/protocols/yahoo/yahoo.c:2557
-#: src/protocols/yahoo/yahoo.c:2924 src/protocols/yahoo/yahoo.c:3033
+#: src/protocols/msn/msn.c:558 src/protocols/msn/state.c:36
+#: src/protocols/yahoo/yahoo.c:2645 src/protocols/yahoo/yahoo.c:3160
 msgid "Out To Lunch"
 msgstr ""
 
-#: src/protocols/msn/msn.c:469 src/protocols/msn/msn.c:767
-#: src/protocols/zephyr/zephyr.c:1360 src/protocols/zephyr/zephyr.c:1379
+#: src/protocols/msn/msn.c:562 src/protocols/zephyr/zephyr.c:2221
 msgid "Hidden"
 msgstr ""
 
-#: src/protocols/msn/msn.c:480
+#: src/protocols/msn/msn.c:574
 msgid "Set Friendly Name"
 msgstr ""
 
-#: src/protocols/msn/msn.c:485
+#: src/protocols/msn/msn.c:579
 msgid "Set Home Phone Number"
 msgstr ""
 
-#: src/protocols/msn/msn.c:489
+#: src/protocols/msn/msn.c:583
 msgid "Set Work Phone Number"
 msgstr ""
 
-#: src/protocols/msn/msn.c:493
+#: src/protocols/msn/msn.c:587
 msgid "Set Mobile Phone Number"
 msgstr ""
 
-#: src/protocols/msn/msn.c:499
+#: src/protocols/msn/msn.c:593
 msgid "Enable/Disable Mobile Devices"
 msgstr ""
 
-#: src/protocols/msn/msn.c:504
+#: src/protocols/msn/msn.c:598
 msgid "Allow/Disallow Mobile Pages"
 msgstr ""
 
-#: src/protocols/msn/msn.c:527
+#: src/protocols/msn/msn.c:621
 msgid "Send to Mobile"
 msgstr ""
 
-#: src/protocols/msn/msn.c:537
+#: src/protocols/msn/msn.c:631
 msgid "Initiate Chat"
 msgstr ""
 
-#: src/protocols/msn/msn.c:541
-#, fuzzy
-msgid "Update Buddy Icon"
-msgstr "बड्डी टिकर"
-
-#: src/protocols/msn/msn.c:578
+#: src/protocols/msn/msn.c:667
 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 ""
 
-#: src/protocols/msn/msn.c:1168 src/protocols/yahoo/yahoo_profile.c:659
-#: src/protocols/zephyr/zephyr.c:634
+#: src/protocols/msn/msn.c:1339 src/protocols/yahoo/yahoo_profile.c:659
+#: src/protocols/zephyr/zephyr.c:712 src/protocols/zephyr/zephyr.c:1126
 #, c-format
 msgid "<b>Alias:</b> %s<br>"
 msgstr ""
 
 #. put a link to the actual profile URL
-#: src/protocols/msn/msn.c:1173 src/protocols/msn/msn.c:1513
-#: src/protocols/yahoo/yahoo_profile.c:1168 src/util.c:782
+#: src/protocols/msn/msn.c:1346 src/protocols/msn/msn.c:1702
+#: src/protocols/yahoo/yahoo_profile.c:1170 src/util.c:782
 #, c-format
 msgid "<b>%s:</b> "
 msgstr ""
 
-#: src/protocols/msn/msn.c:1243
+#: src/protocols/msn/msn.c:1432
 msgid "MSN Profile"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1248 src/protocols/msn/msn.c:1500
-#: src/protocols/yahoo/yahoo_profile.c:761
+#: src/protocols/msn/msn.c:1437 src/protocols/msn/msn.c:1689
+#: src/protocols/yahoo/yahoo_profile.c:763
 msgid "Error retrieving profile"
 msgstr ""
 
 #. Age
-#: src/protocols/msn/msn.c:1319 src/protocols/oscar/oscar.c:5007
-#: src/protocols/trepia/trepia.c:285 src/protocols/trepia/trepia.c:404
-#: src/protocols/yahoo/yahoo_profile.c:1015
+#: src/protocols/msn/msn.c:1508 src/protocols/oscar/oscar.c:5078
+#: src/protocols/trepia/trepia.c:286 src/protocols/trepia/trepia.c:405
+#: src/protocols/yahoo/yahoo_profile.c:1017
 msgid "Age"
 msgstr ""
 
 #. Gender
-#: src/protocols/msn/msn.c:1326 src/protocols/oscar/oscar.c:4993
-#: src/protocols/trepia/trepia.c:279 src/protocols/trepia/trepia.c:406
-#: src/protocols/yahoo/yahoo_profile.c:1025
+#: src/protocols/msn/msn.c:1515 src/protocols/oscar/oscar.c:5065
+#: src/protocols/trepia/trepia.c:280 src/protocols/trepia/trepia.c:407
+#: src/protocols/yahoo/yahoo_profile.c:1027
 msgid "Gender"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1335 src/protocols/yahoo/yahoo_profile.c:1020
+#: src/protocols/msn/msn.c:1524 src/protocols/yahoo/yahoo_profile.c:1022
 msgid "Marital Status"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1342 src/protocols/novell/novell.c:1444
-#: src/protocols/yahoo/yahoo_profile.c:1010
+#: src/protocols/msn/msn.c:1531 src/protocols/novell/novell.c:1454
+#: src/protocols/yahoo/yahoo_profile.c:1012
 msgid "Location"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1350 src/protocols/yahoo/yahoo_profile.c:1030
+#: src/protocols/msn/msn.c:1539 src/protocols/yahoo/yahoo_profile.c:1032
 msgid "Occupation"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1367 src/protocols/msn/msn.c:1373
-#: src/protocols/msn/msn.c:1380 src/protocols/msn/msn.c:1388
-#: src/protocols/msn/msn.c:1395
+#: src/protocols/msn/msn.c:1556 src/protocols/msn/msn.c:1562
+#: src/protocols/msn/msn.c:1569 src/protocols/msn/msn.c:1577
+#: src/protocols/msn/msn.c:1584
 msgid "A Little About Me"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1404 src/protocols/msn/msn.c:1410
-#: src/protocols/msn/msn.c:1417 src/protocols/msn/msn.c:1424
+#: src/protocols/msn/msn.c:1593 src/protocols/msn/msn.c:1599
+#: src/protocols/msn/msn.c:1606 src/protocols/msn/msn.c:1613
 msgid "Favorite Things"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1433 src/protocols/msn/msn.c:1439
-#: src/protocols/msn/msn.c:1446
+#: src/protocols/msn/msn.c:1622 src/protocols/msn/msn.c:1628
+#: src/protocols/msn/msn.c:1635
 msgid "Hobbies and Interests"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1455 src/protocols/msn/msn.c:1461
-#: src/protocols/yahoo/yahoo_profile.c:1072
+#: src/protocols/msn/msn.c:1644 src/protocols/msn/msn.c:1650
+#: src/protocols/yahoo/yahoo_profile.c:1074
 msgid "Favorite Quote"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1469 src/protocols/yahoo/yahoo_profile.c:1123
+#: src/protocols/msn/msn.c:1658 src/protocols/yahoo/yahoo_profile.c:1125
 msgid "Last Updated"
 msgstr ""
 
 #. Homepage
-#: src/protocols/msn/msn.c:1480 src/protocols/silc/ops.c:844
-#: src/protocols/trepia/trepia.c:289 src/protocols/trepia/trepia.c:419
+#: src/protocols/msn/msn.c:1669 src/protocols/silc/ops.c:846
+#: src/protocols/trepia/trepia.c:290 src/protocols/trepia/trepia.c:420
 msgid "Homepage"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1502
+#: src/protocols/msn/msn.c:1691
 msgid "The user has not created a public profile."
 msgstr ""
 
-#: src/protocols/msn/msn.c:1503
+#: src/protocols/msn/msn.c:1692
 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 ""
 
-#: src/protocols/msn/msn.c:1507
+#: src/protocols/msn/msn.c:1696
 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:1513 src/protocols/yahoo/yahoo_profile.c:1168
+#: src/protocols/msn/msn.c:1702 src/protocols/yahoo/yahoo_profile.c:1170
 msgid "Profile URL"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1645
+#: src/protocols/msn/msn.c:1843
 msgid "Display conversation closed notices"
 msgstr ""
 
-#: src/protocols/msn/msn.c:1650
+#: src/protocols/msn/msn.c:1848
 msgid "Display timeout notices"
 msgstr ""
 
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7213,17 +7255,17 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/msn/msn.c:1735 src/protocols/msn/msn.c:1737
+#: src/protocols/msn/msn.c:1935 src/protocols/msn/msn.c:1937
 #, fuzzy
 msgid "MSN Protocol Plugin"
 msgstr "%s हेतु प्रोटोकाल प्लगइन नहीं है."
 
-#: src/protocols/msn/msn.c:1756 src/protocols/trepia/trepia.c:1293
+#: src/protocols/msn/msn.c:1956 src/protocols/trepia/trepia.c:1298
 #, fuzzy
 msgid "Login server"
 msgstr "डाक सर्वर"
 
-#: src/protocols/msn/msn.c:1765
+#: src/protocols/msn/msn.c:1965
 msgid "Use HTTP Method"
 msgstr ""
 
@@ -7231,24 +7273,31 @@
 msgid "Unable to connect to server"
 msgstr ""
 
-#: src/protocols/msn/nexus.c:215
+#: src/protocols/msn/nexus.c:218
 msgid "Unknown error when attempting to authorize with MSN login server."
 msgstr ""
 
-#: src/protocols/msn/notification.c:84
+#: src/protocols/msn/notification.c:85
 msgid "Requesting to send password"
 msgstr ""
 
-#: src/protocols/msn/notification.c:118 src/protocols/trepia/trepia.c:635
+#: src/protocols/msn/notification.c:119 src/protocols/trepia/trepia.c:636
 msgid "Retrieving buddy list"
 msgstr ""
 
-#: src/protocols/msn/notification.c:144 src/protocols/msn/notification.c:173
-#: src/protocols/oscar/oscar.c:2440
+#: src/protocols/msn/notification.c:145 src/protocols/msn/notification.c:174
+#: src/protocols/oscar/oscar.c:2483
 msgid "Password sent"
 msgstr ""
 
-#: src/protocols/msn/notification.c:1079
+#: src/protocols/msn/notification.c:732
+#, c-format
+msgid ""
+"Your MSN buddy list for %s is temporarily unavailable. Please wait and try "
+"again."
+msgstr ""
+
+#: src/protocols/msn/notification.c:1128
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7267,21 +7316,17 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/protocols/msn/notification.c:1144
-msgid "Syncing with server"
-msgstr ""
-
-#: src/protocols/msn/servconn.c:46
+#: src/protocols/msn/servconn.c:93
 #, c-format
 msgid "Unable to connect to %s server"
 msgstr ""
 
-#: src/protocols/msn/servconn.c:50
+#: src/protocols/msn/servconn.c:97
 #, fuzzy, c-format
 msgid "Error writing to %s server"
 msgstr "गपशप से ऐसे जुड़ें"
 
-#: src/protocols/msn/servconn.c:54
+#: src/protocols/msn/servconn.c:101
 #, c-format
 msgid "Error reading from %s server"
 msgstr ""
@@ -7290,87 +7335,108 @@
 # gnome-session/gsm-client-row.c:43
 # #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
 # gnome-session/gsm-client-row.c:43
-#: src/protocols/msn/servconn.c:58
+#: src/protocols/msn/servconn.c:105
 #, fuzzy, c-format
 msgid "Unknown error from %s server"
 msgstr "अज्ञात"
 
-#: src/protocols/msn/servconn.c:72
-#, c-format
-msgid "MSN error for account %s"
-msgstr ""
-
-#: src/protocols/msn/servconn.c:346
+#: src/protocols/msn/servconn.c:334
 msgid "Received HTTP error. Please report this."
 msgstr ""
 
-#: src/protocols/msn/switchboard.c:172
+#: src/protocols/msn/state.c:34
+msgid "Away From Computer"
+msgstr ""
+
+#: src/protocols/msn/switchboard.c:197
 msgid "The conversation has become inactive and timed out."
 msgstr ""
 
 #  Remove on type button
-#: src/protocols/msn/switchboard.c:180
+#: src/protocols/msn/switchboard.c:216
 #, fuzzy, c-format
 msgid "%s has closed the conversation window."
 msgstr "वार्तालाप विंडो में टाइप कर रहे  हों तो हटाएँ (_t)"
 
+#: src/protocols/msn/switchboard.c:485
+msgid "Message could not be sent, not allowed while invisible"
+msgstr ""
+
+#: src/protocols/msn/switchboard.c:488
+msgid "Message could not be sent because the user is offline"
+msgstr ""
+
+#: src/protocols/msn/switchboard.c:491
+msgid "Message could not be sent because a connection error occured"
+msgstr ""
+
+#: src/protocols/msn/switchboard.c:494
+msgid "Message could not be sent for an unknown reason"
+msgstr ""
+
+#: src/protocols/msn/switchboard.c:499
+#, c-format
+msgid ""
+"%s:\n"
+"%s"
+msgstr ""
+
 #: src/protocols/msn/userlist.c:86
 #, c-format
 msgid "The user %s (%s) wants to add %s to his or her buddy list."
 msgstr ""
 
-#: src/protocols/msn/userlist.c:94
+#: src/protocols/msn/userlist.c:95
 #, c-format
 msgid "The user %s wants to add %s to his or her buddy list."
 msgstr ""
 
-#: src/protocols/napster/napster.c:229
+#: src/protocols/napster/napster.c:241
 msgid "Unable to read header from server"
 msgstr ""
 
-#: src/protocols/napster/napster.c:243
+#: src/protocols/napster/napster.c:255
 #, c-format
 msgid "Unable to read message from server: %s.  Command is %hd, length is %hd."
 msgstr ""
 
-#: src/protocols/napster/napster.c:306
+#: src/protocols/napster/napster.c:318
 #, c-format
 msgid "users: %s, files: %s, size: %sGB"
 msgstr ""
 
 #. MSG_SERVER_HOTLIST_ERROR
-#: src/protocols/napster/napster.c:317
+#: src/protocols/napster/napster.c:329
 #, c-format
 msgid "Unable to add \"%s\" to your Napster hotlist"
 msgstr ""
 
-#: src/protocols/napster/napster.c:325
+#: src/protocols/napster/napster.c:337
 msgid "You were disconnected from the server."
 msgstr ""
 
 #. MSG_CLIENT_WHOIS
-#: src/protocols/napster/napster.c:383
+#: src/protocols/napster/napster.c:395
 #, c-format
 msgid "%s requested your information"
 msgstr ""
 
-#: src/protocols/napster/napster.c:421
+#: 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:427
+#: src/protocols/napster/napster.c:439
 #, c-format
 msgid "%s requested a PING"
 msgstr ""
 
-#: src/protocols/napster/napster.c:540 src/protocols/toc/toc.c:1266
+#: src/protocols/napster/napster.c:573 src/protocols/toc/toc.c:1275
 msgid "_Group:"
 msgstr ""
 
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7381,7 +7447,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/napster/napster.c:636 src/protocols/napster/napster.c:638
+#: src/protocols/napster/napster.c:671 src/protocols/napster/napster.c:673
 msgid "NAPSTER Protocol Plugin"
 msgstr ""
 
@@ -7521,117 +7587,117 @@
 msgid "Unknown error: 0x%X"
 msgstr "अज्ञात"
 
-#: src/protocols/novell/novell.c:116
+#: src/protocols/novell/novell.c:117
 #, c-format
 msgid "Login failed (%s)."
 msgstr ""
 
-#: src/protocols/novell/novell.c:229
+#: src/protocols/novell/novell.c:232
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr ""
 
-#: src/protocols/novell/novell.c:378
+#: src/protocols/novell/novell.c:381
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr ""
 
 #. TODO: Improve this! message to who or for what conference?
-#: src/protocols/novell/novell.c:404
+#: src/protocols/novell/novell.c:407
 #, fuzzy, c-format
 msgid "Unable to send message (%s)."
 msgstr "दूर संदेश मिटाएँ"
 
-#: src/protocols/novell/novell.c:475 src/protocols/novell/novell.c:969
+#: src/protocols/novell/novell.c:478 src/protocols/novell/novell.c:972
 #, fuzzy, c-format
 msgid "Unable to invite user (%s)."
 msgstr "फ़ाइल हस्तांतरण"
 
-#: src/protocols/novell/novell.c:514
+#: src/protocols/novell/novell.c:517
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr ""
 
-#: src/protocols/novell/novell.c:519
+#: src/protocols/novell/novell.c:522
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr ""
 
-#: src/protocols/novell/novell.c:566
+#: src/protocols/novell/novell.c:569
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
 "creating folder (%s)."
 msgstr ""
 
-#: src/protocols/novell/novell.c:614
+#: src/protocols/novell/novell.c:617
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
 "list (%s)."
 msgstr ""
 
-#: src/protocols/novell/novell.c:687
+#: src/protocols/novell/novell.c:690
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr ""
 
-#: src/protocols/novell/novell.c:733 src/protocols/novell/novell.c:879
+#: src/protocols/novell/novell.c:736 src/protocols/novell/novell.c:882
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr ""
 
-#: src/protocols/novell/novell.c:780
+#: src/protocols/novell/novell.c:783
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr ""
 
-#: src/protocols/novell/novell.c:833
+#: src/protocols/novell/novell.c:836
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr ""
 
-#: src/protocols/novell/novell.c:901
+#: src/protocols/novell/novell.c:904
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr ""
 
-#: src/protocols/novell/novell.c:924 src/protocols/novell/novell.c:1619
+#: src/protocols/novell/novell.c:927 src/protocols/novell/novell.c:1629
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr ""
 
-#: src/protocols/novell/novell.c:996
+#: src/protocols/novell/novell.c:999
 #, fuzzy, c-format
 msgid "Unable to create conference (%s)."
 msgstr "फ़ाइल हस्तांतरण"
 
-#: src/protocols/novell/novell.c:1107 src/protocols/novell/novell.c:1658
+#: src/protocols/novell/novell.c:1110 src/protocols/novell/novell.c:1668
 msgid "Error communicating with server. Closing connection."
 msgstr ""
 
-#: src/protocols/novell/novell.c:1442
-msgid "Telephone Number"
-msgstr ""
-
-#: src/protocols/novell/novell.c:1446
-msgid "Department"
-msgstr ""
-
-#: src/protocols/novell/novell.c:1448
-msgid "Personal Title"
-msgstr ""
-
 #: src/protocols/novell/novell.c:1452
+msgid "Telephone Number"
+msgstr ""
+
+#: src/protocols/novell/novell.c:1456
+msgid "Department"
+msgstr ""
+
+#: src/protocols/novell/novell.c:1458
+msgid "Personal Title"
+msgstr ""
+
+#: src/protocols/novell/novell.c:1462
 msgid "Mailstop"
 msgstr ""
 
-#: src/protocols/novell/novell.c:1454 src/protocols/oscar/oscar.c:4980
-#: src/protocols/oscar/oscar.c:4987
+#: src/protocols/novell/novell.c:1464 src/protocols/oscar/oscar.c:5051
+#: src/protocols/oscar/oscar.c:5058
 msgid "Email Address"
 msgstr ""
 
-#: src/protocols/novell/novell.c:1470
+#: src/protocols/novell/novell.c:1480
 msgid "User ID"
 msgstr ""
 
@@ -7642,49 +7708,49 @@
 #. tag, value);
 #. }
 #.
-#: src/protocols/novell/novell.c:1484
+#: src/protocols/novell/novell.c:1494
 msgid "Full name"
 msgstr ""
 
-#: src/protocols/novell/novell.c:1505
+#: src/protocols/novell/novell.c:1515
 msgid "User Properties"
 msgstr ""
 
-#: src/protocols/novell/novell.c:1609
+#: src/protocols/novell/novell.c:1619
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr ""
 
-#: src/protocols/novell/novell.c:1634
+#: src/protocols/novell/novell.c:1644
 msgid "Unable to make SSL connection to server."
 msgstr ""
 
-#: src/protocols/novell/novell.c:1664
+#: src/protocols/novell/novell.c:1674
 #, c-format
 msgid "Error processing event or response (%s)."
 msgstr ""
 
-#: src/protocols/novell/novell.c:1698
+#: src/protocols/novell/novell.c:1708
 msgid "Authenticating..."
 msgstr ""
 
-#: src/protocols/novell/novell.c:1713
+#: src/protocols/novell/novell.c:1723
 msgid "Waiting for response..."
 msgstr ""
 
 #  Remove on type button
-#: src/protocols/novell/novell.c:1848
+#: src/protocols/novell/novell.c:1858
 #, fuzzy, c-format
 msgid "%s has been invited to this conversation."
 msgstr "वार्तालाप विंडो में टाइप कर रहे  हों तो हटाएँ (_t)"
 
 #  Conversations
-#: src/protocols/novell/novell.c:1875
+#: src/protocols/novell/novell.c:1885
 #, fuzzy
 msgid "Invitation to Conversation"
 msgstr "वार्तालाप"
 
-#: src/protocols/novell/novell.c:1876
+#: src/protocols/novell/novell.c:1886
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -7692,15 +7758,15 @@
 "Sent: %s"
 msgstr ""
 
-#: src/protocols/novell/novell.c:1878
+#: src/protocols/novell/novell.c:1888
 msgid "Would you like to join the conversation?"
 msgstr ""
 
-#: src/protocols/novell/novell.c:1983
+#: src/protocols/novell/novell.c:1994
 msgid "You have been logged out because you logged in at another workstation."
 msgstr ""
 
-#: src/protocols/novell/novell.c:2037
+#: src/protocols/novell/novell.c:2050
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -7710,39 +7776,28 @@
 #. *  gaim_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: src/protocols/novell/novell.c:2135
+#: src/protocols/novell/novell.c:2148
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 msgstr ""
 
-#: src/protocols/novell/novell.c:2157
+#: src/protocols/novell/novell.c:2170
 msgid "Error. SSL support is not installed."
 msgstr ""
 
-#: src/protocols/novell/novell.c:2461
+#: src/protocols/novell/novell.c:2474
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
 
-#: src/protocols/novell/novell.c:2807 src/protocols/oscar/oscar.c:702
-#: src/protocols/oscar/oscar.c:6568 src/protocols/yahoo/yahoo.c:2565
-msgid "Offline"
-msgstr ""
-
-#: src/protocols/novell/novell.c:2818
-#, fuzzy
-msgid "Message"
-msgstr "नया संदेश..."
-
-#: src/protocols/novell/novell.c:2917 src/protocols/novell/novell.c:2973
+#: src/protocols/novell/novell.c:2930 src/protocols/novell/novell.c:2986
 msgid "Appear Offline"
 msgstr ""
 
-#: src/protocols/novell/novell.c:3367
+#: src/protocols/novell/novell.c:3380
 msgid "Initiate _Chat"
 msgstr ""
 
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7753,253 +7808,246 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/novell/novell.c:3464 src/protocols/novell/novell.c:3466
+#: src/protocols/novell/novell.c:3479 src/protocols/novell/novell.c:3481
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr ""
 
-#: src/protocols/novell/novell.c:3485
+#: src/protocols/novell/novell.c:3500
 msgid "Server address"
 msgstr ""
 
-#: src/protocols/novell/novell.c:3489
+#: src/protocols/novell/novell.c:3504
 msgid "Server port"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:185
+#: src/protocols/oscar/oscar.c:190
 #, fuzzy
 msgid "Invalid error"
 msgstr "अवैध समूह-नाम"
 
-#: src/protocols/oscar/oscar.c:186
+#: src/protocols/oscar/oscar.c:191
 #, fuzzy
 msgid "Invalid SNAC"
 msgstr "अवैध एआईएम यूआरआई"
 
-#: src/protocols/oscar/oscar.c:187
+#: src/protocols/oscar/oscar.c:192
 msgid "Rate to host"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:188
-msgid "Rate to client"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:190
-msgid "Service unavailable"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:191
-msgid "Service not defined"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:192
-msgid "Obsolete SNAC"
-msgstr ""
-
 #: src/protocols/oscar/oscar.c:193
-msgid "Not supported by host"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:194
-msgid "Not supported by client"
+msgid "Rate to client"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:195
-msgid "Refused by client"
+msgid "Service unavailable"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:196
-msgid "Reply too big"
+msgid "Service not defined"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:197
-msgid "Responses lost"
+msgid "Obsolete SNAC"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:198
-msgid "Request denied"
+msgid "Not supported by host"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:199
-msgid "Busted SNAC payload"
+msgid "Not supported by client"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:200
-msgid "Insufficient rights"
+msgid "Refused by client"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:201
-msgid "In local permit/deny"
+msgid "Reply too big"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:202
-msgid "Too evil (sender)"
+msgid "Responses lost"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:203
-msgid "Too evil (receiver)"
+msgid "Request denied"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:204
-msgid "User temporarily unavailable"
+msgid "Busted SNAC payload"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:205
-msgid "No match"
+msgid "Insufficient rights"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:206
-msgid "List overflow"
+msgid "In local permit/deny"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:207
-msgid "Request ambiguous"
+msgid "Too evil (sender)"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:208
-msgid "Queue full"
+msgid "Too evil (receiver)"
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:209
+msgid "User temporarily unavailable"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:210
+msgid "No match"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:211
+msgid "List overflow"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:212
+msgid "Request ambiguous"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:213
+msgid "Queue full"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:214
 msgid "Not while on AOL"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:400
-msgid ""
-"(There was an error converting this message.  The buddy you are speaking to "
+#: src/protocols/oscar/oscar.c:401 src/protocols/oscar/oscar.c:484
+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:452
-msgid "(There was an error receiving this message)"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:557
+#: src/protocols/oscar/oscar.c:586
 msgid "Voice"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:560
+#: src/protocols/oscar/oscar.c:589
 msgid "AIM Direct IM"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:563 src/protocols/silc/silc.c:641
+#: src/protocols/oscar/oscar.c:592 src/protocols/silc/silc.c:660
 #: src/protocols/silc/util.c:506
 #, fuzzy
 msgid "Chat"
 msgstr "गपशप"
 
-#: src/protocols/oscar/oscar.c:566 src/protocols/oscar/oscar.c:6870
+#: src/protocols/oscar/oscar.c:595 src/protocols/oscar/oscar.c:7017
 msgid "Get File"
 msgstr ""
 
 #  *  DEFINES, MACROS & DATA TYPES
-#: src/protocols/oscar/oscar.c:573
+#: src/protocols/oscar/oscar.c:602
 #, fuzzy
 msgid "Games"
 msgstr "गेम"
 
-#: src/protocols/oscar/oscar.c:576
+#: src/protocols/oscar/oscar.c:605
 msgid "Add-Ins"
 msgstr ""
 
 #  Buddy List
-#: src/protocols/oscar/oscar.c:579
+#: src/protocols/oscar/oscar.c:608
 #, fuzzy
 msgid "Send Buddy List"
 msgstr "बड्डी सूची"
 
-#: src/protocols/oscar/oscar.c:582
+#: src/protocols/oscar/oscar.c:611
 msgid "ICQ Direct Connect"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:585
+#: src/protocols/oscar/oscar.c:614
 msgid "AP User"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:588
+#: src/protocols/oscar/oscar.c:617
 msgid "ICQ RTF"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:591
+#: src/protocols/oscar/oscar.c:620
 msgid "Nihilist"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:594
+#: src/protocols/oscar/oscar.c:623
 msgid "ICQ Server Relay"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:597
+#: src/protocols/oscar/oscar.c:626
 msgid "Old ICQ UTF8"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:600
+#: src/protocols/oscar/oscar.c:629
 msgid "Trillian Encryption"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:603
+#: src/protocols/oscar/oscar.c:632
 msgid "ICQ UTF8"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:606
+#: src/protocols/oscar/oscar.c:635
 #, fuzzy
 msgid "Hiptop"
 msgstr "इतिहास"
 
-#: src/protocols/oscar/oscar.c:609
+#: src/protocols/oscar/oscar.c:638
 msgid "Security Enabled"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:612
+#: src/protocols/oscar/oscar.c:641
 #, fuzzy
 msgid "Video Chat"
 msgstr "गपशप से जुड़ें"
 
-#: src/protocols/oscar/oscar.c:616
+#: src/protocols/oscar/oscar.c:645
 #, fuzzy
 msgid "iChat AV"
 msgstr "गपशप से ऐसे जुड़ें"
 
-#: src/protocols/oscar/oscar.c:619
+#: src/protocols/oscar/oscar.c:648
 msgid "Live Video"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:622
+#: src/protocols/oscar/oscar.c:651
 msgid "Camera"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:640 src/protocols/oscar/oscar.c:5582
-#: src/protocols/oscar/oscar.c:6762
+#: src/protocols/oscar/oscar.c:669 src/protocols/oscar/oscar.c:6900
 msgid "Free For Chat"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:644 src/protocols/oscar/oscar.c:5576
-#: src/protocols/oscar/oscar.c:6760
+#: src/protocols/oscar/oscar.c:673 src/protocols/oscar/oscar.c:6915
 msgid "Not Available"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:646 src/protocols/oscar/oscar.c:5579
-#: src/protocols/oscar/oscar.c:6761
+#: src/protocols/oscar/oscar.c:675 src/protocols/oscar/oscar.c:6905
 msgid "Occupied"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:650
+#: src/protocols/oscar/oscar.c:679
 msgid "Web Aware"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:718
+#: src/protocols/oscar/oscar.c:755
 msgid "Capabilities"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:727
+#: src/protocols/oscar/oscar.c:764
 #, fuzzy
 msgid "Buddy Comment"
 msgstr "बड्डी गपशप"
 
-#: src/protocols/oscar/oscar.c:862
+#: src/protocols/oscar/oscar.c:899
 #, c-format
 msgid "Direct IM with %s closed"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:864
+#: src/protocols/oscar/oscar.c:901
 #, c-format
 msgid "Direct IM with %s failed"
 msgstr ""
@@ -8011,61 +8059,61 @@
 #  *< dependencies
 #  *< priority
 #  *< id
-#: src/protocols/oscar/oscar.c:871
+#: src/protocols/oscar/oscar.c:909
 #, fuzzy
 msgid "Direct Connect failed"
 msgstr "रिमोट कंट्रोल"
 
-#: src/protocols/oscar/oscar.c:948 src/protocols/oscar/oscar.c:1079
+#: src/protocols/oscar/oscar.c:986 src/protocols/oscar/oscar.c:1117
 #, c-format
 msgid "Direct IM with %s established"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1029
+#: src/protocols/oscar/oscar.c:1067
 #, c-format
 msgid "Attempting to connect to %s at %s:%hu for Direct IM."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1446
+#: src/protocols/oscar/oscar.c:1485
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1451
-msgid "Unable to open Direct IM"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:1486
-#, c-format
-msgid "You have selected to open a Direct IM connection with %s."
-msgstr ""
-
 #: src/protocols/oscar/oscar.c:1490
+msgid "Unable to open Direct IM"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1525
+#, c-format
+msgid "You have selected to open a Direct IM connection with %s."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:1529
 msgid ""
 "Because this reveals your IP address, it may be considered a privacy risk.  "
 "Do you wish to continue?"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1494 src/protocols/oscar/oscar.c:3431
+#: src/protocols/oscar/oscar.c:1533 src/protocols/oscar/oscar.c:3490
 #, fuzzy
 msgid "Connect"
 msgstr "कनेक्शन में त्रुटि"
 
-#: src/protocols/oscar/oscar.c:1561 src/protocols/toc/toc.c:872
+#: src/protocols/oscar/oscar.c:1600 src/protocols/toc/toc.c:881
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1580
+#: src/protocols/oscar/oscar.c:1619
 msgid "Chat is currently unavailable"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1661
+#: src/protocols/oscar/oscar.c:1700
 #, fuzzy
 msgid "Screen name sent"
 msgstr "कोई स्क्रीन-नाम नहीं दिया है."
 
-#: src/protocols/oscar/oscar.c:1675
+#: src/protocols/oscar/oscar.c:1714
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -8073,140 +8121,140 @@
 "letters, numbers and spaces, or contain only numbers."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1703
+#: src/protocols/oscar/oscar.c:1745
 msgid "Unable to login to AIM"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1804 src/protocols/oscar/oscar.c:2243
+#: src/protocols/oscar/oscar.c:1848 src/protocols/oscar/oscar.c:2286
 msgid "Could Not Connect"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1812
+#: src/protocols/oscar/oscar.c:1856
 msgid "Connection established, cookie sent"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1925 src/protocols/yahoo/yahoo_filexfer.c:180
+#: src/protocols/oscar/oscar.c:1969 src/protocols/yahoo/yahoo_filexfer.c:180
 #: src/protocols/yahoo/yahoo_filexfer.c:189
 #: src/protocols/yahoo/yahoo_filexfer.c:199
 msgid "Unable to establish file descriptor."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:1930
+#: src/protocols/oscar/oscar.c:1974
 msgid "Unable to create new connection."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2002
+#: src/protocols/oscar/oscar.c:2046
 msgid "Unable to establish listener socket."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2127 src/protocols/toc/toc.c:540
+#: src/protocols/oscar/oscar.c:2171 src/protocols/toc/toc.c:542
 msgid "Incorrect nickname or password."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2132
+#: src/protocols/oscar/oscar.c:2176
 msgid "Your account is currently suspended."
 msgstr ""
 
 #. service temporarily unavailable
-#: src/protocols/oscar/oscar.c:2136
+#: src/protocols/oscar/oscar.c:2180
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2141
+#: src/protocols/oscar/oscar.c:2185
 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:2146
+#: src/protocols/oscar/oscar.c:2190
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2178
+#: src/protocols/oscar/oscar.c:2221
 #, fuzzy
 msgid "Internal Error"
 msgstr "कनेक्शन में त्रुटि"
 
-#: src/protocols/oscar/oscar.c:2250
+#: src/protocols/oscar/oscar.c:2293
 msgid "Received authorization"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2286 src/protocols/oscar/oscar.c:2316
-#: src/protocols/oscar/oscar.c:2405
+#: src/protocols/oscar/oscar.c:2329 src/protocols/oscar/oscar.c:2359
+#: src/protocols/oscar/oscar.c:2448
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
 "fixed.  Check %s for updates."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2289 src/protocols/oscar/oscar.c:2319
+#: src/protocols/oscar/oscar.c:2332 src/protocols/oscar/oscar.c:2362
 msgid "Gaim was unable to get a valid AIM login hash."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:2408
+#: src/protocols/oscar/oscar.c:2451
 msgid "Gaim was unable to get a valid login hash."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3423
+#: src/protocols/oscar/oscar.c:3481
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3426
+#: src/protocols/oscar/oscar.c:3484
 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/oscar/oscar.c:3462
+#: src/protocols/oscar/oscar.c:3523
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3470
+#: src/protocols/oscar/oscar.c:3531
 msgid "Authorization Request Message:"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3471
+#: src/protocols/oscar/oscar.c:3532
 msgid "Please authorize me!"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3501
+#: src/protocols/oscar/oscar.c:3562
 #, c-format
 msgid ""
 "The user %s requires authorization before being added to a buddy list.  Do "
 "you want to send an authorization request?"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3506 src/protocols/oscar/oscar.c:3508
+#: src/protocols/oscar/oscar.c:3567 src/protocols/oscar/oscar.c:3569
 msgid "Request Authorization"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3556 src/protocols/oscar/oscar.c:3558
-#: src/protocols/oscar/oscar.c:3565 src/protocols/oscar/oscar.c:3659
-#: src/protocols/oscar/oscar.c:3679 src/protocols/oscar/oscar.c:6207
-#: src/protocols/oscar/oscar.c:6253
+#: src/protocols/oscar/oscar.c:3617 src/protocols/oscar/oscar.c:3619
+#: src/protocols/oscar/oscar.c:3626 src/protocols/oscar/oscar.c:3723
+#: src/protocols/oscar/oscar.c:3743 src/protocols/oscar/oscar.c:6292
+#: src/protocols/oscar/oscar.c:6338
 #, fuzzy
 msgid "No reason given."
 msgstr "कोई कमरा-नाम नहीं दिया है."
 
-#: src/protocols/oscar/oscar.c:3564
+#: src/protocols/oscar/oscar.c:3625
 msgid "Authorization Denied Message:"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3659
+#: src/protocols/oscar/oscar.c:3723
 #, c-format
 msgid ""
 "The user %u wants to add you to their buddy list for the following reason:\n"
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3667 src/protocols/oscar/oscar.c:6213
+#: src/protocols/oscar/oscar.c:3731 src/protocols/oscar/oscar.c:6298
 msgid "Authorization Request"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3679
+#: src/protocols/oscar/oscar.c:3743
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -8214,17 +8262,17 @@
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3680
+#: src/protocols/oscar/oscar.c:3744
 msgid "ICQ authorization denied."
 msgstr ""
 
 #. Someone has granted you authorization
-#: src/protocols/oscar/oscar.c:3687
+#: src/protocols/oscar/oscar.c:3751
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3695
+#: src/protocols/oscar/oscar.c:3759
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8233,7 +8281,7 @@
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3703
+#: src/protocols/oscar/oscar.c:3767
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8242,7 +8290,7 @@
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3711
+#: src/protocols/oscar/oscar.c:3775
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -8251,34 +8299,34 @@
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3732
+#: src/protocols/oscar/oscar.c:3796
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3738
+#: src/protocols/oscar/oscar.c:3802
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3742
+#: src/protocols/oscar/oscar.c:3806
 msgid "Decline"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:3826
+#: src/protocols/oscar/oscar.c:3890
 #, 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] ""
 msgstr[1] ""
 
-#: src/protocols/oscar/oscar.c:3835
+#: src/protocols/oscar/oscar.c:3899
 #, 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] ""
 msgstr[1] ""
 
-#: src/protocols/oscar/oscar.c:3844
+#: src/protocols/oscar/oscar.c:3908
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -8287,33 +8335,34 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/protocols/oscar/oscar.c:3853
+#: src/protocols/oscar/oscar.c:3917
 #, 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] ""
 msgstr[1] ""
 
-#: src/protocols/oscar/oscar.c:3862
+#: src/protocols/oscar/oscar.c:3926
 #, 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] ""
 msgstr[1] ""
 
-#: src/protocols/oscar/oscar.c:3871
+#: src/protocols/oscar/oscar.c:3935
 #, 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] ""
 msgstr[1] ""
 
-#: src/protocols/oscar/oscar.c:3925 src/protocols/oscar/oscar.c:4155
+#: src/protocols/oscar/oscar.c:3989 src/protocols/oscar/oscar.c:4222
+#: src/protocols/silc/ops.c:1087 src/protocols/silc/ops.c:1149
 #, fuzzy, c-format
 msgid "Info for %s"
 msgstr "उपयोगकर्ता %s हेतु जानकारी बदलें"
 
-#: src/protocols/oscar/oscar.c:3991
+#: src/protocols/oscar/oscar.c:4055
 #, c-format
 msgid "SNAC threw error: %s\n"
 msgstr ""
@@ -8322,13 +8371,13 @@
 # gnome-session/gsm-client-row.c:43
 # #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
 # gnome-session/gsm-client-row.c:43
-#: src/protocols/oscar/oscar.c:3992
+#: src/protocols/oscar/oscar.c:4056
 #, fuzzy
 msgid "Unknown error"
 msgstr "अज्ञात"
 
 #. Data is assumed to be the destination sn
-#: src/protocols/oscar/oscar.c:4027
+#: src/protocols/oscar/oscar.c:4092
 #, fuzzy, c-format
 msgid "Unable to send message: %s"
 msgstr "दूर संदेश मिटाएँ"
@@ -8337,216 +8386,212 @@
 # gnome-session/gsm-client-row.c:43
 # #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
 # gnome-session/gsm-client-row.c:43
-#: src/protocols/oscar/oscar.c:4027 src/protocols/oscar/oscar.c:4032
-#: src/protocols/oscar/oscar.c:4090 src/protocols/oscar/oscar.c:4094
+#: src/protocols/oscar/oscar.c:4092 src/protocols/oscar/oscar.c:4097
+#: src/protocols/oscar/oscar.c:4155 src/protocols/oscar/oscar.c:4159
 #, fuzzy
 msgid "Unknown reason."
 msgstr "अज्ञात"
 
-#: src/protocols/oscar/oscar.c:4030
+#: src/protocols/oscar/oscar.c:4095
 #, fuzzy, c-format
 msgid "Unable to send message to %s:"
 msgstr "दूर संदेश मिटाएँ"
 
-#: src/protocols/oscar/oscar.c:4090
+#: src/protocols/oscar/oscar.c:4155
 #, fuzzy, c-format
 msgid "User information not available: %s"
 msgstr "उपयोगकर्ता %s हेतु जानकारी बदलें"
 
-#: src/protocols/oscar/oscar.c:4093
+#: src/protocols/oscar/oscar.c:4158
 #, fuzzy, c-format
 msgid "User information for %s unavailable:"
 msgstr "उपयोगकर्ता %s हेतु जानकारी बदलें"
 
-#: src/protocols/oscar/oscar.c:4115
+#: src/protocols/oscar/oscar.c:4180
 msgid "Warning Level"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4118
+#: src/protocols/oscar/oscar.c:4184
 msgid "Online Since"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4122 src/protocols/yahoo/yahoo_profile.c:1118
+#: src/protocols/oscar/oscar.c:4189 src/protocols/yahoo/yahoo_profile.c:1120
 msgid "Member Since"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4206
+#: src/protocols/oscar/oscar.c:4273
 msgid "Your AIM connection may be lost."
 msgstr ""
 
 #. The conversion failed!
-#: src/protocols/oscar/oscar.c:4392
+#: src/protocols/oscar/oscar.c:4459
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4612
+#: src/protocols/oscar/oscar.c:4679
 msgid "Rate limiting error."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4613
+#: src/protocols/oscar/oscar.c:4680
 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:4676
+#: src/protocols/oscar/oscar.c:4747
 msgid ""
 "You have been disconnected because you have signed on with this screen name "
 "at another location."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4678
+#: src/protocols/oscar/oscar.c:4749
 msgid "You have been signed off for an unknown reason."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4709
+#: src/protocols/oscar/oscar.c:4780
 msgid "Finalizing connection"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4992 src/protocols/silc/util.c:538
+#: src/protocols/oscar/oscar.c:5063 src/protocols/silc/util.c:538
 msgid "Mobile Phone"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4993
-msgid "Not specified"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:4994 src/protocols/trepia/trepia.c:281
-#: src/protocols/trepia/trepia.c:407
+#: src/protocols/oscar/oscar.c:5065 src/protocols/trepia/trepia.c:282
+#: src/protocols/trepia/trepia.c:408
 msgid "Female"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:4994 src/protocols/trepia/trepia.c:280
-#: src/protocols/trepia/trepia.c:407
+#: src/protocols/oscar/oscar.c:5065 src/protocols/trepia/trepia.c:281
+#: src/protocols/trepia/trepia.c:408
 msgid "Male"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5010
+#: src/protocols/oscar/oscar.c:5081
 msgid "Personal Web Page"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5014
+#: src/protocols/oscar/oscar.c:5085
 msgid "Additional Information"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5019
+#: src/protocols/oscar/oscar.c:5090
 msgid "Home Address"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5023 src/protocols/oscar/oscar.c:5031
+#: src/protocols/oscar/oscar.c:5094 src/protocols/oscar/oscar.c:5102
 msgid "Zip Code"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5027
+#: src/protocols/oscar/oscar.c:5098
 msgid "Work Address"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5035
+#: src/protocols/oscar/oscar.c:5106
 msgid "Work Information"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5036
+#: src/protocols/oscar/oscar.c:5107
 msgid "Company"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5037
+#: src/protocols/oscar/oscar.c:5108
 msgid "Division"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5038
+#: src/protocols/oscar/oscar.c:5109
 msgid "Position"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5040
+#: src/protocols/oscar/oscar.c:5111
 msgid "Web Page"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5050
+#: src/protocols/oscar/oscar.c:5121
 #, c-format
 msgid "ICQ Info for %s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5099
+#: src/protocols/oscar/oscar.c:5170
 msgid "Pop-Up Message"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5120
+#: src/protocols/oscar/oscar.c:5191
 #, c-format
 msgid "The following screen names are associated with %s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5124
-msgid "Search Results"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:5141
-#, c-format
-msgid "No results found for email address %s"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:5162
-#, c-format
-msgid "You should receive an email asking to confirm %s."
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:5164
-msgid "Account Confirmation Requested"
-msgstr ""
-
 #: src/protocols/oscar/oscar.c:5195
+msgid "Search Results"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:5212
+#, c-format
+msgid "No results found for email address %s"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:5233
+#, c-format
+msgid "You should receive an email asking to confirm %s."
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:5235
+msgid "Account Confirmation Requested"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:5266
 msgid "Error Changing Account Info"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5198
+#: src/protocols/oscar/oscar.c:5269
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5201
+#: src/protocols/oscar/oscar.c:5272
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "ends in a space."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5204
+#: src/protocols/oscar/oscar.c:5275
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5207
+#: src/protocols/oscar/oscar.c:5278
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this screen name."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5210
+#: src/protocols/oscar/oscar.c:5281
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5213
+#: src/protocols/oscar/oscar.c:5284
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5216
+#: src/protocols/oscar/oscar.c:5287
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5226
+#: src/protocols/oscar/oscar.c:5297
 #, c-format
 msgid ""
 "Your screen name is currently formatted as follows:\n"
@@ -8554,33 +8599,33 @@
 msgstr ""
 
 #  And now for the buttons
-#: src/protocols/oscar/oscar.c:5227 src/protocols/oscar/oscar.c:5234
+#: src/protocols/oscar/oscar.c:5298 src/protocols/oscar/oscar.c:5305
 #, fuzzy
 msgid "Account Info"
 msgstr "खाता"
 
-#: src/protocols/oscar/oscar.c:5232
+#: src/protocols/oscar/oscar.c:5303
 #, c-format
 msgid "The email address for %s is %s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5296
+#: src/protocols/oscar/oscar.c:5370
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5431
+#: src/protocols/oscar/oscar.c:5505
 msgid "Unable to set AIM profile."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5432
+#: src/protocols/oscar/oscar.c:5506
 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:5459
+#: src/protocols/oscar/oscar.c:5533
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
@@ -8591,27 +8636,23 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/protocols/oscar/oscar.c:5464
+#: src/protocols/oscar/oscar.c:5538
 msgid "Profile too long."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5480 src/protocols/oscar/oscar.c:6767
-msgid "Visible"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:5498
+#: src/protocols/oscar/oscar.c:5569
 #, fuzzy
 msgid "Unable to set AIM away message."
 msgstr "दूर संदेश मिटाएँ"
 
-#: src/protocols/oscar/oscar.c:5499
+#: src/protocols/oscar/oscar.c:5570
 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 ""
 
-#: src/protocols/oscar/oscar.c:5539
+#: src/protocols/oscar/oscar.c:5615
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
@@ -8622,11 +8663,11 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/protocols/oscar/oscar.c:5544
+#: src/protocols/oscar/oscar.c:5620
 msgid "Away message too long."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5622
+#: src/protocols/oscar/oscar.c:5700
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -8634,41 +8675,41 @@
 "spaces, or contain only numbers."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5624 src/protocols/oscar/oscar.c:6073
-#: src/protocols/oscar/oscar.c:6087
+#: src/protocols/oscar/oscar.c:5702 src/protocols/oscar/oscar.c:6158
+#: src/protocols/oscar/oscar.c:6172
 msgid "Unable To Add"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:5785
+#: src/protocols/oscar/oscar.c:5864
 #, fuzzy
 msgid "Unable To Retrieve Buddy List"
 msgstr "डाकेबल बड्डी सूची (_D)"
 
-#: src/protocols/oscar/oscar.c:5786
+#: src/protocols/oscar/oscar.c:5865
 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 ""
 
-#: src/protocols/oscar/oscar.c:5968 src/protocols/oscar/oscar.c:5969
-#: src/protocols/oscar/oscar.c:5974 src/protocols/oscar/oscar.c:6131
-#: src/protocols/oscar/oscar.c:6132 src/protocols/oscar/oscar.c:6137
+#: src/protocols/oscar/oscar.c:6049 src/protocols/oscar/oscar.c:6050
+#: src/protocols/oscar/oscar.c:6055 src/protocols/oscar/oscar.c:6216
+#: src/protocols/oscar/oscar.c:6217 src/protocols/oscar/oscar.c:6222
 msgid "Orphans"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6071
+#: src/protocols/oscar/oscar.c:6156
 #, 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 ""
 
-#: src/protocols/oscar/oscar.c:6071 src/protocols/oscar/oscar.c:6085
+#: src/protocols/oscar/oscar.c:6156 src/protocols/oscar/oscar.c:6170
 msgid "(no name)"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6085
+#: src/protocols/oscar/oscar.c:6170
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -8676,18 +8717,18 @@
 "buddy list."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6168
+#: src/protocols/oscar/oscar.c:6253
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
 "want to add them?"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6174
+#: src/protocols/oscar/oscar.c:6259
 msgid "Authorization Given"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6207
+#: src/protocols/oscar/oscar.c:6292
 #, c-format
 msgid ""
 "The user %s wants to add you to their buddy list for the following reason:\n"
@@ -8695,17 +8736,17 @@
 msgstr ""
 
 #. Granted
-#: src/protocols/oscar/oscar.c:6249
+#: src/protocols/oscar/oscar.c:6334
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6250
+#: src/protocols/oscar/oscar.c:6335
 msgid "Authorization Granted"
 msgstr ""
 
 #. Denied
-#: src/protocols/oscar/oscar.c:6253
+#: src/protocols/oscar/oscar.c:6338
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -8713,163 +8754,158 @@
 "%s"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6254
+#: src/protocols/oscar/oscar.c:6339
 msgid "Authorization Denied"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6291 src/protocols/toc/toc.c:1271
+#: src/protocols/oscar/oscar.c:6376 src/protocols/toc/toc.c:1280
 #, fuzzy
 msgid "_Exchange:"
 msgstr "बदलें"
 
-#: src/protocols/oscar/oscar.c:6325
+#: src/protocols/oscar/oscar.c:6414
 msgid "Invalid chat name specified."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6414
+#: src/protocols/oscar/oscar.c:6503
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6540
+#: src/protocols/oscar/oscar.c:6638
 #, fuzzy
 msgid "Away Message"
 msgstr "नया दूर संदेश"
 
-#: src/protocols/oscar/oscar.c:6826
+#: src/protocols/oscar/oscar.c:6973
 #, fuzzy, c-format
 msgid "Buddy Comment for %s"
 msgstr "बड्डी गपशप"
 
-#: src/protocols/oscar/oscar.c:6827
+#: src/protocols/oscar/oscar.c:6974
 #, fuzzy
 msgid "Buddy Comment:"
 msgstr "बड्डी गपशप"
 
-#: src/protocols/oscar/oscar.c:6846
+#: src/protocols/oscar/oscar.c:6993
 msgid "Edit Buddy Comment"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6852
+#: src/protocols/oscar/oscar.c:6999
 msgid "Get Status Msg"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6864
+#: src/protocols/oscar/oscar.c:7011
 msgid "Direct IM"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6881
+#: src/protocols/oscar/oscar.c:7028
 msgid "Re-request Authorization"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6911
+#: src/protocols/oscar/oscar.c:7058
 msgid "The new formatting is invalid."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6912
+#: src/protocols/oscar/oscar.c:7059
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:6919
+#: src/protocols/oscar/oscar.c:7066
 #, fuzzy
 msgid "New screen name formatting:"
 msgstr "कोई स्क्रीन-नाम नहीं दिया है."
 
-#: src/protocols/oscar/oscar.c:6971
+#: src/protocols/oscar/oscar.c:7118
 msgid "Change Address To:"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:7016
+#: src/protocols/oscar/oscar.c:7163
 msgid "<i>you are not waiting for authorization</i>"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:7019
+#: src/protocols/oscar/oscar.c:7166
 msgid "You are awaiting authorization from the following buddies"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:7020
+#: src/protocols/oscar/oscar.c:7167
 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:7037
+#: src/protocols/oscar/oscar.c:7184
 msgid "Find Buddy by E-mail"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:7038
+#: src/protocols/oscar/oscar.c:7185
 msgid "Search for a buddy by e-mail address"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:7039
+#: src/protocols/oscar/oscar.c:7186
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:7056
-msgid "Available Message:"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:7057
-msgid "I'm doing work and hoping for a distraction--IM me!"
-msgstr ""
-
-#: src/protocols/oscar/oscar.c:7138 src/protocols/silc/silc.c:795
+#: src/protocols/oscar/oscar.c:7267 src/protocols/silc/silc.c:814
 msgid "Set User Info..."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:7143
+#: src/protocols/oscar/oscar.c:7272
 msgid "Set User Info (URL)..."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:7149
-#, fuzzy
-msgid "Set Available Message..."
-msgstr "नया संदेश..."
-
-#: src/protocols/oscar/oscar.c:7154 src/protocols/silc/silc.c:791
+#: src/protocols/oscar/oscar.c:7277 src/protocols/silc/silc.c:810
 #, fuzzy
 msgid "Change Password..."
 msgstr " %s: के लिए पासवर्ड बदला"
 
-#: src/protocols/oscar/oscar.c:7159
+#: src/protocols/oscar/oscar.c:7282
 #, fuzzy
 msgid "Change Password (URL)"
 msgstr " %s: के लिए पासवर्ड बदला"
 
-#: src/protocols/oscar/oscar.c:7163
+#: src/protocols/oscar/oscar.c:7286
 msgid "Configure IM Forwarding (URL)"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:7172
+#: src/protocols/oscar/oscar.c:7295
 msgid "Format Screen Name..."
 msgstr ""
 
 #  And now for the buttons
-#: src/protocols/oscar/oscar.c:7176
+#: src/protocols/oscar/oscar.c:7299
 #, fuzzy
 msgid "Confirm Account"
 msgstr "खाता"
 
-#: src/protocols/oscar/oscar.c:7180
+#: src/protocols/oscar/oscar.c:7303
 msgid "Display Currently Registered Address"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:7184
+#: src/protocols/oscar/oscar.c:7307
 msgid "Change Currently Registered Address..."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:7191
+#: src/protocols/oscar/oscar.c:7314
 msgid "Show Buddies Awaiting Authorization"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:7197
+#: src/protocols/oscar/oscar.c:7320
 msgid "Search for Buddy by Email..."
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:7202
+#: src/protocols/oscar/oscar.c:7325
 msgid "Search for Buddy by Information"
 msgstr ""
 
-#. *< api_version
+#: src/protocols/oscar/oscar.c:7394
+msgid "Use recent buddies group"
+msgstr ""
+
+#: src/protocols/oscar/oscar.c:7397
+#, fuzzy
+msgid "Show how long you have been idle"
+msgstr "आपको हैंड-कानफिगर की अनुमति देता है कि आप कितने देर निष्क्रिय रह सकते हैं"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -8880,19 +8916,23 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/oscar/oscar.c:7321 src/protocols/oscar/oscar.c:7323
+#: src/protocols/oscar/oscar.c:7490 src/protocols/oscar/oscar.c:7492
 msgid "AIM/ICQ Protocol Plugin"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:7342
+#: src/protocols/oscar/oscar.c:7511
 msgid "Auth host"
 msgstr ""
 
-#: src/protocols/oscar/oscar.c:7345
+#: src/protocols/oscar/oscar.c:7514
 #, fuzzy
 msgid "Auth port"
 msgstr "समर्थन"
 
+#: src/protocols/oscar/oscar.c:7517 src/protocols/zephyr/zephyr.c:2859
+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
@@ -8976,16 +9016,16 @@
 msgstr "नया पासवर्ड "
 
 #: src/protocols/silc/buddy.c:506 src/protocols/silc/buddy.c:541
-#: src/protocols/silc/ops.c:1276 src/protocols/silc/ops.c:1287
+#: src/protocols/silc/ops.c:1274 src/protocols/silc/ops.c:1285
 msgid "Get Public Key"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1277
-#: src/protocols/silc/ops.c:1288
+#: src/protocols/silc/buddy.c:542 src/protocols/silc/ops.c:1275
+#: src/protocols/silc/ops.c:1286
 msgid "Cannot fetch the public key"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1544
+#: src/protocols/silc/buddy.c:629 src/protocols/silc/buddy.c:1549
 msgid "Show Public Key"
 msgstr ""
 
@@ -8994,15 +9034,15 @@
 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
+#: src/protocols/silc/buddy.c:707 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:1101
 #, fuzzy
 msgid "User Information"
 msgstr "उपयोगकर्ता %s हेतु जानकारी बदलें"
 
-#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:944
-#: src/protocols/silc/ops.c:1099
+#: src/protocols/silc/buddy.c:708 src/protocols/silc/ops.c:946
+#: src/protocols/silc/ops.c:1102
 #, fuzzy
 msgid "Cannot get user information"
 msgstr "उपयोगकर्ता %s हेतु जानकारी बदलें"
@@ -9055,95 +9095,92 @@
 "from the list to add to the buddy list."
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1377
+#: src/protocols/silc/buddy.c:1382
 msgid "Detached"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1381 src/protocols/silc/silc.c:48
-#: src/protocols/silc/silc.c:80
+#: src/protocols/silc/buddy.c:1386 src/protocols/silc/silc.c:56
 msgid "Indisposed"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1385 src/protocols/silc/silc.c:49
-#: src/protocols/silc/silc.c:82
+#: src/protocols/silc/buddy.c:1390 src/protocols/silc/silc.c:58
 msgid "Wake Me Up"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1387 src/protocols/silc/silc.c:45
-#: src/protocols/silc/silc.c:74
+#: src/protocols/silc/buddy.c:1392 src/protocols/silc/silc.c:50
 msgid "Hyper Active"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1389
+#: src/protocols/silc/buddy.c:1394
 msgid "Robot"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1396 src/protocols/silc/silc.c:616
+#: src/protocols/silc/buddy.c:1401 src/protocols/silc/silc.c:635
 #: src/protocols/silc/util.c:469
 #, fuzzy
 msgid "Happy"
 msgstr "लागू करें (_A)"
 
-#: src/protocols/silc/buddy.c:1398 src/protocols/silc/silc.c:618
+#: src/protocols/silc/buddy.c:1403 src/protocols/silc/silc.c:637
 #: src/protocols/silc/util.c:471
 msgid "Sad"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1400 src/protocols/silc/silc.c:620
+#: src/protocols/silc/buddy.c:1405 src/protocols/silc/silc.c:639
 #: src/protocols/silc/util.c:473
 msgid "Angry"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1402 src/protocols/silc/silc.c:622
+#: src/protocols/silc/buddy.c:1407 src/protocols/silc/silc.c:641
 #: src/protocols/silc/util.c:475
 msgid "Jealous"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1404 src/protocols/silc/silc.c:624
+#: src/protocols/silc/buddy.c:1409 src/protocols/silc/silc.c:643
 #: src/protocols/silc/util.c:477
 msgid "Ashamed"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1406 src/protocols/silc/silc.c:626
+#: src/protocols/silc/buddy.c:1411 src/protocols/silc/silc.c:645
 #: src/protocols/silc/util.c:479
 msgid "Invincible"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1408 src/protocols/silc/silc.c:628
+#: src/protocols/silc/buddy.c:1413 src/protocols/silc/silc.c:647
 #: src/protocols/silc/util.c:481
 msgid "In Love"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1410 src/protocols/silc/silc.c:630
+#: src/protocols/silc/buddy.c:1415 src/protocols/silc/silc.c:649
 #: src/protocols/silc/util.c:483
 msgid "Sleepy"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1412 src/protocols/silc/silc.c:632
+#: src/protocols/silc/buddy.c:1417 src/protocols/silc/silc.c:651
 #: src/protocols/silc/util.c:485
 msgid "Bored"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1414 src/protocols/silc/silc.c:634
+#: src/protocols/silc/buddy.c:1419 src/protocols/silc/silc.c:653
 #: src/protocols/silc/util.c:487
 msgid "Excited"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1416 src/protocols/silc/silc.c:636
+#: src/protocols/silc/buddy.c:1421 src/protocols/silc/silc.c:655
 #: src/protocols/silc/util.c:489
 msgid "Anxious"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1448 src/protocols/silc/ops.c:980
+#: src/protocols/silc/buddy.c:1453 src/protocols/silc/ops.c:982
 msgid "User Modes"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1457 src/protocols/silc/ops.c:989
+#: src/protocols/silc/buddy.c:1462 src/protocols/silc/ops.c:991
 msgid "Mood"
 msgstr ""
 
 #  Autostart
-#: src/protocols/silc/buddy.c:1461 src/protocols/silc/ops.c:995
+#: src/protocols/silc/buddy.c:1466 src/protocols/silc/ops.c:997
 #, fuzzy
 msgid "Status Text"
 msgstr "प्रारंभ-में"
@@ -9155,51 +9192,51 @@
 #  *< dependencies
 #  *< priority
 #  *< id
-#: src/protocols/silc/buddy.c:1466 src/protocols/silc/ops.c:1001
+#: src/protocols/silc/buddy.c:1471 src/protocols/silc/ops.c:1003
 #, fuzzy
 msgid "Preferred Contact"
 msgstr "रिमोट कंट्रोल"
 
-#: src/protocols/silc/buddy.c:1471 src/protocols/silc/ops.c:1006
+#: src/protocols/silc/buddy.c:1476 src/protocols/silc/ops.c:1008
 #, fuzzy
 msgid "Preferred Language"
 msgstr "वरीयताएँ"
 
-#: src/protocols/silc/buddy.c:1476 src/protocols/silc/ops.c:1011
+#: src/protocols/silc/buddy.c:1481 src/protocols/silc/ops.c:1013
 msgid "Device"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1481 src/protocols/silc/ops.c:1016
-#: src/protocols/silc/silc.c:684 src/protocols/silc/silc.c:686
+#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:1018
+#: src/protocols/silc/silc.c:703 src/protocols/silc/silc.c:705
 #, fuzzy
 msgid "Timezone"
 msgstr "निष्क्रिय समय"
 
 #  ---------- "Notification Methods" ----------
-#: src/protocols/silc/buddy.c:1486 src/protocols/silc/ops.c:1021
+#: src/protocols/silc/buddy.c:1491 src/protocols/silc/ops.c:1023
 #, fuzzy
 msgid "Geolocation"
 msgstr "सूचना की विधियाँ"
 
-#: src/protocols/silc/buddy.c:1529
+#: src/protocols/silc/buddy.c:1534
 msgid "Reset IM Key"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1534
+#: src/protocols/silc/buddy.c:1539
 msgid "IM with Key Exchange"
 msgstr ""
 
-#: src/protocols/silc/buddy.c:1538
+#: src/protocols/silc/buddy.c:1543
 #, fuzzy
 msgid "IM with Password"
 msgstr "नया पासवर्ड "
 
-#: src/protocols/silc/buddy.c:1549
+#: src/protocols/silc/buddy.c:1554
 msgid "Get Public Key..."
 msgstr ""
 
 #  *  DEFINES, MACROS & DATA TYPES
-#: src/protocols/silc/buddy.c:1555 src/protocols/silc/ops.c:1409
+#: src/protocols/silc/buddy.c:1560 src/protocols/silc/ops.c:1407
 #, fuzzy
 msgid "Kill User"
 msgstr "गेम"
@@ -9310,7 +9347,7 @@
 msgid "Group Name"
 msgstr ""
 
-#: src/protocols/silc/chat.c:579 src/protocols/silc/ops.c:1689
+#: src/protocols/silc/chat.c:579 src/protocols/silc/ops.c:1687
 msgid "Passphrase"
 msgstr ""
 
@@ -9396,7 +9433,7 @@
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr ""
 
-#: src/protocols/silc/chat.c:1051
+#: 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"
@@ -9409,16 +9446,16 @@
 #  *< dependencies
 #  *< priority
 #  *< id
-#: src/protocols/silc/chat.c:1053
+#: src/protocols/silc/chat.c:1058
 #, fuzzy
 msgid "Join Private Group"
 msgstr "रिमोट कंट्रोल"
 
-#: src/protocols/silc/chat.c:1054
+#: src/protocols/silc/chat.c:1059
 msgid "Cannot join private group"
 msgstr ""
 
-#: src/protocols/silc/chat.c:1247 src/protocols/silc/silc.c:894
+#: src/protocols/silc/chat.c:1252 src/protocols/silc/silc.c:914
 msgid "Cannot call command"
 msgstr ""
 
@@ -9426,7 +9463,7 @@
 # gnome-session/gsm-client-row.c:43
 # #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
 # gnome-session/gsm-client-row.c:43
-#: src/protocols/silc/chat.c:1248 src/protocols/silc/silc.c:895
+#: src/protocols/silc/chat.c:1253 src/protocols/silc/silc.c:915
 #, fuzzy
 msgid "Unknown command"
 msgstr "अज्ञात"
@@ -9456,7 +9493,7 @@
 
 #: src/protocols/silc/ft.c:102
 #, fuzzy
-msgid "File transfer sessions does not exist"
+msgid "File transfer session does not exist"
 msgstr "फ़ाइल हस्तांतरण"
 
 #: src/protocols/silc/ft.c:206
@@ -9482,159 +9519,150 @@
 msgid "Cannot send file"
 msgstr "आपने भेजा"
 
-#: src/protocols/silc/ops.c:339 src/protocols/silc/ops.c:348
-#: src/protocols/silc/ops.c:357
+#: src/protocols/silc/ops.c:341 src/protocols/silc/ops.c:350
+#: src/protocols/silc/ops.c:359
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr ""
 
-#: src/protocols/silc/ops.c:423
+#: src/protocols/silc/ops.c:425
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr ""
 
-#: src/protocols/silc/ops.c:427
+#: src/protocols/silc/ops.c:429
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr ""
 
-#: src/protocols/silc/ops.c:460
+#: src/protocols/silc/ops.c:462
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr ""
 
-#: src/protocols/silc/ops.c:468
+#: src/protocols/silc/ops.c:470
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr ""
 
-#: src/protocols/silc/ops.c:497
+#: src/protocols/silc/ops.c:499
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr ""
 
-#: src/protocols/silc/ops.c:527 src/protocols/silc/ops.c:532
-#: src/protocols/silc/ops.c:537
+#: src/protocols/silc/ops.c:529 src/protocols/silc/ops.c:534
+#: src/protocols/silc/ops.c:539
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr ""
 
-#: src/protocols/silc/ops.c:558 src/protocols/silc/ops.c:563
-#: src/protocols/silc/ops.c:568
+#: src/protocols/silc/ops.c:560 src/protocols/silc/ops.c:565
+#: src/protocols/silc/ops.c:570
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr ""
 
-#: src/protocols/silc/ops.c:614
+#: src/protocols/silc/ops.c:616
 #, fuzzy
 msgid "Server signoff"
 msgstr "साइनऑफ"
 
-#: src/protocols/silc/ops.c:801
+#: src/protocols/silc/ops.c:803
 #, fuzzy
 msgid "Personal Information"
 msgstr "उपयोगकर्ता %s हेतु जानकारी बदलें"
 
-#: src/protocols/silc/ops.c:824
+#: src/protocols/silc/ops.c:826
 msgid "Birth Day"
 msgstr ""
 
-#: src/protocols/silc/ops.c:828
+#: src/protocols/silc/ops.c:830
 msgid "Job Title"
 msgstr ""
 
-#: src/protocols/silc/ops.c:832
+#: src/protocols/silc/ops.c:834
 msgid "Job Role"
 msgstr ""
 
-#: src/protocols/silc/ops.c:836
+#: src/protocols/silc/ops.c:838
 msgid "Organization"
 msgstr ""
 
-#: src/protocols/silc/ops.c:840
+#: src/protocols/silc/ops.c:842
 msgid "Unit"
 msgstr ""
 
-#: src/protocols/silc/ops.c:859
+#: src/protocols/silc/ops.c:861
 msgid "EMail"
 msgstr ""
 
-#: src/protocols/silc/ops.c:864
+#: src/protocols/silc/ops.c:866
 #, fuzzy
 msgid "Note"
 msgstr "(नहीं"
 
-#: src/protocols/silc/ops.c:912
+#: src/protocols/silc/ops.c:914
 #, fuzzy
 msgid "Join Chat"
 msgstr "गपशप से जुड़ें"
 
-#: src/protocols/silc/ops.c:1068 src/protocols/silc/ops.c:1139
+#: src/protocols/silc/ops.c:1070 src/protocols/silc/ops.c:1142
 msgid "Public Key Fingerprint"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1069 src/protocols/silc/ops.c:1140
+#: src/protocols/silc/ops.c:1071 src/protocols/silc/ops.c:1143
 msgid "Public Key Babbleprint"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1082
+#: src/protocols/silc/ops.c:1084
 #, fuzzy
 msgid "More..."
 msgstr "नया..."
 
-#: src/protocols/silc/ops.c:1155 src/protocols/silc/silc.c:783
+#: src/protocols/silc/ops.c:1159 src/protocols/silc/silc.c:802
 #, fuzzy
 msgid "Detach From Server"
 msgstr "डाक सर्वर"
 
-#: src/protocols/silc/ops.c:1155
+#: src/protocols/silc/ops.c:1159
 msgid "Cannot detach"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1166
+#: src/protocols/silc/ops.c:1170
 msgid "Cannot set topic"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1204
+#: src/protocols/silc/ops.c:1202
 msgid "Failed to change nickname"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1241
-#, fuzzy
-msgid "Roomlist"
-msgstr "रजिस्ट्रेशन त्रुटि"
-
-#: src/protocols/silc/ops.c:1241
-msgid "Cannot get room list"
-msgstr ""
-
-#: src/protocols/silc/ops.c:1289
+#: src/protocols/silc/ops.c:1287
 msgid "No public key was received"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1302 src/protocols/silc/ops.c:1316
+#: src/protocols/silc/ops.c:1300 src/protocols/silc/ops.c:1314
 #, fuzzy
 msgid "Server Information"
 msgstr "उपयोगकर्ता %s हेतु जानकारी बदलें"
 
-#: src/protocols/silc/ops.c:1303
+#: src/protocols/silc/ops.c:1301
 #, fuzzy
 msgid "Cannot get server information"
 msgstr "उपयोगकर्ता %s हेतु जानकारी बदलें"
 
-#: src/protocols/silc/ops.c:1334 src/protocols/silc/ops.c:1343
+#: src/protocols/silc/ops.c:1332 src/protocols/silc/ops.c:1341
 msgid "Server Statistics"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1335
+#: src/protocols/silc/ops.c:1333
 msgid "Cannot get server statistics"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1344
+#: src/protocols/silc/ops.c:1342
 msgid "No server statistics available"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1366
+#: src/protocols/silc/ops.c:1364
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -9654,99 +9682,99 @@
 "Total router operators: %d\n"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1389
+#: src/protocols/silc/ops.c:1387
 msgid "Network Statistics"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1397 src/protocols/silc/ops.c:1402
+#: src/protocols/silc/ops.c:1395 src/protocols/silc/ops.c:1400
 msgid "Ping"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1397
+#: src/protocols/silc/ops.c:1395
 msgid "Ping failed"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1402
+#: src/protocols/silc/ops.c:1400
 msgid "Ping reply received from server"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1410
+#: src/protocols/silc/ops.c:1408
 #, fuzzy
 msgid "Could not kill user"
 msgstr "आपने भेजा"
 
-#: src/protocols/silc/ops.c:1491
+#: src/protocols/silc/ops.c:1489
 msgid "Error during connecting to SILC Server"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1496
+#: src/protocols/silc/ops.c:1494
 msgid "Key Exchange failed"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1505
+#: src/protocols/silc/ops.c:1503
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 
-#: src/protocols/silc/ops.c:1540
+#: src/protocols/silc/ops.c:1538
 #, fuzzy
 msgid "Disconnected by server"
 msgstr "कनेक्शन में त्रुटि"
 
-#: src/protocols/silc/ops.c:1600 src/protocols/silc/ops.c:1647
-#: src/protocols/silc/silc.c:173
+#: src/protocols/silc/ops.c:1598 src/protocols/silc/ops.c:1645
+#: src/protocols/silc/silc.c:192
 msgid "Resuming session"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1602
+#: src/protocols/silc/ops.c:1600
 msgid "Authenticating connection"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1649
+#: src/protocols/silc/ops.c:1647
 msgid "Verifying server public key"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1690
+#: src/protocols/silc/ops.c:1688
 msgid "Passphrase required"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1719
+#: src/protocols/silc/ops.c:1717
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1722
+#: src/protocols/silc/ops.c:1720
 msgid "Failure: Remote does not trust/support your public key"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1725
+#: src/protocols/silc/ops.c:1723
 msgid "Failure: Remote does not support proposed KE group"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1728
+#: src/protocols/silc/ops.c:1726
 msgid "Failure: Remote does not support proposed cipher"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1731
+#: src/protocols/silc/ops.c:1729
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1734
+#: src/protocols/silc/ops.c:1732
 msgid "Failure: Remote does not support proposed hash function"
 msgstr ""
 
+#: src/protocols/silc/ops.c:1735
+msgid "Failure: Remote does not support proposed HMAC"
+msgstr ""
+
 #: src/protocols/silc/ops.c:1737
-msgid "Failure: Remote does not support proposed HMAC"
+msgid "Failure: Incorrect signature"
 msgstr ""
 
 #: src/protocols/silc/ops.c:1739
-msgid "Failure: Incorrect signature"
-msgstr ""
-
-#: src/protocols/silc/ops.c:1741
 msgid "Failure: Invalid cookie"
 msgstr ""
 
-#: src/protocols/silc/ops.c:1752
+#: src/protocols/silc/ops.c:1750
 msgid "Failure: Authentication failed"
 msgstr ""
 
@@ -9771,325 +9799,320 @@
 "%s\n"
 msgstr ""
 
-#: src/protocols/silc/pk.c:115 src/protocols/silc/pk.c:139
+#: src/protocols/silc/pk.c:115 src/protocols/silc/pk.c:140
 msgid "Verify Public Key"
 msgstr ""
 
-#: src/protocols/silc/pk.c:118
+#: src/protocols/silc/pk.c:119
 #, fuzzy
 msgid "View..."
 msgstr "नया..."
 
-#: src/protocols/silc/pk.c:140
+#: src/protocols/silc/pk.c:141
 msgid "Unsupported public key type"
 msgstr ""
 
-#: src/protocols/silc/silc.c:133
+#: src/protocols/silc/silc.c:152
 #, fuzzy
 msgid "Connection failed"
 msgstr "कनेक्शन में त्रुटि"
 
-#: src/protocols/silc/silc.c:165
+#: src/protocols/silc/silc.c:184
 msgid "Cannot initialize SILC Client connection"
 msgstr ""
 
-#: src/protocols/silc/silc.c:176
+#: src/protocols/silc/silc.c:195
 msgid "Performing key exchange"
 msgstr ""
 
-#: src/protocols/silc/silc.c:248
+#: src/protocols/silc/silc.c:267
 msgid "Out of memory"
 msgstr ""
 
 #. Progress
-#: src/protocols/silc/silc.c:282
+#: src/protocols/silc/silc.c:301
 #, fuzzy
 msgid "Connecting to SILC Server"
 msgstr "कनेक्शन में त्रुटि"
 
-#: src/protocols/silc/silc.c:612
+#: src/protocols/silc/silc.c:631
 msgid "Your Current Mood"
 msgstr ""
 
-#: src/protocols/silc/silc.c:614
+#: src/protocols/silc/silc.c:633
 msgid "Normal"
 msgstr ""
 
-#: src/protocols/silc/silc.c:639
+#: src/protocols/silc/silc.c:658
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
 msgstr ""
 
-#: src/protocols/silc/silc.c:647 src/protocols/silc/util.c:514
+#: src/protocols/silc/silc.c:666 src/protocols/silc/util.c:514
 #, fuzzy
 msgid "SMS"
 msgstr "SSL"
 
-#: src/protocols/silc/silc.c:649 src/protocols/silc/util.c:516
+#: src/protocols/silc/silc.c:668 src/protocols/silc/util.c:516
 msgid "MMS"
 msgstr ""
 
-#: src/protocols/silc/silc.c:651 src/protocols/silc/util.c:518
+#: src/protocols/silc/silc.c:670 src/protocols/silc/util.c:518
 msgid "Video Conferencing"
 msgstr ""
 
-#: src/protocols/silc/silc.c:656
+#: src/protocols/silc/silc.c:675
 msgid "Your Current Status"
 msgstr ""
 
-#: src/protocols/silc/silc.c:663
+#: src/protocols/silc/silc.c:682
 #, fuzzy
 msgid "Online Services"
 msgstr "डाक सर्वर"
 
-#: src/protocols/silc/silc.c:666
+#: src/protocols/silc/silc.c:685
 msgid "Let others see what services you are using"
 msgstr ""
 
-#: src/protocols/silc/silc.c:672
+#: src/protocols/silc/silc.c:691
 msgid "Let others see what computer you are using"
 msgstr ""
 
-#: src/protocols/silc/silc.c:679
+#: src/protocols/silc/silc.c:698
 msgid "Your VCard File"
 msgstr ""
 
-#: src/protocols/silc/silc.c:692 src/protocols/silc/silc.c:693
+#: src/protocols/silc/silc.c:711 src/protocols/silc/silc.c:712
 msgid "User Online Status Attributes"
 msgstr ""
 
-#: src/protocols/silc/silc.c:694
+#: src/protocols/silc/silc.c:713
 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:734 src/protocols/silc/silc.c:740
-#: src/protocols/silc/silc.c:1143
+#: src/protocols/silc/silc.c:753 src/protocols/silc/silc.c:759
+#: src/protocols/silc/silc.c:1159
 msgid "Message of the Day"
 msgstr ""
 
-#: src/protocols/silc/silc.c:734
+#: src/protocols/silc/silc.c:753
 msgid "No Message of the Day available"
 msgstr ""
 
-#: src/protocols/silc/silc.c:735 src/protocols/silc/silc.c:1138
+#: src/protocols/silc/silc.c:754 src/protocols/silc/silc.c:1154
 msgid "There is no Message of the Day associated with this connection"
 msgstr ""
 
 #  Autostart
-#: src/protocols/silc/silc.c:778
+#: src/protocols/silc/silc.c:797
 #, fuzzy
 msgid "Online Status"
 msgstr "प्रारंभ-में"
 
-#: src/protocols/silc/silc.c:787
+#: src/protocols/silc/silc.c:806
 msgid "View Message of the Day"
 msgstr ""
 
-#: src/protocols/silc/silc.c:859
+#: src/protocols/silc/silc.c:879
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr ""
 
-#: src/protocols/silc/silc.c:968
-msgid "Failed to leave channel"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1014
+#: src/protocols/silc/silc.c:1030
 msgid "Topic too long"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1095
+#: src/protocols/silc/silc.c:1111
 msgid "You must specify a nick"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1197
+#: src/protocols/silc/silc.c:1213
 #, fuzzy, c-format
 msgid "channel %s not found"
 msgstr "अब %s निष्क्रिय नहीं है."
 
-#: src/protocols/silc/silc.c:1202
+#: src/protocols/silc/silc.c:1218
 #, fuzzy, c-format
 msgid "channel modes for %s: %s"
 msgstr " %s: के लिए पासवर्ड बदला"
 
-#: src/protocols/silc/silc.c:1204
+#: src/protocols/silc/silc.c:1220
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1217
+#: src/protocols/silc/silc.c:1233
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1247
+#: src/protocols/silc/silc.c:1263
 #, c-format
 msgid "Unknown command: %s, (may be a Gaim bug)"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1310
+#: src/protocols/silc/silc.c:1326
 msgid "part [channel]:  Leave the chat"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1314
+#: src/protocols/silc/silc.c:1330
 msgid "leave [channel]:  Leave the chat"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1318
+#: src/protocols/silc/silc.c:1334
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1323
-msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1327
-msgid "list:  List channels on this network"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1331
-msgid "whois &lt;nick&gt;:  View nick's information"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1335 src/protocols/zephyr/zephyr.c:1678
-msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
-msgstr ""
-
 #: src/protocols/silc/silc.c:1339
-msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
+msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr ""
 
 #: src/protocols/silc/silc.c:1343
-msgid "motd:  View the server's Message Of The Day"
+msgid "list:  List channels on this network"
 msgstr ""
 
 #: src/protocols/silc/silc.c:1347
-msgid "detach:  Detach this session"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1351
-msgid "quit [message]:  Disconnect from the server, with an optional message"
+msgid "whois &lt;nick&gt;:  View nick's information"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1351 src/protocols/zephyr/zephyr.c:2563
+msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
 
 #: src/protocols/silc/silc.c:1355
+msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1359
+msgid "motd:  View the server's Message Of The Day"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1363
+msgid "detach:  Detach this session"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1367
+msgid "quit [message]:  Disconnect from the server, with an optional message"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1371
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1361
+#: src/protocols/silc/silc.c:1377
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1365
+#: src/protocols/silc/silc.c:1381
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1369
+#: src/protocols/silc/silc.c:1385
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1373
+#: src/protocols/silc/silc.c:1389
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1377
+#: src/protocols/silc/silc.c:1393
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1381
+#: src/protocols/silc/silc.c:1397
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1385
-msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1389
-msgid ""
-"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
-"channel invite list"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1393
-msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1397
-msgid "info [server]:  View server administrative details"
-msgstr ""
-
 #: src/protocols/silc/silc.c:1401
-msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
+msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr ""
 
 #: src/protocols/silc/silc.c:1405
-msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
+msgid ""
+"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
+"channel invite list"
 msgstr ""
 
 #: src/protocols/silc/silc.c:1409
-msgid "stats:  View server and network statistics"
+msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 
 #: src/protocols/silc/silc.c:1413
+msgid "info [server]:  View server administrative details"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1417
+msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1421
+msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1425
+msgid "stats:  View server and network statistics"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1429
 msgid "ping:  Send PING to the connected server"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1418
+#: src/protocols/silc/silc.c:1434
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1422
+#: src/protocols/silc/silc.c:1438
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1434
+#: src/protocols/silc/silc.c:1450
 #, fuzzy
 msgid "Instant Messages"
 msgstr "नया दूर संदेश"
 
-#: src/protocols/silc/silc.c:1439
+#: src/protocols/silc/silc.c:1455
 msgid "Digitally sign all IM messages"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1444
+#: src/protocols/silc/silc.c:1460
 msgid "Verify all IM message signatures"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1447
+#: src/protocols/silc/silc.c:1463
 #, fuzzy
 msgid "Channel Messages"
 msgstr "नया दूर संदेश"
 
-#: src/protocols/silc/silc.c:1452
+#: src/protocols/silc/silc.c:1468
 msgid "Digitally sign all channel messages"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1457
+#: src/protocols/silc/silc.c:1473
 msgid "Verify all channel message signatures"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1460
+#: src/protocols/silc/silc.c:1476
 msgid "Default SILC Key Pair"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1465
+#: src/protocols/silc/silc.c:1481
 msgid "SILC Public Key"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1470
+#: src/protocols/silc/silc.c:1486
 msgid "SILC Private Key"
 msgstr ""
 
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -10099,41 +10122,41 @@
 #. *< name
 #. *< version
 #. *  summary
-#: src/protocols/silc/silc.c:1557
+#: src/protocols/silc/silc.c:1575
 #, fuzzy
 msgid "SILC Protocol Plugin"
 msgstr "%s हेतु प्रोटोकाल प्लगइन नहीं है."
 
 #. *  description
-#: src/protocols/silc/silc.c:1559
+#: src/protocols/silc/silc.c:1577
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr ""
 
-#: src/protocols/silc/silc.c:1589
-msgid "Public key authentication"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1595
-msgid "Public Key File"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1599
-msgid "Private Key File"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1604
-msgid "Reject watching by other users"
-msgstr ""
-
 #: src/protocols/silc/silc.c:1607
-msgid "Block invites"
-msgstr ""
-
-#: src/protocols/silc/silc.c:1610
-msgid "Block IMs without Key Exchange"
+msgid "Public key authentication"
 msgstr ""
 
 #: src/protocols/silc/silc.c:1613
+msgid "Public Key File"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1617
+msgid "Private Key File"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1622
+msgid "Reject watching by other users"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1625
+msgid "Block invites"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1628
+msgid "Block IMs without Key Exchange"
+msgstr ""
+
+#: src/protocols/silc/silc.c:1631
 msgid "Reject online status attribute requests"
 msgstr ""
 
@@ -10221,196 +10244,200 @@
 msgid "Terminal"
 msgstr ""
 
-#: src/protocols/toc/toc.c:136
+#: src/protocols/toc/toc.c:138
 #, c-format
 msgid "Looking up %s"
 msgstr ""
 
-#: src/protocols/toc/toc.c:479
+#: src/protocols/toc/toc.c:199
+#, c-format
+msgid "Signon: %s"
+msgstr ""
+
+#: src/protocols/toc/toc.c:481
 #, c-format
 msgid "Unable to write file %s."
 msgstr ""
 
-#: src/protocols/toc/toc.c:482
+#: src/protocols/toc/toc.c:484
 #, c-format
 msgid "Unable to read file %s."
 msgstr ""
 
-#: src/protocols/toc/toc.c:485
+#: src/protocols/toc/toc.c:487
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr ""
 
-#: src/protocols/toc/toc.c:488
+#: src/protocols/toc/toc.c:490
 #, c-format
 msgid "%s not currently logged in."
 msgstr ""
 
-#: src/protocols/toc/toc.c:491
+#: src/protocols/toc/toc.c:493
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr ""
 
-#: src/protocols/toc/toc.c:494
+#: src/protocols/toc/toc.c:496
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr ""
 
-#: src/protocols/toc/toc.c:497
+#: src/protocols/toc/toc.c:499
 #, c-format
 msgid "Chat in %s is not available."
 msgstr ""
 
-#: src/protocols/toc/toc.c:500
+#: src/protocols/toc/toc.c:502
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr ""
 
-#: src/protocols/toc/toc.c:503
+#: src/protocols/toc/toc.c:505
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr ""
 
-#: src/protocols/toc/toc.c:506
+#: src/protocols/toc/toc.c:508
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr ""
 
-#: src/protocols/toc/toc.c:509
+#: src/protocols/toc/toc.c:511
 msgid "Failure."
 msgstr ""
 
-#: src/protocols/toc/toc.c:512
+#: src/protocols/toc/toc.c:514
 msgid "Too many matches."
 msgstr ""
 
-#: src/protocols/toc/toc.c:515
+#: src/protocols/toc/toc.c:517
 msgid "Need more qualifiers."
 msgstr ""
 
-#: src/protocols/toc/toc.c:518
+#: src/protocols/toc/toc.c:520
 msgid "Dir service temporarily unavailable."
 msgstr ""
 
-#: src/protocols/toc/toc.c:521
+#: src/protocols/toc/toc.c:523
 msgid "Email lookup restricted."
 msgstr ""
 
-#: src/protocols/toc/toc.c:524
+#: src/protocols/toc/toc.c:526
 msgid "Keyword ignored."
 msgstr ""
 
-#: src/protocols/toc/toc.c:527
+#: src/protocols/toc/toc.c:529
 msgid "No keywords."
 msgstr ""
 
-#: src/protocols/toc/toc.c:530
+#: src/protocols/toc/toc.c:532
 msgid "User has no directory information."
 msgstr ""
 
-#: src/protocols/toc/toc.c:534
+#: src/protocols/toc/toc.c:536
 msgid "Country not supported."
 msgstr ""
 
-#: src/protocols/toc/toc.c:537
+#: src/protocols/toc/toc.c:539
 #, c-format
 msgid "Failure unknown: %s."
 msgstr ""
 
-#: src/protocols/toc/toc.c:543
+#: src/protocols/toc/toc.c:545
 msgid "The service is temporarily unavailable."
 msgstr ""
 
-#: src/protocols/toc/toc.c:546
+#: src/protocols/toc/toc.c:548
 msgid "Your warning level is currently too high to log in."
 msgstr ""
 
-#: src/protocols/toc/toc.c:549
+#: src/protocols/toc/toc.c:551
 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:551
+#: src/protocols/toc/toc.c:553
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr ""
 
-#: src/protocols/toc/toc.c:554
+#: src/protocols/toc/toc.c:556
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr ""
 
-#: src/protocols/toc/toc.c:575
+#: src/protocols/toc/toc.c:577
 #, fuzzy
 msgid "Connection Closed"
 msgstr "कनेक्शन में त्रुटि"
 
-#: src/protocols/toc/toc.c:615
+#: src/protocols/toc/toc.c:617
 msgid "Waiting for reply..."
 msgstr ""
 
-#: src/protocols/toc/toc.c:694
+#: src/protocols/toc/toc.c:696
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr ""
 
-#: src/protocols/toc/toc.c:890
+#: src/protocols/toc/toc.c:899
 msgid "Password Change Successful"
 msgstr ""
 
-#: src/protocols/toc/toc.c:894
+#: src/protocols/toc/toc.c:903
 msgid "TOC has sent a PAUSE command."
 msgstr ""
 
-#: src/protocols/toc/toc.c:895
+#: src/protocols/toc/toc.c:904
 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 ""
 
-#: src/protocols/toc/toc.c:1421
+#: src/protocols/toc/toc.c:1430
 msgid "Get Dir Info"
 msgstr ""
 
-#: src/protocols/toc/toc.c:1557
+#: src/protocols/toc/toc.c:1566
 msgid "Set Dir Info"
 msgstr ""
 
-#: src/protocols/toc/toc.c:1679
+#: src/protocols/toc/toc.c:1688
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr ""
 
-#: src/protocols/toc/toc.c:1715
+#: src/protocols/toc/toc.c:1724
 msgid "File transfer failed; other side probably canceled."
 msgstr ""
 
-#: src/protocols/toc/toc.c:1760 src/protocols/toc/toc.c:1800
-#: src/protocols/toc/toc.c:1924 src/protocols/toc/toc.c:2012
+#: src/protocols/toc/toc.c:1769 src/protocols/toc/toc.c:1809
+#: src/protocols/toc/toc.c:1933 src/protocols/toc/toc.c:2021
 msgid "Could not connect for transfer."
 msgstr ""
 
-#: src/protocols/toc/toc.c:1957
+#: src/protocols/toc/toc.c:1966
 msgid "Could not write file header.  The file will not be transferred."
 msgstr ""
 
-#: src/protocols/toc/toc.c:2057
+#: src/protocols/toc/toc.c:2066
 msgid "Gaim - Save As..."
 msgstr ""
 
-#: src/protocols/toc/toc.c:2091
+#: src/protocols/toc/toc.c:2100
 #, 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] ""
 msgstr[1] ""
 
-#: src/protocols/toc/toc.c:2098
+#: src/protocols/toc/toc.c:2107
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr ""
 
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -10421,88 +10448,87 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/toc/toc.c:2182 src/protocols/toc/toc.c:2184
+#: src/protocols/toc/toc.c:2194 src/protocols/toc/toc.c:2196
 msgid "TOC Protocol Plugin"
 msgstr ""
 
-#: src/protocols/toc/toc.c:2203
+#: src/protocols/toc/toc.c:2215
 msgid "TOC host"
 msgstr ""
 
-#: src/protocols/toc/toc.c:2207
+#: src/protocols/toc/toc.c:2219
 msgid "TOC port"
 msgstr ""
 
 #. Basic Profile group.
-#: src/protocols/trepia/trepia.c:263
+#: src/protocols/trepia/trepia.c:264
 msgid "Basic Profile"
 msgstr ""
 
 #. E-Mail Address
-#: src/protocols/trepia/trepia.c:294
+#: src/protocols/trepia/trepia.c:295
 msgid "E-Mail Address"
 msgstr ""
 
-#: src/protocols/trepia/trepia.c:300
+#: src/protocols/trepia/trepia.c:301
 msgid "Profile Information"
 msgstr ""
 
 #. Instant Messagers
-#: src/protocols/trepia/trepia.c:306
+#: src/protocols/trepia/trepia.c:307
 msgid "Instant Messagers"
 msgstr ""
 
 #. AIM
-#: src/protocols/trepia/trepia.c:310
+#: src/protocols/trepia/trepia.c:311
 msgid "AIM"
 msgstr ""
 
 #. ICQ
-#: src/protocols/trepia/trepia.c:314
+#: src/protocols/trepia/trepia.c:315
 msgid "ICQ UIN"
 msgstr ""
 
 #. MSN
-#: src/protocols/trepia/trepia.c:318
+#: src/protocols/trepia/trepia.c:319
 msgid "MSN"
 msgstr ""
 
 #. Yahoo
-#: src/protocols/trepia/trepia.c:322
+#: src/protocols/trepia/trepia.c:323
 msgid "Yahoo"
 msgstr ""
 
 #. I'm From
-#: src/protocols/trepia/trepia.c:327
+#: src/protocols/trepia/trepia.c:328
 msgid "I'm From"
 msgstr ""
 
 #. Call the dialog.
-#: src/protocols/trepia/trepia.c:344
+#: src/protocols/trepia/trepia.c:345
 msgid "Set your Trepia profile data."
 msgstr ""
 
-#: src/protocols/trepia/trepia.c:424
+#: src/protocols/trepia/trepia.c:425
 msgid "Profile"
 msgstr ""
 
-#: src/protocols/trepia/trepia.c:438
+#: src/protocols/trepia/trepia.c:439
 msgid "Set Profile"
 msgstr ""
 
-#: src/protocols/trepia/trepia.c:475
+#: src/protocols/trepia/trepia.c:476
 msgid "Visit Homepage"
 msgstr ""
 
-#: src/protocols/trepia/trepia.c:821 src/protocols/trepia/trepia.c:824
+#: src/protocols/trepia/trepia.c:822 src/protocols/trepia/trepia.c:825
 msgid "Local Users"
 msgstr ""
 
-#: src/protocols/trepia/trepia.c:1027
+#: src/protocols/trepia/trepia.c:1030
 msgid "Logging in"
 msgstr ""
 
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -10513,46 +10539,46 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/trepia/trepia.c:1272 src/protocols/trepia/trepia.c:1274
+#: src/protocols/trepia/trepia.c:1277 src/protocols/trepia/trepia.c:1279
 msgid "Trepia Protocol Plugin"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:338
+#: src/protocols/yahoo/yahoo.c:400
 msgid ""
 "You have been logged off as you have logged in on a different machine or "
 "device."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:808
+#: src/protocols/yahoo/yahoo.c:884
 msgid "Your Yahoo! message did not get sent."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:827
+#: src/protocols/yahoo/yahoo.c:903 src/protocols/yahoo/yahoo.c:3429
 msgid "Buzz!!"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:870
+#: src/protocols/yahoo/yahoo.c:948
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:936
+#: src/protocols/yahoo/yahoo.c:1015
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:939
+#: src/protocols/yahoo/yahoo.c:1018
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:942
+#: src/protocols/yahoo/yahoo.c:1021
 msgid "Add buddy rejected"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1702
+#: src/protocols/yahoo/yahoo.c:1782
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -10560,32 +10586,32 @@
 "on to Yahoo.  Check %s for updates."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1705
+#: src/protocols/yahoo/yahoo.c:1785
 msgid "Failed Yahoo! Authentication"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1777
+#: src/protocols/yahoo/yahoo.c:1858
 #, 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 ""
 
-#: src/protocols/yahoo/yahoo.c:1780
+#: src/protocols/yahoo/yahoo.c:1861
 msgid "Ignore buddy?"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1814
+#: src/protocols/yahoo/yahoo.c:1895
 #, fuzzy
 msgid "Invalid username."
 msgstr "अवैध समूह-नाम"
 
-#: src/protocols/yahoo/yahoo.c:1825
+#: src/protocols/yahoo/yahoo.c:1906
 #, fuzzy
 msgid "Normal authentication failed!"
 msgstr "संदेश सूचना"
 
-#: src/protocols/yahoo/yahoo.c:1826
+#: src/protocols/yahoo/yahoo.c:1907
 msgid ""
 "The normal authentication method has failed. This means either your password "
 "is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
@@ -10593,99 +10619,101 @@
 "reduced functionality and features."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1834
+#: src/protocols/yahoo/yahoo.c:1915
 #, fuzzy
 msgid "Incorrect password."
 msgstr "नया पासवर्ड "
 
-#: src/protocols/yahoo/yahoo.c:1837
+#: src/protocols/yahoo/yahoo.c:1918
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1840
+#: src/protocols/yahoo/yahoo.c:1921
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1894
+#: src/protocols/yahoo/yahoo.c:1975
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:1897
+#: src/protocols/yahoo/yahoo.c:1978
 msgid "Could not add buddy to server list"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2131 src/protocols/yahoo/yahoo.c:2259
+#: src/protocols/yahoo/yahoo.c:2212 src/protocols/yahoo/yahoo.c:2340
 #: src/protocols/yahoo/ycht.c:414
 msgid "Unable to read"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2281 src/protocols/yahoo/yahoo.c:2391
-#: src/protocols/yahoo/yahoo.c:2441 src/protocols/yahoo/yahoo.c:2451
-#: src/protocols/yahoo/yahoochat.c:1410 src/protocols/yahoo/yahoochat.c:1471
+#: src/protocols/yahoo/yahoo.c:2362 src/protocols/yahoo/yahoo.c:2472
+#: src/protocols/yahoo/yahoo.c:2522 src/protocols/yahoo/yahoo.c:2532
+#: src/protocols/yahoo/yahoochat.c:1415 src/protocols/yahoo/yahoochat.c:1476
 #: src/protocols/yahoo/ycht.c:518
 #, fuzzy
 msgid "Connection problem"
 msgstr "कनेक्शन में त्रुटि"
 
-#: src/protocols/yahoo/yahoo.c:2547 src/protocols/yahoo/yahoo.c:2914
-#: src/protocols/yahoo/yahoo.c:3028
+#: src/protocols/yahoo/yahoo.c:2635 src/protocols/yahoo/yahoo.c:3145
 msgid "Not At Home"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2549 src/protocols/yahoo/yahoo.c:2916
-#: src/protocols/yahoo/yahoo.c:3029
+#: src/protocols/yahoo/yahoo.c:2637 src/protocols/yahoo/yahoo.c:3148
 msgid "Not At Desk"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2551 src/protocols/yahoo/yahoo.c:2918
-#: src/protocols/yahoo/yahoo.c:3030
+#: src/protocols/yahoo/yahoo.c:2639 src/protocols/yahoo/yahoo.c:3151
 msgid "Not In Office"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2555 src/protocols/yahoo/yahoo.c:2922
-#: src/protocols/yahoo/yahoo.c:3032
+#: src/protocols/yahoo/yahoo.c:2643 src/protocols/yahoo/yahoo.c:3157
 msgid "On Vacation"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2559 src/protocols/yahoo/yahoo.c:2926
-#: src/protocols/yahoo/yahoo.c:3034
+#: src/protocols/yahoo/yahoo.c:2647 src/protocols/yahoo/yahoo.c:3163
 msgid "Stepped Out"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2640 src/protocols/yahoo/yahoo.c:2666
+#: src/protocols/yahoo/yahoo.c:2728 src/protocols/yahoo/yahoo.c:2754
 msgid "Not on server list"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2745
+#: src/protocols/yahoo/yahoo.c:2833
 #, fuzzy
 msgid "Join in Chat"
 msgstr "गपशप से जुड़ें"
 
-#: src/protocols/yahoo/yahoo.c:2750
+#: src/protocols/yahoo/yahoo.c:2838
 msgid "Initiate Conference"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2802
+#: src/protocols/yahoo/yahoo.c:2890
 msgid "Active which ID?"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2811
+#: src/protocols/yahoo/yahoo.c:2899
 #, fuzzy
 msgid "Join who in chat?"
 msgstr "गपशप से जुड़ें"
 
-#: src/protocols/yahoo/yahoo.c:2821
+#: src/protocols/yahoo/yahoo.c:2909
 msgid "Activate ID..."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:2825
+#: src/protocols/yahoo/yahoo.c:2913
 #, fuzzy
 msgid "Join user in chat..."
 msgstr "गपशप से जुडें..."
 
-#. *< api_version
+#: src/protocols/yahoo/yahoo.c:3473
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr ""
+
+#: src/protocols/yahoo/yahoo.c:3477
+msgid "buzz: Buzz a contact to get their attention"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -10696,50 +10724,50 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/yahoo/yahoo.c:3350 src/protocols/yahoo/yahoo.c:3352
+#: src/protocols/yahoo/yahoo.c:3557 src/protocols/yahoo/yahoo.c:3559
 msgid "Yahoo Protocol Plugin"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:3371
+#: src/protocols/yahoo/yahoo.c:3578
 msgid "Yahoo Japan"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:3374
+#: src/protocols/yahoo/yahoo.c:3581
 msgid "Pager host"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:3377
+#: src/protocols/yahoo/yahoo.c:3584
 msgid "Japan Pager host"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:3380
+#: src/protocols/yahoo/yahoo.c:3587
 msgid "Pager port"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:3383
+#: src/protocols/yahoo/yahoo.c:3590
 #, fuzzy
 msgid "File transfer host"
 msgstr "फ़ाइल हस्तांतरण"
 
-#: src/protocols/yahoo/yahoo.c:3386
+#: src/protocols/yahoo/yahoo.c:3593
 #, fuzzy
 msgid "Japan File transfer host"
 msgstr "फ़ाइल हस्तांतरण"
 
-#: src/protocols/yahoo/yahoo.c:3389
+#: src/protocols/yahoo/yahoo.c:3596
 #, fuzzy
 msgid "File transfer port"
 msgstr "फ़ाइल हस्तांतरण"
 
-#: src/protocols/yahoo/yahoo.c:3392
+#: src/protocols/yahoo/yahoo.c:3599
 msgid "Chat Room List Url"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:3395
+#: src/protocols/yahoo/yahoo.c:3602
 msgid "YCHT Host"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo.c:3398
+#: src/protocols/yahoo/yahoo.c:3605
 msgid "YCHT Port"
 msgstr ""
 
@@ -10749,87 +10777,87 @@
 "(1,048,576 bytes)."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo_profile.c:675
+#: src/protocols/yahoo/yahoo_profile.c:677
 #, c-format
 msgid "<b>IP Address:</b> %s<br>"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo_profile.c:749
+#: src/protocols/yahoo/yahoo_profile.c:751
 msgid "Yahoo! Japan Profile"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo_profile.c:750
+#: src/protocols/yahoo/yahoo_profile.c:752
 msgid "Yahoo! Profile"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo_profile.c:794
+#: 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:796
+#: 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:969
+#: src/protocols/yahoo/yahoo_profile.c:971
 msgid "Yahoo! ID"
 msgstr ""
 
-#: 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:1045
+#: src/protocols/yahoo/yahoo_profile.c:1049
+#: src/protocols/yahoo/yahoo_profile.c:1053
 msgid "Hobbies"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo_profile.c:1061
-#: src/protocols/yahoo/yahoo_profile.c:1065
+#: src/protocols/yahoo/yahoo_profile.c:1063
+#: src/protocols/yahoo/yahoo_profile.c:1067
 msgid "Latest News"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo_profile.c:1086
+#: src/protocols/yahoo/yahoo_profile.c:1088
 msgid "Home Page"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo_profile.c:1101
+#: src/protocols/yahoo/yahoo_profile.c:1103
 msgid "Cool Link 1"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo_profile.c:1106
+#: src/protocols/yahoo/yahoo_profile.c:1108
 msgid "Cool Link 2"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo_profile.c:1110
+#: src/protocols/yahoo/yahoo_profile.c:1112
 msgid "Cool Link 3"
 msgstr ""
 
-#: src/protocols/yahoo/yahoo_profile.c:1130
+#: src/protocols/yahoo/yahoo_profile.c:1132
 #, fuzzy, c-format
 msgid "User information for %s unavailable"
 msgstr "उपयोगकर्ता %s हेतु जानकारी बदलें"
 
-#: src/protocols/yahoo/yahoo_profile.c:1136
+#: src/protocols/yahoo/yahoo_profile.c:1138
 msgid ""
 "Sorry, this profile seems to be in a language that is not supported at this "
 "time."
 msgstr ""
 
-#: src/protocols/yahoo/yahoo_profile.c:1152
+#: src/protocols/yahoo/yahoo_profile.c:1154
 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:1155
+#: src/protocols/yahoo/yahoo_profile.c:1157
 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:1163
+#: src/protocols/yahoo/yahoo_profile.c:1165
 msgid "The user's profile is empty."
 msgstr ""
 
@@ -10863,27 +10891,27 @@
 msgid "Maybe they're not in a chat?"
 msgstr ""
 
-#: src/protocols/yahoo/yahoochat.c:1351
+#: src/protocols/yahoo/yahoochat.c:1356
 msgid "Unable to connect"
 msgstr ""
 
-#: src/protocols/yahoo/yahoochat.c:1351
+#: src/protocols/yahoo/yahoochat.c:1356
 msgid "Fetching the room list failed."
 msgstr ""
 
-#: src/protocols/yahoo/yahoochat.c:1396
+#: src/protocols/yahoo/yahoochat.c:1401
 msgid "Voices"
 msgstr ""
 
-#: src/protocols/yahoo/yahoochat.c:1399
+#: src/protocols/yahoo/yahoochat.c:1404
 msgid "Webcams"
 msgstr ""
 
-#: src/protocols/yahoo/yahoochat.c:1410 src/protocols/yahoo/yahoochat.c:1471
+#: src/protocols/yahoo/yahoochat.c:1415 src/protocols/yahoo/yahoochat.c:1476
 msgid "Unable to fetch room list."
 msgstr ""
 
-#: src/protocols/yahoo/yahoochat.c:1464
+#: src/protocols/yahoo/yahoochat.c:1469
 msgid "User Rooms"
 msgstr ""
 
@@ -10892,102 +10920,111 @@
 msgid "Connection problem with the YCHT server."
 msgstr "कनेक्शन में त्रुटि"
 
-#: src/protocols/zephyr/zephyr.c:597
+#: src/protocols/zephyr/zephyr.c:329
+msgid ""
+"(There was an error converting this message.\t Check the 'Encoding' option "
+"in the Account Editor)"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:677
 #, c-format
 msgid "Unable send to chat %s,%s,%s"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:632
+#: src/protocols/zephyr/zephyr.c:710 src/protocols/zephyr/zephyr.c:1124
 #, c-format
 msgid "<b>User:</b> %s<br>"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:636
+#: src/protocols/zephyr/zephyr.c:714 src/protocols/zephyr/zephyr.c:1129
 msgid "<br>Hidden or not logged-in"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:641
+#: src/protocols/zephyr/zephyr.c:719 src/protocols/zephyr/zephyr.c:1131
 #, c-format
 msgid "<br>At %s since %s"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:989 src/protocols/zephyr/zephyr.c:990
+#: src/protocols/zephyr/zephyr.c:1420 src/protocols/zephyr/zephyr.c:1421
 msgid "Anyone"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:1391
+#: src/protocols/zephyr/zephyr.c:2239
 msgid "_Class:"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:1397
+#: src/protocols/zephyr/zephyr.c:2245
 msgid "_Instance:"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:1403
+#: src/protocols/zephyr/zephyr.c:2251
 msgid "_Recipient:"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:1414
+#: src/protocols/zephyr/zephyr.c:2262
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:1683
+#: src/protocols/zephyr/zephyr.c:2568
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:1688
+#: src/protocols/zephyr/zephyr.c:2573
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:1693
+#: src/protocols/zephyr/zephyr.c:2578
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:1698
+#: src/protocols/zephyr/zephyr.c:2583
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:1704
+#: src/protocols/zephyr/zephyr.c:2588
+msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:2594
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:1709
+#: src/protocols/zephyr/zephyr.c:2599
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:1715
+#: src/protocols/zephyr/zephyr.c:2605
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:1721
+#: src/protocols/zephyr/zephyr.c:2611
 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 ""
 
-#: src/protocols/zephyr/zephyr.c:1727
+#: src/protocols/zephyr/zephyr.c:2617
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:1732
+#: src/protocols/zephyr/zephyr.c:2622
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:1808
+#: src/protocols/zephyr/zephyr.c:2728
 msgid "Resubscribe"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:1811
+#: src/protocols/zephyr/zephyr.c:2731
 msgid "Retrieve subscriptions from server"
 msgstr ""
 
-#. *< api_version
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -10998,173 +11035,122 @@
 #. *< version
 #. *  summary
 #. *  description
-#: src/protocols/zephyr/zephyr.c:1892 src/protocols/zephyr/zephyr.c:1894
+#: src/protocols/zephyr/zephyr.c:2814 src/protocols/zephyr/zephyr.c:2816
 msgid "Zephyr Protocol Plugin"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:1913
+#: src/protocols/zephyr/zephyr.c:2841
 msgid "Export to .anyone"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:1916
+#: src/protocols/zephyr/zephyr.c:2844
 msgid "Export to .zephyr.subs"
 msgstr ""
 
-#: src/protocols/zephyr/zephyr.c:1919
+#: src/protocols/zephyr/zephyr.c:2847
+msgid "Import from .anyone"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:2850
+msgid "Import from .zephyr.subs"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:2853
+msgid "Realm"
+msgstr ""
+
+#: src/protocols/zephyr/zephyr.c:2856
 msgid "Exposure"
 msgstr ""
 
 #. XXX: why in the hell are we calling gaim_connection_error() here?
 #. Forbidden
-#: src/proxy.c:870
+#: src/proxy.c:953
 #, c-format
 msgid "Access denied: proxy server forbids port %d tunnelling."
 msgstr ""
 
-#: src/proxy.c:874
+#: src/proxy.c:957
 #, fuzzy, c-format
 msgid "Proxy connection error %d"
 msgstr "कनेक्शन में त्रुटि"
 
-#: src/proxy.c:1520
+#: src/proxy.c:1612
 msgid "Invalid proxy settings"
 msgstr ""
 
-#: src/proxy.c:1520
+#: src/proxy.c:1612
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 msgstr ""
 
-#. * Custom away message.
-#: src/prpl.h:180
-msgid "Custom"
-msgstr ""
-
 #. *
 #. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
 #.
-#: src/request.h:1253
+#: src/request.h:1254
 msgid "Accept"
 msgstr ""
 
-#: src/server.c:64
+#: src/server.c:62
 #, fuzzy
 msgid "Please enter your password"
 msgstr "कृपया अपना वर्तमान पासवर्ड भरें तथा आपका नया  पासवर्ड भरें."
 
-#: src/server.c:535
+#: src/server.c:471
 #, fuzzy, c-format
 msgid "%s is now known as %s.\n"
 msgstr "अब %s  दूर नहीं है."
 
-#: src/server.c:946
+#: src/server.c:895
 #, c-format
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/server.c:960
+#: src/server.c:909
 msgid "(1 message)"
 msgstr ""
 
-#: src/server.c:1189 src/server.c:1198
-#, c-format
-msgid "%s logged in."
-msgstr ""
-
-#: src/server.c:1210
-#, c-format
-msgid "%s signed on"
-msgstr ""
-
-#: src/server.c:1225
+#: src/server.c:1164
+#, c-format
+msgid ""
+"%s has invited %s to the chat room %s:\n"
+"<b>%s</b>"
+msgstr ""
+
+#  Remove on type button
+#: src/server.c:1168
+#, fuzzy, c-format
+msgid "%s has invited %s to the chat room %s\n"
+msgstr "वार्तालाप विंडो में टाइप कर रहे  हों तो हटाएँ (_t)"
+
+#: src/server.c:1174
+msgid "Accept chat invitation?"
+msgstr ""
+
+#: src/status.c:553
 #, c-format
 msgid "%s came back"
 msgstr ""
 
-#: src/server.c:1227
+#: src/status.c:558
 #, fuzzy, c-format
 msgid "%s went away"
 msgstr "%s दूर चला गया."
 
-#: src/server.c:1241
+#: src/status.c:1269
 #, fuzzy, c-format
 msgid "%s became idle"
 msgstr "%s निष्क्रिय हो गया है."
 
-#: src/server.c:1252
+#: src/status.c:1285
 #, fuzzy, c-format
 msgid "%s became unidle"
 msgstr "%s निष्क्रिय हो गया है."
 
-#: src/server.c:1262 src/server.c:1269
-#, c-format
-msgid "%s logged out."
-msgstr ""
-
-#: src/server.c:1282
-#, fuzzy, c-format
-msgid "%s signed off"
-msgstr "गेम - साइन्ड ऑफ"
-
-#: src/server.c:1344
-#, c-format
-msgid ""
-"%s has just been warned by %s.\n"
-"Your new warning level is %d%%"
-msgstr ""
-
-#: src/server.c:1347
-msgid "an anonymous person"
-msgstr ""
-
-#: src/server.c:1457
-#, c-format
-msgid ""
-"User '%s' invites %s to buddy chat room: '%s'\n"
-"%s"
-msgstr ""
-
-#: src/server.c:1461
-#, c-format
-msgid "User '%s' invites %s to buddy chat room: '%s'\n"
-msgstr ""
-
-#: src/server.c:1467
-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
-#, fuzzy
-msgid "_Open Mail"
-msgstr "डाक देखें"
-
-#: src/stock.c:93
-msgid "_Warn"
-msgstr ""
-
-#: src/util.c:2352
+#: src/util.c:2354
 msgid "Calculating..."
 msgstr ""
 
@@ -11172,53 +11158,159 @@
 # gnome-session/gsm-client-row.c:43
 # #-#-#-#-#  gnome-session.gnome-2-2.hi.po (gnome-session VERSION)  #-#-#-#-#
 # gnome-session/gsm-client-row.c:43
-#: src/util.c:2355
+#: src/util.c:2357
 #, fuzzy
 msgid "Unknown."
 msgstr "अज्ञात"
 
-#: src/util.c:2381
+#: src/util.c:2387
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/util.c:2395
+#: src/util.c:2401
 msgid "day"
 msgid_plural "days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/util.c:2403
+#: src/util.c:2409
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/util.c:2411
+#: src/util.c:2417
 #, fuzzy
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "मिनट्स"
 msgstr[1] "मिनट्स"
 
-#: src/util.c:2828
+#: src/util.c:2834
 msgid "g003: Error opening connection.\n"
 msgstr ""
 
-#: src/win32/win32dep.c:273
-msgid "Moving Gaim Settings.."
-msgstr ""
-
-#: src/win32/win32dep.c:276
-msgid "Moving Gaim user settings to: "
-msgstr ""
+#~ msgid "Signoff"
+#~ msgstr "साइनऑफ"
+
+#, fuzzy
+#~ msgid "Away!"
+#~ msgstr "दूर"
+
+#, fuzzy
+#~ msgid "Edit This Message"
+#~ msgstr "नया दूर संदेश"
+
+#~ msgid "I'm Back!"
+#~ msgstr "मैं वापस आ गया!"
+
+#~ msgid "Remove Away Message"
+#~ msgstr "दूर संदेश मिटाएँ"
+
+#~ msgid "Set All Away"
+#~ msgstr "सबको दूर नियत करें"
+
+#, fuzzy
+#~ msgid "New away message"
+#~ msgstr "नया दूर संदेश"
+
+#, fuzzy
+#~ msgid "_Save"
+#~ msgstr "सहेजें"
+
+#, fuzzy
+#~ msgid "_Use"
+#~ msgstr "नियत करें (_S)"
+
+#, fuzzy
+#~ msgid "_Chat"
+#~ msgstr "गपशप"
+
+#, fuzzy
+#~ msgid "Join a chat room"
+#~ msgstr "गपशप से जुड़ें"
+
+#, fuzzy
+#~ msgid "_Away"
+#~ msgstr "दूर"
+
+#, fuzzy
+#~ msgid "Set an away message"
+#~ msgstr "नया दूर संदेश"
+
+#, fuzzy
+#~ msgid "Signon: "
+#~ msgstr "साइनऑफ"
+
+#, fuzzy
+#~ msgid "Signon"
+#~ msgstr "साइनऑफ"
+
+#, fuzzy
+#~ msgid "Get Away Msg"
+#~ msgstr "नया दूर संदेश"
+
+#, fuzzy
+#~ msgid "Send Message"
+#~ msgstr "नया संदेश..."
+
+#  Conversations
+#, fuzzy
+#~ msgid "Insertions"
+#~ msgstr "वार्तालाप"
+
+#, fuzzy
+#~ msgid "Away Messages"
+#~ msgstr "नया दूर संदेश"
+
+#  And now for the buttons
+#, fuzzy
+#~ msgid "_Accounts"
+#~ msgstr "खाता"
+
+#, fuzzy
+#~ msgid "_Preferences"
+#~ msgstr "वरीयताएँ"
+
+#, fuzzy
+#~ msgid "_Sign on"
+#~ msgstr "साइनऑफ"
+
+#, fuzzy
+#~ msgid "Connecting..."
+#~ msgstr "कनेक्शन में त्रुटि"
+
+#  *  DEFINES, MACROS & DATA TYPES
+#, fuzzy
+#~ msgid "Gaim User"
+#~ msgstr "गेम"
+
+#, fuzzy
+#~ msgid "Roomlist Error"
+#~ msgstr "रजिस्ट्रेशन त्रुटि"
+
+#, fuzzy
+#~ msgid "Update Buddy Icon"
+#~ msgstr "बड्डी टिकर"
+
+#, fuzzy
+#~ msgid "Set Available Message..."
+#~ msgstr "नया संदेश..."
+
+#, fuzzy
+#~ msgid "Roomlist"
+#~ msgstr "रजिस्ट्रेशन त्रुटि"
+
+#, fuzzy
+#~ msgid "%s signed off"
+#~ msgstr "गेम - साइन्ड ऑफ"
 
 #  ---------- "Notification Methods" ----------
-#: src/win32/win32dep.c:278
-#, fuzzy
-msgid "Notification"
-msgstr "सूचना की विधियाँ"
+#, fuzzy
+#~ msgid "Notification"
+#~ msgstr "सूचना की विधियाँ"
 
 #, fuzzy
 #~ msgid "%s was not found.\n"